diff options
| author | Paweł Anikiel <pan@semihalf.com> | 2023-02-21 16:17:02 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2023-02-22 00:28:39 +0100 |
| commit | 0f3c8fe392618fca29f2093be3ce771401bc6d56 (patch) | |
| tree | e6aa6e043cfdb359adce82c1f22586893418991a | |
| parent | 8f1b3334574bbc1a9a46db92a798f0aed968e858 (diff) | |
| download | u-boot-0f3c8fe392618fca29f2093be3ce771401bc6d56.tar.gz u-boot-0f3c8fe392618fca29f2093be3ce771401bc6d56.tar.bz2 u-boot-0f3c8fe392618fca29f2093be3ce771401bc6d56.zip | |
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>
| -rw-r--r-- | board/google/chameleonv3/environment.txt | 13 | ||||
| -rw-r--r-- | include/configs/socfpga_chameleonv3.h | 9 |
2 files changed, 17 insertions, 5 deletions
diff --git a/board/google/chameleonv3/environment.txt b/board/google/chameleonv3/environment.txt new file mode 100644 index 0000000000..52aedbb90a --- /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 2ce7011529..fc08e74dba 100644 --- 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 |