at91: configs: Drop duplication of defconfig macros

[platform/kernel/u-boot.git] / include / configs / at91-sama5_common.h

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index b9c6a27..6131277 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -13,8 +13,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
-#define CONFIG_ARCH_CPU_INIT
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
@@ -37,13 +35,7 @@
 #ifdef CONFIG_SD_BOOT
 
 #ifdef CONFIG_ENV_IS_IN_MMC
-/* Use raw reserved sectors to save environment */
-#define CONFIG_ENV_OFFSET              0x2000
-#define CONFIG_ENV_SIZE                        0x1000
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#else
-/* u-boot env in sd/mmc card */
-#define CONFIG_ENV_SIZE                0x4000
 #endif
 
 #define CONFIG_BOOTCOMMAND     "if test ! -n ${dtb_name}; then "       \
@@ -67,6 +59,11 @@
                                        "sf read 0x21000000 0x60000 0xc000; "   \
                                        "sf read 0x22000000 0x6c000 0x394000; " \
                                        "bootz 0x22000000 - 0x21000000"
+#elif CONFIG_QSPI_BOOT
+#define CONFIG_BOOTCOMMAND             "sf probe 0; "                                  \
+                                       "sf read 0x21000000 0x180000 0x80000; "         \
+                                       "sf read 0x22000000 0x200000 0x600000; "        \
+                                       "bootz 0x22000000 - 0x21000000"
 #endif
 
 #endif