machine includes: remove from layer

These should either be in oe-core or a BSP layer, but not in meta-oe

(From meta-openembedded rev: cdf65eb0520f1734baaf8cbbfad7e47fe03f0987)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/conf/machine/include/davinci.inc b/meta-openembedded/meta-oe/conf/machine/include/davinci.inc
deleted file mode 100644 (file)
index 3e48097..0000000
--- a/meta-openembedded/meta-oe/conf/machine/include/davinci.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-require conf/machine/include/tune-arm926ejs.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r50"
-
-TARGET_ARCH = "arm"
-
-KERNEL_IMAGETYPE = "uImage"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE = "davinci_dvevm_config"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-
-#ROOT_FLASH_SIZE = "29"
-
-MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"

diff --git a/meta-openembedded/meta-oe/conf/machine/include/omap3.inc b/meta-openembedded/meta-oe/conf/machine/include/omap3.inc
deleted file mode 100644 (file)
index 15e34c6..0000000
--- a/meta-openembedded/meta-oe/conf/machine/include/omap3.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SOC_FAMILY = "omap3"
-TARGET_ARCH = "arm"
-
-require conf/machine/include/tune-cortexa8.inc
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r99"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
-

diff --git a/meta-openembedded/meta-oe/conf/machine/include/omapl138.inc b/meta-openembedded/meta-oe/conf/machine/include/omapl138.inc
deleted file mode 100644 (file)
index 4c22275..0000000
--- a/meta-openembedded/meta-oe/conf/machine/include/omapl138.inc
+++ /dev/null
@@ -1 +0,0 @@
-SOC_FAMILY = "omapl138"

diff --git a/meta-openembedded/meta-oe/conf/machine/include/tune-arm926ejs.inc b/meta-openembedded/meta-oe/conf/machine/include/tune-arm926ejs.inc
deleted file mode 100644 (file)
index f41e460..0000000
--- a/meta-openembedded/meta-oe/conf/machine/include/tune-arm926ejs.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-FEED_ARCH = "armv5te"
-PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te"
-# For gcc 3.x you need:
-#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
-# For gcc 4.x you need:
-TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
-BASE_PACKAGE_ARCH = "armv5te"

diff --git a/meta-openembedded/meta-oe/conf/machine/include/tune-cortexa8.inc b/meta-openembedded/meta-oe/conf/machine/include/tune-cortexa8.inc
deleted file mode 100644 (file)
index 2ac0ebf..0000000
--- a/meta-openembedded/meta-oe/conf/machine/include/tune-cortexa8.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3]
-# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html
-# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 
-# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
-
-# Can be 'softfp' or 'hardfp'
-ARM_FP_MODE ?= "softfp"
-
-ARM_FP_OPT = "${@['-mfloat-abi=softfp', '-mfloat-abi=hard'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}"
-ARM_FP_PACKAGESUFFIX = "${@['', '-hardfp'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}"
-
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon ${ARM_FP_OPT}"
-
-FEED_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
-BASE_PACKAGE_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
-
-PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a${ARM_FP_PACKAGESUFFIX}"