merge of 'b0e8a7b18bc538b2926b839a1a3adad6234a53e0'

     and 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'

6 files changed, 26 insertions, 25 deletions

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 3d21ae77d4..5450c1ebd3 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -30,7 +30,7 @@ MACHINE_TASK_PROVIDER = "task-base"
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n"
 
 # build tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf
index 576846fbdf..d0100c9968 100644
--- a/conf/machine/include/LAB-settings.conf
+++ b/conf/machine/include/LAB-settings.conf
@@ -5,4 +5,4 @@
 #
 
 # LAB can only resolve relative symlinks
-ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
+#ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; "
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf
index 06eb56d2b6..06f12f532f 100644
--- a/conf/machine/include/simpad-2.4.conf
+++ b/conf/machine/include/simpad-2.4.conf
@@ -1,9 +1,14 @@
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
 
+MACHINE_FEATURES_append = "kernel24"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \
+	kernel-module-sa1100usb-core kernel-module-usb-eth \
+	kernel-module-pcnet-cs kernel-module-8390 "
+
+USE_DEVFS = "1"
+
+PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
+
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules  \
- pcmcia-cs apm hostap-utils wpa-supplicant-nossl"
-
-USE_DEVFS = "1"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index 69f04f0730..e485c7bf2a 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,5 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
-BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
+PCMCIA_MANAGER ?= "pcmciautils"
+
+MACHINE_FEATURES_append = "kernel26"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 2478ce17c9..f99d509c86 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -3,27 +3,21 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
 
 MACHINE_KERNEL_VERSION ?= "2.4"
-require conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
 
 TARGET_ARCH = "arm"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel"
 
-BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs  \
-kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \
-kernel-module-pcnet-cs kernel-module-8390"
+MACHINE_TASK_PROVIDER = "task-base"
+MACHINE_FEATURES = " apm pcmcia irda screen touchscreen "
+
+include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf
+require conf/machine/include/tune-strongarm.conf
 
-# This is needed for the ramdisk script to work
-BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
+ROOT_FLASH_SIZE = "16"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"
-EXTRA_IMAGEDEPENDS = ""
-SERIAL_CONSOLE = "ttySA0 115200 vt100"
 
 GUI_MACHINE_CLASS = "bigscreen"
-ROOT_FLASH_SIZE = "16"
+SERIAL_CONSOLE = "ttySA0 115200 vt100"
 USE_VT = "0"
-GPE_EXTRA_INSTALL += "suspend-desktop"
-
-require conf/machine/include/tune-strongarm.conf
 
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index b25061db21..7f7d24c1e9 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -17,10 +17,11 @@ OPENTURBOSTATION_KERNEL = ""
 
 # We want udev support in the image
 udevdir = "/dev"
-TURBOSTATION_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
+TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
 BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 
-ROOT_FLASH_SIZE = 12
-# Hardware stuff
+# Hardware stuff used in image generation
 ERASEBLOCK_SIZE = "0x20000"	
+JFFS2_ROOTFS_SIZE = "0xC80000"
+KERNEL_IMAGE_SIZE = "0x280000"
 require conf/machine/include/tune-ppc603e.conf