meta-agl-bsp: meta-raspberrypi updates for YP 3.1.2

Changes include:
- Rename bcm2835-bootfiles.bbappend to bootfiles.bbappend to match
  the recipe rename done in meta-raspberrypi
- Update bootfile paths in rpi-config_git.bbappend to match the rename
  done in meta-raspberrypi
- Remove local u-boot bbappend, as none of its changes are required
  with latest meta-raspberrypi and meta-updater
- A previously silently failing command in the create-combined-dtb
  recipe's do_install when building with agl-sota enabled now triggers
  a build failure, logic has been added to handle meta-updater's
  disabling of the required overlay file.

Bug-AGL: SPEC-3529

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib5fd9f308fcd2da76ae882dd5b2413e56d3eee40
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25081
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

2 files changed, 16 insertions, 16 deletions

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend
index adb19c09c..adb19c09c 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bootfiles.bbappend
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index 9891fa200..bbab3df46 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -4,49 +4,49 @@ TOTAL_BOARD_MEM = "3072"
 do_deploy_append_raspberrypi4() {
     # ENABLE CAN
     if [ "${ENABLE_CAN}" = "1" ]; then
-        echo "# Enable CAN" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        echo "dtoverlay=mcp2515-can0,oscillator=16000000,interrupt=25" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "# Enable CAN" >>${DEPLOYDIR}/bootfiles/config.txt
+        echo "dtoverlay=mcp2515-can0,oscillator=16000000,interrupt=25" >>${DEPLOYDIR}/bootfiles/config.txt
     fi
 
     # Handle setup with armstub file
     if [ -n "${ARMSTUB}" ]; then
-        echo "\n# ARM stub configuration" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        echo "armstub=${ARMSTUB}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "\n# ARM stub configuration" >> ${DEPLOYDIR}/bootfiles/config.txt
+        echo "armstub=${ARMSTUB}" >> ${DEPLOYDIR}/bootfiles/config.txt
         case "${ARMSTUB}" in
             *-gic.bin)
-                echo  "enable_gic=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+                echo  "enable_gic=1" >> ${DEPLOYDIR}/bootfiles/config.txt
                 ;;
         esac
     fi
 
     if [ "${AGL_XEN_WANTED}" = "1" ]; then
-        echo "total_mem=${TOTAL_BOARD_MEM}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "total_mem=${TOTAL_BOARD_MEM}" >> ${DEPLOYDIR}/bootfiles/config.txt
     fi
 }
 
 do_deploy_append() {
     if [ "${ENABLE_CMA}" = "1" ] && [ -n "${CMA_LWM}" ]; then
-        sed -i '/#cma_lwm/ c\cma_lwm=${CMA_LWM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#cma_lwm/ c\cma_lwm=${CMA_LWM}' ${DEPLOYDIR}/bootfiles/config.txt
     fi
 
     if [ "${ENABLE_CMA}" = "1" ] && [ -n "${CMA_HWM}" ]; then
-        sed -i '/#cma_hwm/ c\cma_hwm=${CMA_HWM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        sed -i '/#cma_hwm/ c\cma_hwm=${CMA_HWM}' ${DEPLOYDIR}/bootfiles/config.txt
     fi
 
-    echo "avoid_warnings=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "mask_gpu_interrupt0=0x400" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "dtoverlay=vc4-kms-v3d-overlay,cma-256" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "dtoverlay=rpi-ft5406-overlay" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "avoid_warnings=2" >> ${DEPLOYDIR}/bootfiles/config.txt
+    echo "mask_gpu_interrupt0=0x400" >> ${DEPLOYDIR}/bootfiles/config.txt
+    echo "dtoverlay=vc4-kms-v3d-overlay,cma-256" >> ${DEPLOYDIR}/bootfiles/config.txt
+    echo "dtoverlay=rpi-ft5406-overlay" >> ${DEPLOYDIR}/bootfiles/config.txt
+    echo "dtparam=audio=on" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
 
 do_deploy_append_raspberrypi4() {
-    echo -e "\n[pi4]" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "max_framebuffers=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo -e "\n[pi4]" >> ${DEPLOYDIR}/bootfiles/config.txt
+    echo "max_framebuffers=2" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
 
 do_deploy_append_sota() {
-    echo "device_tree_address=0x0c800000" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "device_tree_address=0x0c800000" >> ${DEPLOYDIR}/bootfiles/config.txt
 }
 
 ENABLE_UART_raspberrypi3 = "1"