diff options
Diffstat (limited to 'meta-ti-bsp/conf/machine')
76 files changed, 944 insertions, 341 deletions
diff --git a/meta-ti-bsp/conf/machine/am335x-evm.conf b/meta-ti-bsp/conf/machine/am335x-evm.conf index 9301406b..5b7739ce 100644 --- a/meta-ti-bsp/conf/machine/am335x-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-evm.conf @@ -10,7 +10,6 @@ IMAGE_FSTYPES += "ubifs ubi" # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # UBI information. Note that this is board and kernel specific. Changes # in your kernel port may require changes in these variables. For more @@ -23,7 +22,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900" +MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 13000" # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 # from dmesg: diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf index 7caa5bfd..ca102961 100644 --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf @@ -15,4 +15,12 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am3x" +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf index 98602add..248add70 100644 --- a/meta-ti-bsp/conf/machine/am437x-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-evm.conf @@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 994 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000" # do ubiattach /dev/ubi_ctrl -m 11 -O 4096 # from dmesg: diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index 68b808d2..632b4995 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf @@ -11,10 +11,18 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x" - OPTEEMACHINE = "ti-am43xx" OPTEEFLAVOR = "am43xx" -OPTEEOUTPUTMACHINE = "ti" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index 825bc31d..09eb4705 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf @@ -2,33 +2,37 @@ #@NAME: AM57xx EVM #@DESCRIPTION: Machine configuration for the TI AM57xx EVM -require conf/machine/include/dra7xx.inc +require conf/machine/include/am57xx.inc MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = " \ - am57xx-beagle-x15.dtb \ - am57xx-beagle-x15-revb1.dtb \ - am57xx-beagle-x15-revc.dtb \ - am5729-beagleboneai.dtb \ +KERNEL_DEVICETREE_PREFIX = " \ + am57 \ + ov10635 \ + ti/am57 \ + ti/lcd \ + ti/ov10635 \ + ti/omap/am57 \ +" + +KERNEL_DEVICETREE_DTBMERGE = " \ am57xx-evm.dtb \ - ti/am57xx-evm-common.dtbo \ am57xx-evm-reva3.dtb \ - ti/am57xx-evm-reva3.dtbo \ - am571x-idk.dtb \ - ti/am571x-idk-touchscreen.dtbo \ - am572x-idk.dtb \ - am574x-idk.dtb \ - ti/am57xx-idk-osd-lcd-common.dtbo \ - ti/am572x-idk-touchscreen.dtbo \ - ti/lcd-osd101t2587.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/ov10635.dtbo \ + ti/omap/am57xx-evm.dtb \ + ti/omap/am57xx-evm-reva3.dtb \ " -KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" +KERNEL_DEVICETREE = " \ + ti/omap/am57xx-beagle-x15.dtb \ + ti/omap/am57xx-beagle-x15-revb1.dtb \ + ti/omap/am57xx-beagle-x15-revc.dtb \ + ti/omap/am5729-beagleboneai.dtb \ + ti/omap/am571x-idk.dtb \ + ti/omap/am572x-idk.dtb \ + ti/omap/am574x-idk.dtb \ +" UBOOT_MACHINE = "am57xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 5232cbd9..4f36a847 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf @@ -11,11 +11,19 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x" - OPTEEMACHINE = "ti-am57xx" OPTEEFLAVOR = "am57xx" -OPTEEOUTPUTMACHINE = "ti" OPTEEPAGER = "y" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf new file mode 100644 index 00000000..2af3317e --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62A HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf new file mode 100644 index 00000000..238718d0 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -0,0 +1,18 @@ +#@TYPE: Machine +#@NAME: AM62AXX EVM +#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM + +require conf/machine/include/am62axx.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62a7 \ + ti/k3-am62x-sk \ + ti/k3-fpdlink \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62a7-sk.dtb \ +" + +UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf new file mode 100644 index 00000000..36915381 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM62PX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc + +SYSFW_SOC = "am62px" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62px_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf new file mode 100644 index 00000000..fab96bd8 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: AM62PX EVM +#@DESCRIPTION: Machine configuration for the TI AM62PX EVM + +require conf/machine/include/am62pxx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62p5 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk-lpm \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62p5-sk.dtb \ +" + +UBOOT_MACHINE = "am62px_evm_a53_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +# For AM62P tisdk-display-cluster image, splash screen is handled by SBL. +# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree +UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 724a8d4a..548369ca 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -3,9 +3,10 @@ #@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 = "gp" +SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 33b3294e..fadbc6f4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -3,10 +3,15 @@ #@DESCRIPTION: Machine configuration for the TI AM62XX EVM require conf/machine/include/am62xx.inc +require conf/machine/include/ti-extras.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtb \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf new file mode 100644 index 00000000..52b69a72 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@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 + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf new file mode 100644 index 00000000..51e99728 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@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 + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62-lp \ + ti/k3-am625-sk \ + ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk-lpm \ + ti/k3-am62x-sk-mcan \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am62-lp-sk.dtb \ +" + +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf new file mode 100644 index 00000000..0daff2b9 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf new file mode 100644 index 00000000..b5dd18f1 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX SIP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM + +require conf/machine/include/am62xx.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am625-sk.dtb \ +" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf index afd36b72..e932928a 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf @@ -4,8 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am64x" +SYSFW_SOC = "am64x_sr2" SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" +SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf deleted file mode 100644 index d12c030f..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf deleted file mode 100644 index 44e81463..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ /dev/null @@ -1,22 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf deleted file mode 100644 index e74dd3ab..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index bd17474e..8744ac3e 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -4,9 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am65x" +SYSFW_SOC = "am65x_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_SYMLINK = "" UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm.conf b/meta-ti-bsp/conf/machine/am65xx-evm.conf index 8b6ef546..60eed90f 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm.conf @@ -5,3 +5,5 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_evm_a53_defconfig" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf deleted file mode 100644 index ff1645e4..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index d6d4b1e3..337c8413 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -4,11 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "am65x" +SYSFW_SOC = "am65x_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" -UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf index e4eebb6a..f8221f31 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf @@ -4,19 +4,4 @@ require conf/machine/include/am65xx.inc -UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "am65x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf new file mode 100644 index 00000000..9d2b4cd6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am69-sk-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM69 SK (R5F) +#@DESCRIPTION: Machine configuration for the TI AM69 SK (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am69_sk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf new file mode 100644 index 00000000..6341a6fa --- /dev/null +++ b/meta-ti-bsp/conf/machine/am69-sk.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM69 SK +#@DESCRIPTION: Machine configuration for the TI AM69 SK + +require conf/machine/include/am69.inc + +TFA_K3_USART = "0x8" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am69-sk \ + ti/k3-fpdlink \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am69-sk.dtb \ +" + +UBOOT_MACHINE = "am69_sk_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index c7503266..6fc7957c 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -2,9 +2,18 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/dra7xx.inc +require conf/machine/include/beagle.inc +require conf/machine/include/am57xx.inc -KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" +KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15" + +KERNEL_DEVICETREE = " \ +am57xx-beagle-x15.dtb \ +am57xx-beagle-x15-revb1.dtb \ +am57xx-beagle-x15-revc.dtb \ +am57xx-idk-lcd-osd101t2045.dtbo \ +am57xx-idk-lcd-osd101t2587.dtbo \ +" MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf new file mode 100644 index 00000000..f57ae065 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (R5F) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + +UBOOT_MACHINE = "j721e_evm_r5_defconfig" + + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf new file mode 100644 index 00000000..a9be4d13 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -0,0 +1,37 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (A72) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) + +require conf/machine/include/beagle.inc +require conf/machine/include/j721e.inc + +UBOOT_MACHINE = "j721e_evm_a72_config" + + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721e \ +" + +KERNEL_DEVICETREE = " \ +ti/k3-j721e-beagleboneai64.dtb \ +ti/k3-j721e-common-proc-board.dtb \ +ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ +ti/k3-j721e-evm-csi2-ov5640.dtbo \ +ti/k3-j721e-evm-fusion.dtbo \ +ti/k3-j721e-evm-gesi-exp-board.dtbo \ +ti/k3-j721e-evm-pcie0-ep.dtbo \ +ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ +ti/k3-j721e-evm-virt-mac-client.dtbo \ +ti/k3-j721e-sk.dtb \ +ti/k3-j721e-sk-csi2-ov5640.dtbo \ +ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \ +ti/k3-j721e-sk-fusion.dtbo \ +ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ +" + +MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 413a960d..8b8b9d29 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -2,15 +2,66 @@ #@NAME: BeagleBone machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board +require conf/machine/include/beagle.inc require conf/machine/include/ti33x.inc -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" +KERNEL_DEVICETREE_PREFIX = "am335x-bone" + +KERNEL_DEVICETREE = " \ +am335x-bone.dtb \ +am335x-boneblack.dtb \ +am335x-boneblack-pps.dtb \ +am335x-boneblack-uboot.dtb \ +am335x-boneblack-uboot-univ.dtb \ +am335x-boneblack-wireless.dtb \ +am335x-boneblue.dtb \ +am335x-bonegreen.dtb \ +am335x-bonegreen-gateway.dtb \ +am335x-bonegreen-wireless.dtb \ +am335x-bonegreen-wireless-uboot-univ.dtb \ +am335x-pocketbeagle.dtb \ +am335x-sancloud-bbe.dtb \ +am335x-sancloud-bbe-extended-wifi.dtb \ +am335x-sancloud-bbe-lite.dtb \ +" + +# Extra DT overlays/capes +KERNEL_DEVICETREE += " \ +AM335X-PRU-UIO-00A0.dtbo \ +BB-ADC-00A0.dtbo \ +BB-BBBW-WL1835-00A0.dtbo \ +BB-BBGG-WL1835-00A0.dtbo \ +BB-BBGW-WL1835-00A0.dtbo \ +BB-BONE-4D5R-01-00A1.dtbo \ +BB-BONE-eMMC1-01-00A0.dtbo \ +BB-BONE-LCD4-01-00A1.dtbo \ +BB-BONE-NH7C-01-A0.dtbo \ +BB-CAPE-DISP-CT4-00A0.dtbo \ +BB-HDMI-TDA998x-00A0.dtbo \ +BB-I2C1-MCP7940X-00A0.dtbo \ +BB-I2C1-RTC-DS3231.dtbo \ +BB-I2C1-RTC-PCF8563.dtbo \ +BB-I2C2-BME680.dtbo \ +BB-I2C2-MPU6050.dtbo \ +BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ +BB-NHDMI-TDA998x-00A0.dtbo \ +BBORG_COMMS-00A2.dtbo \ +BBORG_FAN-A000.dtbo \ +BBORG_RELAY-00A2.dtbo \ +BB-SPIDEV0-00A0.dtbo \ +BB-SPIDEV1-00A0.dtbo \ +BB-UART1-00A0.dtbo \ +BB-UART2-00A0.dtbo \ +BB-UART4-00A0.dtbo \ +BB-W1-P9.12-00A0.dtbo \ +BONE-ADC.dtbo \ +M-BB-BBG-00A0.dtbo \ +M-BB-BBGG-00A0.dtbo \ +PB-MIKROBUS-0.dtbo \ +PB-MIKROBUS-1.dtbo \ +" MACHINE_GUI_CLASS = "bigscreen" MACHINE_FEATURES += "screen" SERIAL_CONSOLES = "115200;ttyS0" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree kernel-image-zimage" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf new file mode 100644 index 00000000..601cbbf7 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (R5F) +#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) + +require conf/machine/include/k3r5.inc + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" +PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf new file mode 100644 index 00000000..65c14333 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -0,0 +1,60 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (A53) +#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) + +require conf/machine//include/beagle.inc +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62xx" + +MACHINE_FEATURES += "screen gpu" + +SERIAL_CONSOLES = "115200;ttyS2" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +UBOOT_MACHINE = "am62x_evm_a53_defconfig" + +# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build +# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc +# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. +UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" + +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" +PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk \ +" + +KERNEL_DEVICETREE = " \ +ti/k3-am625-beagleplay.dtb \ +ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ +ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ +ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-sk.dtb \ +ti/k3-am625-sk-dmtimer-pwm.dtbo \ +ti/k3-am625-sk-ecap-capture.dtbo \ +ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ +ti/k3-am625-sk-mcspi-loopback.dtbo \ +ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \ +ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \ +ti/k3-am625-sk-pwm.dtbo \ +ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \ +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-csi2-v3link-fusion.dtbo \ +ti/k3-am62x-sk-eqep.dtbo \ +ti/k3-am62x-sk-hdmi-audio.dtbo \ +ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ +ti/k3-am62x-sk-mcan.dtbo \ +" + +MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf index 5fa1dfa5..f9a3dd0b 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf @@ -8,20 +8,19 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS0" +KERNEL_DEVICETREE_PREFIX = " \ + dra7 \ + ti/dra7 \ + ti/lcd \ + ti/omap/dra7 \ +" + KERNEL_DEVICETREE = " \ - dra7-evm.dtb \ - ti/dra7x-evm-osd-lcd-common.dtbo \ - dra71-evm.dtb \ - dra71-evm-nand.dtb \ - ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \ - dra72-evm.dtb \ - dra72-evm-revc.dtb \ - ti/dra72-evm-touchscreen.dtbo \ - ti/dra74-evm-touchscreen.dtbo \ - dra76-evm.dtb \ - ti/dra76-evm-tfp410.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/lcd-osd101t2587.dtbo \ + ti/omap/dra7-evm.dtb \ + ti/omap/dra71-evm.dtb \ + ti/omap/dra72-evm.dtb \ + ti/omap/dra72-evm-revc.dtb \ + ti/omap/dra76-evm.dtb \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index 49630081..8e57a154 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf @@ -11,11 +11,19 @@ UBOOT_LOADADDRESS = "0x82000000" UBOOT_RD_LOADADDRESS = "0x84000000" UBOOT_RD_ENTRYPOINT = "0x84000000" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7" - OPTEEMACHINE = "ti-dra7xx" OPTEEFLAVOR = "dra7xx" -OPTEEOUTPUTMACHINE = "ti" OPTEEPAGER = "y" EXTRA_IMAGEDEPENDS += "optee-os" + +# FIT image for legacy secure devices +KERNEL_CLASSES += " kernel-fitimage-legacyhs" +KERNEL_IMAGETYPES += " fitImage" + +# FIT image settings +FITIMAGE_HASH_ALGO = "" +FITIMAGE_PACK_TEE = "1" +FITIMAGE_DTB_BY_NAME = "1" +FITIMAGE_TEE_BY_NAME = "1" +FITIMAGE_CONF_BY_NAME = "1" diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc new file mode 100644 index 00000000..85290924 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am57xx.inc @@ -0,0 +1,7 @@ +require conf/machine/include/omap-a15.inc +SOC_FAMILY:append = ":dra7xx" +SOC_FAMILY:append = ":am57xx" + +MACHINE_FEATURES += "pci" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw" diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc new file mode 100644 index 00000000..93a41d8d --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -0,0 +1,20 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62axx" + +MACHINE_FEATURES += "screen touchscreen" + +TFA_K3_SYSTEM_SUSPEND = "1" + +# Default tiboot3.bin on AM62A is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc new file mode 100644 index 00000000..38e35851 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":am62pxx" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on AM62Px is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" + +SERIAL_CONSOLES = "115200;ttyS2" + +# Bitmap image tarball for early splashscreen +IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index fff1312f..a0ec944f 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,25 +1,27 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen gpu" -SERIAL_CONSOLES = "115200;ttyS2" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -# AM62 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM62x is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" + +# Bitmap image tarball for early splashscreen +IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" -OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" +OPTEEMACHINE = "k3-am62x" + +# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use ttyS3, so try both +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index afb96a22..cfade2fa 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -1,24 +1,24 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am64xx" -MACHINE_FEATURES += "screen touchscreen" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ ti/k3-am642-sk.dtb \ - ti/k3-am642-evm-icssg1-dualemac.dtbo \ - ti/k3-am642-evm-nand.dtbo \ " -# AM64 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" + +OPTEEMACHINE = "k3-am64x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index d6bd9810..80a7744a 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -3,36 +3,27 @@ SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ - ti/k3-am654-base-board-sr1.dtbo \ - ti/k3-am654-gp.dtbo \ - ti/k3-am654-idk.dtbo \ - ti/k3-am654-idk-sr1.dtbo \ - ti/k3-am654-sr1.dtbo \ - ti/k3-am654-pcie-usb2.dtbo \ - ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo \ - ti/k3-am654-evm-ov5640.dtbo \ " -BBMULTICONFIG += "k3r5-sr2" +IMAGE_BOOT_FILES += "sysfw.itb" + +# Default on AM65x is for GP +IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" +IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" -# Use default IMAGE_BOOT_FILES_LEGACY files -# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 -IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" -do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" +# Since default on AM65x is for GP, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" + +TFA_BOARD = "generic" OPTEEMACHINE = "k3-am65x" -OPTEEOUTPUTMACHINE = "k3" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc new file mode 100644 index 00000000..81be1397 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -0,0 +1,19 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":j784s4" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on AM69 is for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" + +# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" + +TFA_BOARD = "j784s4" + +OPTEEMACHINE = "k3-j784s4" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc new file mode 100644 index 00000000..27e3298d --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/beagle.inc @@ -0,0 +1,3 @@ + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org" + diff --git a/meta-ti-bsp/conf/machine/include/j7.inc b/meta-ti-bsp/conf/machine/include/j7.inc deleted file mode 100644 index 4ea3a5d8..00000000 --- a/meta-ti-bsp/conf/machine/include/j7.inc +++ /dev/null @@ -1,7 +0,0 @@ -require conf/machine/include/k3.inc -SOC_FAMILY:append = ":j7" - -OPTEEMACHINE = "k3-j721e" -OPTEEOUTPUTMACHINE = "k3" - -# Use default IMAGE_BOOT_FILES_LEGACY files diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index ce88567c..caa79876 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -1,2 +1,23 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j7200" + +# Default tiboot3.bin on J7200 is for GP +IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" + +# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" + +# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j721e" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index fe260178..6040feb0 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,10 +1,35 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721e" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +IMAGE_BOOT_FILES += "sysfw.itb" + +# Default on J721e is for GP +IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" + +# Since default on J721e is for GP, add a version for SR1.1 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" + +# Since default on J721e is for GP, add a version for SR1.1 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" + +# Since default on J721e is for GP, add a version for SR2.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" + +# Since default on J721e is for GP, add a version for SR2.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" +IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j721e" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 5cd74683..5289ec5a 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,10 +1,22 @@ -require conf/machine/include/j7.inc +require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "gpu" +MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J721S2 is for GP +IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" + +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" + +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin" + +TFA_BOARD = "generic" + +OPTEEMACHINE = "k3-j784s4" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc new file mode 100644 index 00000000..3b051f1b --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":j722s" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J722S is for HS-FS +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" + +# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE +IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw" + +SERIAL_CONSOLES = "115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc new file mode 100644 index 00000000..92062cdf --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -0,0 +1,22 @@ +require conf/machine/include/k3.inc +SOC_FAMILY:append = ":j784s4" + +MACHINE_FEATURES += "screen gpu" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + +# Default tiboot3.bin on J784S4 is for GP +IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-SE +IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin" + +TFA_BOARD = "j784s4" + +OPTEEMACHINE = "k3-j784s4" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 911b59bd..e3da9e12 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -15,39 +15,53 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image vmlinux.gz" +KERNEL_IMAGETYPES = "Image fitImage" +KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" +UBOOT_ENTRYPOINT = "0x81000000" +UBOOT_LOADADDRESS = "0x81000000" +UBOOT_RD_LOADADDRESS = "0x84000000" +UBOOT_RD_ENTRYPOINT = "0x84000000" +UBOOT_DTB_LOADADDRESS = "0x83000000" +UBOOT_DTBO_LOADADDRESS = "0x83080000" +UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin" +SPL_BINARYNAME = "tispl.bin" UBOOT_SUFFIX = "img" +UBOOT_SIGN_ENABLE = "1" +UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb" +UBOOT_SIGN_KEYNAME ?= "custMpk" +UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys" +FIT_HASH_ALG ?= "sha512" +FIT_SIGN_ALG ?= "rsa4096" + EXTRA_IMAGEDEPENDS += "virtual/bootloader" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image" + TFA_PLATFORM = "k3" -TFA_BOARD = "generic" # Use the expected value of the ubifs filesystem's volume name in the kernel # and u-boot. UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" -IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" -IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" - -IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" +IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" -WKS_FILE ?= "sdimage-2part-efi.wks" +WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" + do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" + +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 3cc79061..63267a5e 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -8,17 +8,20 @@ DEFAULTTUNE = "armv7athf" require conf/machine/include/arm/armv7a/tune-cortexa8.inc # R5 runs early bootloader and loads SYSFW -# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README -# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -SPL_BINARY = "" +SPL_SUFFIX = "bin" +SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" +SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" UBOOT_SUFFIX = "bin" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}" PACKAGECONFIG:pn-u-boot-ti-staging = "" PACKAGECONFIG:pn-u-boot-ti-mainline = "" diff --git a/meta-ti-bsp/conf/machine/include/mesa-pvr.inc b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc new file mode 100644 index 00000000..d5581315 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc @@ -0,0 +1,8 @@ +PREFERRED_PROVIDER_virtual/mesa ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/egl ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgbm ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libglx ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-pvr" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index f548f3fd..a875713f 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -10,11 +10,11 @@ MACHINE_KERNEL_PR = "r7" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPES = "zImage uImage" @@ -24,7 +24,7 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}" # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" @@ -40,14 +40,18 @@ UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw" + # Use the expected value of the ubifs filesystem's volume name in the kernel # and u-boot. UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc320" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" -do_image_wic[depends] += "u-boot:do_deploy" +do_image_wic[depends] += "virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/omapl1.inc b/meta-ti-bsp/conf/machine/include/omapl1.inc deleted file mode 100644 index d0262c3f..00000000 --- a/meta-ti-bsp/conf/machine/include/omapl1.inc +++ /dev/null @@ -1,2 +0,0 @@ -require conf/machine/include/ti-soc.inc -SOC_FAMILY:append = ":omapl1" diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc index c6eb0cd9..7f8262a5 100644 --- a/meta-ti-bsp/conf/machine/include/omapl138.inc +++ b/meta-ti-bsp/conf/machine/include/omapl138.inc @@ -1,2 +1,16 @@ -require conf/machine/include/omapl1.inc +require conf/machine/include/ti-soc.inc SOC_FAMILY:append = ":omapl138" + +require conf/machine/include/arm/armv5/tune-arm926ejs.inc + +KERNEL_IMAGETYPE = "zImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" + +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_FEATURES = "serial usbhost usbgadget alsa" diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc new file mode 100644 index 00000000..4e62605c --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc @@ -0,0 +1,4 @@ +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse' + +TI_EXTRAS ??= "" +MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}" diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 2792d2a0..a1fd3cbf 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -1,5 +1,9 @@ # This is a generic TI SOC family. It is a superset of all other SOCs # and platforms defined in meta-ti to allow BSP-level overrides. SOC_FAMILY = "ti-soc" + +# TI platforms all use devicetrees with overlays +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1" + require conf/machine/include/soc-family.inc diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index cfacc30d..b0ed1c69 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -11,24 +11,32 @@ MACHINE_KERNEL_PR = "r22" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE = " \ - am335x-evm.dtb am335x-evmsk.dtb \ - am335x-icev2.dtb \ - am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-sancloud-bbe.dtb \ +KERNEL_DEVICETREE_PREFIX = " \ + am335x \ + ti/omap/am335x \ " -KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" +KERNEL_DEVICETREE = " \ + ti/omap/am335x-evm.dtb \ + ti/omap/am335x-evmsk.dtb \ + ti/omap/am335x-icev2.dtb \ + ti/omap/am335x-pocketbeagle.dtb \ + ti/omap/am335x-bone.dtb \ + ti/omap/am335x-boneblue.dtb \ + ti/omap/am335x-bonegreen.dtb \ + ti/omap/am335x-bonegreen-wireless.dtb \ + ti/omap/am335x-boneblack.dtb \ + ti/omap/am335x-boneblack-wireless.dtb \ + ti/omap/am335x-sancloud-bbe.dtb \ +" UBOOT_ARCH = "arm" UBOOT_MACHINE = "am335x_evm_config" @@ -36,13 +44,16 @@ UBOOT_MACHINE = "am335x_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}" + # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" +UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon" UBOOT_EXTLINUX_BOOT_FILES = " \ extlinux.conf;extlinux/extlinux.conf \ ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ + ${DEVICETREE_FILE} \ " SPL_BINARY = "MLO" @@ -54,8 +65,12 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "virtual/bootloader" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" + # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 0da5f761..17ca5240 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -11,18 +11,26 @@ MACHINE_KERNEL_PR = "r3" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" + +# Graphics providers and variables +require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" +PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = " \ + am437x \ + am43x \ + ti/omap/am437x \ + ti/omap/am43x \ +" + KERNEL_DEVICETREE = " \ - am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \ - am437x-sk-evm.dtb am437x-idk-evm.dtb \ - am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \ + ti/omap/am437x-gp-evm.dtb \ + ti/omap/am437x-sk-evm.dtb \ + ti/omap/am437x-idk-evm.dtb \ + ti/omap/am43x-epos-evm.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" @@ -33,13 +41,15 @@ UBOOT_MACHINE = "am43xx_evm_config" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}" + # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" UBOOT_EXTLINUX_BOOT_FILES = " \ extlinux.conf;extlinux/extlinux.conf \ ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ + ${DEVICETREE_FILE} \ " SPL_BINARY = "MLO" @@ -49,12 +59,16 @@ UBOOT_SUFFIX = "img" # and u-boot. UBI_VOLNAME = "rootfs" -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" -do_image_wic[depends] += "u-boot:do_deploy" +do_image_wic[depends] += "virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index 175d30f8..dff1da69 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -4,17 +4,10 @@ require conf/machine/include/j7200.inc -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ " UBOOT_MACHINE = "j7200_evm_a72_config" - -# J7200 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf index 488f19ec..1922d5c8 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf @@ -4,10 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j7200" +SYSFW_SOC = "j7200_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j7200_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf index a5bd637e..54fd2b4a 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf @@ -4,19 +4,4 @@ require conf/machine/j7200-evm.conf -UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j7200_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index fe28e6f5..5e1f6dca 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -4,12 +4,14 @@ require conf/machine/include/j721e.inc -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721e \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ +" KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ - ti/k3-j721e-common-proc-board-infotainment.dtbo \ ti/k3-j721e-sk.dtb \ " diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf deleted file mode 100644 index 6e809f46..00000000 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5-sr1-1.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: J721e SR1.1 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721e SR1.1 HS EVM (R5F core) - -# Booting SR1.1 requires different SYSFW, the rest is handled at runtime - -require conf/machine/j721e-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr1-1" - -SYSFW_SOC = "j721e_sr1_1" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 80f3b969..7904c660 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -4,10 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j721e" +SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index 433863dd..441ca169 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf @@ -4,27 +4,4 @@ require conf/machine/j721e-evm.conf -UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -BBMULTICONFIG += "k3r5-sr1-1" - -# Use default IMAGE_BOOT_FILES_LEGACY files -# Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0 -IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" -do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j721e_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index a2c15f74..c4e8af90 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -4,19 +4,19 @@ require conf/machine/include/j721s2.inc -SERIAL_CONSOLES = "115200;ttyS10" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721s2 \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ + ti/k3-am68-sk \ + ti/k3-v3link \ +" + KERNEL_DEVICETREE = " \ ti/k3-j721s2-common-proc-board.dtb \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" - -# J721S2 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf new file mode 100644 index 00000000..58cd92c4 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721s2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf new file mode 100644 index 00000000..4cf32a28 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM + +require conf/machine/j721s2-evm.conf diff --git a/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf new file mode 100644 index 00000000..2c884ffd --- /dev/null +++ b/meta-ti-bsp/conf/machine/j722s-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J722S EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J722S EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j722s" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "j722s_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j722s-evm.conf b/meta-ti-bsp/conf/machine/j722s-evm.conf new file mode 100644 index 00000000..74bcdfce --- /dev/null +++ b/meta-ti-bsp/conf/machine/j722s-evm.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: J722S EVM +#@DESCRIPTION: Machine configuration for the TI J722S EVM + +require conf/machine/include/j722s.inc + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j722s \ + ti/k3-fpdlink \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = "" + +UBOOT_MACHINE = "j722s_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf new file mode 100644 index 00000000..04feebc6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf new file mode 100644 index 00000000..e451bf47 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM + +require conf/machine/include/j784s4.inc + +TFA_K3_USART = "0x8" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j784s4 \ + ti/k3-fpdlink \ + ti/k3-j7200-evm-mcspi-loopback \ + ti/k3-am69-sk \ + ti/k3-v3link \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-j784s4-evm.dtb \ +" + +UBOOT_MACHINE = "j784s4_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf new file mode 100644 index 00000000..80a228a0 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf new file mode 100644 index 00000000..8fa1c1fd --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf @@ -0,0 +1,5 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM + +require conf/machine/j784s4-evm.conf diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index ba4d5645..fdbaffae 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -2,7 +2,6 @@ #@NAME: OMAP-L138 LCDK #@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board -require conf/machine/include/davinci.inc require conf/machine/include/omapl138.inc UBOOT_MACHINE = "omapl138_lcdk_config" @@ -16,4 +15,12 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" +KERNEL_DEVICETREE_PREFIX = " \ + da850 \ + ti/davinci/da850 \ +" + +KERNEL_DEVICETREE = " \ + da850-evm.dtb \ + da850-lcdk.dtb \ +" |