| Message ID | 7bbf59a0274d75ccc0d0815ca286a4670a4d8a1e.1605538936.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 09996b4d8466a31c300d5de37c3cf8ff33f151a7 |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | microblaze: Cleanup series | expand |
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 72550113cefa..c31a7880743f 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)
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 <michal.simek@xilinx.com> --- Changes in v2: - Rework the whole patch because SPL_NOR is enabled by default. include/configs/microblaze-generic.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)