From: Michal Simek Date: Tue, 27 Jan 2015 13:25:38 +0000 (+0100) Subject: microblaze: Enable SPL_NOR support when FLASH_BASE is setup X-Git-Tag: v2015.04-rc2~36^2~7 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4dd097427aeb6848fcb19c31b805abe1a3906913;p=u-boot microblaze: Enable SPL_NOR support when FLASH_BASE is setup Simplify SPL NOR init. Signed-off-by: Michal Simek --- diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index bb07060002..2e1e64247f 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 - \