diff mbox series

[2/2] corstone1000: Convert to text file environment

Message ID 20220622192145.3696770-2-trini@konsulko.com
State Accepted
Commit 929e581a620feba40bea659725f88b338d8b65ec
Delegated to: Tom Rini
Headers show
Series [1/2] gxp: Convert to text file environment | expand

Commit Message

Tom Rini June 22, 2022, 7:21 p.m. UTC 
Convert this platform to using the text file environment rather than
defining CONFIG_EXTRA_ENV_SETTINGS.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 board/armltd/corstone1000/corstone1000.env | 13 +++++++++++++
 include/configs/corstone1000.h             | 14 --------------
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 board/armltd/corstone1000/corstone1000.env

Comments

Tom Rini June 23, 2022, 12:19 p.m. UTC | #1 
On Wed, Jun 22, 2022 at 03:21:45PM -0400, Tom Rini wrote:

> Convert this platform to using the text file environment rather than
> defining CONFIG_EXTRA_ENV_SETTINGS.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/board/armltd/corstone1000/corstone1000.env b/board/armltd/corstone1000/corstone1000.env
new file mode 100644
index 000000000000..b24ff07fc6bd
--- /dev/null
+++ b/board/armltd/corstone1000/corstone1000.env
@@ -0,0 +1,13 @@ 
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+usb_pgood_delay=250
+boot_bank_flag=0x08002000
+kernel_addr_bank_0=0x083EE000
+kernel_addr_bank_1=0x0936E000
+retrieve_kernel_load_addr=
+	if itest.l *${boot_bank_flag} == 0; then
+		setenv kernel_addr $kernel_addr_bank_0;
+	else
+		setenv kernel_addr $kernel_addr_bank_1;
+	fi;
+kernel_addr_r=0x88200000
diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h
index eba5cba0fba8..38d7fe8d0d42 100644
--- a/include/configs/corstone1000.h
+++ b/include/configs/corstone1000.h
@@ -24,18 +24,4 @@ 
 
 #define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
 
-#define CONFIG_EXTRA_ENV_SETTINGS							\
-				"usb_pgood_delay=250\0"					\
-				"boot_bank_flag=0x08002000\0"				\
-				"kernel_addr_bank_0=0x083EE000\0"			\
-				"kernel_addr_bank_1=0x0936E000\0"			\
-				"retrieve_kernel_load_addr="				\
-					"if itest.l *${boot_bank_flag} == 0; then "	\
-					    "setenv kernel_addr $kernel_addr_bank_0;"	\
-					"else "						\
-					    "setenv kernel_addr $kernel_addr_bank_1;"	\
-					"fi;"						\
-					"\0"						\
-				"kernel_addr_r=0x88200000\0"
-
 #endif