agl-basesystem 0.1sandbox/ToshikazuOhiwa/master

20 files changed, 74 insertions, 29 deletions

diff --git a/bsp/meta-ti/conf/machine/am335x-evm.conf b/bsp/meta-ti/conf/machine/am335x-evm.conf
index 8bab7f07..3cb97d30 100644
--- a/bsp/meta-ti/conf/machine/am335x-evm.conf
+++ b/bsp/meta-ti/conf/machine/am335x-evm.conf
@@ -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 8800"
+MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 10200"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,4 +32,4 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8800"
 # 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"
+UBINIZE_ARGS ?= "-m 2048 -p 128KiB -s 512 -O 2048"
diff --git a/bsp/meta-ti/conf/machine/am335x-hs-evm.conf b/bsp/meta-ti/conf/machine/am335x-hs-evm.conf
index 5f789659..7caa5bfd 100644
--- a/bsp/meta-ti/conf/machine/am335x-hs-evm.conf
+++ b/bsp/meta-ti/conf/machine/am335x-hs-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: AM335x HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM435x HS EVM
+#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM
 
 require conf/machine/am335x-evm.conf
 
diff --git a/bsp/meta-ti/conf/machine/am437x-evm.conf b/bsp/meta-ti/conf/machine/am437x-evm.conf
index 8fdd5005..bd1053a4 100644
--- a/bsp/meta-ti/conf/machine/am437x-evm.conf
+++ b/bsp/meta-ti/conf/machine/am437x-evm.conf
@@ -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 4200"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 5000"
 
 # 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 cbfe2510..a0b1b532 100644
--- a/bsp/meta-ti/conf/machine/am57xx-evm.conf
+++ b/bsp/meta-ti/conf/machine/am57xx-evm.conf
@@ -12,6 +12,7 @@ SERIAL_CONSOLES = "115200;ttyS2"
 
 KERNEL_DEVICETREE = " \
     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 \
diff --git a/bsp/meta-ti/conf/machine/am65xx-evm.conf b/bsp/meta-ti/conf/machine/am65xx-evm.conf
index 1113dbc9..82959ce3 100644
--- a/bsp/meta-ti/conf/machine/am65xx-evm.conf
+++ b/bsp/meta-ti/conf/machine/am65xx-evm.conf
@@ -8,7 +8,8 @@ MACHINE_FEATURES += "touchscreen"
 
 IMAGE_FSTYPES += "tar.xz wic.xz"
 
-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \
@@ -16,6 +17,8 @@ KERNEL_DEVICETREE = " \
     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 \
 "
 
 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
@@ -24,7 +27,10 @@ OPTEEMACHINE = "k3"
 OPTEEFLAVOR = "am65x"
 OPTEEOUTPUTMACHINE = "k3"
 
-WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES = "u-boot.img"
+# 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] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy"
+do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf
index 97afd317..f9897504 100644
--- a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf
+++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf
@@ -6,10 +6,13 @@ require conf/machine/am65xx-evm.conf
 
 UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
 
-UBOOT_ENTRYPOINT = "0x80080000"
-UBOOT_LOADADDRESS = "0x80080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
+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"
diff --git a/bsp/meta-ti/conf/machine/beagle-x15.conf b/bsp/meta-ti/conf/machine/beagle-x15.conf
index 275a5ce0..d5e05ec7 100644
--- a/bsp/meta-ti/conf/machine/beagle-x15.conf
+++ b/bsp/meta-ti/conf/machine/beagle-x15.conf
@@ -12,12 +12,10 @@ SERIAL_CONSOLES = "115200;ttyS2"
 
 UBOOT_MACHINE = "am57xx_evm_config"
 
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
 IMAGE_BOOT_FILES = "MLO u-boot.img"
 IMAGE_FSTYPES += "tar.xz wic.xz"
 
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-
 # 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
diff --git a/bsp/meta-ti/conf/machine/beaglebone.conf b/bsp/meta-ti/conf/machine/beaglebone.conf
index 450a1893..d8fd4062 100644
--- a/bsp/meta-ti/conf/machine/beaglebone.conf
+++ b/bsp/meta-ti/conf/machine/beaglebone.conf
@@ -13,9 +13,8 @@ MACHINE_GUI_CLASS = "bigscreen"
 
 SERIAL_CONSOLES = "115200;ttyS0"
 
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
 
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}"
 
 IMAGE_FSTYPES += "tar.xz wic.xz"
diff --git a/bsp/meta-ti/conf/machine/include/k3.inc b/bsp/meta-ti/conf/machine/include/k3.inc
index 22fdeb9c..8b836ea8 100644
--- a/bsp/meta-ti/conf/machine/include/k3.inc
+++ b/bsp/meta-ti/conf/machine/include/k3.inc
@@ -29,5 +29,5 @@ 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 pci sgx"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu"
 # Not ready yet - dsp mmip
