[oe-commits] org.oe.dev merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
hrw commit
openembedded-commits at lists.openembedded.org
Sun Oct 14 15:03:54 UTC 2007
merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
and 'd4ef8ebf38cc9ef7573a49017e35bd326024f285'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e89e39ccc20eca19775f657dad77115faef9b051
ViewMTN: http://monotone.openembedded.org/revision/info/e89e39ccc20eca19775f657dad77115faef9b051
Files:
1
packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch
packages/linux/linux-openmoko-devel/printascii-2.6.23.patch
conf/machine/bd-neon.conf
conf/machine/dht-walnut.conf
conf/machine/epia.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/magicbox.conf
conf/machine/sequoia.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
packages/libqpe/libqpe-opie_cvs.bb
Diffs:
#
# mt diff -r3157b6fd0bec0b66971ea7b32ac57dc1a5c92940 -re89e39ccc20eca19775f657dad77115faef9b051
#
#
#
# add_file "packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch"
# content [fa19347cd487bae37e0c721e8ca6e950ca917769]
#
# add_file "packages/linux/linux-openmoko-devel/printascii-2.6.23.patch"
# content [dc6b59d86cd6a614c83765aa09dc65df09c1d2b9]
#
# patch "conf/machine/bd-neon.conf"
# from [ddf51a5e947c9b41283ffbadc7113e36ebe7f1db]
# to [5f66259e09dda4c0f07e8bcf1fa3eb1c2f8e5e2b]
#
# patch "conf/machine/dht-walnut.conf"
# from [74013431b04d2e2f9a497c24b2941e148b833e1a]
# to [bb26cc95419c8f5c3a5b33db309f3dd223e684ae]
#
# patch "conf/machine/epia.conf"
# from [7ea29c9254e8cf7eb3efe9042c2597a57123e9d9]
# to [e38302e47146701110383c508240fa26398120ba]
#
# patch "conf/machine/i586-generic.conf"
# from [d53211500c299b141a5911dd6cb8b095d46bf74a]
# to [8a6d91855ec245bf14921fec7caff723d99e1ee5]
#
# patch "conf/machine/i686-generic.conf"
# from [fe0d7dacb28a7233e9aec258ab69a439e0f89d7f]
# to [43bb3d297df31f80caab4d475b000178155c610a]
#
# patch "conf/machine/magicbox.conf"
# from [258d65a553b998a591c90af66c6065e4c922738a]
# to [d69397663a62a770f6f3058881f6bb0801b18d6c]
#
# patch "conf/machine/sequoia.conf"
# from [19f01cff204741e1068e53c071024eb52d6fa320]
# to [93bf49ad628dbf470a00b21f525d9e5a863e7ca7]
#
# patch "conf/machine/x86-32-nocona.conf"
# from [4751fe71ac3de06ec5669fd29663ce396bf3ac4f]
# to [6ec18a5628f4cd6d7ad3b15ba1866eab532bb548]
#
# patch "conf/machine/x86-prescott.conf"
# from [c4bf154f03bb4818ad538b852d24e1d50e653d76]
# to [1d4653c1ee4503181a0ef606680321a3977ba662]
#
============================================================
--- packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch fa19347cd487bae37e0c721e8ca6e950ca917769
+++ packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch fa19347cd487bae37e0c721e8ca6e950ca917769
@@ -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
============================================================
--- packages/linux/linux-openmoko-devel/printascii-2.6.23.patch dc6b59d86cd6a614c83765aa09dc65df09c1d2b9
+++ packages/linux/linux-openmoko-devel/printascii-2.6.23.patch dc6b59d86cd6a614c83765aa09dc65df09c1d2b9
@@ -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
============================================================
--- conf/machine/bd-neon.conf ddf51a5e947c9b41283ffbadc7113e36ebe7f1db
+++ conf/machine/bd-neon.conf 5f66259e09dda4c0f07e8bcf1fa3eb1c2f8e5e2b
@@ -27,7 +27,6 @@ XSERVER = "xserver-kdrive-fbdev"
MODUTILS = "26"
XSERVER = "xserver-kdrive-fbdev"
-MACHINE_TASK_PROVIDER = "task-base"
PREFERRED_VERSION_u-boot = "1.1.2"
============================================================
--- conf/machine/dht-walnut.conf 74013431b04d2e2f9a497c24b2941e148b833e1a
+++ conf/machine/dht-walnut.conf bb26cc95419c8f5c3a5b33db309f3dd223e684ae
@@ -11,7 +11,6 @@ MACHINE_FEATURES = "kernel26 ext2"
UBOOT_ENTRYPOINT = "0"
MACHINE_FEATURES = "kernel26 ext2"
-MACHINE_TASK_PROVIDER = "task-base"
TARGET_CPU = "405"
OLDEST_KERNEL = "2.6.18"
============================================================
--- conf/machine/epia.conf 7ea29c9254e8cf7eb3efe9042c2597a57123e9d9
+++ conf/machine/epia.conf e38302e47146701110383c508240fa26398120ba
@@ -13,6 +13,5 @@ MACHINE_FEATURES = "kernel26 screen keyb
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
============================================================
--- conf/machine/i586-generic.conf d53211500c299b141a5911dd6cb8b095d46bf74a
+++ conf/machine/i586-generic.conf 8a6d91855ec245bf14921fec7caff723d99e1ee5
@@ -21,7 +21,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
#tune for pentium cpu
============================================================
--- conf/machine/i686-generic.conf fe0d7dacb28a7233e9aec258ab69a439e0f89d7f
+++ conf/machine/i686-generic.conf 43bb3d297df31f80caab4d475b000178155c610a
@@ -20,7 +20,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
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
============================================================
--- conf/machine/magicbox.conf 258d65a553b998a591c90af66c6065e4c922738a
+++ conf/machine/magicbox.conf d69397663a62a770f6f3058881f6bb0801b18d6c
@@ -12,7 +12,6 @@ MACHINE_FEATURES = "kernel26"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
MACHINE_FEATURES = "kernel26"
-MACHINE_TASK_PROVIDER = "task-base"
TARGET_CPU = "405"
OLDEST_KERNEL = "2.6.18"
============================================================
--- conf/machine/sequoia.conf 19f01cff204741e1068e53c071024eb52d6fa320
+++ conf/machine/sequoia.conf 93bf49ad628dbf470a00b21f525d9e5a863e7ca7
@@ -11,7 +11,6 @@ MACHINE_FEATURES = "kernel26 usbhost"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
MACHINE_FEATURES = "kernel26 usbhost"
-MACHINE_TASK_PROVIDER = "task-base"
#don't try to access tty1
USE_VT = "0"
============================================================
--- conf/machine/x86-32-nocona.conf 4751fe71ac3de06ec5669fd29663ce396bf3ac4f
+++ conf/machine/x86-32-nocona.conf 6ec18a5628f4cd6d7ad3b15ba1866eab532bb548
@@ -19,5 +19,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
============================================================
--- conf/machine/x86-prescott.conf c4bf154f03bb4818ad538b852d24e1d50e653d76
+++ conf/machine/x86-prescott.conf 1d4653c1ee4503181a0ef606680321a3977ba662
@@ -18,5 +18,5 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
+
#
# mt diff -rd4ef8ebf38cc9ef7573a49017e35bd326024f285 -re89e39ccc20eca19775f657dad77115faef9b051
#
#
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
# to [f276b9b611e6c72c97af9cae949f23dbd6ad44d7]
#
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb 66eb84a06f4f226608fdaccbcc077ac5fb2e540e
+++ packages/libqpe/libqpe-opie_cvs.bb f276b9b611e6c72c97af9cae949f23dbd6ad44d7
@@ -1,7 +1,6 @@ require ${PN}.inc
require ${PN}.inc
-PV = "1.2.2+cvs${SRCDATE}"
-PR = "r10"
+PV = "1.2.3+cvs${SRCDATE}"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
More information about the Openembedded-commits
mailing list