From: Biwen Li <biwen...@nxp.com>

Add COMMON_ENV(kernel_addr_r, fdt_addr_r and so on)
to fix a bug that faild to boot to ubuntu, failed
log as follows,
        ## Executing script at 80000000
        load - load binary file from a filesystemUsage:
        load <interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]
            - Load binary file filename from partition part on device
               type interface instance dev to address addr in memory.
              bytes gives the size to load in bytes.
              If bytes is 0 or omitted, the file is read until the end.
              pos gives the file byte position to start reading from.
              If pos is 0 or omitted, the file is read from the start.
        ...
        Bad Linux ARM64 Image magic!
        SCRIPT FAILED: continuing...

Signed-off-by: Biwen Li <biwen...@nxp.com>
---
Change in v2:
        - update description

 include/configs/ls1088aqds.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 59757120fc..0dd6bb9f32 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -384,10 +384,18 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \
        QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
 
+#define COMMON_ENV \
+       "kernelheader_addr_r=0x80200000\0"      \
+       "fdtheader_addr_r=0x80100000\0"         \
+       "kernel_addr_r=0x81000000\0"            \
+       "fdt_addr_r=0x90000000\0"               \
+       "load_addr=0xa0000000\0"
+
 /* Initial environment variables */
 #ifdef CONFIG_NXP_ESBC
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
+       COMMON_ENV                              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x90100000\0"                 \
        "kernel_addr=0x100000\0"                \
@@ -419,6 +427,7 @@ unsigned long get_board_ddr_clk(void);
 
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
+       COMMON_ENV                              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x90100000\0"                 \
        "kernel_addr=0x100000\0"                \
@@ -480,6 +489,7 @@ unsigned long get_board_ddr_clk(void);
 #if defined(CONFIG_QSPI_BOOT)
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
+       COMMON_ENV                              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x90100000\0"                 \
        "kernel_addr=0x100000\0"                \
@@ -497,6 +507,7 @@ unsigned long get_board_ddr_clk(void);
 #elif defined(CONFIG_SD_BOOT)
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS               \
+       COMMON_ENV                              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x90100000\0"                 \
        "kernel_addr=0x800\0"                \
@@ -514,6 +525,7 @@ unsigned long get_board_ddr_clk(void);
 #else  /* NOR BOOT */
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
+       COMMON_ENV                              \
        "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x90100000\0"                 \
        "kernel_addr=0x100000\0"                \
-- 
2.17.1

Reply via email to