]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
microblaze: Unify of setting for SPL_NOR/XIP support
authorMichal Simek <michal.simek@xilinx.com>
Wed, 4 Nov 2020 15:12:20 +0000 (16:12 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 20 Nov 2020 09:42:53 +0000 (10:42 +0100)
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>
include/configs/microblaze-generic.h

index 72550113cefa1f74782326d6aca0b342499f8522..c31a7880743fe6d948ebacb93a48ca2fc9e0d1cc 100644 (file)
 
 /* 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)