ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation
PATCH 1/1 ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation
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.
--- include/configs/ls1021aiot.h | 5 +++-- include/configs/ls1021aqds.h | 3 +-- include/configs/ls1021atsn.h | 3 ++- include/configs/ls1021atwr.h | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-)
include/configs/ls1021aiot.h +3 -2
@@ -207,12 +207,13 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ -"initrd_high=0xffffffff\0" \ -"fdt_high=0xffffffff\0" +"initrd_high=0xffffffff\0"/* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO
include/configs/ls1021aqds.h +1 -2
@@ -460,13 +460,11 @@ unsigned long get_board_ddr_clk(void);#ifdef CONFIG_LPUART #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"#else #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0"#endif
@@ -474,6 +472,7 @@ unsigned long get_board_ddr_clk(void);/* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20)#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END 0x9fffffff
include/configs/ls1021atsn.h +2 -1
@@ -154,7 +154,6 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x61000000\0" \ "kernelheader_addr=0x60800000\0" \
@@ -216,6 +215,8 @@"bootm $load_addr#$board\0" /* Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) +#define CONFIG_SYS_CBSIZE 256/* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
include/configs/ls1021atwr.h +1 -2
@@ -299,7 +299,6 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \
@@ -357,7 +356,6 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x61000000\0" \ "kernelheader_addr=0x60800000\0" \
@@ -441,6 +439,7 @@/* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20)#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END 0x9fffffff
Signature · 1 line
2.9.5
PATCH 1/1 ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation
Quoted 6 lines · Alison Wang
This patch sets
CONFIG_SYS_BOOTMAPSZto the amount of memory available to safely contain a kernel, device tree and initrd for relocation. The way to setfdt_highas0xffffffffto disable device tree relocation is removed.Signed-off-by Alison Wang <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200203/7de212a5/attachment.sig>
PATCH 1/1 ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation
In reply to Alison WangQuoted 10 lines
-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Alison Wang
Sent: Monday, February 3, 2020 12:55 PM
To: Priyanka Jain <[email protected]>; Jagdish Gediya <[email protected]>; Xiaobo Xie <[email protected]>; u- boot at lists.denx.de
Cc: Alison Wang <[email protected]>
Subject: [PATCH] ls1021a: SetCONFIG_SYS_BOOTMAPSZto the memory for relocation
Quoted 6 lines
This patch sets
CONFIG_SYS_BOOTMAPSZto the amount of memory available to safely contain a kernel, device tree and initrd for relocation. The way to setfdt_highas0xffffffffto disable device tree relocation is removed.Signed-off-by Alison Wang <[email protected]>---
Applied to u-boot-fsl-qoriq. Waiting upstream
Thanks
Priyanka