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/at91sam9m10g45ek.h | |
parent | a35c34025e4ae08441f2e26ddcac86aec63c33af (diff) |
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/at91sam9m10g45ek.h')
-rw-r--r-- | include/configs/at91sam9m10g45ek.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 36acaa5506..2957da9432 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -80,7 +80,7 @@ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_END 0x23e00000 -#ifdef CONFIG_SYS_USE_NANDFLASH +#ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env in nandflash */ #define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 @@ -89,7 +89,7 @@ #define CONFIG_BOOTCOMMAND \ "nand read 0x70000000 0x200000 0x300000;" \ "bootm 0x70000000" -#elif CONFIG_SYS_USE_MMC +#elif CONFIG_SD_BOOT /* bootstrap + u-boot + env + linux in mmc */ #define CONFIG_ENV_SIZE 0x4000 @@ -115,7 +115,7 @@ #define CONFIG_SYS_MONITOR_LEN 0x80000 -#ifdef CONFIG_SYS_USE_MMC +#ifdef CONFIG_SD_BOOT #define CONFIG_SPL_BSS_START_ADDR 0x70000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00080000 @@ -125,7 +125,7 @@ #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 #define CONFIG_SPL_NAND_ECC |