netbook: changed platform name from eee901 to netbook

We want to have a more generic platform definition.
The netbook machine one currently supports the eee901 and the aspire one.
We also moved the machine and netbook image definitions to meta-moblin.

8 files changed, 103 insertions, 0 deletions

diff --git a/meta-moblin/conf/machine/include/tune-atom.inc b/meta-moblin/conf/machine/include/tune-atom.inc
new file mode 100644
index 0000000000..607054674d
--- /dev/null
+++ b/meta-moblin/conf/machine/include/tune-atom.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-march=i586"
diff --git a/meta-moblin/conf/machine/netbook.conf b/meta-moblin/conf/machine/netbook.conf
new file mode 100644
index 0000000000..12f9af7bdf
--- /dev/null
+++ b/meta-moblin/conf/machine/netbook.conf
@@ -0,0 +1,42 @@
+#@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"
+
+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-moblin"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-synaptics \
+           xf86-video-intel"
+MACHINE_DRI_MODULES = "i915"
+
+MACHINE_EXTRA_RDEPENDS = "rt2860"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_ROOTFS_SIZE_ext3 = "250000"
+
+IMAGE_FSTYPES ?= "ext3 jffs2 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-moblin/packages/images/poky-image-live.bb b/meta-moblin/packages/images/poky-image-live.bb
new file mode 100644
index 0000000000..a3bfbfc71f
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-live.inc b/meta-moblin/packages/images/poky-image-live.inc
new file mode 100644
index 0000000000..7f8dd8fba5
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-live.inc
@@ -0,0 +1,18 @@
+AUTO_SYSLINUXCFG = "1"
+INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
+APPEND += "root=/dev/ram0 "
+TIMEOUT = "10"
+
+EXCLUDE_FROM_WORLD = "1"
+
+do_bootimg[depends] += "poky-image-minimal-initramfs:do_rootfs"
+
+inherit bootimg
+
+do_bootimg_prepend () {
+        import bb
+        fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)
+        if 'ext3' not in fstypes:
+                bb.msg.fatal(bb.msg.domain.Build, "ext3 not in IMAGE_FSTYPES")
+}
+
diff --git a/meta-moblin/packages/images/poky-image-minimal-initramfs.bb b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
new file mode 100644
index 0000000000..b2824a7d61
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-minimal-initramfs.bb
@@ -0,0 +1,8 @@
+# Simple initramfs image. Mostly used for live images.
+
+IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
+
+export IMAGE_BASENAME = "poky-image-minimal-initramfs"
+IMAGE_LINGUAS = ""
+
+inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-minimal-live.bb b/meta-moblin/packages/images/poky-image-minimal-live.bb
new file mode 100644
index 0000000000..7d9aa5f154
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-minimal-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Minimal Bootable Live Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-minimal:do_rootfs"
diff --git a/meta-moblin/packages/images/poky-image-netbook.bb b/meta-moblin/packages/images/poky-image-netbook.bb
new file mode 100644
index 0000000000..8138e9d598
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-netbook.bb
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd.
+#
+
+IMAGE_FEATURES += "apps-console-core ${NETBOOK_IMAGE_FEATURES}"
+
+inherit poky-image
diff --git a/meta-moblin/packages/images/poky-image-sato-live.bb b/meta-moblin/packages/images/poky-image-sato-live.bb
new file mode 100644
index 0000000000..9b686e812c
--- /dev/null
+++ b/meta-moblin/packages/images/poky-image-sato-live.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Sato Bootable Live Image"
+
+require poky-image-live.inc
+
+LABELS += "boot install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-sato:do_rootfs"