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>

3 files changed, 4 insertions, 4 deletions

diff --git a/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook b/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc
index cbb453513b..cbb453513b 100644
--- a/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-netbook
+++ b/meta/recipes-kernel/linux/linux-netbook-2.6.33.2/defconfig-atom-pc
diff --git a/meta/recipes-kernel/linux/linux-netbook.inc b/meta/recipes-kernel/linux/linux-netbook.inc
index 71ea1d3e62..05a21d49dd 100644
--- a/meta/recipes-kernel/linux/linux-netbook.inc
+++ b/meta/recipes-kernel/linux/linux-netbook.inc
@@ -14,4 +14,4 @@ do_configure() {
 
 }
 
-COMPATIBLE_MACHINE = "(netbook|menlow)"
+COMPATIBLE_MACHINE = "(atom-pc|menlow)"
diff --git a/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb b/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
index 9b0fd9aaa2..b0ee13704c 100644
--- a/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
+++ b/meta/recipes-kernel/linux/linux-netbook_2.6.33.2.bb
@@ -1,9 +1,9 @@
 require linux-netbook.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_netbook = "1"
+DEFAULT_PREFERENCE_atom-pc = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://linux-2.6.29-dont-wait-for-mouse.patch;patch=1 \
@@ -103,6 +103,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://rtl8192_no_autoconnect.patch;patch=1 \
            file://rtl8192_no_WAP_unassoc.patch;patch=1 \
 #           file://defconfig-menlow \
-           file://defconfig-netbook"
+           file://defconfig-atom-pc"
            
 S = "${WORKDIR}/linux-${PV}"