conf: machine: wic: Fix HS image boot partition
PATCH v3 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 v2:
- Added UBOOT_SYMLINK to fix missing u-boot.img image
conf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)
conf/machine/am64xx-hs-evm.conf +1 -2
@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
conf/machine/am65xx-hs-evm.conf +1 -2
@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" 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 +1 -2
@@ -15,9 +15,8 @@ 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}" +UBOOT_SYMLINK = "u-boot.img" BBMULTICONFIG += "k3r5-sr1-1"
conf/machine/j7200-hs-evm.conf +1 -2
@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 1 line
2.36.1
Quoted 8 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.
Quoted 7 lines
Signed-off-by Manorit Chawdhry <[email protected]>[afd: Extended fix to all HS platforms]Signed-off-by Andrew Davis <[email protected]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img image
LGTM.
Quoted 91 lines
conf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)conf/machine/am64xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" 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 +1
-2@@ -15,9 +15,8 @@ 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}" +UBOOT_SYMLINK = "u-boot.img" BBMULTICONFIG += "k3r5-sr1-1"conf/machine/j7200-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"Signature · 1 line
2.36.1
Quoted 14 lines · Manorit Chawdhry
Quoted 13 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]>---
Quoted 6 lines
Quoted 2 lines
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageLGTM.
Acked-by Manorit Chawdhry <[email protected]>
I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
Quoted 91 lines
Quoted 91 lines
conf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)conf/machine/am64xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" 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 +1
-2@@ -15,9 +15,8 @@ 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}" +UBOOT_SYMLINK = "u-boot.img" BBMULTICONFIG += "k3r5-sr1-1"conf/machine/j7200-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"Signature · 1 line
2.36.1
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 20 lines · Ryan Eatmon
Quoted 17 lines · Manorit Chawdhry
Quoted 15 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]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img image
Quoted 8 lines
Quoted 3 lines
LGTM.
Acked-by Manorit Chawdhry <[email protected]>I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
We can make a delta patch to fixup j721s2 after this goes in.
Jayesh,
Can you take that action, see what we did here for each platform and do the same for j721s2-hs and submit a patch.
Andrew
Quoted 78 lines
Quoted 77 lines
Quoted 77 lines
conf/machine/am64xx-hs-evm.conf| 3 +--
conf/machine/am65xx-hs-evm.conf| 3 +--
conf/machine/include/k3.inc | 5 +++--
conf/machine/j7-hs-evm.conf | 3 +--
conf/machine/j7200-hs-evm.conf | 3 +--5 files changed, 7 insertions(+), 10 deletions(-)conf/machine/am64xx-hs-evm.conf +0
-0@@ -15,8 +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"conf/machine/am64xx-hs-evm.conf +1
-1-IMAGE_BOOT_FILES = "${UBOOT_BINARY}" +UBOOT_SYMLINK = "u-boot.img"
TI_SECURE_DEV_PKG= "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +0
-0@@ -15,8 +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"conf/machine/am65xx-hs-evm.conf +1
-1-IMAGE_BOOT_FILES = "${UBOOT_BINARY}" +UBOOT_SYMLINK = "u-boot.img"
TI_SECURE_DEV_PKG= "${TI_SECURE_DEV_PKG_K3}"conf/machine/include/k3.inc +0
-0@@ -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"conf/machine/include/k3.inc +0
-0@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
IMAGE_FSTYPES+= "tar.xz wic.xz wic.bmap"conf/machine/include/k3.inc +2
-2-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
-0@@ -15,9 +15,8 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
UBOOT_DTBO_OFFSET= "0x00010000"
SPL_BINARY= "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
UBOOT_BINARY= "u-boot.img_HS"conf/machine/j7-hs-evm.conf +1
-1-IMAGE_BOOT_FILES = "${UBOOT_BINARY}" +UBOOT_SYMLINK = "u-boot.img"BBMULTICONFIG += "k3r5-sr1-1"
conf/machine/j7200-hs-evm.conf +0
-0@@ -15,8 +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"conf/machine/j7200-hs-evm.conf +1
-1-IMAGE_BOOT_FILES = "${UBOOT_BINARY}" +UBOOT_SYMLINK = "u-boot.img"
TI_SECURE_DEV_PKG= "${TI_SECURE_DEV_PKG_K3}"Signature · 1 line
2.36.1
Quoted 31 lines · Andrew Davis
Quoted 20 lines · Ryan Eatmon
Quoted 17 lines · Manorit Chawdhry
Quoted 15 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]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageQuoted 8 lines
Quoted 3 lines
LGTM.
Acked-by Manorit Chawdhry <[email protected]>I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
Quoted 10 lines
We can make a delta patch to fixup j721s2 after this goes in.
Jayesh,
Can you take that action, see what we did here for each platform and do the same for j721s2-hs and submit a patch.
Andrew
Okay sure!! I will post the delta patch.
-Jayesh
Quoted 29 lines · Jayesh Choudhary
Quoted 26 lines · Andrew Davis
Quoted 25 lines · Ryan Eatmon
Quoted 20 lines · Manorit Chawdhry
Quoted 8 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.
Quoted 7 lines
Signed-off-by Manorit Chawdhry <[email protected]>[afd: Extended fix to all HS platforms]Signed-off-by Andrew Davis <[email protected]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageLGTM.
Acked-by Manorit Chawdhry <[email protected]>
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
We can make a delta patch to fixup j721s2 after this goes in.
Andrew,
There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched.
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 37 lines · Ryan Eatmon
Quoted 34 lines · Jayesh Choudhary
Quoted 31 lines · Andrew Davis
Quoted 28 lines · Ryan Eatmon
Quoted 14 lines · Manorit Chawdhry
Quoted 13 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]>---
Quoted 6 lines
Quoted 2 lines
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageLGTM.
Acked-by Manorit Chawdhry <[email protected]>I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
We can make a delta patch to fixup j721s2 after this goes in.
Andrew,
There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched.
'conf: machine: Make multi-certificate image the default'?
I just dropped it for now, it is un-related to the first patch. It is still valid and if you would like you can take the v1 of that patch, it would save me from having to send it again as a standalone..
Andrew
Quoted 48 lines · Andrew Davis
Quoted 37 lines · Ryan Eatmon
Quoted 34 lines · Jayesh Choudhary
Quoted 31 lines · Andrew Davis
Quoted 28 lines · Ryan Eatmon
Quoted 14 lines · Manorit Chawdhry
Quoted 13 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]>---
Quoted 6 lines
Quoted 2 lines
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageLGTM.
Acked-by Manorit Chawdhry <[email protected]>I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
We can make a delta patch to fixup j721s2 after this goes in.
Andrew,
There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched.
Quoted 8 lines
'conf: machine: Make multi-certificate image the default'?
I just dropped it for now, it is un-related to the first patch. It is still valid and if you would like you can take the v1 of that patch, it would save me from having to send it again as a standalone..
Andrew
Thank you.
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 16 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]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img image
Quoted 6 lines
conf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)
I am getting build errors for several of the HS platforms related to this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb recipe is failing because the u-boot-<MACHINE>.img file is not in the deploy/images directory.
When I drop the patch all of the builds work correctly.
Quoted 80 lines
conf/machine/am64xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"conf/machine/am65xx-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" 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 +1
-2@@ -15,9 +15,8 @@ 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}" +UBOOT_SYMLINK = "u-boot.img" BBMULTICONFIG += "k3r5-sr1-1"conf/machine/j7200-hs-evm.conf +1
-2@@ -15,8 +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}" +UBOOT_SYMLINK = "u-boot.img" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 27 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 16 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]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageQuoted 6 lines
conf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)
Quoted 6 lines
I am getting build errors for several of the HS platforms related to
this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb recipe is failing because the u-boot-<MACHINE>.img file is not in
the deploy/images directory.When I drop the patch all of the builds work correctly.
Which platforms are failing?
Signature · 1 line
Denys
Quoted 28 lines · Denys Dmytriyenko
Quoted 27 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 22 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]>---
Changes from v2:
- AddedUBOOT_SYMLINKto fix missing u-boot.img imageconf/machine/am64xx-hs-evm.conf | 3 +-- conf/machine/am65xx-hs-evm.conf | 3 +-- conf/machine/include/k3.inc | 5 +++-- conf/machine/j7-hs-evm.conf | 3 +-- conf/machine/j7200-hs-evm.conf | 3 +-- 5 files changed, 7 insertions(+), 10 deletions(-)
Quoted 8 lines
Quoted 6 lines
I am getting build errors for several of the HS platforms related to
this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb recipe is failing because the u-boot-<MACHINE>.img file is not in
the deploy/images directory.When I drop the patch all of the builds work correctly.
Which platforms are failing?
The ones referenced in the patch. am64xx-hs-evm, am65xx-hs-evm, j7-hs-evm and j7200-hs-evm.
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS