From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Mon, 16 Nov 2020 16:02:18 +0100 Subject: [PATCH v2 5/6] microblaze: Unify of setting for SPL_NOR/XIP support In-Reply-To: References: Message-ID: <7bbf59a0274d75ccc0d0815ca286a4670a4d8a1e.1605538936.git.michal.simek@xilinx.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- 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(-) 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) -- 2.29.2