diff --git a/bsp/meta-ti/conf/machine/include/omap-a15.inc b/bsp/meta-ti/conf/machine/include/omap-a15.inc
index 233b45f4..cc055365 100644
--- a/bsp/meta-ti/conf/machine/include/omap-a15.inc
+++ b/bsp/meta-ti/conf/machine/include/omap-a15.inc
@@ -36,4 +36,4 @@ 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 sgx mmip dsp"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp"
diff --git a/bsp/meta-ti/conf/machine/include/omap3.inc b/bsp/meta-ti/conf/machine/include/omap3.inc
index 9270cbb1..489f1f9a 100644
--- a/bsp/meta-ti/conf/machine/include/omap3.inc
+++ b/bsp/meta-ti/conf/machine/include/omap3.inc
@@ -39,4 +39,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen/ethernet for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa gpu"
diff --git a/bsp/meta-ti/conf/machine/include/ti33x.inc b/bsp/meta-ti/conf/machine/include/ti33x.inc
index 5a0ad541..5ff6efea 100644
--- a/bsp/meta-ti/conf/machine/include/ti33x.inc
+++ b/bsp/meta-ti/conf/machine/include/ti33x.inc
@@ -30,8 +30,9 @@ KERNEL_DEVICETREE = " \
     am335x-evm.dtb am335x-evmsk.dtb \
     am335x-icev2.dtb am335x-icev2-prueth.dtb \
     am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
-    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
     am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
+    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
+    am335x-boneblack-prusuart.dtb am335x-sancloud-bbe.dtb \
 "
 
 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
@@ -52,7 +53,7 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
 
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am335x"
diff --git a/bsp/meta-ti/conf/machine/include/ti43x.inc b/bsp/meta-ti/conf/machine/include/ti43x.inc
index d966eaf2..a0cc9cc7 100644
--- a/bsp/meta-ti/conf/machine/include/ti43x.inc
+++ b/bsp/meta-ti/conf/machine/include/ti43x.inc
@@ -50,7 +50,7 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
 
 # Set the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_SOCS = "am437x"
diff --git a/bsp/meta-ti/conf/machine/j7-evm.conf b/bsp/meta-ti/conf/machine/j7-evm.conf
new file mode 100644
index 00000000..318435d9
--- /dev/null
+++ b/bsp/meta-ti/conf/machine/j7-evm.conf
@@ -0,0 +1,37 @@
+#@TYPE: Machine
+#@NAME: J7 EVM
+#@DESCRIPTION: Machine configuration for the TI J7 EVM
+
+require conf/machine/include/k3.inc
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
+
+SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
+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-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/k2e-evm.conf b/bsp/meta-ti/conf/machine/k2e-evm.conf
index e9f500f1..662f5c89 100644
--- a/bsp/meta-ti/conf/machine/k2e-evm.conf
+++ b/bsp/meta-ti/conf/machine/k2e-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
diff --git a/bsp/meta-ti/conf/machine/k2g-evm.conf b/bsp/meta-ti/conf/machine/k2g-evm.conf
index a8ddc667..7681a752 100644
--- a/bsp/meta-ti/conf/machine/k2g-evm.conf
+++ b/bsp/meta-ti/conf/machine/k2g-evm.conf
@@ -25,7 +25,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
diff --git a/bsp/meta-ti/conf/machine/k2hk-evm.conf b/bsp/meta-ti/conf/machine/k2hk-evm.conf
index de79de9a..89386f1d 100644
--- a/bsp/meta-ti/conf/machine/k2hk-evm.conf
+++ b/bsp/meta-ti/conf/machine/k2hk-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3856 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
diff --git a/bsp/meta-ti/conf/machine/k2l-evm.conf b/bsp/meta-ti/conf/machine/k2l-evm.conf
index e326ba24..dddc01f1 100644
--- a/bsp/meta-ti/conf/machine/k2l-evm.conf
+++ b/bsp/meta-ti/conf/machine/k2l-evm.conf
@@ -22,7 +22,7 @@ SYSVINIT_ENABLED_GETTYS = ""
 # UBI: logical eraseblock size:    253952 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 2000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
diff --git a/bsp/meta-ti/conf/machine/lego-ev3.conf b/bsp/meta-ti/conf/machine/lego-ev3.conf
index 5c425221..5b89a6a7 100644
--- a/bsp/meta-ti/conf/machine/lego-ev3.conf
+++ b/bsp/meta-ti/conf/machine/lego-ev3.conf
@@ -17,6 +17,6 @@ KERNEL_DEVICETREE_BUNDLE = "1"
 SERIAL_CONSOLES = "115200;ttyS1"
 
 IMAGE_FSTYPES += " wic"
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
 WIC_CREATE_EXTRA_ARGS += " --no-fstab-update"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}"
diff --git a/bsp/meta-ti/conf/machine/pandaboard.conf b/bsp/meta-ti/conf/machine/pandaboard.conf
index f01472d9..edfc612b 100644
--- a/bsp/meta-ti/conf/machine/pandaboard.conf
+++ b/bsp/meta-ti/conf/machine/pandaboard.conf
@@ -13,4 +13,4 @@ KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
 SERIAL_CONSOLES = "115200;ttyS2"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat gpu"