mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-06-07 19:32:58 +00:00
conf: machine: am62xx-unified: Create new common am62xx machine
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 <reatmon@ti.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user