socfpga: chameleonv3: Move environment to a text file

Move the environment to an easily editable text file in the boot
partition

Signed-off-by: Paweł Anikiel <pan@semihalf.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/board/google/chameleonv3/environment.txt b/board/google/chameleonv3/environment.txt
new file mode 100644 (file)
index 0000000..52aedbb
--- /dev/null
+++ b/board/google/chameleonv3/environment.txt
@@ -0,0 +1,13 @@
+# MMC boot command
+bootcmd_mmc=load mmc 0:1 ${loadaddr} kernel.itb; bootm
+
+# Network boot command and vars
+bootcmd_net=dhcp; tftpboot ${loadaddr} kernel.itb; bootm
+autoload=no
+serverip=192.168.0.1
+
+# U-Boot will run this after loading this file
+bootcmd_txt=run bootcmd_mmc
+
+# Kernel cmdline
+bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rootflags=subvol=root rw rootwait

diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h
index 2ce7011529a49a270ec197c12c3fc34ca4e1b761..fc08e74dba0eb10b1439da9ca314fb24d76210e5 100644 (file)
--- a/include/configs/socfpga_chameleonv3.h
+++ b/include/configs/socfpga_chameleonv3.h
@@ -20,11 +20,10 @@
 #define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
 #define CFG_EXTRA_ENV_SETTINGS \
-       "autoload=no\0" \
-       "bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \
-       "distro_bootcmd=bridge enable; run bootcmd_mmc\0" \
-       "bootcmd_mmc=load mmc 0:1 ${loadaddr} kernel.itb; bootm\0" \
-       "bootcmd_net=dhcp; tftpboot ${loadaddr} kernel.itb; bootm\0"
+       "distro_bootcmd=bridge enable; " \
+               "load mmc 0:1 ${loadaddr} u-boot.txt; " \
+               "env import -t ${loadaddr}; " \
+               "run bootcmd_txt\0"
 
 /*
  * L4 OSC1 Timer 0