diff options
Diffstat (limited to 'bsp/meta-ti/conf/machine')
33 files changed, 230 insertions, 123 deletions
diff --git a/bsp/meta-ti/conf/machine/am335x-evm.conf b/bsp/meta-ti/conf/machine/am335x-evm.conf index 3cb97d30..469c4d37 100644 --- a/bsp/meta-ti/conf/machine/am335x-evm.conf +++ b/bsp/meta-ti/conf/machine/am335x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/ti33x.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "ubifs ubi tar.xz" +IMAGE_FSTYPES += "ubifs ubi" # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" @@ -24,7 +24,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 10200" +MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900" # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/am3517-evm.conf b/bsp/meta-ti/conf/machine/am3517-evm.conf index 87e3f1e0..c20e2f6a 100644 --- a/bsp/meta-ti/conf/machine/am3517-evm.conf +++ b/bsp/meta-ti/conf/machine/am3517-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLES = "115200;ttyS2" diff --git a/bsp/meta-ti/conf/machine/am37x-evm.conf b/bsp/meta-ti/conf/machine/am37x-evm.conf index e9d1838a..a512c8d0 100644 --- a/bsp/meta-ti/conf/machine/am37x-evm.conf +++ b/bsp/meta-ti/conf/machine/am37x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" diff --git a/bsp/meta-ti/conf/machine/am437x-evm.conf b/bsp/meta-ti/conf/machine/am437x-evm.conf index bd1053a4..4e3681d5 100644 --- a/bsp/meta-ti/conf/machine/am437x-evm.conf +++ b/bsp/meta-ti/conf/machine/am437x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/ti43x.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "ubifs ubi tar.xz" +IMAGE_FSTYPES += "ubifs ubi" SERIAL_CONSOLES = "115200;ttyS0" @@ -22,7 +22,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 5000" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800" # do ubiattach /dev/ubi_ctrl -m 11 -O 4096 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/am57xx-evm.conf b/bsp/meta-ti/conf/machine/am57xx-evm.conf index a0b1b532..3b0c18af 100644 --- a/bsp/meta-ti/conf/machine/am57xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am57xx-evm.conf @@ -6,18 +6,25 @@ require conf/machine/include/dra7xx.inc MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "tar.xz" - SERIAL_CONSOLES = "115200;ttyS2" KERNEL_DEVICETREE = " \ - am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ + am57xx-beagle-x15.dtb \ + am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ - am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \ - am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ - am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \ - am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \ + am57xx-evm.dtb \ + am57xx-evm-cam-ov10635.dtb \ + am57xx-evm-reva3.dtb \ + am57xx-evm-reva3-cam-ov10635.dtb \ + am571x-idk.dtb \ + am571x-idk-lcd-osd101t2045.dtb \ + am571x-idk-lcd-osd101t2587.dtb \ + am572x-idk.dtb \ + am572x-idk-lcd-osd101t2045.dtb \ + am572x-idk-lcd-osd101t2587.dtb \ + am574x-idk.dtb \ + am574x-idk-lcd-osd101t2587.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)}" diff --git a/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf new file mode 100644 index 00000000..c0b3cd51 --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf @@ -0,0 +1,11 @@ +#@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/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf new file mode 100644 index 00000000..bd17474e --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM65xx EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am65x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/bsp/meta-ti/conf/machine/am65xx-evm.conf b/bsp/meta-ti/conf/machine/am65xx-evm.conf index 82959ce3..2f3b92a8 100644 --- a/bsp/meta-ti/conf/machine/am65xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-evm.conf @@ -4,33 +4,10 @@ require conf/machine/include/am65xx.inc -MACHINE_FEATURES += "touchscreen" - -IMAGE_FSTYPES += "tar.xz wic.xz" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -KERNEL_DEVICETREE = " \ - ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \ - ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \ - ti/k3-am654-evm-csi2-ov490.dtbo ti/k3-am654-evm-csi2-ov5640.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-base-board-jailhouse.dtbo \ - ti/k3-am654-evm-prupwm.dtbo \ -" +BBMULTICONFIG += "k3r5-sr2" UBOOT_MACHINE = "am65x_evm_a53_defconfig" -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "am65x" -OPTEEOUTPUTMACHINE = "k3" - -# Please note that booting AM65xx platform also requires -# tiboot3.bin and sysfw.itb, which are provided by meta-arago -# u-boot-k3-r5 and ti-sci-fw recipes -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE ?= "sdimage-bootpart.wks" - -do_image_wic[depends] += "u-boot:do_deploy" +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" diff --git a/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf new file mode 100644 index 00000000..2b06f2cc --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: AM65xx HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am65x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf index f9897504..e4eebb6a 100644 --- a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf @@ -2,7 +2,7 @@ #@NAME: AM65xx HS EVM #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM -require conf/machine/am65xx-evm.conf +require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" @@ -20,7 +20,3 @@ UBOOT_BINARY = "u-boot.img_HS" IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" - -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "am65x" -OPTEEOUTPUTMACHINE = "k3" diff --git a/bsp/meta-ti/conf/machine/beagle-x15.conf b/bsp/meta-ti/conf/machine/beagle-x15.conf index d5e05ec7..c7503266 100644 --- a/bsp/meta-ti/conf/machine/beagle-x15.conf +++ b/bsp/meta-ti/conf/machine/beagle-x15.conf @@ -11,28 +11,3 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS2" UBOOT_MACHINE = "am57xx_evm_config" - -WKS_FILE ?= "sdimage-bootpart.wks" -IMAGE_BOOT_FILES = "MLO u-boot.img" -IMAGE_FSTYPES += "tar.xz wic.xz" - -# UBI information. Note that this is board and kernel specific. Changes -# in your kernel port may require changes in these variables. For more -# details about this board please see -# http://processors.wiki.ti.com/index.php/UBIFS_Support - -# do ubiattach /dev/ubi_ctrl -m 7 -O 2048 -# From dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: logical eraseblock size: 126976 bytes -# from ubiattach stdout: -# UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192" - -# do ubiattach /dev/ubi_ctrl -m 7 -O 2048 -# from dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: physical eraseblock size: 131072 bytes (128 KiB) -# UBI: sub-page size: 512 -# UBI: VID header offset: 2048 (aligned 2048) -UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048" diff --git a/bsp/meta-ti/conf/machine/beagleboard.conf b/bsp/meta-ti/conf/machine/beagleboard.conf index 37d23aa7..ee51fd66 100644 --- a/bsp/meta-ti/conf/machine/beagleboard.conf +++ b/bsp/meta-ti/conf/machine/beagleboard.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc # Only has DVI connector for external screen MACHINE_GUI_CLASS = "bigscreen" -IMAGE_FSTYPES += "tar.gz ubi" +IMAGE_FSTYPES += "tar.xz ubi" EXTRA_IMAGECMD_jffs2 = "-lnp" KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb" diff --git a/bsp/meta-ti/conf/machine/beaglebone.conf b/bsp/meta-ti/conf/machine/beaglebone.conf index d8fd4062..896a9d73 100644 --- a/bsp/meta-ti/conf/machine/beaglebone.conf +++ b/bsp/meta-ti/conf/machine/beaglebone.conf @@ -13,12 +13,6 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS0" -WKS_FILE ?= "sdimage-bootpart.wks" - -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}" - -IMAGE_FSTYPES += "tar.xz wic.xz" - IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" # Refine the list of device targets for ti-pdk class recipes diff --git a/bsp/meta-ti/conf/machine/dra7xx-evm.conf b/bsp/meta-ti/conf/machine/dra7xx-evm.conf index ada32073..67f9a0d1 100644 --- a/bsp/meta-ti/conf/machine/dra7xx-evm.conf +++ b/bsp/meta-ti/conf/machine/dra7xx-evm.conf @@ -6,17 +6,23 @@ require conf/machine/include/dra7xx.inc MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "tar.xz" - SERIAL_CONSOLES = "115200;ttyS0" KERNEL_DEVICETREE = " \ - dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ - dra71-evm.dtb dra71-evm-nand.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \ - dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ - dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \ - dra76-evm.dtb dra76-evm-tfp410.dtb dra76-evm-ov490.dtb dra76-evm-ov5640.dtb \ - dra76-evm-tfp410-ov490.dtb dra76-evm-tfp410-ov5640.dtb \ + dra7-evm.dtb \ + dra7-evm-lcd-osd101t2045.dtb \ + dra7-evm-lcd-osd101t2587.dtb \ + dra71-evm.dtb \ + dra71-evm-nand.dtb \ + dra71-evm-lcd-auo-g101evn01.0.dtb \ + dra72-evm.dtb \ + dra72-evm-lcd-osd101t2045.dtb \ + dra72-evm-lcd-osd101t2587.dtb \ + dra72-evm-revc.dtb \ + dra72-evm-revc-lcd-osd101t2045.dtb \ + dra72-evm-revc-lcd-osd101t2587.dtb \ + dra76-evm.dtb \ + dra76-evm-tfp410.dtb \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/bsp/meta-ti/conf/machine/include/am65xx.inc b/bsp/meta-ti/conf/machine/include/am65xx.inc index d433ed10..f60d1662 100644 --- a/bsp/meta-ti/conf/machine/include/am65xx.inc +++ b/bsp/meta-ti/conf/machine/include/am65xx.inc @@ -1,6 +1,30 @@ require conf/machine/include/k3.inc SOC_FAMILY_append = ":am65xx" +MACHINE_FEATURES += "touchscreen" + +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = " \ + ti/k3-am654-base-board.dtb \ + ti/k3-am654-base-board-sr1.dtb \ + ti/k3-am654-gp.dtbo \ + ti/k3-am654-idk.dtbo \ + ti/k3-am654-idk-sr1.dtbo \ + ti/k3-am654-evm-hdmi.dtbo \ + ti/k3-am654-evm-oldi-lcd1evm.dtbo \ + ti/k3-am654-evm-tc358876.dtbo \ + ti/k3-am654-pcie-usb2.dtbo \ + ti/k3-am654-pcie-usb3.dtbo \ + ti/k3-am654-base-board-jailhouse.dtbo \ + ti/k3-am654-evm-prupwm.dtbo \ +" + +OPTEEMACHINE = "k3" +OPTEEFLAVOR = "am65x" +OPTEEOUTPUTMACHINE = "k3" + # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am65xx" TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk" diff --git a/bsp/meta-ti/conf/machine/include/davinci.inc b/bsp/meta-ti/conf/machine/include/davinci.inc index 6de64839..62ca6887 100644 --- a/bsp/meta-ti/conf/machine/include/davinci.inc +++ b/bsp/meta-ti/conf/machine/include/davinci.inc @@ -5,7 +5,7 @@ MACHINE_KERNEL_PR = "r54" KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/j7.inc b/bsp/meta-ti/conf/machine/include/j7.inc new file mode 100644 index 00000000..f6d91615 --- /dev/null +++ b/bsp/meta-ti/conf/machine/include/j7.inc @@ -0,0 +1,11 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":j7" + +OPTEEMACHINE = "k3" +OPTEEFLAVOR = "j7" +OPTEEOUTPUTMACHINE = "k3" + +# Set the list of device targets for ti-pdk class recipes +TI_PDK_LIMIT_SOCS = "j721e j7200" +TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" +TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1" diff --git a/bsp/meta-ti/conf/machine/include/k3.inc b/bsp/meta-ti/conf/machine/include/k3.inc index 8b836ea8..6b78f4ca 100644 --- a/bsp/meta-ti/conf/machine/include/k3.inc +++ b/bsp/meta-ti/conf/machine/include/k3.inc @@ -1,12 +1,16 @@ +# TI K3 Aarch64 profile for Cortex-A53/A72 cores + require conf/machine/include/ti-soc.inc SOC_FAMILY_append = ":k3" require conf/machine/include/arm/arch-arm64.inc +BBMULTICONFIG += "k3r5" + # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r0" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -22,6 +26,9 @@ UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader" +TFA_PLATFORM = "k3" +TFA_BOARD = "generic" + MACHINE_GUI_CLASS = "smallscreen" # Use the expected value of the ubifs filesystem's volume name in the kernel @@ -31,3 +38,11 @@ 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 pci gpu" # Not ready yet - dsp mmip + +IMAGE_FSTYPES += "tar.xz wic.xz" + +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +WKS_FILE ?= "sdimage-2part.wks" +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" diff --git a/bsp/meta-ti/conf/machine/include/k3r5.inc b/bsp/meta-ti/conf/machine/include/k3r5.inc new file mode 100644 index 00000000..52fcf38b --- /dev/null +++ b/bsp/meta-ti/conf/machine/include/k3r5.inc @@ -0,0 +1,23 @@ +# TI K3 Armv7 profile for Cortex-R5F cores + +require conf/machine/include/ti-soc.inc +SOC_FAMILY_append = ":k3r5" + +# The closest of existing tunes for Cortex-R5F +DEFAULTTUNE = "armv7athf" +require conf/machine/include/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 +PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" + +SPL_BINARY = "" +UBOOT_SUFFIX = "bin" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + +PACKAGECONFIG_pn-u-boot-ti-staging = "" diff --git a/bsp/meta-ti/conf/machine/include/keystone.inc b/bsp/meta-ti/conf/machine/include/keystone.inc index ef33975f..e7ea9758 100644 --- a/bsp/meta-ti/conf/machine/include/keystone.inc +++ b/bsp/meta-ti/conf/machine/include/keystone.inc @@ -4,7 +4,7 @@ SOC_FAMILY_append = ":keystone" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/tune-cortexa15.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/omap-a15.inc b/bsp/meta-ti/conf/machine/include/omap-a15.inc index cc055365..e491d2b5 100644 --- a/bsp/meta-ti/conf/machine/include/omap-a15.inc +++ b/bsp/meta-ti/conf/machine/include/omap-a15.inc @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa15.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r7" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -36,4 +36,9 @@ MACHINE_GUI_CLASS = "smallscreen" 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" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/include/omap3.inc b/bsp/meta-ti/conf/machine/include/omap3.inc index 489f1f9a..5696c82d 100644 --- a/bsp/meta-ti/conf/machine/include/omap3.inc +++ b/bsp/meta-ti/conf/machine/include/omap3.inc @@ -22,7 +22,7 @@ MACHINE_KERNEL_PR = "r127" KERNEL_IMAGETYPE = "zImage" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/omap4.inc b/bsp/meta-ti/conf/machine/include/omap4.inc index d9706066..cbca267c 100644 --- a/bsp/meta-ti/conf/machine/include/omap4.inc +++ b/bsp/meta-ti/conf/machine/include/omap4.inc @@ -4,7 +4,7 @@ SOC_FAMILY_append = ":omap4" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/ti33x.inc b/bsp/meta-ti/conf/machine/include/ti33x.inc index 5ff6efea..abfd7ec7 100644 --- a/bsp/meta-ti/conf/machine/include/ti33x.inc +++ b/bsp/meta-ti/conf/machine/include/ti33x.inc @@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_KERNEL_PR = "r22" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -28,11 +28,12 @@ KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = " \ am335x-evm.dtb am335x-evmsk.dtb \ - am335x-icev2.dtb am335x-icev2-prueth.dtb \ + am335x-icev2.dtb \ + am335x-icev2-prueth.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-boneblack-prusuart.dtb am335x-sancloud-bbe.dtb \ + am335x-sancloud-bbe.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" @@ -58,3 +59,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am335x" TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/include/ti43x.inc b/bsp/meta-ti/conf/machine/include/ti43x.inc index a0cc9cc7..524b0b2c 100644 --- a/bsp/meta-ti/conf/machine/include/ti43x.inc +++ b/bsp/meta-ti/conf/machine/include/ti43x.inc @@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_KERNEL_PR = "r3" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -55,3 +55,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am437x" TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf b/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf new file mode 100644 index 00000000..b9e8cc01 --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J7 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/bsp/meta-ti/conf/machine/j7-evm.conf b/bsp/meta-ti/conf/machine/j7-evm.conf index 318435d9..aedfc825 100644 --- a/bsp/meta-ti/conf/machine/j7-evm.conf +++ b/bsp/meta-ti/conf/machine/j7-evm.conf @@ -2,36 +2,17 @@ #@NAME: J7 EVM #@DESCRIPTION: Machine configuration for the TI J7 EVM -require conf/machine/include/k3.inc +require conf/machine/include/j7.inc -IMAGE_FSTYPES += "tar.xz wic.xz" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ ti/k3-j721e-proc-board-tps65917.dtb \ ti/k3-j721e-common-proc-board-infotainment.dtbo \ - ti/k3-j721e-common-proc-board-infotainment-display-sharing.dtbo \ + ti/k3-j721e-pcie-backplane.dtbo \ ti/k3-j721e-common-proc-board-jailhouse.dtbo \ " UBOOT_MACHINE = "j721e_evm_a72_config" - -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "j7" -OPTEEOUTPUTMACHINE = "k3" - -# Please note that booting J7 platform also requires -# tiboot3.bin and sysfw.itb, which are provided by meta-arago -# u-boot-k3-r5 and ti-sci-fw recipes -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE ?= "sdimage-bootpart.wks" - -do_image_wic[depends] += "u-boot:do_deploy" - -# Set the list of device targets for ti-pdk class recipes -TI_PDK_LIMIT_SOCS = "j721e j7200" -TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" -TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1" diff --git a/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf b/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf new file mode 100644 index 00000000..53a7016f --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: J7 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/j7-hs-evm.conf b/bsp/meta-ti/conf/machine/j7-hs-evm.conf new file mode 100644 index 00000000..70e14754 --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-hs-evm.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: J7 HS EVM +#@DESCRIPTION: Machine configuration for the TI J7 HS EVM + +require conf/machine/j7-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}" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/omap3evm.conf b/bsp/meta-ti/conf/machine/omap3evm.conf index a7457c04..01808b68 100644 --- a/bsp/meta-ti/conf/machine/omap3evm.conf +++ b/bsp/meta-ti/conf/machine/omap3evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "jffs2 tar.gz" +IMAGE_FSTYPES += "jffs2 tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLES = "115200;ttyS0" diff --git a/bsp/meta-ti/conf/machine/omap5-evm.conf b/bsp/meta-ti/conf/machine/omap5-evm.conf index 28044cb9..b4cec1a2 100644 --- a/bsp/meta-ti/conf/machine/omap5-evm.conf +++ b/bsp/meta-ti/conf/machine/omap5-evm.conf @@ -4,7 +4,7 @@ require conf/machine/include/omap-a15.inc -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" KERNEL_DEVICETREE = "omap5-uevm.dtb" diff --git a/bsp/meta-ti/conf/machine/omapl137-evm.conf b/bsp/meta-ti/conf/machine/omapl137-evm.conf index a8039f31..207b213a 100644 --- a/bsp/meta-ti/conf/machine/omapl137-evm.conf +++ b/bsp/meta-ti/conf/machine/omapl137-evm.conf @@ -6,7 +6,7 @@ require conf/machine/include/davinci.inc require conf/machine/include/omapl137.inc # HACK: The omapl137 family does not have linux kernel support. -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy" EXTRA_IMAGEDEPENDS = "" IMAGE_FSTYPES = "tar.xz" diff --git a/bsp/meta-ti/conf/machine/pandaboard.conf b/bsp/meta-ti/conf/machine/pandaboard.conf index edfc612b..4dd6fa29 100644 --- a/bsp/meta-ti/conf/machine/pandaboard.conf +++ b/bsp/meta-ti/conf/machine/pandaboard.conf @@ -6,7 +6,7 @@ require conf/machine/include/omap4.inc MACHINE_GUI_CLASS = "bigscreen" -IMAGE_FSTYPES += "tar.gz" +IMAGE_FSTYPES += "tar.xz" KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" |