Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ software =
},
{
name = "setargs_mainline";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt systemAB.slot=${systemAB_next}";
},
{
name = "bootcmd_";
Expand Down Expand Up @@ -142,7 +142,7 @@ software =
},
{
name = "setargs_mainline";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt systemAB.slot=${systemAB_next}";
},
{
name = "bootcmd_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ software =
},
{
name = "setargs_mainline";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt systemAB.slot=${systemAB_next}";
},
{
name = "bootcmd_";
Expand Down Expand Up @@ -200,7 +200,7 @@ software =
},
{
name = "setargs_mainline";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt";
value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt systemAB.slot=${systemAB_next}";
},
{
name = "bootcmd_";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ swu_mode=mainline
systemAB_next=A
boot_part=4
mmc_root=/dev/mmcblk0p5
setargs_mainline=setenv bootargs console=ttyS0,115200 earlycon=uart8250,mmio32,0x02500000 root=${mmc_root} rootwait gpt
setargs_mainline=setenv bootargs console=ttyS0,115200 earlycon=uart8250,mmio32,0x02500000 root=${mmc_root} rootwait gpt systemAB.slot=${systemAB_next}
bootcmd_mainline=run setargs_mainline; fatload mmc 0:${boot_part} 43000000 zImage; fatload mmc 0:${boot_part} 43800000 elegoo-centauri-carbon1.dtb; bootz 43000000 - 43800000
bootcmd=if test x${swu_mode} = xmainline; then run bootcmd_mainline; else run bootcmd_stock; fi
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ swu_mode=mainline
systemAB_next=A
boot_part=5
mmc_root=/dev/mmcblk0p7
setargs_mainline=setenv bootargs console=ttyS2,115200 root=${mmc_root} rootwait gpt
setargs_mainline=setenv bootargs console=ttyS2,115200 root=${mmc_root} rootwait gpt systemAB.slot=${systemAB_next}
bootcmd_mainline=run setargs_mainline; fatload mmc 1:${boot_part} 43000000 zImage; fatload mmc 1:${boot_part} 43800000 elegoo-centauri-carbon2.dtb; bootz 43000000 - 43800000
bootcmd=if test x${swu_mode} = xmainline; then run bootcmd_mainline; else run bootcmd_stock; fi
2 changes: 1 addition & 1 deletion meta-opencentauri/recipes-core/swu-flasher/files/flash
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi

rm -f "$TEMP_DIR/sw-description"

curr=$(fw_printenv systemAB_next | awk -F= '{ print $2 }' | tr -d '[:space:]')
curr=$(tr ' ' '\n' < /proc/cmdline | awk -F= '$1 == "systemAB.slot" { print $2 }' | tr -d '[:space:]')

if [[ "$curr" == "A" ]]; then
boot_partition="now_A_next_B"
Expand Down
Loading