conf: machine: wic: Fix HS image boot partition
PATCH v2 1/1 conf: machine: wic: Fix HS image boot partition
From: Manorit Chawdhry <[email protected]>
IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to incomplete binaries in /boot and the naming of the binaries were not correct.
Fixes /boot partition for HS devices.
---
Changes from v1:
- Use signed u-boot.img file for HS
conf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-)
conf/machine/am64xx-hs-evm.conf +0 -2
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/am65xx-hs-evm.conf +0 -2
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/include/k3.inc +3 -2
@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader"
@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
conf/machine/j7-hs-evm.conf +0 -2
@@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" BBMULTICONFIG += "k3r5-sr1-1"
conf/machine/j7200-hs-evm.conf +0 -2
@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.36.1
Quoted 11 lines · Andrew Davis
From: Manorit Chawdhry <[email protected]>
IMAGE_BOOT_FILESwas being overwritten in the HS recipes leading to incomplete binaries in /boot and the naming of the binaries were not correct.Fixes /boot partition for HS devices.
Signed-off-by Manorit Chawdhry <[email protected]>[afd: Extended fix to all HS platforms]Signed-off-by Andrew Davis <[email protected]>
Hi, the builds are failing for this. Maybe try some clean builds?
Regards,
Manorit
Quoted 91 lines
---
Changes from v1:
- Use signed u-boot.img file for HSconf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-)conf/machine/am64xx-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/include/k3.inc +3
-2@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader"@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"conf/machine/j7-hs-evm.conf +0
-2@@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" BBMULTICONFIG += "k3r5-sr1-1"conf/machine/j7200-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"Signature · 1 line
2.36.1
Quoted 7 lines · Manorit Chawdhry
Quoted 6 lines · Andrew Davis
From: Manorit Chawdhry <[email protected]>
IMAGE_BOOT_FILESwas being overwritten in the HS recipes leading to incomplete binaries in /boot and the naming of the binaries were not correct.
Quoted 8 lines
Quoted 5 lines
Fixes /boot partition for HS devices.
Signed-off-by Manorit Chawdhry <[email protected]>[afd: Extended fix to all HS platforms]Signed-off-by Andrew Davis <[email protected]>Hi, the builds are failing for this. Maybe try some clean builds?
Had to completely remove all build and caches to get it to fail here, odd would have expected only removing the build dir to show this issue.
This turned out a bit more involved than I was expecting, but think I found a way to pull in the _HS version and do the rename without effecting anything else.. sending v3.
Thanks,
Andrew
Quoted 94 lines
Regards,
ManoritQuoted 91 lines
---
Changes from v1:
- Use signed u-boot.img file for HSconf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-)conf/machine/am64xx-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/include/k3.inc +3
-2@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader"@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"conf/machine/j7-hs-evm.conf +0
-2@@ -15,9 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" BBMULTICONFIG += "k3r5-sr1-1"conf/machine/j7200-hs-evm.conf +0
-2@@ -15,8 +15,6 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000" UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"Signature · 1 line
2.36.1