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

12 files changed, 63 insertions, 19 deletions

diff --git a/classes/dsmg600-image.bbclass b/classes/dsmg600-image.bbclass
index 5ccf49267b..4e4550f5b7 100644
--- a/classes/dsmg600-image.bbclass
+++ b/classes/dsmg600-image.bbclass
@@ -1,6 +1,6 @@
 dsmg600_pack_image () {
 	install -d ${DEPLOY_DIR_IMAGE}/firmupgrade
-	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \
+	install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS}.bin \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a94e5ba40b..9e008a36be 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -91,7 +91,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1084"
 SRCREV_pn-linux-openmoko ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-devel ?= "75e0b08ee55b32b996d491809ce60b63287dadf5"
-SRCREV_pn-linux-eten ?= "bb4b5f4bb55736259216a957a14a1e0d33dbc232"
+SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
diff --git a/packages/linux/linux-eten/defconfig b/packages/linux/linux-eten/defconfig
index 538117f7dc..0daa6c670e 100644
--- a/packages/linux/linux-eten/defconfig
+++ b/packages/linux/linux-eten/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28-rc3
-# Wed Nov 19 04:39:03 2008
+# Linux kernel version: 2.6.28-rc4
+# Fri Dec 12 16:46:44 2008
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -172,8 +172,9 @@ CONFIG_S3C2410_CLOCK=y
 CONFIG_CPU_S3C244X=y
 CONFIG_S3C24XX_PWM=y
 CONFIG_S3C2410_DMA=y
-# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_S3C2410_DMA_DEBUG=y
 CONFIG_MACH_SMDK=y
+CONFIG_MACH_NEO1973=y
 CONFIG_PLAT_S3C=y
 CONFIG_CPU_LLSERIAL_S3C2410=y
 CONFIG_CPU_LLSERIAL_S3C2440=y
@@ -183,6 +184,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
 #
 # CONFIG_S3C_BOOT_WATCHDOG is not set
 # CONFIG_S3C_BOOT_ERROR_RESET is not set
+CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
 
 #
 # Power management
@@ -315,7 +317,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootdelay=5"
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootdelay=5 ro"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -576,7 +578,9 @@ CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
-# CONFIG_RFKILL is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_LEDS=y
 # CONFIG_NET_9P is not set
 
 #
@@ -812,6 +816,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_HSO is not set
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
@@ -859,6 +864,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_NEO1973=y
 CONFIG_KEYBOARD_M800=y
 # CONFIG_KEYBOARD_QT2410 is not set
 CONFIG_INPUT_MOUSE=y
@@ -872,6 +878,7 @@ CONFIG_INPUT_MOUSE=y
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_FILTER=y
+CONFIG_TOUCHSCREEN_FILTER_GROUP=y
 CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
 CONFIG_TOUCHSCREEN_FILTER_MEAN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -1128,6 +1135,7 @@ CONFIG_FB_S3C2410=y
 # CONFIG_FB_S3C2410_DEBUG is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_LTV350QV is not set
@@ -1192,8 +1200,11 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_CAIAQ is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_S3C24XX_SOC=m
+CONFIG_SND_S3C24XX_SOC_I2S=m
 # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
+CONFIG_SND_S3C24XX_SOC_GFISH_AK4641=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_AK4641=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
@@ -1438,7 +1449,7 @@ CONFIG_SDIO_UART=m
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SPI is not set
 CONFIG_MMC_S3C=y
 # CONFIG_MEMSTICK is not set
@@ -1453,6 +1464,7 @@ CONFIG_LEDS_S3C24XX=m
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_NEO1973_VIBRATOR is not set
 
 #
 # LED Triggers
@@ -1542,10 +1554,6 @@ CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
 # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_PARANOID_NETWORK=y
-
-#
-# Voltage and Current regulators
-#
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
diff --git a/packages/linux/linux-eten_2.6.28-rc4+git.bb b/packages/linux/linux-eten_2.6.28-rc4+git.bb
index f38a7d4fd8..0d3dac86c6 100644
--- a/packages/linux/linux-eten_2.6.28-rc4+git.bb
+++ b/packages/linux/linux-eten_2.6.28-rc4+git.bb
@@ -18,4 +18,4 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-CMDLINE = "root=/dev/mmcblk0p1 rootdelay=5"
+CMDLINE = "root=/dev/mmcblk0p1 rootdelay=5 ro"
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index 7e7548491f..7b20b4fa99 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -89,7 +89,7 @@ EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}"
 KERNEL_CCSUFFIX = "-2.95"
 KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(c7x0|corgi|husky|shepherd|poodle|poodle255)'
+COMPATIBLE_MACHINE = '(corgi|husky|shepherd|poodle|poodle255)'
 PARALLEL_MAKE = ""
 
 #
diff --git a/packages/netbase/netbase/eten-m800/interfaces b/packages/netbase/netbase/eten-m800/interfaces
new file mode 100644
index 0000000000..090c18aa07
--- /dev/null
+++ b/packages/netbase/netbase/eten-m800/interfaces
@@ -0,0 +1,28 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+ 
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+wireless_mode managed
+wireless_essid any
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+auto usb0
+iface usb0 inet static
+	address 192.168.0.202
+	netmask 255.255.255.0
+	network 192.168.0.0
+	gateway 192.168.0.200
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 2fc352f547..a0baa81658 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r28"
+PR = "r29"
 
 inherit update-rc.d
 
diff --git a/packages/pointercal/files/eten-m800/pointercal b/packages/pointercal/files/eten-m800/pointercal
new file mode 100644
index 0000000000..2fc5007a7d
--- /dev/null
+++ b/packages/pointercal/files/eten-m800/pointercal
@@ -0,0 +1 @@
+-39200 1057 36888216 180 -57378 55366888 65536
diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index a3d1df7e2a..b22735c6be 100644
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.6.inc b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
index 6198958cd5..779bee7487 100644
--- a/packages/wpa-supplicant/wpa-supplicant-0.6.inc
+++ b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
@@ -59,7 +59,14 @@ do_install () {
 	install -d ${D}${sysconfdir}/wpa_supplicant
 	install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/
 	install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant
-	
+
+	install -d ${D}/${sysconfdir}/dbus-1/system.d
+	install -m 644 ${S}/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
+	install -d ${D}/${datadir}/dbus-1/system-services
+	install -m 644 ${S}/dbus-wpa_supplicant.service ${D}/${datadir}/dbus-1/system-services
+
 	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant
 	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant
 }
+
+FILES_${PN} += "${datadir}/dbus-1/system-services/*"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
index d20ccaa9fe..11fc774a18 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
index d20ccaa9fe..11fc774a18 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-PR = "r1"
+PR = "r2"