dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation

Browse Source 
This patch sets CONFIG_SYS_BOOTMAPSZ to the amount of memory available
to safely contain a kernel, device tree and initrd for relocation. The
way to set fdt_high as 0xffffffff to disable device tree relocation is
removed.

Signed-off-by: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Alison Wang
2020-02-03 15:25:19 +08:00
committed by Priyanka Jain
parent 350c44dfb9
commit c463eeb4b6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/configs/ls1021aiot.h
View File

@@ -207,12 +207,13 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0"
"fdt_high=0xffffffff\0"
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
#define CONFIG_CMD_GREPENV #define CONFIG_CMD_GREPENV
#define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMINFO

3
include/configs/ls1021aqds.h
View File

@@ -460,13 +460,11 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_LPUART #ifdef CONFIG_LPUART
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
#else #else
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"
#endif #endif
@@ -474,6 +472,7 @@ unsigned long get_board_ddr_clk(void);
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
#define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff #define CONFIG_SYS_MEMTEST_END 0x9fffffff

3
include/configs/ls1021atsn.h
View File

@@ -154,7 +154,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x64f00000\0" \ "fdt_addr=0x64f00000\0" \
"kernel_addr=0x61000000\0" \ "kernel_addr=0x61000000\0" \
"kernelheader_addr=0x60800000\0" \ "kernelheader_addr=0x60800000\0" \
@@ -216,6 +215,8 @@
"bootm $load_addr#$board\0" "bootm $load_addr#$board\0"
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE \ #define CONFIG_SYS_PBSIZE \
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)

3
include/configs/ls1021atwr.h
View File

@@ -299,7 +299,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x64f00000\0" \ "fdt_addr=0x64f00000\0" \
"kernel_addr=0x65000000\0" \ "kernel_addr=0x65000000\0" \
"scriptaddr=0x80000000\0" \ "scriptaddr=0x80000000\0" \
@@ -357,7 +356,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_high=0xffffffff\0" \
"fdt_addr=0x64f00000\0" \ "fdt_addr=0x64f00000\0" \
"kernel_addr=0x61000000\0" \ "kernel_addr=0x61000000\0" \
"kernelheader_addr=0x60800000\0" \ "kernelheader_addr=0x60800000\0" \
@@ -441,6 +439,7 @@
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CONFIG_SYS_BOOTMAPSZ (256 << 20)
#define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END 0x9fffffff #define CONFIG_SYS_MEMTEST_END 0x9fffffff