diff options
author | Franklin S. Cooper Jr <fcooper@ti.com> | 2013-02-18 22:45:16 -0600 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2013-02-25 19:48:41 -0500 |
commit | 4d99e63181c6f58b5bb41eb830c7af75b097e10e (patch) | |
tree | f580915e12d3565f80e93e43a143610d6e5bd0f0 /conf | |
parent | 3aeebece0e37425fd9e480127d1ac599c87ca750 (diff) | |
download | meta-ti-4d99e63181c6f58b5bb41eb830c7af75b097e10e.tar.gz |
machine configs: Add SGX to MACHINE_FEATURES
* Add sgx to MACHINE_FEATURES to indicate that a particular machine supports
sgx.
* TI chips are available in multiple variants including some that supports sgx
while others do not.
* By adding sgx as a machine feature other layers can create generic
packagegroups or images for a particular soc but will only include sgx
dependencies if the particular machine has sgx support.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/am335x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am3517-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am37x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am387x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/am389x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/beagleboard.conf | 2 | ||||
-rw-r--r-- | conf/machine/beaglebone.conf | 2 | ||||
-rw-r--r-- | conf/machine/c6a814x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/c6a816x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/dm814x-evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/omap3-touchbook.conf | 2 | ||||
-rw-r--r-- | conf/machine/omap3evm.conf | 2 | ||||
-rw-r--r-- | conf/machine/pandaboard.conf | 2 |
13 files changed, 18 insertions, 8 deletions
diff --git a/conf/machine/am335x-evm.conf b/conf/machine/am335x-evm.conf index cd30594b..28893589 100644 --- a/conf/machine/am335x-evm.conf +++ b/conf/machine/am335x-evm.conf | |||
@@ -43,4 +43,4 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | |||
43 | UBOOT_ARCH = "arm" | 43 | UBOOT_ARCH = "arm" |
44 | UBOOT_MACHINE = "am335x_evm_config" | 44 | UBOOT_MACHINE = "am335x_evm_config" |
45 | 45 | ||
46 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" | 46 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx" |
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index 536d337c..d9ce7586 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf | |||
@@ -30,7 +30,7 @@ UBOOT_ARCH = "arm" | |||
30 | UBOOT_MACHINE = "am3517_evm_config" | 30 | UBOOT_MACHINE = "am3517_evm_config" |
31 | XLOAD_MACHINE = "am3517evm_config" | 31 | XLOAD_MACHINE = "am3517evm_config" |
32 | 32 | ||
33 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet" | 33 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet sgx" |
34 | 34 | ||
35 | # NOTE: there are NAND and OneNAND versions of this board... | 35 | # NOTE: there are NAND and OneNAND versions of this board... |
36 | 36 | ||
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf index 866abc58..2d1d44d8 100644 --- a/conf/machine/am37x-evm.conf +++ b/conf/machine/am37x-evm.conf | |||
@@ -29,7 +29,7 @@ UBOOT_ARCH = "arm" | |||
29 | UBOOT_MACHINE = "omap3_evm_config" | 29 | UBOOT_MACHINE = "omap3_evm_config" |
30 | XLOAD_MACHINE = "omap3evm_config" | 30 | XLOAD_MACHINE = "omap3evm_config" |
31 | 31 | ||
32 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" | 32 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx" |
33 | 33 | ||
34 | # NOTE: there are NAND and OneNAND versions of this board... | 34 | # NOTE: there are NAND and OneNAND versions of this board... |
35 | 35 | ||
diff --git a/conf/machine/am387x-evm.conf b/conf/machine/am387x-evm.conf index 5d9cc8f1..b2df3703 100644 --- a/conf/machine/am387x-evm.conf +++ b/conf/machine/am387x-evm.conf | |||
@@ -5,3 +5,5 @@ | |||
5 | require conf/machine/include/ti814x.inc | 5 | require conf/machine/include/ti814x.inc |
6 | 6 | ||
7 | IMAGE_FSTYPES += "ubi tar.gz" | 7 | IMAGE_FSTYPES += "ubi tar.gz" |
8 | |||
9 | MACHINE_FEATURES += "sgx" | ||
diff --git a/conf/machine/am389x-evm.conf b/conf/machine/am389x-evm.conf index 2a84cad9..3b2145d6 100644 --- a/conf/machine/am389x-evm.conf +++ b/conf/machine/am389x-evm.conf | |||
@@ -5,3 +5,5 @@ | |||
5 | require conf/machine/include/ti816x.inc | 5 | require conf/machine/include/ti816x.inc |
6 | 6 | ||
7 | IMAGE_FSTYPES += "ubi tar.gz" | 7 | IMAGE_FSTYPES += "ubi tar.gz" |
8 | |||
9 | MACHINE_FEATURES += "sgx" | ||
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 8f84c6cc..e8b62792 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf | |||
@@ -45,7 +45,7 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" | |||
45 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" | 45 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" |
46 | 46 | ||
47 | # and sdio | 47 | # and sdio |
48 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" | 48 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa sgx" |
49 | 49 | ||
50 | # For a modularized kernel we want to drag in networking, sound, rtc etc." | 50 | # For a modularized kernel we want to drag in networking, sound, rtc etc." |
51 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl \ | 51 | MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl \ |
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf index 3803edf6..43af461b 100644 --- a/conf/machine/beaglebone.conf +++ b/conf/machine/beaglebone.conf | |||
@@ -23,4 +23,4 @@ SERIAL_CONSOLE = "115200 ttyO0" | |||
23 | UBOOT_MACHINE = "am335x_evm_config" | 23 | UBOOT_MACHINE = "am335x_evm_config" |
24 | 24 | ||
25 | # and sdio | 25 | # and sdio |
26 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" | 26 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa sgx" |
diff --git a/conf/machine/c6a814x-evm.conf b/conf/machine/c6a814x-evm.conf index b85c4894..a81d7fd7 100644 --- a/conf/machine/c6a814x-evm.conf +++ b/conf/machine/c6a814x-evm.conf | |||
@@ -3,3 +3,5 @@ | |||
3 | #@DESCRIPTION: Machine configuration for the c6a814x evm | 3 | #@DESCRIPTION: Machine configuration for the c6a814x evm |
4 | 4 | ||
5 | require conf/machine/include/ti814x.inc | 5 | require conf/machine/include/ti814x.inc |
6 | |||
7 | MACHINE_FEATURES += "sgx" | ||
diff --git a/conf/machine/c6a816x-evm.conf b/conf/machine/c6a816x-evm.conf index a7ab9b08..380c4b8b 100644 --- a/conf/machine/c6a816x-evm.conf +++ b/conf/machine/c6a816x-evm.conf | |||
@@ -3,3 +3,5 @@ | |||
3 | #@DESCRIPTION: Machine configuration for the c6a816x evm | 3 | #@DESCRIPTION: Machine configuration for the c6a816x evm |
4 | 4 | ||
5 | require conf/machine/include/ti816x.inc | 5 | require conf/machine/include/ti816x.inc |
6 | |||
7 | MACHINE_FEATURES += "sgx" | ||
diff --git a/conf/machine/dm814x-evm.conf b/conf/machine/dm814x-evm.conf index 140dcc10..4fa1e247 100644 --- a/conf/machine/dm814x-evm.conf +++ b/conf/machine/dm814x-evm.conf | |||
@@ -3,3 +3,5 @@ | |||
3 | #@DESCRIPTION: Machine configuration for the DM814x evm | 3 | #@DESCRIPTION: Machine configuration for the DM814x evm |
4 | 4 | ||
5 | require conf/machine/include/ti814x.inc | 5 | require conf/machine/include/ti814x.inc |
6 | |||
7 | MACHINE_FEATURES += "sgx" | ||
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf index 8439e0aa..6c52d9ee 100644 --- a/conf/machine/omap3-touchbook.conf +++ b/conf/machine/omap3-touchbook.conf | |||
@@ -43,4 +43,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" | |||
43 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" | 43 | UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" |
44 | 44 | ||
45 | # and sdio | 45 | # and sdio |
46 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" | 46 | MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen sgx" |
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index dfedf0fc..07196715 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf | |||
@@ -30,7 +30,7 @@ UBOOT_ARCH = "arm" | |||
30 | UBOOT_MACHINE = "omap3_evm_config" | 30 | UBOOT_MACHINE = "omap3_evm_config" |
31 | XLOAD_MACHINE = "omap3evm_config" | 31 | XLOAD_MACHINE = "omap3evm_config" |
32 | 32 | ||
33 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" | 33 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen sgx" |
34 | 34 | ||
35 | # NOTE: there are NAND and OneNAND versions of this board... | 35 | # NOTE: there are NAND and OneNAND versions of this board... |
36 | 36 | ||
diff --git a/conf/machine/pandaboard.conf b/conf/machine/pandaboard.conf index 2c37b4fa..3ebd6d93 100644 --- a/conf/machine/pandaboard.conf +++ b/conf/machine/pandaboard.conf | |||
@@ -13,6 +13,6 @@ IMAGE_FSTYPES += "tar.bz2" | |||
13 | SERIAL_CONSOLE = "115200 ttyO2" | 13 | SERIAL_CONSOLE = "115200 ttyO2" |
14 | 14 | ||
15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" | 15 | MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" |
16 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat" | 16 | MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen touchscreen usbgadget usbhost vfat sgx" |
17 | 17 | ||
18 | 18 | ||