Convert CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig

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

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index a3df404..4873395 100644 (file)
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -46,8 +46,18 @@
 
 #endif
 
+#ifdef CONFIG_QSPI_BOOT
+#undef CONFIG_ENV_SPI_BUS
+#undef CONFIG_BOOTCOMMAND
+#define CONFIG_ENV_SPI_BUS     1
+#define CONFIG_BOOTCOMMAND     "sf probe 1:0; "                        \
+                               "sf read 0x21000000 0x180000 0x80000; " \
+                               "sf read 0x22000000 0x200000 0x600000; "\
+                               "bootz 0x22000000 - 0x21000000"
+
+#endif
+
 /* SPL */
-#define CONFIG_SPL_TEXT_BASE           0x200000
 #define CONFIG_SPL_MAX_SIZE            0x10000
 #define CONFIG_SPL_BSS_START_ADDR      0x20000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000
@@ -59,10 +69,6 @@
 #ifdef CONFIG_SD_BOOT
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
-
-#elif CONFIG_SPI_BOOT
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x10000
-
 #endif
 
 #endif