| Message ID | 20220528231318.359510-3-judge.packham@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/3] arm: mvebu: Use MVEBU_SPL_BOOT_DEVICE instead of SPL_BOOT_DEVICE | expand |
On Sun, 29 May 2022 11:13:18 +1200 Chris Packham <judge.packham@gmail.com> wrote: > CONFIG_SPL_BOOT_DEVICE was made obsolete by > CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. > CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of > CONFIG_SPL_BOOT_DEVICE can simply have the option removed. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Marek Behún <marek.behun@nic.cz>
On 29.05.22 01:13, Chris Packham wrote: > CONFIG_SPL_BOOT_DEVICE was made obsolete by > CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. > CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of > CONFIG_SPL_BOOT_DEVICE can simply have the option removed. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > > include/configs/controlcenterdc.h | 11 ----------- > include/configs/db-88f6820-amc.h | 12 ------------ > include/configs/db-88f6820-gp.h | 11 ----------- > scripts/config_whitelist.txt | 1 - > 4 files changed, 35 deletions(-) > > diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h > index a8534e59d9b1..3d7da4b2a33e 100644 > --- a/include/configs/controlcenterdc.h > +++ b/include/configs/controlcenterdc.h > @@ -23,17 +23,6 @@ > #endif > > /* SPL */ > -/* > - * Select the boot device here > - * > - * Currently supported are: > - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash > - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) > - */ > -#define SPL_BOOT_SPI_NOR_FLASH 1 > -#define SPL_BOOT_SDIO_MMC_CARD 2 > -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH > - > /* Defines for SPL */ > #define CONFIG_SPL_SIZE (160 << 10) > > diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h > index 6538e66052aa..d044292d6b5a 100644 > --- a/include/configs/db-88f6820-amc.h > +++ b/include/configs/db-88f6820-amc.h > @@ -27,18 +27,6 @@ > "initrd_high=0x10000000\0" > > /* SPL */ > -/* > - * Select the boot device here > - * > - * Currently supported are: > - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash > - * > - * MMC is not populated on this board. > - * NAND support may be added in the future. > - */ > -#define SPL_BOOT_SPI_NOR_FLASH 1 > -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH > - > /* Defines for SPL */ > #define CONFIG_SPL_SIZE (140 << 10) > #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) > diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h > index b4b58e0bcb8a..35ff6a876fde 100644 > --- a/include/configs/db-88f6820-gp.h > +++ b/include/configs/db-88f6820-gp.h > @@ -28,17 +28,6 @@ > "initrd_high=0x10000000\0" > > /* SPL */ > -/* > - * Select the boot device here > - * > - * Currently supported are: > - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash > - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) > - */ > -#define SPL_BOOT_SPI_NOR_FLASH 1 > -#define SPL_BOOT_SDIO_MMC_CARD 2 > -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH > - > /* Defines for SPL */ > #define CONFIG_SPL_SIZE (140 << 10) > #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 25962b735f27..a8766c9755ab 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX > CONFIG_SPI_N25Q256A_RESET > CONFIG_SPL_BOARD_LOAD_IMAGE > CONFIG_SPL_BOOTROM_SAVE > -CONFIG_SPL_BOOT_DEVICE > CONFIG_SPL_BSS_MAX_SIZE > CONFIG_SPL_BSS_START_ADDR > CONFIG_SPL_CMT Viele Grüße, Stefan Roese
On Sun, May 29, 2022 at 11:13:18AM +1200, Chris Packham wrote: > CONFIG_SPL_BOOT_DEVICE was made obsolete by > CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. > CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of > CONFIG_SPL_BOOT_DEVICE can simply have the option removed. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > Reviewed-by: Marek Behún <marek.behun@nic.cz> > Reviewed-by: Stefan Roese <sr@denx.de> Applied to u-boot/next, thanks!
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index a8534e59d9b1..3d7da4b2a33e 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -23,17 +23,6 @@ #endif /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (160 << 10) diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 6538e66052aa..d044292d6b5a 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -27,18 +27,6 @@ "initrd_high=0x10000000\0" /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * - * MMC is not populated on this board. - * NAND support may be added in the future. - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index b4b58e0bcb8a..35ff6a876fde 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -28,17 +28,6 @@ "initrd_high=0x10000000\0" /* SPL */ -/* - * Select the boot device here - * - * Currently supported are: - * SPL_BOOT_SPI_NOR_FLASH - Booting via SPI NOR flash - * SPL_BOOT_SDIO_MMC_CARD - Booting via SDIO/MMC card (partition 1) - */ -#define SPL_BOOT_SPI_NOR_FLASH 1 -#define SPL_BOOT_SDIO_MMC_CARD 2 -#define CONFIG_SPL_BOOT_DEVICE SPL_BOOT_SPI_NOR_FLASH - /* Defines for SPL */ #define CONFIG_SPL_SIZE (140 << 10) #define CONFIG_SPL_MAX_SIZE (CONFIG_SPL_SIZE - (CONFIG_SPL_TEXT_BASE - 0x40000000)) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 25962b735f27..a8766c9755ab 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -565,7 +565,6 @@ CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET CONFIG_SPL_BOARD_LOAD_IMAGE CONFIG_SPL_BOOTROM_SAVE -CONFIG_SPL_BOOT_DEVICE CONFIG_SPL_BSS_MAX_SIZE CONFIG_SPL_BSS_START_ADDR CONFIG_SPL_CMT
CONFIG_SPL_BOOT_DEVICE was made obsolete by CONFIG_MVEBU_SPL_BOOT_DEVICE_{SPI,MMC,SATA,UART}. CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is the default so existing users of CONFIG_SPL_BOOT_DEVICE can simply have the option removed. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- include/configs/controlcenterdc.h | 11 ----------- include/configs/db-88f6820-amc.h | 12 ------------ include/configs/db-88f6820-gp.h | 11 ----------- scripts/config_whitelist.txt | 1 - 4 files changed, 35 deletions(-)