To reduce the number of required builds for testing purposes, create a common unified am62xx machine target that can produce all of the files for all of the variant platforms related to am62xx (sip and lp). Additionally, continue to support building the specific target if desired.
Signed-off-by: Ryan Eatmon <[email protected]> --- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 9 +--- meta-ti-bsp/conf/machine/am62xx-evm.conf | 5 +-- .../conf/machine/am62xx-lp-evm-k3r5.conf | 9 +--- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 5 +-- .../conf/machine/am62xx-unified-k3r5.conf | 20 +++++++++ meta-ti-bsp/conf/machine/am62xx-unified.conf | 43 +++++++++++++++++++ .../conf/machine/am62xxsip-evm-k3r5.conf | 8 ++-- meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 6 +-- 8 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-unified.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 548369ca..3a819835 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -2,11 +2,6 @@ #@NAME: AM62XX EVM (R5F) #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) -require conf/machine/include/k3r5.inc -require conf/machine/include/ti-extras.inc +require conf/machine/am62xx-unified-k3r5.conf -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am62x_evm_r5_defconfig" +UBOOT_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 31de4a14..8c80cb1f 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -2,8 +2,7 @@ #@NAME: AM62XX EVM #@DESCRIPTION: Machine configuration for the TI AM62XX EVM -require conf/machine/include/am62xx.inc -require conf/machine/include/ti-extras.inc +require conf/machine/am62xx-unified.conf KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ @@ -30,4 +29,4 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -UBOOT_MACHINE = "am62x_evm_a53_defconfig" +UBOOT_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 52b69a72..fb760e99 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -2,11 +2,6 @@ #@NAME: AM62XX LP GP EVM (R5F) #@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core) -require conf/machine/include/k3r5.inc -require conf/machine/include/ti-extras.inc +require conf/machine/am62xx-unified-k3r5.conf -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" +UBOOT_CONFIG = "lpsk" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index e9271f5b..f7d89d68 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -2,8 +2,7 @@ #@NAME: AM62XX LP EVM #@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM -require conf/machine/include/am62xx.inc -require conf/machine/include/ti-extras.inc +require conf/machine/am62xx-unified.conf KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62-lp \ @@ -19,4 +18,4 @@ KERNEL_DEVICETREE = " \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " -UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" +UBOOT_CONFIG = "lpsk" diff --git a/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf new file mode 100644 index 00000000..7d65e6af --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-unified-k3r5.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "" +# Last config in the list is default +UBOOT_CONFIG ??= "sip lpsk evm" + +UBOOT_CONFIG:bsp-ti-6_1 ??= "evm" + +UBOOT_CONFIG[sip] = "am62xsip_evm_r5_defconfig" +UBOOT_CONFIG[lpsk] = "am62x_lpsk_r5_defconfig" +UBOOT_CONFIG[evm] = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-unified.conf b/meta-ti-bsp/conf/machine/am62xx-unified.conf new file mode 100644 index 00000000..5b03239f --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-unified.conf @@ -0,0 +1,43 @@ +#@TYPE: Machine +#@NAME: AM62XX Unified EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX EVM and all of its variations + +require conf/machine/include/am62xx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62-lp \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62-lp-sk.dtb \ + ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ + ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ + ti/k3-am625-beagleplay.dtb \ + ti/k3-am625-phyboard-lyra-rdk.dtb \ + ti/k3-am625-sk.dtb \ + ti/k3-am625-verdin-nonwifi-dahlia.dtb \ + ti/k3-am625-verdin-nonwifi-dev.dtb \ + ti/k3-am625-verdin-nonwifi-mallow.dtb \ + ti/k3-am625-verdin-nonwifi-yavia.dtb \ + ti/k3-am625-verdin-wifi-dahlia.dtb \ + ti/k3-am625-verdin-wifi-dev.dtb \ + ti/k3-am625-verdin-wifi-mallow.dtb \ + ti/k3-am625-verdin-wifi-yavia.dtb \ + ti/k3-am62x-sk-csi2-imx219.dtbo \ + ti/k3-am62x-sk-csi2-ov5640.dtbo \ + ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \ + ti/k3-am62x-sk-hdmi-audio.dtbo \ +" + +UBOOT_MACHINE = "" +# Last config in the list is default +UBOOT_CONFIG ??= "sip lpsk evm" + +UBOOT_CONFIG:bsp-ti-6_1 ??= "lpsk evm" + +UBOOT_CONFIG[sip] = "am62xsip_evm_a53_defconfig" +UBOOT_CONFIG[lpsk] = "am62x_lpsk_a53_defconfig" +UBOOT_CONFIG[evm] = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf index 55bc530b..ab538ff3 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -2,13 +2,11 @@ #@NAME: AM62XX SIP EVM (R5F) #@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core) -require conf/machine/include/k3r5.inc +require conf/machine/am62xx-unified-k3r5.conf -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" +UBOOT_CONFIG = "sip" -UBOOT_MACHINE = "am62xsip_evm_r5_defconfig" +UBOOT_CONFIG:bsp-ti-6_1 = "" UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf index 8104329e..6b179b80 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -2,7 +2,7 @@ #@NAME: AM62XX SIP EVM #@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM -require conf/machine/include/am62xx.inc +require conf/machine/am62xx-unified.conf KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ @@ -13,6 +13,4 @@ KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ " -UBOOT_MACHINE = "am62xsip_evm_a53_defconfig" - -UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" +UBOOT_CONFIG = "sip" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17931): https://lists.yoctoproject.org/g/meta-ti/message/17931 Mute This Topic: https://lists.yoctoproject.org/mt/107796202/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
