summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-05-15 20:37:52 +0900
committerMichal Simek <michal.simek@xilinx.com>2014-05-15 13:57:28 +0200
commit0dfbcf02de58b2ebf8ea63f57a9971592b5b2277 (patch)
treedbdbeb7ae6f0ac1a81638ef14c47cc78344434e0
parent2405d09c4c8a1e4cd7744e5f10d1592bd974a939 (diff)
downloadu-boot-imx-0dfbcf02de58b2ebf8ea63f57a9971592b5b2277.zip
u-boot-imx-0dfbcf02de58b2ebf8ea63f57a9971592b5b2277.tar.gz
u-boot-imx-0dfbcf02de58b2ebf8ea63f57a9971592b5b2277.tar.bz2
zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined
SPL should load "u-boot-dtb.img" if both CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE are defined. Otherwise, "u-boot.img" should be loaded. Since CONFIG_OF_CONTROL is always undefined for SPL_BUILD, the undef block should be moved below the conditional definition of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--include/configs/zynq-common.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d2149b3..579091d 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -262,13 +262,6 @@
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/zynq/u-boot-spl.lds"
-/* Disable dcache for SPL just for sure */
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_DCACHE_OFF
-#undef CONFIG_FPGA
-#undef CONFIG_OF_CONTROL
-#endif
-
/* MMC support */
#ifdef CONFIG_ZYNQ_SDHCI0
#define CONFIG_SPL_MMC_SUPPORT
@@ -277,7 +270,18 @@
#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
#define CONFIG_SPL_LIBDISK_SUPPORT
#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_OF_SEPARATE)
+# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot-dtb.img"
+#else
+# define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#endif
+#endif
+
+/* Disable dcache for SPL just for sure */
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SYS_DCACHE_OFF
+#undef CONFIG_FPGA
+#undef CONFIG_OF_CONTROL
#endif
/* Address in RAM where the parameters must be copied by SPL. */