diff options
author | Sinthu Raja <sinthu.raja@ti.com> | 2023-02-10 00:25:14 +0530 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-02-10 12:17:12 -0600 |
commit | 295309d4460a7a3f0d6a4260587fb610c263a8a8 (patch) | |
tree | 90a66be359db0992cf15857811d07cbab1b61d49 | |
parent | ac12229cdf41b9f0a50e4da15e4e7b9714a5e1ed (diff) | |
download | meta-ti-295309d4460a7a3f0d6a4260587fb610c263a8a8.tar.gz |
conf: machine: k3: Define RD, DTB and DTBO load address for FIT image
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 <sinthu.raja@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | conf/machine/am65xx-hs-evm.conf | 8 | ||||
-rw-r--r-- | conf/machine/include/k3.inc | 5 | ||||
-rw-r--r-- | conf/machine/j7-hs-evm.conf | 8 | ||||
-rw-r--r-- | conf/machine/j7200-hs-evm.conf | 8 | ||||
-rw-r--r-- | 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 | |||
6 | 6 | ||
7 | UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" | 7 | UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" |
8 | 8 | ||
9 | UBOOT_ENTRYPOINT = "0x80080000" | ||
10 | UBOOT_LOADADDRESS = "0x80080000" | ||
11 | UBOOT_RD_LOADADDRESS = "0x84000000" | ||
12 | UBOOT_RD_ENTRYPOINT = "0x84000000" | ||
13 | UBOOT_DTB_LOADADDRESS = "0x83000000" | ||
14 | UBOOT_DTBO_LOADADDRESS = "0x83080000" | ||
15 | UBOOT_DTBO_OFFSET = "0x00010000" | ||
16 | |||
17 | SPL_BINARY = "tispl.bin_HS" | 9 | SPL_BINARY = "tispl.bin_HS" |
18 | UBOOT_BINARY = "u-boot.img_HS" | 10 | UBOOT_BINARY = "u-boot.img_HS" |
19 | UBOOT_SYMLINK = "u-boot.img" | 11 | 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" | |||
21 | UBOOT_ARCH = "arm" | 21 | UBOOT_ARCH = "arm" |
22 | UBOOT_ENTRYPOINT = "0x80008000" | 22 | UBOOT_ENTRYPOINT = "0x80008000" |
23 | UBOOT_LOADADDRESS = "0x80008000" | 23 | UBOOT_LOADADDRESS = "0x80008000" |
24 | UBOOT_RD_LOADADDRESS = "0x84000000" | ||
25 | UBOOT_RD_ENTRYPOINT = "0x84000000" | ||
26 | UBOOT_DTB_LOADADDRESS = "0x83000000" | ||
27 | UBOOT_DTBO_LOADADDRESS = "0x83080000" | ||
28 | UBOOT_DTBO_OFFSET = "0x00010000" | ||
24 | 29 | ||
25 | SPL_BINARY = "tispl.bin" | 30 | SPL_BINARY = "tispl.bin" |
26 | SPL_BINARYNAME = "tispl.bin" | 31 | 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 | |||
6 | 6 | ||
7 | UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" | 7 | UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" |
8 | 8 | ||
9 | UBOOT_ENTRYPOINT = "0x80080000" | ||
10 | UBOOT_LOADADDRESS = "0x80080000" | ||
11 | UBOOT_RD_LOADADDRESS = "0x84000000" | ||
12 | UBOOT_RD_ENTRYPOINT = "0x84000000" | ||
13 | UBOOT_DTB_LOADADDRESS = "0x83000000" | ||
14 | UBOOT_DTBO_LOADADDRESS = "0x83080000" | ||
15 | UBOOT_DTBO_OFFSET = "0x00010000" | ||
16 | |||
17 | SPL_BINARY = "tispl.bin_HS" | 9 | SPL_BINARY = "tispl.bin_HS" |
18 | UBOOT_BINARY = "u-boot.img_HS" | 10 | UBOOT_BINARY = "u-boot.img_HS" |
19 | UBOOT_SYMLINK = "u-boot.img" | 11 | 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 | |||
6 | 6 | ||
7 | UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" | 7 | UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" |
8 | 8 | ||
9 | UBOOT_ENTRYPOINT = "0x80080000" | ||
10 | UBOOT_LOADADDRESS = "0x80080000" | ||
11 | UBOOT_RD_LOADADDRESS = "0x84000000" | ||
12 | UBOOT_RD_ENTRYPOINT = "0x84000000" | ||
13 | UBOOT_DTB_LOADADDRESS = "0x83000000" | ||
14 | UBOOT_DTBO_LOADADDRESS = "0x83080000" | ||
15 | UBOOT_DTBO_OFFSET = "0x00010000" | ||
16 | |||
17 | SPL_BINARY = "tispl.bin_HS" | 9 | SPL_BINARY = "tispl.bin_HS" |
18 | UBOOT_BINARY = "u-boot.img_HS" | 10 | UBOOT_BINARY = "u-boot.img_HS" |
19 | UBOOT_SYMLINK = "u-boot.img" | 11 | 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 | |||
6 | 6 | ||
7 | UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" | 7 | UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" |
8 | 8 | ||
9 | UBOOT_ENTRYPOINT = "0x80080000" | ||
10 | UBOOT_LOADADDRESS = "0x80080000" | ||
11 | UBOOT_RD_LOADADDRESS = "0x84000000" | ||
12 | UBOOT_RD_ENTRYPOINT = "0x84000000" | ||
13 | UBOOT_DTB_LOADADDRESS = "0x83000000" | ||
14 | UBOOT_DTBO_LOADADDRESS = "0x83080000" | ||
15 | UBOOT_DTBO_OFFSET = "0x00010000" | ||
16 | |||
17 | SPL_BINARY = "tispl.bin_HS" | 9 | SPL_BINARY = "tispl.bin_HS" |
18 | UBOOT_BINARY = "u-boot.img_HS" | 10 | UBOOT_BINARY = "u-boot.img_HS" |
19 | UBOOT_SYMLINK = "u-boot.img" | 11 | UBOOT_SYMLINK = "u-boot.img" |