meta-agl-bsp: Remove remaining traces of SOTA support 34/30934/2
authorScott Murray <scott.murray@konsulko.com>
Wed, 23 Apr 2025 16:21:24 +0000 (12:21 -0400)
committerScott Murray <scott.murray@konsulko.com>
Thu, 24 Apr 2025 13:50:02 +0000 (13:50 +0000)
The previous removal of SOTA support missed some files, remove the
remaining traces to reduce maintenance and avoid confusion about
supporting it.

Bug-AGL: SPEC-5423

Change-Id: I0579f014814557255071eea7b0cce9f3d8d576ae
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30934
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
17 files changed:
meta-agl-bsp/conf/include/agl_qemuarm.inc
meta-agl-bsp/conf/include/agl_qemuarm64.inc
meta-agl-bsp/conf/include/agl_qemuriscv64.inc
meta-agl-bsp/conf/include/agl_qemux86-64.inc
meta-agl-bsp/conf/include/agl_raspberrypi4.inc
meta-agl-bsp/conf/include/agl_raspberrypi5.inc
meta-agl-bsp/conf/include/agl_rcar-nogfx.inc
meta-agl-bsp/conf/include/agl_virtio-aarch64.inc
meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript.bb [deleted file]
meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr [deleted file]
meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt [deleted file]
meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt [deleted file]
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt [deleted file]
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt [deleted file]
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt [deleted file]
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt [deleted file]
meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb [deleted file]

index 52fb0ab..624ebe9 100644 (file)
@@ -1,6 +1,3 @@
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-#DISTRO_FEATURES:append = " sota"
-
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
index 9f33a55..6ee148d 100644 (file)
@@ -1,6 +1,3 @@
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-#DISTRO_FEATURES:append = " sota"
-
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
@@ -17,4 +14,4 @@ QB_MEM:qemuarm64 = "-m 2048"
 QB_AUDIO_DRV:qemuarm64 := "alsa"
 QB_MACHINE:qemuarm64 := "-machine virt -smp 4"
 QB_OPT_APPEND:qemuarm64 := " -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd"
