| Message ID | 20200316075906.29904-1-alison.wang@nxp.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | configs: ls1021a: Append othbootargs to bootargs | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Alison Wang >Sent: Monday, March 16, 2020 1:29 PM >To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com>; Jagdish >Gediya <jagdish.gediya@nxp.com> >Cc: Alison Wang <alison.wang@nxp.com> >Subject: [PATCH] configs: ls1021a: Append othbootargs to bootargs > >This patch appends othbootargs to bootargs for LS1021ATWR board. > >Signed-off-by: Alison Wang <alison.wang@nxp.com> >--- > include/configs/ls1021atwr.h | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > >diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index >8e2784b..266107c 100644 >--- a/include/configs/ls1021atwr.h >+++ b/include/configs/ls1021atwr.h >@@ -297,7 +297,7 @@ > > #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 >$othbootargs\0" \ > "initrd_high=0xffffffff\0" \ > "fdt_high=0xffffffff\0" \ > "fdt_addr=0x64f00000\0" \ >@@ -313,7 +313,6 @@ > "kernel_size=0x2800000\0" \ > "kernel_addr_sd=0x8000\0" \ > "kernel_size_sd=0x14000\0" \ >- "$othbootargs\0" \ > "othbootargs=cma=64M@0x0-0xb0000000\0" \ > BOOTENV \ > "boot_scripts=ls1021atwr_boot.scr\0" \ >@@ -355,7 +354,7 @@ > "$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 $othbootargs\0" >\ > "initrd_high=0xffffffff\0" \ > "fdt_high=0xffffffff\0" \ > "fdt_addr=0x64f00000\0" \ >@@ -375,7 +374,6 @@ > "kernel_size_sd=0x14000\0" \ > "kernelhdr_addr_sd=0x4000\0" \ > "kernelhdr_size_sd=0x10\0" \ >- "$othbootargs\0" \ > "othbootargs=cma=64M@0x0-0xb0000000\0" \ > BOOTENV \ > "boot_scripts=ls1021atwr_boot.scr\0" \ >-- >2.9.5 Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
>-----Original Message----- >From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Alison Wang >Sent: Monday, March 16, 2020 1:29 PM >To: u-boot@lists.denx.de; Priyanka Jain <priyanka.jain@nxp.com>; Jagdish >Gediya <jagdish.gediya@nxp.com> >Cc: Alison Wang <alison.wang@nxp.com> >Subject: [PATCH] configs: ls1021a: Append othbootargs to bootargs > >This patch appends othbootargs to bootargs for LS1021ATWR board. > >Signed-off-by: Alison Wang <alison.wang@nxp.com> >--- Applied to u-boot-fsl-qoriq after rebasing. Waiting upstream Thanks Priyanka
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 8e2784b..266107c 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -297,7 +297,7 @@ #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 $othbootargs\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ @@ -313,7 +313,6 @@ "kernel_size=0x2800000\0" \ "kernel_addr_sd=0x8000\0" \ "kernel_size_sd=0x14000\0" \ - "$othbootargs\0" \ "othbootargs=cma=64M@0x0-0xb0000000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \ @@ -355,7 +354,7 @@ "$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 $othbootargs\0" \ "initrd_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ @@ -375,7 +374,6 @@ "kernel_size_sd=0x14000\0" \ "kernelhdr_addr_sd=0x4000\0" \ "kernelhdr_size_sd=0x10\0" \ - "$othbootargs\0" \ "othbootargs=cma=64M@0x0-0xb0000000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \
This patch appends othbootargs to bootargs for LS1021ATWR board. Signed-off-by: Alison Wang <alison.wang@nxp.com> --- include/configs/ls1021atwr.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)