microblaze: Enable SPL_NOR support when FLASH_BASE is setup

Simplify SPL NOR init.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index bb070600021b4a7da9728aaaafd3c9ba132ddf5c..2e1e64247fe045ae56ff4b8374f20ac2fc3d9360 100644 (file)
--- 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 - \