From c449c78c25eacb17797097377802af291247b8c0 Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhart@linux.intel.com>
Date: Thu, 7 Oct 2010 13:04:23 -0700
Subject: Rename MACHINE=netbook to MACHINE=atom-pc

In preparation for the more generic atom-pc, rename the netbook machine and all
the relevant overrides. Leave the linux-netbook kernel recipe intact and as the
default kernel for the atom-pc machine.  A future patch will convert this over
to linux-wrs and likely remove the linux-netbook kernel recipe.

Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/conf/local.conf.sample    |  2 +-
 meta/conf/machine/atom-pc.conf | 44 ++++++++++++++++++++++++++++++++++++++++++
 meta/conf/machine/netbook.conf | 44 ------------------------------------------
 3 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 meta/conf/machine/atom-pc.conf
 delete mode 100644 meta/conf/machine/netbook.conf

(limited to 'meta/conf')

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index fc6f13932..29f896751 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -21,7 +21,7 @@ MACHINE ?= "qemux86"
 # Other supported machines
 #MACHINE ?= "qemuarm"
 #MACHINE ?= "qemux86-64"
-#MACHINE ?= "netbook"
+#MACHINE ?= "atom-pc"
 #MACHINE ?= "c7x0"
 #MACHINE ?= "akita"
 #MACHINE ?= "spitz"
diff --git a/meta/conf/machine/atom-pc.conf b/meta/conf/machine/atom-pc.conf
new file mode 100644
index 000000000..d1fa1efcb
--- /dev/null
+++ b/meta/conf/machine/atom-pc.conf
@@ -0,0 +1,44 @@
+#@TYPE: Machine
+#@NAME: Atom-PC
+
+#@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board.
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86 core2"
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
+                    acpi"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-netbook"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-input-synaptics \
+           xf86-video-intel \
+           mesa-dri-driver-i915"
+
+#MACHINE_EXTRA_RDEPENDS = "rt2860"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_ROOTFS_SIZE_ext3 = "500000"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz"
+
+APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
diff --git a/meta/conf/machine/netbook.conf b/meta/conf/machine/netbook.conf
deleted file mode 100644
index 17bb8d789..000000000
--- a/meta/conf/machine/netbook.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-#@TYPE: Machine
-#@NAME: Netbook
-
-#@DESCRIPTION: Machine configuration for Netbooks. Currently supported machines are the Asus eee901 and the Acer Aspire One
-
-TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 core2"
-
-include conf/machine/include/tune-atom.inc
-
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
-                    acpi"
-
-KERNEL_IMAGETYPE = "bzImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-netbook"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-input-evdev \
-           xf86-input-synaptics \
-           xf86-video-intel \
-           mesa-dri-driver-i915"
-
-#MACHINE_EXTRA_RDEPENDS = "rt2860"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-IMAGE_ROOTFS_SIZE_ext3 = "500000"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-APPEND += "video=intelfb:mode=800x600,accel=0,hwcursor=0 vga=788 usbcore.autosuspend=1"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
-- 
cgit v1.2.3