arm: mvebu: Remove CONFIG_SPL_BOOT_DEVICE
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>
This commit is contained in:
parent
b19512f1cf
commit
3ff2aa6d04
@ -22,18 +22,6 @@
|
|||||||
#define CONFIG_PCI_SCAN_SHOW
|
#define CONFIG_PCI_SCAN_SHOW
|
||||||
#endif
|
#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
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Environment Configuration
|
* Environment Configuration
|
||||||
*/
|
*/
|
||||||
|
@ -26,19 +26,6 @@
|
|||||||
"fdt_high=0x10000000\0" \
|
"fdt_high=0x10000000\0" \
|
||||||
"initrd_high=0x10000000\0"
|
"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
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* mv-common.h should be defined after CMD configs since it used them
|
* mv-common.h should be defined after CMD configs since it used them
|
||||||
* to enable certain macros
|
* to enable certain macros
|
||||||
|
@ -27,18 +27,6 @@
|
|||||||
"fdt_high=0x10000000\0" \
|
"fdt_high=0x10000000\0" \
|
||||||
"initrd_high=0x10000000\0"
|
"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
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* mv-common.h should be defined after CMD configs since it used them
|
* mv-common.h should be defined after CMD configs since it used them
|
||||||
* to enable certain macros
|
* to enable certain macros
|
||||||
|
Loading…
Reference in New Issue
Block a user