diff options
author | Denys Dmytriyenko <denys@ti.com> | 2020-02-11 06:07:40 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2020-02-11 01:14:57 +0000 |
commit | 576c6f9a31efb67b0b86f580950f0dd1082f6904 (patch) | |
tree | f80bdc825d2cacbc6841177d97655c68cee23a07 /conf/machine | |
parent | b91222fe1d25e322b36c8f71e5d556800d73641c (diff) | |
download | meta-ti-576c6f9a31efb67b0b86f580950f0dd1082f6904.tar.gz |
conf/machine: generalize wic usage by moving settings to SOC files
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/am335x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am437x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am57xx-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am65xx-evm.conf | 10 | ||||
-rw-r--r-- | conf/machine/beagle-x15.conf | 25 | ||||
-rw-r--r-- | conf/machine/beaglebone.conf | 6 | ||||
-rw-r--r-- | conf/machine/dra7xx-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/k3.inc | 10 | ||||
-rw-r--r-- | conf/machine/include/omap-a15.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/ti33x.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/ti43x.inc | 4 | ||||
-rw-r--r-- | conf/machine/j7-evm.conf | 10 |
12 files changed, 24 insertions, 57 deletions
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index 8bfbee84..469c4d37 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf | |||
@@ -7,7 +7,7 @@ require conf/machine/include/ti33x.inc | |||
7 | MACHINE_GUI_CLASS = "smallscreen" | 7 | MACHINE_GUI_CLASS = "smallscreen" |
8 | MACHINE_FEATURES += "touchscreen" | 8 | MACHINE_FEATURES += "touchscreen" |
9 | 9 | ||
10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 10 | IMAGE_FSTYPES += "ubifs ubi" |
11 | 11 | ||
12 | # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both | 12 | # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both |
13 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" | 13 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" |
diff --git a/conf/machine/am437x-evm.conf b/conf/machine/am437x-evm.conf index e7d3a98e..4e3681d5 100644 --- a/conf/machine/am437x-evm.conf +++ b/conf/machine/am437x-evm.conf | |||
@@ -7,7 +7,7 @@ require conf/machine/include/ti43x.inc | |||
7 | MACHINE_GUI_CLASS = "smallscreen" | 7 | MACHINE_GUI_CLASS = "smallscreen" |
8 | MACHINE_FEATURES += "touchscreen" | 8 | MACHINE_FEATURES += "touchscreen" |
9 | 9 | ||
10 | IMAGE_FSTYPES += "ubifs ubi tar.xz" | 10 | IMAGE_FSTYPES += "ubifs ubi" |
11 | 11 | ||
12 | SERIAL_CONSOLES = "115200;ttyS0" | 12 | SERIAL_CONSOLES = "115200;ttyS0" |
13 | 13 | ||
diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index 449aad9e..3f050357 100644 --- a/conf/machine/am57xx-evm.conf +++ b/conf/machine/am57xx-evm.conf | |||
@@ -6,8 +6,6 @@ require conf/machine/include/dra7xx.inc | |||
6 | 6 | ||
7 | MACHINE_FEATURES += "touchscreen" | 7 | MACHINE_FEATURES += "touchscreen" |
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | ||
10 | |||
11 | SERIAL_CONSOLES = "115200;ttyS2" | 9 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 10 | ||
13 | KERNEL_DEVICETREE = " \ | 11 | KERNEL_DEVICETREE = " \ |
diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf index bc5fdc39..dce6d05a 100644 --- a/conf/machine/am65xx-evm.conf +++ b/conf/machine/am65xx-evm.conf | |||
@@ -6,8 +6,6 @@ require conf/machine/include/am65xx.inc | |||
6 | 6 | ||
7 | MACHINE_FEATURES += "touchscreen" | 7 | MACHINE_FEATURES += "touchscreen" |
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
10 | |||
11 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" | 9 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" |
12 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
13 | 11 | ||
@@ -24,11 +22,3 @@ UBOOT_MACHINE = "am65x_evm_a53_defconfig" | |||
24 | OPTEEMACHINE = "k3" | 22 | OPTEEMACHINE = "k3" |
25 | OPTEEFLAVOR = "am65x" | 23 | OPTEEFLAVOR = "am65x" |
26 | OPTEEOUTPUTMACHINE = "k3" | 24 | OPTEEOUTPUTMACHINE = "k3" |
27 | |||
28 | # Please note that booting AM65xx platform also requires | ||
29 | # tiboot3.bin and sysfw.itb, which are provided by meta-arago | ||
30 | # u-boot-k3-r5 and ti-sci-fw recipes | ||
31 | IMAGE_BOOT_FILES = "tispl.bin u-boot.img" | ||
32 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
33 | |||
34 | do_image_wic[depends] += "u-boot:do_deploy" | ||
diff --git a/conf/machine/beagle-x15.conf b/conf/machine/beagle-x15.conf index d5e05ec7..c7503266 100644 --- a/conf/machine/beagle-x15.conf +++ b/conf/machine/beagle-x15.conf | |||
@@ -11,28 +11,3 @@ MACHINE_GUI_CLASS = "bigscreen" | |||
11 | SERIAL_CONSOLES = "115200;ttyS2" | 11 | SERIAL_CONSOLES = "115200;ttyS2" |
12 | 12 | ||
13 | UBOOT_MACHINE = "am57xx_evm_config" | 13 | UBOOT_MACHINE = "am57xx_evm_config" |
14 | |||
15 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
16 | IMAGE_BOOT_FILES = "MLO u-boot.img" | ||
17 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
18 | |||
19 | # UBI information. Note that this is board and kernel specific. Changes | ||
20 | # in your kernel port may require changes in these variables. For more | ||
21 | # details about this board please see | ||
22 | # http://processors.wiki.ti.com/index.php/UBIFS_Support | ||
23 | |||
24 | # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 | ||
25 | # From dmesg: | ||
26 | # UBI: smallest flash I/O unit: 2048 | ||
27 | # UBI: logical eraseblock size: 126976 bytes | ||
28 | # from ubiattach stdout: | ||
29 | # UBI device number 0, total 1988 LEBs | ||
30 | MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192" | ||
31 | |||
32 | # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 | ||
33 | # from dmesg: | ||
34 | # UBI: smallest flash I/O unit: 2048 | ||
35 | # UBI: physical eraseblock size: 131072 bytes (128 KiB) | ||
36 | # UBI: sub-page size: 512 | ||
37 | # UBI: VID header offset: 2048 (aligned 2048) | ||
38 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048" | ||
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index d8fd4062..896a9d73 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf | |||
@@ -13,12 +13,6 @@ MACHINE_GUI_CLASS = "bigscreen" | |||
13 | 13 | ||
14 | SERIAL_CONSOLES = "115200;ttyS0" | 14 | SERIAL_CONSOLES = "115200;ttyS0" |
15 | 15 | ||
16 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
17 | |||
18 | IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}" | ||
19 | |||
20 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
21 | |||
22 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" | 16 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" |
23 | 17 | ||
24 | # Refine the list of device targets for ti-pdk class recipes | 18 | # Refine the list of device targets for ti-pdk class recipes |
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index b1da8441..67ce99cf 100644 --- a/conf/machine/dra7xx-evm.conf +++ b/conf/machine/dra7xx-evm.conf | |||
@@ -6,8 +6,6 @@ require conf/machine/include/dra7xx.inc | |||
6 | 6 | ||
7 | MACHINE_FEATURES += "touchscreen" | 7 | MACHINE_FEATURES += "touchscreen" |
8 | 8 | ||
9 | IMAGE_FSTYPES += "tar.xz" | ||
10 | |||
11 | SERIAL_CONSOLES = "115200;ttyS0" | 9 | SERIAL_CONSOLES = "115200;ttyS0" |
12 | 10 | ||
13 | KERNEL_DEVICETREE = " \ | 11 | KERNEL_DEVICETREE = " \ |
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 8b836ea8..c9ff553d 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc | |||
@@ -31,3 +31,13 @@ UBI_VOLNAME = "rootfs" | |||
31 | # List common SoC features, may need to add touchscreen for specific machines | 31 | # List common SoC features, may need to add touchscreen for specific machines |
32 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" | 32 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" |
33 | # Not ready yet - dsp mmip | 33 | # Not ready yet - dsp mmip |
34 | |||
35 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
36 | |||
37 | # Please note that booting K3 platform also requires | ||
38 | # tiboot3.bin and sysfw.itb, which are provided by meta-arago | ||
39 | # u-boot-k3-r5 and ti-sci-fw recipes | ||
40 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | ||
41 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
42 | |||
43 | do_image_wic[depends] += "u-boot:do_deploy" | ||
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc index cc055365..1b9f653b 100644 --- a/conf/machine/include/omap-a15.inc +++ b/conf/machine/include/omap-a15.inc | |||
@@ -37,3 +37,7 @@ UBI_VOLNAME = "rootfs" | |||
37 | 37 | ||
38 | # List common SoC features, may need to add touchscreen for specific machines | 38 | # List common SoC features, may need to add touchscreen for specific machines |
39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp" | 39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp" |
40 | |||
41 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
42 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
43 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | ||
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index 6f97361f..a744cd6f 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -58,3 +58,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne | |||
58 | # Set the list of device targets for ti-pdk class recipes | 58 | # Set the list of device targets for ti-pdk class recipes |
59 | TI_PDK_LIMIT_SOCS = "am335x" | 59 | TI_PDK_LIMIT_SOCS = "am335x" |
60 | TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" | 60 | TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" |
61 | |||
62 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
63 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
64 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | ||
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index a0cc9cc7..252053c6 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc | |||
@@ -55,3 +55,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne | |||
55 | # Set the list of device targets for ti-pdk class recipes | 55 | # Set the list of device targets for ti-pdk class recipes |
56 | TI_PDK_LIMIT_SOCS = "am437x" | 56 | TI_PDK_LIMIT_SOCS = "am437x" |
57 | TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" | 57 | TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" |
58 | |||
59 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
60 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
61 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | ||
diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf index e41b152e..581fed95 100644 --- a/conf/machine/j7-evm.conf +++ b/conf/machine/j7-evm.conf | |||
@@ -4,8 +4,6 @@ | |||
4 | 4 | ||
5 | require conf/machine/include/k3.inc | 5 | require conf/machine/include/k3.inc |
6 | 6 | ||
7 | IMAGE_FSTYPES += "tar.xz wic.xz" | ||
8 | |||
9 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" | 7 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" |
10 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 8 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
11 | 9 | ||
@@ -21,14 +19,6 @@ OPTEEMACHINE = "k3" | |||
21 | OPTEEFLAVOR = "j7" | 19 | OPTEEFLAVOR = "j7" |
22 | OPTEEOUTPUTMACHINE = "k3" | 20 | OPTEEOUTPUTMACHINE = "k3" |
23 | 21 | ||
24 | # Please note that booting J7 platform also requires | ||
25 | # tiboot3.bin and sysfw.itb, which are provided by meta-arago | ||
26 | # u-boot-k3-r5 and ti-sci-fw recipes | ||
27 | IMAGE_BOOT_FILES = "tispl.bin u-boot.img" | ||
28 | WKS_FILE ?= "sdimage-bootpart.wks" | ||
29 | |||
30 | do_image_wic[depends] += "u-boot:do_deploy" | ||
31 | |||
32 | # Set the list of device targets for ti-pdk class recipes | 22 | # Set the list of device targets for ti-pdk class recipes |
33 | TI_PDK_LIMIT_SOCS = "j721e j7200" | 23 | TI_PDK_LIMIT_SOCS = "j721e j7200" |
34 | TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" | 24 | TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" |