summaryrefslogtreecommitdiff
path: root/include/configs/sama5d2_ptc.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/sama5d2_ptc.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/sama5d2_ptc.h')
-rw-r--r--include/configs/sama5d2_ptc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index 75a81f1..3ae16df 100644
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -72,7 +72,7 @@
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_MACB_SEARCH_PHY
-#ifdef CONFIG_SYS_USE_NANDFLASH
+#ifdef CONFIG_NAND_BOOT
#undef CONFIG_ENV_OFFSET
#undef CONFIG_ENV_OFFSET_REDUND
#undef CONFIG_BOOTCOMMAND
@@ -95,13 +95,14 @@
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
-#ifdef CONFIG_SYS_USE_SERIALFLASH
+#ifdef CONFIG_SPI_BOOT
#define CONFIG_SPL_SPI_LOAD
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000
-#elif CONFIG_SYS_USE_NANDFLASH
+#elif CONFIG_NAND_BOOT
#define CONFIG_SPL_NAND_DRIVERS
#define CONFIG_SPL_NAND_BASE
+#endif
#define CONFIG_PMECC_CAP 8
#define CONFIG_PMECC_SECTOR_SIZE 512
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000
@@ -112,6 +113,5 @@
#define CONFIG_SYS_NAND_BLOCK_SIZE 0x40000
#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0x0
#define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
-#endif
#endif