| Message ID | 20250113225222.13622-1-reatmon@ti.com |
|---|---|
| State | Under Review |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap,1/2] conf: machine: beagleplay*: Update defaults to mainline | expand |
On Mon, Jan 13, 2025 at 04:52:21PM -0600, Ryan Eatmon via lists.yoctoproject.org wrote: > The defaults for UBOOT_MACHINE and SPL_BINARY are now aligned with the > mainline values and new ti-6_1 values for the previous defaults were > created to capture those. Also updated the meta-beagle beagleplay since > it inherits the beagleplay-ti settings. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> Tested-by: Denys Dmytriyenko <denys@konsulko.com> > --- > meta-beagle/conf/machine/beagleplay-k3r5.conf | 2 +- > meta-beagle/conf/machine/beagleplay.conf | 5 +---- > meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 6 ++---- > meta-ti-bsp/conf/machine/beagleplay-ti.conf | 9 +++------ > 4 files changed, 7 insertions(+), 15 deletions(-) > > diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf > index 3e7f0c1b..f053c11e 100644 > --- a/meta-beagle/conf/machine/beagleplay-k3r5.conf > +++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf > @@ -6,6 +6,6 @@ require conf/machine/beagleplay-ti-k3r5.conf > > require conf/machine/include/beagle-bsp.inc > > -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig" > +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig" > > UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config" > diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf > index b1a463e1..bc0de3f0 100644 > --- a/meta-beagle/conf/machine/beagleplay.conf > +++ b/meta-beagle/conf/machine/beagleplay.conf > @@ -6,13 +6,10 @@ require conf/machine/beagleplay-ti.conf > > require conf/machine/include/beagle-bsp.inc > > -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig" > +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig" > > UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" > > -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" > -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" > - > KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ > ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ > ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ > diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf > index c27e0abc..72dc145b 100644 > --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf > +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf > @@ -8,9 +8,7 @@ SYSFW_SOC = "am62x" > SYSFW_CONFIG = "evm" > SYSFW_SUFFIX = "gp" > > -UBOOT_MACHINE = "am62x_evm_r5_defconfig" > -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" > -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" > +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" > +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" > > UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config" > -UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config" > diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf > index 68d6dced..3824d867 100644 > --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf > +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf > @@ -19,15 +19,12 @@ TFA_K3_SYSTEM_SUSPEND = "1" > > OPTEEMACHINE = "k3-am62x" > > -UBOOT_MACHINE = "am62x_evm_a53_defconfig" > -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" > -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" > +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" > +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" > > UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config" > -UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config" > > -SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" > -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" > +SPL_BINARY = "tispl.bin_unsigned" > > KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-am625-beagle \ > -- > 2.17.1
diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf index 3e7f0c1b..f053c11e 100644 --- a/meta-beagle/conf/machine/beagleplay-k3r5.conf +++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf @@ -6,6 +6,6 @@ require conf/machine/beagleplay-ti-k3r5.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config" diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf index b1a463e1..bc0de3f0 100644 --- a/meta-beagle/conf/machine/beagleplay.conf +++ b/meta-beagle/conf/machine/beagleplay.conf @@ -6,13 +6,10 @@ require conf/machine/beagleplay-ti.conf require conf/machine/include/beagle-bsp.inc -UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config" -SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin" - KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \ ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf index c27e0abc..72dc145b 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf @@ -8,9 +8,7 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -UBOOT_MACHINE = "am62x_evm_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config" -UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config" diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf index 68d6dced..3824d867 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf @@ -19,15 +19,12 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" -UBOOT_MACHINE = "am62x_evm_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config" -UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config" -SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" -SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" +SPL_BINARY = "tispl.bin_unsigned" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625-beagle \
The defaults for UBOOT_MACHINE and SPL_BINARY are now aligned with the mainline values and new ti-6_1 values for the previous defaults were created to capture those. Also updated the meta-beagle beagleplay since it inherits the beagleplay-ti settings. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-beagle/conf/machine/beagleplay-k3r5.conf | 2 +- meta-beagle/conf/machine/beagleplay.conf | 5 +---- meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 6 ++---- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 9 +++------ 4 files changed, 7 insertions(+), 15 deletions(-)