-QB_KERNEL_CMDLINE_APPEND:qemuarm64 := "console=ttyAMA0,115200n8 verbose"
\ No newline at end of file
+QB_KERNEL_CMDLINE_APPEND:qemuarm64 := "console=ttyAMA0,115200n8 verbose"
index 434f1dd..3c1b570 100644 (file)
@@ -1,6 +1,3 @@
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-DISTRO_FEATURES:append = " sota"
-
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
index 7798ac2..6d9de97 100644 (file)
@@ -17,9 +17,6 @@ QB_KERNEL_CMDLINE_APPEND:append = " console=ttyS0,115200n8"
 # All boot message will be off
 QB_KERNEL_CMDLINE_APPEND:append = " quiet"
 
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-DISTRO_FEATURES:append = " sota"
-
 # Add firmware required by Up^2 board and default Intel mPCIe wifi card
 # sold by upshop.org
 MACHINE_EXTRA_RRECOMMENDS:append = " \
@@ -35,7 +32,6 @@ MACHINE_EXTRA_RRECOMMENDS:append = " \
 #       AGL_DEFAULT_IMAGE_FSTYPES to not include them, but for Intel
 #       we actually do want them for use on physical hardware.
 AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap ${@bb.utils.contains('AGL_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}"
-IMAGE_BOOT_FILES:sota = "u-boot-qemux86-64.rom"
 
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
index 998ffed..b87181a 100644 (file)
@@ -1,9 +1,6 @@
 # Maximum memory allowed to be assigned
 GPU_MEM = "256"
 
-# Add CMA to the kernel arguments for SOTA
-OSTREE_KERNEL_ARGS:sota:append = " cma=256M"
-
 # use u-boot always
 RPI_USE_U_BOOT = "1"
 
index 4db5bb7..b043a59 100644 (file)
@@ -1,9 +1,6 @@
 # Maximum memory allowed to be assigned
 GPU_MEM = "256"
 
-# Add CMA to the kernel arguments for SOTA
-OSTREE_KERNEL_ARGS:sota:append = " cma=256M"
-
 # use u-boot always
 RPI_USE_U_BOOT = "1"
 
index fb67fd9..413d44c 100644 (file)
@@ -1,9 +1,3 @@
-DISTRO_FEATURES:append = " sota"
-
-OSTREE_KERNEL = "Image"
-IMAGE_BOOT_FILES:sota = "renesas-ota-bootfiles/* ${DTB_SUFFIX}.dtb"
-OSTREE_BOOTLOADER ?= "u-boot"
-
 WKS_FILE:rcar-gen3 = "singlepart-noloader.wks"
 
 RENESAS_DATADIR = "/usr"
index 5093d0b..7553222 100644 (file)
@@ -1,6 +1,3 @@
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-DISTRO_FEATURES:append = " sota"
-
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript.bb b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript.bb
deleted file mode 100644 (file)
index ccaefc7..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Boot script for launching OTA-enabled images on raspberrypi"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-DEPENDS = "u-boot-mkimage-native"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-SRC_URI = "file://boot.scr \
-           file://uEnv.txt \
-           file://uEnv.cma.txt \
-          "
-
-S = "${WORKDIR}"
-
-inherit deploy
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/bcm2835-bootfiles
-
-    mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Ostree boot script" -d ${S}/boot.scr ${DEPLOYDIR}/bcm2835-bootfiles/boot.scr
-    if [ "${ENABLE_CMA}" = "1" ]; then
-        install -m 0755 ${S}/uEnv.cma.txt ${DEPLOYDIR}/bcm2835-bootfiles/uEnv.txt
-    else
-        install -m 0755 ${S}/uEnv.txt ${DEPLOYDIR}/bcm2835-bootfiles/uEnv.txt
-    fi
-}
-
-addtask deploy before do_package after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr
deleted file mode 100644 (file)
index dc13f85..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-fatload mmc 0:1 $loadaddr /uEnv.txt
-env import -t $loadaddr $filesize
-run bootcmd
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt
deleted file mode 100644 (file)
index 062bddb..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-bootcmd_resetvars=setenv kernel_image; setenv bootargs; setenv kernel_image2; setenv bootargs2
-bootcmd_otenv=run bootcmd_resetvars; load mmc 0:2 $loadaddr /boot/loader/uEnv.txt; env import -t $loadaddr $filesize
-bootcmd_rollbackenv=setenv kernel_image ${kernel_image2}; setenv bootargs ${bootargs2}
-
-bootcmd_args=setenv bootargs "$bootargs $bootargs_fdt ostree_root=/dev/mmcblk0p2 root=/dev/ram0 rw rootwait rootdelay=2 ramdisk_size=8192 panic=1 coherent_pool=6M smsc95xx.turbo_mode=N"
-
-bootcmd_getroot=setexpr ostree_root gsub "^.*ostree=([^ ]*).*$" "\\\\1" "${bootargs}";
-
-bootcmd_fitconf=run bootcmd_getroot; if test -e mmc 0:2 "${ostree_root}/usr/lib/fit_conf"; then load mmc 0:2 $loadaddr "${ostree_root}/usr/lib/fit_conf"; env import -t $loadaddr $filesize; fi
-
-bootcmd_load=load mmc 0:2 $ramdisk_addr_r "/boot"$kernel_image
-bootcmd_run=bootm "${ramdisk_addr_r}${fit_conf}"
-
-bootcmd_create_envfile=if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
-
-bootlimit=3
-
-bootcmd=if test "${rollback}" = "1"; then run altbootcmd; else run bootcmd_create_envfile; run bootcmd_otenv; run bootcmd_args; run bootcmd_fitconf; run bootcmd_load; run bootcmd_run; if ! "${upgrade_available}" = "1"; then setenv upgrade_available 1; saveenv; fi; reset; fi
-
-bootcmd_set_rollback=if test ! "${rollback}" = "1"; then setenv rollback 1; setenv upgrade_available 0; saveenv; fi
-altbootcmd=run bootcmd_create_envfile; run bootcmd_otenv; run bootcmd_set_rollback; if test -n "${kernel_image2}"; then run bootcmd_rollbackenv; fi; run bootcmd_args; run bootcmd_fitconf; run bootcmd_load; run bootcmd_run; reset
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
deleted file mode 100644 (file)
index 436fe95..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-bootcmd_resetvars=setenv kernel_image; setenv bootargs; setenv kernel_image2; setenv bootargs2
-bootcmd_otenv=run bootcmd_resetvars; load mmc 0:2 $loadaddr /boot/loader/uEnv.txt; env import -t $loadaddr $filesize
-bootcmd_rollbackenv=setenv kernel_image ${kernel_image2}; setenv bootargs ${bootargs2}
-
-bootcmd_args=setenv bootargs "$bootargs $bootargs_fdt ostree_root=/dev/mmcblk0p2 root=/dev/ram0 rw rootwait rootdelay=2 ramdisk_size=8192 panic=1"
-
-bootcmd_getroot=setexpr ostree_root gsub "^.*ostree=([^ ]*).*$" "\\\\1" "${bootargs}";
-
-bootcmd_fitconf=run bootcmd_getroot; if test -e mmc 0:2 "${ostree_root}/usr/lib/fit_conf"; then load mmc 0:2 $loadaddr "${ostree_root}/usr/lib/fit_conf"; env import -t $loadaddr $filesize; fi
-
-bootcmd_load=load mmc 0:2 $ramdisk_addr_r "/boot"$kernel_image
-bootcmd_run=bootm "${ramdisk_addr_r}${fit_conf}"
-
-bootcmd_create_envfile=if test ! -e mmc 0:1 uboot.env; then saveenv; fi;
-
-bootlimit=3
-
-bootcmd=if test "${rollback}" = "1"; then run altbootcmd; else run bootcmd_create_envfile; run bootcmd_otenv; run bootcmd_args; run bootcmd_fitconf; run bootcmd_load; run bootcmd_run; if ! "${upgrade_available}" = "1"; then setenv upgrade_available 1; saveenv; fi; reset; fi
-
-bootcmd_set_rollback=if test ! "${rollback}" = "1"; then setenv rollback 1; setenv upgrade_available 0; saveenv; fi
-altbootcmd=run bootcmd_create_envfile; run bootcmd_otenv; run bootcmd_set_rollback; if test -n "${kernel_image2}"; then run bootcmd_rollbackenv; fi; run bootcmd_args; run bootcmd_fitconf; run bootcmd_load; run bootcmd_run; reset
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt
deleted file mode 100644 (file)
index 9a8dc56..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bootkaddr=0x49090000
-bootdaddr=0x48000000
-bootiaddr=0x5C3F9520
-
-bootargs_console=console=ttySC0,115200 ignore_loglevel
-bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
-bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
-
-bootmmc=0:1
-rootmmc=0:2
-
-booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
-bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
-bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7795-salvator-xs.dtb
-
-bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
-
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt
deleted file mode 100644 (file)
index 9cc3eb9..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bootkaddr=0x49090000
-bootdaddr=0x48000000
-bootiaddr=0x5C3F9520
-
-bootargs_console=console=ttySC0,115200 ignore_loglevel
-bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
-bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
-
-bootmmc=0:1
-rootmmc=0:2
-
-booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
-bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
-bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77951-ulcb.dtb
-
-bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
-
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt
deleted file mode 100644 (file)
index 7b76e1e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bootkaddr=0x49090000
-bootdaddr=0x48000000
-bootiaddr=0x5C3F9520
-
-bootargs_console=console=ttySC0,115200 ignore_loglevel
-bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
-bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
-
-bootmmc=0:1
-rootmmc=0:2
-
-booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
-bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
-bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a7796-salvator-xs.dtb
-
-bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
-
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt
deleted file mode 100644 (file)
index 145f82e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-bootkaddr=0x49090000
-bootdaddr=0x48000000
-bootiaddr=0x5C3F9520
-
-bootargs_console=console=ttySC0,115200 ignore_loglevel
-bootargs_extra=rw rootfstype=ext4 rootwait rootdelay=2
-bootargs_root=ostree_root=/dev/mmcblk1p2 root=/dev/ram0 ramdisk_size=16384
-
-bootmmc=0:1
-rootmmc=0:2
-
-booteload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/loader/uEnv.txt; env import -t ${bootkaddr} ${filesize}
-bootkload_sd=ext4load mmc ${rootmmc} ${bootkaddr} boot/${kernel_image}
-bootiload_sd=ext4load mmc ${rootmmc} ${bootiaddr} boot/${ramdisk_image}; setenv ramdisk_size ${filesize}
-bootdload_sd=fatload mmc ${bootmmc} ${bootdaddr} r8a77960-ulcb.dtb
-
-bootcmd=run booteload_sd; setenv bootargs ${bootargs} ${bootargs_console} ${bootargs_root} ${bootargs_extra}; run bootkload_sd; run bootiload_sd; run bootdload_sd; booti ${bootkaddr} ${bootiaddr}:${ramdisk_size} ${bootdaddr}
-
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb
deleted file mode 100644 (file)
index d46f4d8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Boot files (bootscripts etc.) for Renesas RCar-M3 board"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-inherit deploy
-
-COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)"
-
-S = "${WORKDIR}"
-
-SRC_URI:append:sota = " file://uEnv-ota-m3ulcb.txt \
-                        file://uEnv-ota-h3ulcb.txt \
-                        file://uEnv-ota-h3-salvator-xs \
-                        file://uEnv-ota-m3-salvator-xs"
-do_deploy() {
-    install -d ${DEPLOYDIR}/${PN}
-}
-
-do_deploy:append:sota() {
-    install -m 0755 ${WORKDIR}/uEnv-ota-${BOARD_NAME}.txt ${DEPLOYDIR}/${PN}/uEnv.txt
-}
-
-addtask deploy before do_package after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-