Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

7 files changed, 30 insertions, 10 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2be8714005..a102538f62 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -22102,6 +22102,10 @@ sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
 md5=e5766e2566e0297adebebbcc0aba1f2d
 sha256=67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
 
+[http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2]
+md5=1a4b84e5536ad8170563ffa88c34679c
+sha256=2d9769a02c46cff73f56a076268192da1ce91c913e2e4e31c120be098f704c8c
+
 [http://wiki.openembedded.net/dl/uclibc-locale/uClibc-locale-030818.arm.tgz]
 md5=fc0b6113f2b333564d3558e241059db8
 sha256=6765f08499079207ba8c4da999d602ca75c384ff5812aa973f27b6a501b3438e
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f2385b32a3..d629c4adc4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -183,9 +183,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "202"
-SRCREV_pn-opkg-native ?= "201"
-SRCREV_pn-opkg-sdk ?= "201"
+SRCREV_pn-opkg ?= "203"
+SRCREV_pn-opkg-native ?= "203"
+SRCREV_pn-opkg-sdk ?= "203"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 0d859903e1..b261d635af 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -73,7 +73,7 @@ PREFERRED_ARM_INSTRUCTION_SET         ?=  "arm"
 PREFERRED_ARM_INSTRUCTION_SET_armv4t   = "thumb"
 PREFERRED_ARM_INSTRUCTION_SET_armv5te  = "thumb"
 PREFERRED_ARM_INSTRUCTION_SET_armv5teb = "thumb"
-ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}
+ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 # "arm" "thumb"
 #    The instruction set the compiler should use when generating application
 #    code.  The kernel is always compiled with arm code at present.  arm code
@@ -91,9 +91,6 @@ THUMB_INTERWORK = "yes"
 
 # We don't want to keep OABI compat
 ARM_KEEP_OABI = "0"
-# Do keep OABI compat for om-gta01 to keep the gllin binary working
-ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
-ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
 
 # ARM EABI is softfloat by default, but let's make sure :)
 # make it overridable for platforms with FPU, like ep93xx or i.mx31
@@ -108,7 +105,8 @@ TARGET_FPU_armv7a ?= "hard"
 TARGET_FPU_ppc603e ?= "hard"
 
 # webkit-gtk and cairo have alignment issues with double instructions on armv5 so
-# disable them here
+# disable them here. TODO: This knowledge should rather be encoded in the actual
+# recipes!
 TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
 TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
 
diff --git a/conf/machine/gamecube.conf b/conf/machine/gamecube.conf
new file mode 100644
index 0000000000..30323baf9e
--- /dev/null
+++ b/conf/machine/gamecube.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@Name: Nintendo GameCube
+#@DESCRIPTION: Machine configuration for the Nintendo GameCube
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 ext2"
+
+KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/include/tune-arm1136-novfp.inc b/conf/machine/include/tune-arm1136-novfp.inc
index 372148e7a2..e1f7945a0f 100644
--- a/conf/machine/include/tune-arm1136-novfp.inc
+++ b/conf/machine/include/tune-arm1136-novfp.inc
@@ -6,3 +6,5 @@ FEED_ARCH = "armv6-novfp"
 BASE_PACKAGE_ARCH = "armv6-novfp"
 PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6-novfp"
 
+# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish
+require conf/machine/include/tune-thumb.inc
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 7f2cc875b9..95bfd40b23 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -21,7 +21,12 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-modules \
 "
 
-SERIAL_CONSOLE = "115200 ttySAC2"
+# device has 4 UARTS:
+# ttySAC0: mc75 GSM modem
+# ttySAC1: NC
+# ttySAC2: NC
+# ttySAC3: serial console
+SERIAL_CONSOLE = "115200 ttySAC3"
 USE_VT = "0"
 
 # used by some images
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index 4308c6b865..22fe5d4643 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -31,7 +31,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
-UBOOT_MACHINE = "omap3_zoom_config"
+UBOOT_MACHINE = "omap3_zoom1_config"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # From dmesg: