summaryrefslogtreecommitdiff
path: root/include/configs/at91-sama5_common.h
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@microchip.com>2017-09-14 03:07:44 (GMT)
committerTom Rini <trini@konsulko.com>2017-09-14 20:02:48 (GMT)
commit5541543f686b43210fb92181003ff7175d4ab036 (patch)
treea9e5f81fe6a382c1caae6eacb4114232c8a8eed6 /include/configs/at91-sama5_common.h
parenta35c34025e4ae08441f2e26ddcac86aec63c33af (diff)
downloadu-boot-5541543f686b43210fb92181003ff7175d4ab036.tar.xz
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/at91-sama5_common.h')
-rw-r--r--include/configs/at91-sama5_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 435c7df..dc36c2a 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -42,7 +42,7 @@
* Command line configuration.
*/
-#ifdef CONFIG_SYS_USE_MMC
+#ifdef CONFIG_SD_BOOT
#ifdef CONFIG_ENV_IS_IN_MMC
/* Use raw reserved sectors to save environment */
@@ -63,7 +63,7 @@
#else
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
/* u-boot env in nand flash */
#define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
@@ -71,7 +71,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x21000000 0x180000 0x80000;" \
"nand read 0x22000000 0x200000 0x600000;" \
"bootz 0x22000000 - 0x21000000"
-#elif CONFIG_SYS_USE_SERIALFLASH
+#elif CONFIG_SPI_BOOT
/* u-boot env in serial flash, by default is bus 0 and cs 0 */
#define CONFIG_ENV_OFFSET 0x6000
#define CONFIG_ENV_SIZE 0x2000