| Message ID | 20250627060416.639661-2-anshuld@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [v1,1/2] conf: machine: k3: update fitImage load address | expand |
UBOOR ? Typo in the subject. On 6/27/2025 1:04 AM, Anshul Dalal wrote: > Since all k3 and legacy platforms share common load addresses for kernel > and initrd in the fitImage, move them to top level ti-soc.inc. > > No functional change is intended from this patch. > > Signed-off-by: Anshul Dalal <anshuld@ti.com> > --- > meta-ti-bsp/conf/machine/am335x-hs-evm.conf | 5 ----- > meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 5 ----- > meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 5 ----- > meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 5 ----- > meta-ti-bsp/conf/machine/include/k3.inc | 4 ---- > meta-ti-bsp/conf/machine/include/ti-soc.inc | 6 ++++++ > 6 files changed, 6 insertions(+), 24 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf > index ca102961..652496c2 100644 > --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf > +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf > @@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc" > UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config" > UBOOT_CONFIG[mmc] = "am335x_hs_evm_config" > > -UBOOT_ENTRYPOINT = "0x82000000" > -UBOOT_LOADADDRESS = "0x82000000" > -UBOOT_RD_LOADADDRESS = "0x84000000" > -UBOOT_RD_ENTRYPOINT = "0x84000000" > - > # FIT image for legacy secure devices > KERNEL_CLASSES += " kernel-fitimage-legacyhs" > KERNEL_IMAGETYPES += " fitImage" > diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf > index 632b4995..fde38d39 100644 > --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf > +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf > @@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf > > UBOOT_MACHINE = "am43xx_hs_evm_config" > > -UBOOT_ENTRYPOINT = "0x82000000" > -UBOOT_LOADADDRESS = "0x82000000" > -UBOOT_RD_LOADADDRESS = "0x84000000" > -UBOOT_RD_ENTRYPOINT = "0x84000000" > - > OPTEEMACHINE = "ti-am43xx" > OPTEEFLAVOR = "am43xx" > > diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf > index 4f36a847..fcdc5c0b 100644 > --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf > +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf > @@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf > > UBOOT_MACHINE = "am57xx_hs_evm_config" > > -UBOOT_ENTRYPOINT = "0x82000000" > -UBOOT_LOADADDRESS = "0x82000000" > -UBOOT_RD_LOADADDRESS = "0x84000000" > -UBOOT_RD_ENTRYPOINT = "0x84000000" > - > OPTEEMACHINE = "ti-am57xx" > OPTEEFLAVOR = "am57xx" > OPTEEPAGER = "y" > diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf > index 8e57a154..37ffef31 100644 > --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf > +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf > @@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf > > UBOOT_MACHINE = "dra7xx_hs_evm_config" > > -UBOOT_ENTRYPOINT = "0x82000000" > -UBOOT_LOADADDRESS = "0x82000000" > -UBOOT_RD_LOADADDRESS = "0x84000000" > -UBOOT_RD_ENTRYPOINT = "0x84000000" > - > OPTEEMACHINE = "ti-dra7xx" > OPTEEFLAVOR = "dra7xx" > OPTEEPAGER = "y" > diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc > index 28785173..feb5a543 100644 > --- a/meta-ti-bsp/conf/machine/include/k3.inc > +++ b/meta-ti-bsp/conf/machine/include/k3.inc > @@ -13,10 +13,6 @@ KERNEL_IMAGETYPES = "Image fitImage" > KERNEL_CLASSES += "kernel-fitimage" > > UBOOT_ARCH = "arm" > -UBOOT_ENTRYPOINT = "0x82000000" > -UBOOT_LOADADDRESS = "0x82000000" > -UBOOT_RD_LOADADDRESS = "0x84000000" > -UBOOT_RD_ENTRYPOINT = "0x84000000" > UBOOT_DTB_LOADADDRESS = "0x88000000" > UBOOT_DTBO_LOADADDRESS = "0x88080000" > UBOOT_DTBO_OFFSET = "0x00010000" > diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc > index 5d77e719..5125856f 100644 > --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc > +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc > @@ -3,6 +3,12 @@ > SOC_FAMILY = "ti-soc" > require conf/machine/include/soc-family.inc > > +# kernel, initrd load addresses for the fitImage in all TI platforms > +UBOOT_ENTRYPOINT = "0x82000000" > +UBOOT_LOADADDRESS = "0x82000000" > +UBOOT_RD_LOADADDRESS = "0x84000000" > +UBOOT_RD_ENTRYPOINT = "0x84000000" > + > # TI platforms all use devicetrees with overlays > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" > KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
On Fri Jun 27, 2025 at 8:02 PM IST, Ryan Eatmon wrote: > > UBOOR ? Typo in the subject. > My bad, didn't catch that earlier. Sorry for the inconvenience but could you reword it locally please :) - Anshul
Ok... On 6/27/2025 9:39 AM, Anshul Dalal wrote: > On Fri Jun 27, 2025 at 8:02 PM IST, Ryan Eatmon wrote: >> >> UBOOR ? Typo in the subject. >> > > My bad, didn't catch that earlier. Sorry for the inconvenience but could > you reword it locally please :) > > - Anshul
diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf index ca102961..652496c2 100644 --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf @@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc" UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config" UBOOT_CONFIG[mmc] = "am335x_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - # FIT image for legacy secure devices KERNEL_CLASSES += " kernel-fitimage-legacyhs" KERNEL_IMAGETYPES += " fitImage" diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index 632b4995..fde38d39 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf UBOOT_MACHINE = "am43xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-am43xx" OPTEEFLAVOR = "am43xx" diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 4f36a847..fcdc5c0b 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf UBOOT_MACHINE = "am57xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-am57xx" OPTEEFLAVOR = "am57xx" OPTEEPAGER = "y" diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index 8e57a154..37ffef31 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf @@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf UBOOT_MACHINE = "dra7xx_hs_evm_config" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" - OPTEEMACHINE = "ti-dra7xx" OPTEEFLAVOR = "dra7xx" OPTEEPAGER = "y" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 28785173..feb5a543 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -13,10 +13,6 @@ KERNEL_IMAGETYPES = "Image fitImage" KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" -UBOOT_ENTRYPOINT = "0x82000000" -UBOOT_LOADADDRESS = "0x82000000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" UBOOT_DTB_LOADADDRESS = "0x88000000" UBOOT_DTBO_LOADADDRESS = "0x88080000" UBOOT_DTBO_OFFSET = "0x00010000" diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 5d77e719..5125856f 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -3,6 +3,12 @@ SOC_FAMILY = "ti-soc" require conf/machine/include/soc-family.inc +# kernel, initrd load addresses for the fitImage in all TI platforms +UBOOT_ENTRYPOINT = "0x82000000" +UBOOT_LOADADDRESS = "0x82000000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" + # TI platforms all use devicetrees with overlays MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
Since all k3 and legacy platforms share common load addresses for kernel and initrd in the fitImage, move them to top level ti-soc.inc. No functional change is intended from this patch. Signed-off-by: Anshul Dalal <anshuld@ti.com> --- meta-ti-bsp/conf/machine/am335x-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/am437x-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/am57xx-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf | 5 ----- meta-ti-bsp/conf/machine/include/k3.inc | 4 ---- meta-ti-bsp/conf/machine/include/ti-soc.inc | 6 ++++++ 6 files changed, 6 insertions(+), 24 deletions(-)