From: Michal Simek Date: Wed, 4 Nov 2020 15:12:20 +0000 (+0100) Subject: microblaze: Unify of setting for SPL_NOR/XIP support X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=09996b4d8466a31c300d5de37c3cf8ff33f151a7;p=u-boot.git microblaze: Unify of setting for SPL_NOR/XIP support XIP is not enabled in SPL. SPL_NOR is enabled but any macro setting with using SYS_FLASH_BASE are wrong because it is not aligned with DM. That's why change these macro and align them with TEXT_BASE macro. Information should be find at run time based on DT but implementation is not done yet. Signed-off-by: Michal Simek --- diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 72550113ce..c31a788074 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -163,14 +163,12 @@ /* SPL part */ -#ifdef CONFIG_SYS_FLASH_BASE -# define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE -#endif +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE /* for booting directly linux */ +#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_TEXT_BASE + \ + 0x40000) -#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + \ - 0x40000) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_TEXT_BASE + \ 0x1000000)