Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

10 files changed, 0 insertions, 11 deletions

diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index f7a60b4be4..0ee57c407f 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -18,7 +18,6 @@ require conf/machine/include/omap3.inc
 PACKAGE_EXTRA_ARCHS += "omap3517-evm"
 
 # Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 69cdec6f1f..a5de68e0af 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -41,6 +41,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 PREFERRED_VERSION_u-boot = "git"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf
index deb17233cc..55c18507c3 100644
--- a/conf/machine/igep0020.conf
+++ b/conf/machine/igep0020.conf
@@ -41,5 +41,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
 # UBI: sub-page size:              512
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
-# MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index bb750aad98..e87b56c282 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -11,8 +11,6 @@ UBOOT_LOADADDRESS = "0x80008000"
 # Only build u-boot, xload is optional
 EXTRA_IMAGEDEPENDS += "u-boot"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
-
 # TI DVSDK stuff:
 CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
 CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 8729715513..c896fa0b02 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -5,7 +5,6 @@
 
 TARGET_ARCH = "arm"
 
-MACHINE_EXTRA_RRECOMMENDS = "omap3-sgx-modules "
 
 PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 3595383f03..2839b7ddf6 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -45,6 +45,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 PREFERRED_VERSION_u-boot = "git"
 
-MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index ad410fae4c..097904d886 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -16,7 +16,6 @@ GUI_MACHINE_CLASS = "smallscreen"
 require conf/machine/include/omap3.inc
 
 # Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index 4ca164e633..4732f68c98 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -52,6 +52,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 PREFERRED_VERSION_u-boot = "git"
 #EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
-#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf
index 7d0a72b5d7..749339faea 100644
--- a/conf/machine/omapzoom2.conf
+++ b/conf/machine/omapzoom2.conf
@@ -50,7 +50,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 PREFERRED_VERSION_u-boot = "git"
 #EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
-#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 MACHINE_EXTRA_RRECOMMENDS = ""
 # and sdio
 MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf
index c7baaedd2d..dccc892472 100644
--- a/conf/machine/palmpre.conf
+++ b/conf/machine/palmpre.conf
@@ -26,6 +26,5 @@ IMAGE_FSTYPES += "tar.bz2"
 # Let's keep the following three from the beagleboard machine config
 UBOOT_MACHINE = "omap3_beagle_config"
 PREFERRED_VERSION_u-boot = "git"
-#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi"