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

5 files changed, 45 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6abcf5a75f..e75900d7dd 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -122,6 +122,10 @@ sha256=771206f2b7a916ce0dfb93d82200472beaeb910248482734179bf36808e486b1
 md5=86d95ee16854a5503dc9f86a2f2ffa83
 sha256=8750d58745e57654820aa9359891cb0d875d804dbfcfa2e1bb95c56531e423d1
 
+[http://coherence.beebits.net/download/Coherence-0.6.0.tar.gz]
+md5=3180cf36a7bc401aefb236f4b5dbf14e
+sha256=2aa1906562387a5de05df25a3140ada89df648ccc4eac4ae7b583d0e029103e7
+
 [http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz]
 md5=1ab76bfd6731d80f6abbd1643c90cabd
 sha256=7794d91711e8c9e526431da72c53bb08e14790f326d0e330d9e9d651f3f6fc6c
@@ -21394,6 +21398,10 @@ sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f
 md5=5a1a4476087973852e30f8cdb5b0ff92
 sha256=c762525fdbf5f5dd32c6c950f2a63d8c1b15ec3dc7afca5d2dc3dbd1b129a00d
 
+[http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog-5.4.tar.gz]
+md5=66480128b9dabcced2e4c8db3e60fa50
+sha256=6c5bfb2edae5c289233b6cd65393bb7414a2d30ad4d1239c207a659a4232d91a
+
 [http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/watchdog_5.3.1.tar.gz]
 md5=ba97ddce396bfccd8d409bc3141d7ef4
 sha256=b7bf9feeedea26d7e06935369a1a556089426e94f9ead946018526c96cd9b12e
@@ -24826,3 +24834,11 @@ sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
+[http://davehylands.com/gumstix-wiki/gpio-event/gpio-event-2.6.21-1444-select.tar.gz]
+md5=b5cc96cba5a70e19d58534c250de67e2
+sha256=a937f4ba6b450b1330049c90e5e787490eff5bb376dbfe9099abbcdc7a8f6b6c
+
+[http://www.davehylands.com/gumstix-wiki/char-driver/char-driver-2.6.21.tar.gz]
+md5=70113b86db5dea86c282053e15f36cb7
+sha256=9a87282052a8c0807bbcb46367102f97896a1cf4fcc0d35cfe34b2e5a1456a31
+
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 0aeabe4f15..72787d69cf 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -95,6 +95,8 @@ ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 #ANGSTROM_GCC_VERSION_armv7a		 = "4.2.1+csl-arm-2007q3-53"
 ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
 
+ANGSTROM_GCC_VERSION_486sx = "4.3.2"
+
 #Horrible workaround for armv7a follows:
 # gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function
 # gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4156c971aa..3aaa13276d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -60,7 +60,7 @@ SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
-SRCREV_pn-gnuradio ?= "9809"
+SRCREV_pn-gnuradio ?= "10302"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-sketchbook ?= "9547"
 SRCREV_pn-gpe-conf ?= "9798"
@@ -208,6 +208,7 @@ SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
+SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
 SRCREV_pn-table ?= "2191"
diff --git a/conf/machine/include/tune-i486sx.inc b/conf/machine/include/tune-i486sx.inc
new file mode 100644
index 0000000000..bd8025924a
--- /dev/null
+++ b/conf/machine/include/tune-i486sx.inc
@@ -0,0 +1,9 @@
+TARGET_ARCH = "i486"
+TARGET_CC_ARCH = "-march=i486"
+PACKAGE_EXTRA_ARCHS = "486sx"
+BASE_PACKAGE_ARCH = "486sx"
+FEED_ARCH = "${BASE_PACKAGE_ARCH}"
+
+# gcc doesn't understand softfloat:
+# "This target does not support --with-float"
+
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
new file mode 100644
index 0000000000..4595b6aebe
--- /dev/null
+++ b/conf/machine/vortex86sx.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Vortex86sx i486sx clone
+
+require conf/machine/include/tune-i486sx.inc
+
+MACHINE_FEATURES += "x86"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"