From 867c673b1ee671626df16c5141d1d5f7644f283d Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 23 Apr 2025 12:21:24 -0400 Subject: [PATCH] meta-agl-bsp: Remove remaining traces of SOTA support 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 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 --- meta-agl-bsp/conf/include/agl_qemuarm.inc | 3 -- meta-agl-bsp/conf/include/agl_qemuarm64.inc | 5 +--- meta-agl-bsp/conf/include/agl_qemuriscv64.inc | 3 -- meta-agl-bsp/conf/include/agl_qemux86-64.inc | 4 --- meta-agl-bsp/conf/include/agl_raspberrypi4.inc | 3 -- meta-agl-bsp/conf/include/agl_raspberrypi5.inc | 3 -- meta-agl-bsp/conf/include/agl_rcar-nogfx.inc | 6 ---- meta-agl-bsp/conf/include/agl_virtio-aarch64.inc | 3 -- .../u-boot-otascript/u-boot-otascript.bb | 32 ---------------------- .../u-boot-otascript/u-boot-otascript/boot.scr | 3 -- .../u-boot-otascript/u-boot-otascript/uEnv.cma.txt | 21 -------------- .../u-boot-otascript/u-boot-otascript/uEnv.txt | 21 -------------- .../bootfiles/files/uEnv-ota-h3-salvator-x.txt | 18 ------------ .../bootfiles/files/uEnv-ota-h3ulcb.txt | 18 ------------ .../bootfiles/files/uEnv-ota-m3-salvator-x.txt | 18 ------------ .../bootfiles/files/uEnv-ota-m3ulcb.txt | 18 ------------ .../recipes-bsp/bootfiles/renesas-ota-bootfiles.bb | 27 ------------------ 17 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript.bb delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb diff --git a/meta-agl-bsp/conf/include/agl_qemuarm.inc b/meta-agl-bsp/conf/include/agl_qemuarm.inc index 52fb0abd6..624ebe96d 100644 --- a/meta-agl-bsp/conf/include/agl_qemuarm.inc +++ b/meta-agl-bsp/conf/include/agl_qemuarm.inc @@ -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/conf/include/agl_qemuarm64.inc b/meta-agl-bsp/conf/include/agl_qemuarm64.inc index 9f33a55ba..6ee148d46 100644 --- a/meta-agl-bsp/conf/include/agl_qemuarm64.inc +++ b/meta-agl-bsp/conf/include/agl_qemuarm64.inc @@ -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" diff --git a/meta-agl-bsp/conf/include/agl_qemuriscv64.inc b/meta-agl-bsp/conf/include/agl_qemuriscv64.inc index 434f1dd78..3c1b5704a 100644 --- a/meta-agl-bsp/conf/include/agl_qemuriscv64.inc +++ b/meta-agl-bsp/conf/include/agl_qemuriscv64.inc @@ -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/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 7798ac25c..6d9de977c 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -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" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc index 998ffedc8..b87181a1d 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi4.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi4.inc @@ -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" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc index 4db5bb762..b043a5958 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi5.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi5.inc @@ -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" diff --git a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc index fb67fd976..413d44c6f 100644 --- a/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_rcar-nogfx.inc @@ -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" diff --git a/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc b/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc index 5093d0bd5..75532221e 100644 --- a/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc +++ b/meta-agl-bsp/conf/include/agl_virtio-aarch64.inc @@ -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 index ccaefc715..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript.bb +++ /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 index dc13f85b2..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr +++ /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 index 062bddb93..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt +++ /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 index 436fe95fe..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt +++ /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 index 9a8dc560d..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3-salvator-x.txt +++ /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 index 9cc3eb9d2..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-h3ulcb.txt +++ /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 index 7b76e1ef9..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3-salvator-x.txt +++ /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 index 145f82eae..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/files/uEnv-ota-m3ulcb.txt +++ /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 index d46f4d885..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/bootfiles/renesas-ota-bootfiles.bb +++ /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}" - -- 2.16.6