From 63d3464d2e72158e2d6f20c187be0a066b5d8577 Mon Sep 17 00:00:00 2001 From: Biwen Li Date: Fri, 10 Jan 2020 17:16:04 +0800 Subject: include/configs: ls1012ardb: adjust kernel_addr_r The linux kernel Image is growing quite quickly, if kernel Image size grow beyond 36 MB then kernel Image at load address 0x81000000 overlaps with the reserved memory region at 0x83400000. Adjust kernel load address(kernel_addr_r) from 0x81000000 to 0x96000000 to avoid kernel Image overlapping with reserved memory region. This change fixes the below U-Boot error while booting uncompressed kernel Image through booti command, ERROR: reserving fdt memory region failed (addr=83400000 size=c00000) Signed-off-by: Biwen Li Reviewed-by: Priyanka Jain --- include/configs/ls1012ardb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 0341495dfb5..b419c46829e 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -69,7 +69,7 @@ "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ - "kernel_addr_r=0x81000000\0" \ + "kernel_addr_r=0x96000000\0" \ "fdt_addr_r=0x90000000\0" \ "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ -- cgit v1.2.3 From f0d4cd4307ba7b90bd2cf18ef14bb84a95c7c01c Mon Sep 17 00:00:00 2001 From: Biwen Li Date: Fri, 10 Jan 2020 17:16:05 +0800 Subject: include/configs: ls1012afrwy: adjust kernel_addr_r The linux kernel Image is growing quite quickly, if kernel Image size grow beyond 36 MB then kernel Image at load address 0x81000000 overlaps with the reserved memory region at 0x83400000. Adjust kernel load address(kernel_addr_r) from 0x81000000 to 0x96000000 to avoid kernel Image overlapping with reserved memory region. This change fixes the below U-Boot error while booting uncompressed kernel Image through booti command, ERROR: reserving fdt memory region failed (addr=83400000 size=c00000) Signed-off-by: Biwen Li Reviewed-by: Priyanka Jain --- include/configs/ls1012afrwy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index c0519e3c110..dde4369c97c 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -63,7 +63,7 @@ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernelheader_size=0x40000\0" \ - "kernel_addr_r=0x81000000\0" \ + "kernel_addr_r=0x96000000\0" \ "fdt_addr_r=0x90000000\0" \ "load_addr=0x96000000\0" \ "kernel_size=0x2800000\0" \ -- cgit v1.2.3 From 69b3894e6fe91d260cac1a7ab34f16c4a0c92f66 Mon Sep 17 00:00:00 2001 From: Meenakshi Aggarwal Date: Fri, 10 Jan 2020 20:13:19 +0530 Subject: lx2160: Correct default environment variable Create separate "boot_scripts" and "boot_script_hdr" environment variable for LX2160A RDB and QDS board. Signed-off-by: Meenakshi Aggarwal Reviewed-by: Priyanka Jain --- include/configs/lx2160a_common.h | 4 +--- include/configs/lx2160aqds.h | 4 +++- include/configs/lx2160ardb.h | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index cd3e2c4c854..02cccff0c82 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef __LX2_COMMON_H @@ -229,8 +229,6 @@ unsigned long get_board_ddr_clk(void); BOOTENV \ "mcmemsize=0x70000000\0" \ XSPI_MC_INIT_CMD \ - "boot_scripts=lx2160ardb_boot.scr\0" \ - "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 662e601f0fd..f25cab18ae5 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef __LX2_QDS_H @@ -120,6 +120,8 @@ u8 qixis_esdhc_detect_quirk(void); #define CONFIG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ "lx2160aqds_vdd_mv=800\0" \ + "boot_scripts=lx2160aqds_boot.scr\0" \ + "boot_script_hdr=hdr_lx2160aqds_bs.out\0" \ "BOARD=lx2160aqds\0" \ "xspi_bootcmd=echo Trying load from flexspi..;" \ "sf probe 0:0 && sf read $load_addr " \ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index c6bacb65ec0..de385f82c89 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 NXP + * Copyright 2018,2020 NXP */ #ifndef __LX2_RDB_H @@ -89,6 +89,8 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ + "boot_scripts=lx2160ardb_boot.scr\0" \ + "boot_script_hdr=hdr_lx2160ardb_bs.out\0" \ "lx2160ardb_vdd_mv=800\0" \ "BOARD=lx2160ardb\0" \ "xspi_bootcmd=echo Trying load from flexspi..;" \ -- cgit v1.2.3