[oe] [PATCH 1/6] Remove alix machine, update geodelx one to use Alix settings

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw at openembedded.org>

Alix.1c is GeodeLX based so no need to keep two machine configs.

And there are people which tries to use geodelx as base for their
devices and get into troubles as it uses quite old kernel.

Signed-off-by: Marcin Juszkiewicz <hrw at openembedded.org>
---
 conf/machine/alix.conf    |   27 ---------------------------
 conf/machine/geodelx.conf |   15 ++++++++++++---
 2 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 conf/machine/alix.conf

diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
deleted file mode 100644
index 7b9aa98..0000000
--- a/conf/machine/alix.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#@TYPE: Machine
-#@NAME: Alix
-#@DESCRIPTION: Machine.inciguration for PC Engines Alix1c board
-#
-# http://pcengines.ch/alix1c.htm
-
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
-TARGET_ARCH = "i586"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-OLDEST_KERNEL = "2.6.17"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
-
-require conf/machine/include/tune-geodelx.inc
-
-IMAGE_FSTYPES += "tar.gz"
-
-MACHINE_EXTRA_RRECOMMENDS = "\
-	kernel-modules \
-	"
-
-KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index de4d9ca..bd87077 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -1,10 +1,15 @@
-TARGET_ARCH = "i486"
+#@TYPE: Machine
+#@NAME: Geode LX
+#@DESCRIPTION: Machine configuration for GeodeLX based devices
+
+TARGET_ARCH = "i586"
 
 require conf/machine/include/tune-geodelx.inc
 
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
-PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi x86"
 
 SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
 
@@ -12,3 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES += "tar.gz"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
-- 
1.6.3