Skip to contentSkip to conversation

configs: ls1021a: Append othbootargs to bootargs

PATCH Superseded Alison Wang 2 participants 3 messages Mar 16, 2020 – Mar 30, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs: ls1021a: Append othbootargs to bootargs

This patch appends othbootargs to bootargs for LS1021ATWR board.

---
 include/configs/ls1021atwr.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
include/configs/ls1021atwr.h +2 -4
index 8e2784b..266107c 100644
@@ -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 at 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 at 0x0-0xb0000000\0"	\
 	BOOTENV				\
 	"boot_scripts=ls1021atwr_boot.scr\0"	\
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 configs: ls1021a: Append othbootargs to bootargs

Quoted 56 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Alison Wang
Sent: Monday, March 16, 2020 1:29 PM
To: u-boot at lists.denx.de; Priyanka Jain <[email protected]>; Jagdish Gediya <[email protected]>
Cc: Alison Wang <[email protected]>
Subject: [PATCH] configs: ls1021a: Append othbootargs to bootargs

This patch appends othbootargs to bootargs for LS1021ATWR board.

---
include/configs/ls1021atwr.h | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
include/configs/ls1021atwr.h index renamed from include/configs/ls1021atwr.h +0 -0

8e2784b..266107c 100644

include/configs/ls1021atwr.h +1 -1
@@ -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"		\
include/configs/ls1021atwr.h +1 -2
@@ -313,7 +313,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 +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"		\
include/configs/ls1021atwr.h +0 -2
@@ -375,7 +374,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"	\
--
Quoted 1 line

2.9.5

#2 lore raw

PATCH 1/1 configs: ls1021a: Append othbootargs to bootargs

In reply to Alison Wang
Quoted 8 lines

-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Alison Wang
Sent: Monday, March 16, 2020 1:29 PM
To: u-boot at lists.denx.de; Priyanka Jain <[email protected]>; Jagdish Gediya <[email protected]>
Cc: Alison Wang <[email protected]>
Subject: [PATCH] configs: ls1021a: Append othbootargs to bootargs

Quoted 4 lines

This patch appends othbootargs to bootargs for LS1021ATWR board.

---

Applied to u-boot-fsl-qoriq after rebasing. Waiting upstream

Thanks
Priyanka