| Message ID | 20251202223210.3816583-2-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master,1/4] conf: machine: Remove remaining K3 HS machines | expand |
On Tue, Dec 02, 2025 at 04:32:08PM -0600, Andrew Davis via lists.yoctoproject.org wrote: > These were set to the defaults we would expect from OMAP class U-Boot, > but as all board families set these including the OMAP class MACHINEs > we can remove these defaults. This helps in the cases that we do not > want to define one of these, such as SPL_BINARY in the case of OMAP-L138 > which does not use SPL. Isn't OMAP-L138 finally deprecated as of this year? I guess it's a good time to remove the entire machine config as well... > Signed-off-by: Andrew Davis <afd@ti.com> > --- > meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 1 - > meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 3 --- > 2 files changed, 4 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf > index 458caaff..c1e47926 100644 > --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf > +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf > @@ -6,7 +6,6 @@ require conf/machine/include/omapl138.inc > > UBOOT_MACHINE = "omapl138_lcdk_config" > UBOOT_SUFFIX = "ais" > -SPL_BINARY = "" > > UBOOT_ENTRYPOINT = "0xc0008000" > UBOOT_LOADADDRESS = "0xc0008000" > diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > index de4a37b4..277ec7fe 100644 > --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > @@ -5,9 +5,6 @@ do_compile:prepend () { > echo ${scm_version} > ${S}/.scmversion > } > > -UBOOT_SUFFIX ?= "img" > -SPL_BINARY ?= "MLO" > - > require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc > require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc > require u-boot-mergeconfig.inc > -- > 2.39.2
diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index 458caaff..c1e47926 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -6,7 +6,6 @@ require conf/machine/include/omapl138.inc UBOOT_MACHINE = "omapl138_lcdk_config" UBOOT_SUFFIX = "ais" -SPL_BINARY = "" UBOOT_ENTRYPOINT = "0xc0008000" UBOOT_LOADADDRESS = "0xc0008000" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index de4a37b4..277ec7fe 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -5,9 +5,6 @@ do_compile:prepend () { echo ${scm_version} > ${S}/.scmversion } -UBOOT_SUFFIX ?= "img" -SPL_BINARY ?= "MLO" - require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc require u-boot-mergeconfig.inc
These were set to the defaults we would expect from OMAP class U-Boot, but as all board families set these including the OMAP class MACHINEs we can remove these defaults. This helps in the cases that we do not want to define one of these, such as SPL_BINARY in the case of OMAP-L138 which does not use SPL. Signed-off-by: Andrew Davis <afd@ti.com> --- meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 1 - meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 3 --- 2 files changed, 4 deletions(-)