1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-06 19:00:49 +00:00

conf/machine: generalize wic usage by moving settings to SOC files

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Denys Dmytriyenko
2020-02-11 06:07:40 +00:00
parent b91222fe1d
commit 576c6f9a31
12 changed files with 24 additions and 57 deletions
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
-2
View File
@@ -6,8 +6,6 @@ require conf/machine/include/dra7xx.inc
MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "tar.xz"
SERIAL_CONSOLES = "115200;ttyS2"
KERNEL_DEVICETREE = " \
-10
View File
@@ -6,8 +6,6 @@ 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}"
@@ -24,11 +22,3 @@ 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"
-25
View File
@@ -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"
-6
View File
@@ -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
-2
View File
@@ -6,8 +6,6 @@ require conf/machine/include/dra7xx.inc
MACHINE_FEATURES += "touchscreen"
IMAGE_FSTYPES += "tar.xz"
SERIAL_CONSOLES = "115200;ttyS0"
KERNEL_DEVICETREE = " \
+10
View File
@@ -31,3 +31,13 @@ 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"
# Please note that booting K3 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 ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
WKS_FILE ?= "sdimage-bootpart.wks"
do_image_wic[depends] += "u-boot:do_deploy"
+4
View File
@@ -37,3 +37,7 @@ 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"
IMAGE_FSTYPES += "tar.xz wic.xz"
WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
+4
View File
@@ -58,3 +58,7 @@ 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-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
+4
View File
@@ -55,3 +55,7 @@ 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-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-10
View File
@@ -4,8 +4,6 @@
require conf/machine/include/k3.inc
IMAGE_FSTYPES += "tar.xz wic.xz"
SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
@@ -21,14 +19,6 @@ 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"