merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'

     and 'd4ef8ebf38cc9ef7573a49017e35bd326024f285'

11 files changed, 44 insertions, 9 deletions

diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf
index 779080730c..fe7ff724fd 100644
--- a/conf/machine/bd-neon.conf
+++ b/conf/machine/bd-neon.conf
@@ -27,7 +27,6 @@ PERFERRED_VERSION_linux = "2.6.22"
 
 MODUTILS = "26"	
 XSERVER = "xserver-kdrive-fbdev"
-MACHINE_TASK_PROVIDER = "task-base"
 
 PREFERRED_VERSION_u-boot = "1.1.2"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index ead6a83282..c31aecd550 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -11,7 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 UBOOT_ENTRYPOINT = "0"
 
 MACHINE_FEATURES = "kernel26 ext2"
-MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.18"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 69d5e66171..b423f83f00 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -13,6 +13,5 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 IMAGE_FSTYPES = "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
-MACHINE_TASK_PROVIDER = "task-base"
 
 require conf/machine/include/tune-c3.inc
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 53e088da1c..f2a1869b99 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -21,7 +21,6 @@ IMAGE_FSTYPES = "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
 
 
 #tune for pentium cpu
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index b8e73f3085..5399316cd5 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -20,7 +20,6 @@ IMAGE_FSTYPES = "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #tune for pentium pro cpu
 require conf/machine/include/tune-pentiumpro.inc
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 178c242056..9839b6d69e 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -12,7 +12,6 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26"
-MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
 OLDEST_KERNEL = "2.6.18"
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index 72f0a8feb2..b391f4e277 100644
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -11,7 +11,6 @@ PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440e"
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 usbhost"
-MACHINE_TASK_PROVIDER = "task-base"
 
 #don't try to access tty1
 USE_VT = "0"
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index e52454ed52..20b5a11770 100644
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -19,5 +19,5 @@ IMAGE_FSTYPES = "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
 
diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf
index bd96c387b6..6a91bc39fb 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -18,5 +18,5 @@ IMAGE_FSTYPES = "ext2.gz"
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
 
diff --git a/packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch b/packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch
new file mode 100644
index 0000000000..ef4e939640
--- /dev/null
+++ b/packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch
@@ -0,0 +1,21 @@
+Index: linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.22/arch/arm/mach-s3c2440/Kconfig
+@@ -69,14 +69,14 @@
+ 
+ config MACH_HXD8
+ 	bool "FIC HXD8"
+-	select CPU_S3C2440
++	select CPU_S3C2442
+ 	select SENSORS_PCF50606
+ 	help
+ 	   Say Y here if you are using the FIC Neo1973 GSM Phone
+ 
+ config MACH_NEO1973_GTA02
+ 	bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
+-	select CPU_S3C2440
++	select CPU_S3C2442
+ 	select SENSORS_PCF50633
+ 	help
+ 	   Say Y here if you are using the FIC Neo1973 GSM Phone
diff --git a/packages/linux/linux-openmoko-devel/printascii-2.6.23.patch b/packages/linux/linux-openmoko-devel/printascii-2.6.23.patch
new file mode 100644
index 0000000000..4818ac6bfc
--- /dev/null
+++ b/packages/linux/linux-openmoko-devel/printascii-2.6.23.patch
@@ -0,0 +1,21 @@
+Index: linux-2.6.22/kernel/printk.c
+===================================================================
+--- linux-2.6.22.orig/kernel/printk.c
++++ linux-2.6.22/kernel/printk.c
+@@ -519,6 +519,8 @@
+ /* cpu currently holding logbuf_lock */
+ static volatile unsigned int printk_cpu = UINT_MAX;
+ 
++extern void printascii(const char *);
++
+ asmlinkage int vprintk(const char *fmt, va_list args)
+ {
+ 	unsigned long flags;
+@@ -541,6 +543,7 @@
+ 
+ 	/* Emit the output into the temporary buffer */
+ 	printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
++    printascii(printk_buf);
+ 
+ 	/*
+ 	 * Copy the output into log_buf.  If the caller didn't provide