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

2022-06-23 Thread Tom Rini
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 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature


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

2022-06-22 Thread Tom Rini
Convert this platform to using the text file environment rather than
defining CONFIG_EXTRA_ENV_SETTINGS.

Signed-off-by: Tom Rini 
---
 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

diff --git a/board/armltd/corstone1000/corstone1000.env 
b/board/armltd/corstone1000/corstone1000.env
new file mode 100644
index ..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=0x8820
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=0x8820\0"
-
 #endif
-- 
2.25.1