Message ID | 20200325043426.30484-1-alison.wang@nxp.com |
---|---|
State | New |
Headers | show |
Series | [v2] configs: ls1021a: Append othbootargs to bootargs | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Alison Wang >Sent: Wednesday, March 25, 2020 10:04 AM >To: u-boot at lists.denx.de; Priyanka Jain <priyanka.jain at nxp.com>; Jagdish >Gediya <jagdish.gediya at nxp.com> >Cc: Alison Wang <alison.wang at nxp.com>; Shengzhou Liu ><shengzhou.liu at nxp.com> >Subject: [PATCH v2] configs: ls1021a: Append othbootargs to bootargs > >This patch appends CMA configuration to bootargs for LS1021ATWR board. > >Signed-off-by: Shengzhou Liu <Shengzhou.Liu at nxp.com> >Signed-off-by: Alison Wang <alison.wang at nxp.com> >--- >Changes for v2: > - Append CMA configuration to bootargs directly > > include/configs/ls1021atwr.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index >8e2784b..5f73821 100644 >--- a/include/configs/ls1021atwr.h >+++ b/include/configs/ls1021atwr.h >@@ -297,7 +297,8 @@ > > #ifdef CONFIG_LPUART > #define CONFIG_EXTRA_ENV_SETTINGS \ >- "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ >+ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 " \ >+ "cma=64M at 0x0-0xb0000000\0" \ > "initrd_high=0xffffffff\0" \ > "fdt_high=0xffffffff\0" \ > "fdt_addr=0x64f00000\0" \ >@@ -313,7 +314,6 @@ > "kernel_size=0x2800000\0" \ > "kernel_addr_sd=0x8000\0" \ > "kernel_size_sd=0x14000\0" \ >- "$othbootargs\0" \ > "othbootargs=cma=64M at 0x0-0xb0000000\0" \ > BOOTENV \ > "boot_scripts=ls1021atwr_boot.scr\0" \ >@@ -355,7 +355,8 @@ > "$kernel_size && bootm $load_addr#$board\0" > #else > #define CONFIG_EXTRA_ENV_SETTINGS \ >- "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ >+ "bootargs=root=/dev/ram0 rw console=ttyS0,115200 " \ >+ "cma=64M at 0x0-0xb0000000\0" \ > "initrd_high=0xffffffff\0" \ > "fdt_high=0xffffffff\0" \ > "fdt_addr=0x64f00000\0" \ >@@ -375,7 +376,6 @@ > "kernel_size_sd=0x14000\0" \ > "kernelhdr_addr_sd=0x4000\0" \ > "kernelhdr_size_sd=0x10\0" \ >- "$othbootargs\0" \ > "othbootargs=cma=64M at 0x0-0xb0000000\0" \ > BOOTENV \ > "boot_scripts=ls1021atwr_boot.scr\0" \ >-- >2.9.5 Reviewed-by: Priyanka Jain <priyanka.jain at nxp.com>
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8e2784b..5f73821 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -297,7 +297,8 @@ #ifdef CONFIG_LPUART #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ + "bootargs=root=/dev/ram0 rw console=ttyLP0,115200 " \ + "cma=64M at 0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ @@ -313,7 +314,6 @@ "kernel_size=0x2800000\0" \ "kernel_addr_sd=0x8000\0" \ "kernel_size_sd=0x14000\0" \ - "$othbootargs\0" \ "othbootargs=cma=64M at 0x0-0xb0000000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \ @@ -355,7 +355,8 @@ "$kernel_size && bootm $load_addr#$board\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ + "bootargs=root=/dev/ram0 rw console=ttyS0,115200 " \ + "cma=64M at 0x0-0xb0000000\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ @@ -375,7 +376,6 @@ "kernel_size_sd=0x14000\0" \ "kernelhdr_addr_sd=0x4000\0" \ "kernelhdr_size_sd=0x10\0" \ - "$othbootargs\0" \ "othbootargs=cma=64M at 0x0-0xb0000000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \