summaryrefslogtreecommitdiff
path: root/include/configs/microblaze-generic.h
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-01-27 14:25:38 +0100
committerMichal Simek <michal.simek@xilinx.com>2015-02-09 15:09:58 +0100
commit4dd097427aeb6848fcb19c31b805abe1a3906913 (patch)
tree8a0ea720b6d2c044d974e0bad7a02fe4a43c4aaf /include/configs/microblaze-generic.h
parent9cef20b10929d7ad047b071c3dcb924401bf78e8 (diff)
downloadu-boot-imx-4dd097427aeb6848fcb19c31b805abe1a3906913.zip
u-boot-imx-4dd097427aeb6848fcb19c31b805abe1a3906913.tar.gz
u-boot-imx-4dd097427aeb6848fcb19c31b805abe1a3906913.tar.bz2
microblaze: Enable SPL_NOR support when FLASH_BASE is setup
Simplify SPL NOR init. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'include/configs/microblaze-generic.h')
-rw-r--r--include/configs/microblaze-generic.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index bb07060..2e1e642 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -452,7 +452,10 @@
#define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds"
#define CONFIG_SPL_RAM_DEVICE
-#define CONFIG_SPL_NOR_SUPPORT
+#ifdef CONFIG_SYS_FLASH_BASE
+# define CONFIG_SPL_NOR_SUPPORT
+# define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE
+#endif
/* for booting directly linux */
#define CONFIG_SPL_OS_BOOT
@@ -491,7 +494,6 @@
/* Just for sure that there is a space for stack */
#define CONFIG_SPL_STACK_SIZE 0x100
-#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_INIT_RAM_SIZE - \