From cac1b16a16fe3b440004a1b3fdaec6cae7a4e115 Mon Sep 17 00:00:00 2001 From: Lucien Mueller Date: Wed, 20 Nov 2019 10:00:45 +0100 Subject: [PATCH] u-boot-env: append preexisting bootargs to the ostree-bootargs. BugzID: 59504 Signed-off-by: Lucien Mueller --- include/configs/am335x_netbird_v2.h | 4 +++- include/configs/am335x_nmhw21.h | 4 ++-- include/configs/am335x_nrhw20.h | 6 ++++-- include/configs/am335x_nrhw24.h | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/configs/am335x_netbird_v2.h b/include/configs/am335x_netbird_v2.h index d978ce0967..e7c5795dff 100644 --- a/include/configs/am335x_netbird_v2.h +++ b/include/configs/am335x_netbird_v2.h @@ -90,7 +90,9 @@ "tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; setenv bootargs rdinit=/etc/preinit console=$defaultconsole,115200 debug; run shieldcmd; run modifyfdtcmd; bootz $kernel_addr - $fdt_addr\0" \ "pxe_recovery=sleep 3 && dhcp && pxe get && pxe boot\0" \ "recovery=run pxe_recovery || setenv ipaddr $ipaddr; setenv serverip $serverip; run tftp_recovery\0" /* setenv ipaddr and serverip is necessary, because dhclient can destroy the IPs inernally */ \ - "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; env import -t $load_addr $filesize; setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 rw ostree_root=/dev/mmcblk1p1\0" \ + "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; " \ + "setenv bootargs_prev $bootargs; " \ + "env import -t $load_addr $filesize; setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ "bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; bootm $kernel_addr_r#conf@am335x-nrhw16-prod4.dtb\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" diff --git a/include/configs/am335x_nmhw21.h b/include/configs/am335x_nmhw21.h index c794f11485..de3df92d38 100644 --- a/include/configs/am335x_nmhw21.h +++ b/include/configs/am335x_nmhw21.h @@ -107,8 +107,8 @@ int eth_phy_timeout(void); "ethprime=cpsw\0" \ "ethopts=ti_cpsw.rx_packet_max=1526\0" \ "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; " \ - "env import -t $load_addr $filesize; " \ - "setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ + "setenv bootargs_prev $bootargs; " \ + "env import -t $load_addr $filesize; setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ "$ethopts rw ostree_root=/dev/mmcblk1p1\0" \ "bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; " \ "bootm $kernel_addr_r\0" \ diff --git a/include/configs/am335x_nrhw20.h b/include/configs/am335x_nrhw20.h index d05ec46e95..77e09e5dfb 100644 --- a/include/configs/am335x_nrhw20.h +++ b/include/configs/am335x_nrhw20.h @@ -146,8 +146,9 @@ int eth_phy_timeout(void); \ /* OSTree boot */ \ "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; " \ + "setenv bootargs_prev $bootargs; " \ "env import -t $load_addr $filesize; " \ - "setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ + "setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ "$ethopts rw ostree_root=/dev/mmcblk1p1\0" \ "bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; " \ "bootm $kernel_addr_r\0" \ @@ -219,8 +220,9 @@ int eth_phy_timeout(void); "run add_sd_bootargs; run add_version_bootargs; run shieldcmd; " \ "bootz $kernel_addr - $fdt_addr; fi\0" \ "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; " \ + "setenv bootargs_prev $bootargs; " \ "env import -t $load_addr $filesize; " \ - "setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ + "setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ "$ethopts rw ostree_root=/dev/mmcblk1p1\0" \ "bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; " \ "bootm $kernel_addr_r\0" \ diff --git a/include/configs/am335x_nrhw24.h b/include/configs/am335x_nrhw24.h index aaa5afb6db..1844dd3839 100644 --- a/include/configs/am335x_nrhw24.h +++ b/include/configs/am335x_nrhw24.h @@ -144,8 +144,8 @@ int eth_phy_timeout(void); \ /* OSTree boot */ \ "bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; " \ - "env import -t $load_addr $filesize; " \ - "setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ + "setenv bootargs_prev $bootargs; " \ + "env import -t $load_addr $filesize; setenv bootargs $bootargs_prev $bootargs root=/dev/ram0 console=$defaultconsole,115200 " \ "$ethopts rw ostree_root=/dev/mmcblk1p1\0" \ "bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; " \ "bootm $kernel_addr_r\0" \