[PATCH u-boot-mvebu v2 38/41] arm: mvebu: Remove unused macro CONFIG_SYS_U_BOOT_OFFS
Stefan Roese
sr at denx.de
Thu Jul 22 10:53:17 CEST 2021
On 19.07.21 14:21, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
>
> Macro CONFIG_SYS_U_BOOT_OFFS is set but not used anymore. Remove it.
>
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>
> Reviewed-by: Chris Packham <judge.packham at gmail.com>
Reviewed-by: Stefan Roese <sr at denx.de>
Thanks,
Stefan
> ---
> include/configs/clearfog.h | 6 +-----
> include/configs/controlcenterdc.h | 6 ------
> include/configs/db-88f6720.h | 3 ---
> include/configs/db-88f6820-amc.h | 5 -----
> include/configs/db-88f6820-gp.h | 6 ------
> include/configs/db-mv784mp-gp.h | 3 ---
> include/configs/ds414.h | 5 -----
> include/configs/helios4.h | 6 +-----
> include/configs/theadorable.h | 3 ---
> include/configs/turris_omnia.h | 6 ------
> include/configs/x530.h | 3 ---
> scripts/config_whitelist.txt | 1 -
> 12 files changed, 2 insertions(+), 51 deletions(-)
>
> diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
> index 255b147945..fbdd2f0a24 100644
> --- a/include/configs/clearfog.h
> +++ b/include/configs/clearfog.h
> @@ -69,12 +69,8 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x20000
> -#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
> +#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
> /* SPL related MMC defines */
> -#define CONFIG_SYS_U_BOOT_OFFS (160 << 10)
> #ifdef CONFIG_SPL_BUILD
> #define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
> #endif
> diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
> index fffc372872..e81d05aa2e 100644
> --- a/include/configs/controlcenterdc.h
> +++ b/include/configs/controlcenterdc.h
> @@ -85,15 +85,9 @@
> #define CONFIG_SPL_LIBGENERIC_SUPPORT
> #define CONFIG_SPL_I2C_SUPPORT
>
> -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x30000
> -#endif
> -
> #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
> /* SPL related MMC defines */
> #define CONFIG_SPL_MMC_SUPPORT
> -#define CONFIG_SYS_U_BOOT_OFFS (168 << 10)
> #ifdef CONFIG_SPL_BUILD
> #define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
> #endif
> diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
> index 14c0190375..cbb9270f93 100644
> --- a/include/configs/db-88f6720.h
> +++ b/include/configs/db-88f6720.h
> @@ -65,7 +65,4 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x20000
> -
> #endif /* _CONFIG_DB_88F6720_H */
> diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
> index 3cd1ff899a..757fbc0b9b 100644
> --- a/include/configs/db-88f6820-amc.h
> +++ b/include/configs/db-88f6820-amc.h
> @@ -59,11 +59,6 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x24000
> -#endif
> -
> /*
> * mv-common.h should be defined after CMD configs since it used them
> * to enable certain macros
> diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
> index 5e43191e8e..d50eb2c120 100644
> --- a/include/configs/db-88f6820-gp.h
> +++ b/include/configs/db-88f6820-gp.h
> @@ -71,14 +71,8 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -#if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x24000
> -#endif
> -
> #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD
> /* SPL related MMC defines */
> -#define CONFIG_SYS_U_BOOT_OFFS (160 << 10)
> #ifdef CONFIG_SPL_BUILD
> #define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
> #endif
> diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
> index 990fcec129..ef7eebd081 100644
> --- a/include/configs/db-mv784mp-gp.h
> +++ b/include/configs/db-mv784mp-gp.h
> @@ -78,9 +78,6 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x20000
> -
> /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
> #define CONFIG_SPD_EEPROM 0x4e
> #define CONFIG_BOARD_ECC_SUPPORT /* this board supports ECC */
> diff --git a/include/configs/ds414.h b/include/configs/ds414.h
> index b34da334e2..4bbb244fa2 100644
> --- a/include/configs/ds414.h
> +++ b/include/configs/ds414.h
> @@ -68,11 +68,6 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x24000
> -#endif
> -
> /* DS414 bus width is 32bits */
> #define CONFIG_DDR_32BIT
>
> diff --git a/include/configs/helios4.h b/include/configs/helios4.h
> index 3875377971..1368080f03 100644
> --- a/include/configs/helios4.h
> +++ b/include/configs/helios4.h
> @@ -69,12 +69,8 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI)
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x20000
> -#elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
> +#if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) || defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA)
> /* SPL related MMC defines */
> -#define CONFIG_SYS_U_BOOT_OFFS (160 << 10)
> #ifdef CONFIG_SPL_BUILD
> #define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
> #endif
> diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
> index bfe135da6b..31852fb248 100644
> --- a/include/configs/theadorable.h
> +++ b/include/configs/theadorable.h
> @@ -93,9 +93,6 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x1a000
> -
> /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
> #define CONFIG_DDR_FIXED_SIZE (2 << 20) /* 2GiB */
>
> diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
> index 49ee7a7af5..0a824b7939 100644
> --- a/include/configs/turris_omnia.h
> +++ b/include/configs/turris_omnia.h
> @@ -45,14 +45,8 @@
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
> #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
>
> -#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI
> -/* SPL related SPI defines */
> -# define CONFIG_SYS_U_BOOT_OFFS 0x24000
> -#endif
> -
> #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
> /* SPL related MMC defines */
> -# define CONFIG_SYS_U_BOOT_OFFS (160 << 10)
> # ifdef CONFIG_SPL_BUILD
> # define CONFIG_FIXED_SDHCI_ALIGNED_BUFFER 0x00180000 /* in SDRAM */
> # endif
> diff --git a/include/configs/x530.h b/include/configs/x530.h
> index 25b259832a..515c6e7ff4 100644
> --- a/include/configs/x530.h
> +++ b/include/configs/x530.h
> @@ -97,7 +97,4 @@
> #define CONFIG_SPL_STACK (0x40000000 + ((192 - 16) << 10))
> #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4)
>
> -/* SPL related SPI defines */
> -#define CONFIG_SYS_U_BOOT_OFFS 0x24000
> -
> #endif /* _CONFIG_X530_H */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 042ca116e9..1f88212625 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -3301,7 +3301,6 @@ CONFIG_SYS_USE_NAND
> CONFIG_SYS_USE_NANDFLASH
> CONFIG_SYS_USE_NORFLASH
> CONFIG_SYS_USR_EXCEP
> -CONFIG_SYS_U_BOOT_OFFS
> CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR
> CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN
> CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT
>
Viele Grüße,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
More information about the U-Boot
mailing list