diff --git a/meta-opencentauri/images/files/centauri-carbon-1/sw-description b/meta-opencentauri/images/files/centauri-carbon-1/sw-description index bf8d1020..248ea7e6 100644 --- a/meta-opencentauri/images/files/centauri-carbon-1/sw-description +++ b/meta-opencentauri/images/files/centauri-carbon-1/sw-description @@ -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"; + value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt"; }, { name = "bootcmd_"; @@ -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"; + value = "setenv bootargs console=@@KERNEL_CONSOLE@@ earlycon=uart8250,mmio32,@@SERIAL_ADDR@@ root=${mmc_root} rootwait consoleblank=0 gpt"; }, { name = "bootcmd_"; diff --git a/meta-opencentauri/images/files/centauri-carbon-2/sw-description b/meta-opencentauri/images/files/centauri-carbon-2/sw-description index 8c9cd7bf..8d9c53b4 100644 --- a/meta-opencentauri/images/files/centauri-carbon-2/sw-description +++ b/meta-opencentauri/images/files/centauri-carbon-2/sw-description @@ -86,7 +86,7 @@ software = }, { name = "setargs_mainline"; - value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0"; + value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt"; }, { name = "bootcmd_"; @@ -200,7 +200,7 @@ software = }, { name = "setargs_mainline"; - value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0"; + value = "setenv bootargs console=@@KERNEL_CONSOLE@@ root=${mmc_root} rootwait consoleblank=0 gpt"; }, { name = "bootcmd_"; diff --git a/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon1.env b/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon1.env index 78f62dd0..765d36de 100644 --- a/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon1.env +++ b/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon1.env @@ -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 +setargs_mainline=setenv bootargs console=ttyS0,115200 earlycon=uart8250,mmio32,0x02500000 root=${mmc_root} rootwait gpt 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 diff --git a/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon2.env b/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon2.env index 678a9241..34dad9cb 100644 --- a/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon2.env +++ b/meta-opencentauri/recipes-bsp/u-boot/files/elegoo-centauri-carbon2.env @@ -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 +setargs_mainline=setenv bootargs console=ttyS2,115200 root=${mmc_root} rootwait gpt 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