From: Sinthu Raja <[email protected]> K3 platforms include the FIT image-based kernel by default. The bootloader loads the kernel and DTB from the FIT image. The DTB/DTBOs are added to the FIT image but the load address is not included in the image section of each DTB/DTBO. This load address is determined by the LOADADDRESS macros in the kernel-fitmage class.
Hence, define the RD/DTB/DTBOs LOADADDRESS and OFFSET macros in the K3 common include, and remove those macros defined in the K3 board specific config files. Signed-off-by: Sinthu Raja <[email protected]> Reviewed-by: Andrew Davis <[email protected]> --- Changes in V6: ============= Address review comments: - Update commit description, keep K3 capitalized. - Remove space align for the macros. Change in V4 & V5: ================= - Update commit description, keep FIT as capitalized. Changes in V3: ============= Address review comments: - Update commit description. - Define UBOOT_RD_* in k3 common include. - Remove the UBOOT* defines from k3 board specific files. Changes in V2: ============= Address review comment: - Move the change to k3.inc as the FIT image is included as default image across all platforms V1: https://lists.yoctoproject.org/g/meta-ti/message/15754 V2: https://lists.yoctoproject.org/g/meta-ti/message/15768 V3: https://lists.yoctoproject.org/g/meta-ti/message/15776 V4: https://lists.yoctoproject.org/g/meta-ti/message/15777 V5: https://lists.yoctoproject.org/g/meta-ti/message/15778 conf/machine/am65xx-hs-evm.conf | 8 -------- conf/machine/include/k3.inc | 5 +++++ conf/machine/j7-hs-evm.conf | 8 -------- conf/machine/j7200-hs-evm.conf | 8 -------- conf/machine/j721s2-hs-evm.conf | 8 -------- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index ea1f8ff1..2c1256d0 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 81139571..2a74f71b 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -21,6 +21,11 @@ KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_DTB_LOADADDRESS = "0x83000000" +UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin" SPL_BINARYNAME = "tispl.bin" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index bbfe6fcb..68d36d5f 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j7-evm.conf UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index ef7268b1..dc928974 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j7200-evm.conf UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf index 84db90bb..3d737f44 100644 --- a/conf/machine/j721s2-hs-evm.conf +++ b/conf/machine/j721s2-hs-evm.conf @@ -6,14 +6,6 @@ require conf/machine/j721s2-evm.conf UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" -- 2.36.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15780): https://lists.yoctoproject.org/g/meta-ti/message/15780 Mute This Topic: https://lists.yoctoproject.org/mt/96860111/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
