diff options
author | Wenyou Yang <wenyou.yang@microchip.com> | 2017-09-14 11:07:44 +0800 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-09-14 16:02:48 -0400 |
commit | 5541543f686b43210fb92181003ff7175d4ab036 (patch) | |
tree | a9e5f81fe6a382c1caae6eacb4114232c8a8eed6 /include/configs/sama5d3_xplained.h | |
parent | a35c34025e4ae08441f2e26ddcac86aec63c33af (diff) | |
download | u-boot-5541543f686b43210fb92181003ff7175d4ab036.zip u-boot-5541543f686b43210fb92181003ff7175d4ab036.tar.gz u-boot-5541543f686b43210fb92181003ff7175d4ab036.tar.bz2 |
configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment
To remove the assignment of CONFIG_SYS_EXTRA_OPTIONS option,
which is deprecated, use the CONFIG_XXXX_BOOT options to
indicate the boot media, and the SoC is selected by the board.
Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
Diffstat (limited to 'include/configs/sama5d3_xplained.h')
-rw-r--r-- | include/configs/sama5d3_xplained.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 54ea98d..a6697cd 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -69,12 +69,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -#if CONFIG_SYS_USE_NANDFLASH -/* override the bootcmd, bootargs and other configuration for nandflash env */ -#elif CONFIG_SYS_USE_MMC -/* override the bootcmd, bootargs and other configuration for sd/mmc env */ -#endif - /* SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 @@ -86,13 +80,14 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE +#endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 @@ -103,5 +98,3 @@ #define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER #endif - -#endif |