Revert "Revert "linux-openmoko-2.6.30 : update to 2.6.30.4""

This reverts commit 12fec90c58b9d671e939444df70a7e95cffde2cf.

34 files changed, 18 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ce93c1bbf0..c16f16bc46 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13678,6 +13678,10 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 md5=7da2e2e31f1c00f2673d2dc50de76b33
 sha256=fccb12e3f0f2fe13f392f60682b7114c40cca5c81f1bd9638f48ecd3cd3cba9c
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.4.tar.bz2]
+md5=ac05e32764368af7eff79c5e3df65efb
+sha256=b52d3949219d912763f6614f1c68d51018f820ca6267f8d194dd5ac8b85159b8
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz b/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz
deleted file mode 100644
index cc5d68a3e4..0000000000
--- a/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz
+++ /dev/null
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/001-merge-openmoko.patch b/recipes/linux/linux-openmoko-2.6.30.4/001-merge-openmoko.patch
index 1a515a4896..1a515a4896 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/001-merge-openmoko.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/001-merge-openmoko.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/010-s3c-dma.patch b/recipes/linux/linux-openmoko-2.6.30.4/010-s3c-dma.patch
index e0ff7c442c..e0ff7c442c 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/010-s3c-dma.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/010-s3c-dma.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/011-s3c-pwm.patch b/recipes/linux/linux-openmoko-2.6.30.4/011-s3c-pwm.patch
index 5e097d8bb9..5e097d8bb9 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/011-s3c-pwm.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/011-s3c-pwm.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/012-s3c-usb.patch b/recipes/linux/linux-openmoko-2.6.30.4/012-s3c-usb.patch
index 0e8a5e9daa..0e8a5e9daa 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/012-s3c-usb.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/012-s3c-usb.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/013-fiq_c_handler.patch b/recipes/linux/linux-openmoko-2.6.30.4/013-fiq_c_handler.patch
index de12e10cd7..de12e10cd7 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/013-fiq_c_handler.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/013-fiq_c_handler.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/014-neo1973_mach.patch b/recipes/linux/linux-openmoko-2.6.30.4/014-neo1973_mach.patch
index 926af21b83..926af21b83 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/014-neo1973_mach.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/014-neo1973_mach.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/015-mach-gta02.patch b/recipes/linux/linux-openmoko-2.6.30.4/015-mach-gta02.patch
index dae9ce6cbd..dae9ce6cbd 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/015-mach-gta02.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/015-mach-gta02.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/030-dont-override-logo-with-early-printks.patch b/recipes/linux/linux-openmoko-2.6.30.4/030-dont-override-logo-with-early-printks.patch
index 305af188ac..305af188ac 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/030-dont-override-logo-with-early-printks.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/030-dont-override-logo-with-early-printks.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/040-rename-serialdevs.patch b/recipes/linux/linux-openmoko-2.6.30.4/040-rename-serialdevs.patch
index 4176dbc87f..4176dbc87f 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/040-rename-serialdevs.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/040-rename-serialdevs.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/050-s3c2442-touchscreen.patch b/recipes/linux/linux-openmoko-2.6.30.4/050-s3c2442-touchscreen.patch
index c0de0e6af2..c0de0e6af2 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/050-s3c2442-touchscreen.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/050-s3c2442-touchscreen.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/051-gta02kbd.patch b/recipes/linux/linux-openmoko-2.6.30.4/051-gta02kbd.patch
index cb3c57bccf..cb3c57bccf 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/051-gta02kbd.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/051-gta02kbd.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/052-touchscreen_filter.patch b/recipes/linux/linux-openmoko-2.6.30.4/052-touchscreen_filter.patch
index 1a04bce689..1a04bce689 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/052-touchscreen_filter.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/052-touchscreen_filter.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/053-glamo.patch b/recipes/linux/linux-openmoko-2.6.30.4/053-glamo.patch
index f756e9f3c7..f756e9f3c7 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/053-glamo.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/053-glamo.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/054-bq27000.patch b/recipes/linux/linux-openmoko-2.6.30.4/054-bq27000.patch
index 36de12f8cb..36de12f8cb 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/054-bq27000.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/054-bq27000.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/055-gta02-leds.patch b/recipes/linux/linux-openmoko-2.6.30.4/055-gta02-leds.patch
index 7f5514503e..7f5514503e 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/055-gta02-leds.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/055-gta02-leds.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/055-jbt6k74.patch b/recipes/linux/linux-openmoko-2.6.30.4/055-jbt6k74.patch
index aa70205368..aa70205368 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/055-jbt6k74.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/055-jbt6k74.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/056-pcf50633.patch b/recipes/linux/linux-openmoko-2.6.30.4/056-pcf50633.patch
index 84083b4f32..84083b4f32 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/056-pcf50633.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/056-pcf50633.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch b/recipes/linux/linux-openmoko-2.6.30.4/057-lis302dl.patch
index ebb194bf3c..020cbf74df 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/057-lis302dl.patch
@@ -21,5 +21,4 @@
 @@ -25,3 +25,4 @@ obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
  obj-$(CONFIG_INPUT_WISTRON_BTNS)	+= wistron_btns.o
  obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
- obj-$(CONFIG_INPUT_GPIO_BUTTONS)	+= gpio_buttons.o
 +obj-$(CONFIG_INPUT_LIS302DL)		+= lis302dl.o
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/058-gta02-wm8752.patch b/recipes/linux/linux-openmoko-2.6.30.4/058-gta02-wm8752.patch
index d72f3874ff..d72f3874ff 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/058-gta02-wm8752.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/058-gta02-wm8752.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/060-spi-gpio-non-blocking.patch b/recipes/linux/linux-openmoko-2.6.30.4/060-spi-gpio-non-blocking.patch
index 3dcf9c0486..3dcf9c0486 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/060-spi-gpio-non-blocking.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/060-spi-gpio-non-blocking.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/068-ar6000.patch b/recipes/linux/linux-openmoko-2.6.30.4/068-ar6000.patch
index d5565efab1..d5565efab1 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/068-ar6000.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/068-ar6000.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/070-s3c24xx-time.patch b/recipes/linux/linux-openmoko-2.6.30.4/070-s3c24xx-time.patch
index 8b850452e2..8b850452e2 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/070-s3c24xx-time.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/070-s3c24xx-time.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/080-nr-tty-devices.patch b/recipes/linux/linux-openmoko-2.6.30.4/080-nr-tty-devices.patch
index e58152d0c9..e58152d0c9 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/080-nr-tty-devices.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/080-nr-tty-devices.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/100-udc-poll-vbus.patch b/recipes/linux/linux-openmoko-2.6.30.4/100-udc-poll-vbus.patch
index 5658e8d37d..5658e8d37d 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/100-udc-poll-vbus.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/100-udc-poll-vbus.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/110-serial.patch b/recipes/linux/linux-openmoko-2.6.30.4/110-serial.patch
index e01394b6ff..e01394b6ff 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/110-serial.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/110-serial.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/120-fix-wm8753-reg_cache.patch b/recipes/linux/linux-openmoko-2.6.30.4/120-fix-wm8753-reg_cache.patch
index f7e801ce96..a227788c59 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/120-fix-wm8753-reg_cache.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/120-fix-wm8753-reg_cache.patch
@@ -9,7 +9,7 @@
  };
  
  /* codec private data */
-@@ -1660,11 +1660,11 @@ static int wm8753_register(struct wm8753
+@@ -1660,7 +1660,7 @@ static int wm8753_register(struct wm8753
  	codec->set_bias_level = wm8753_set_bias_level;
  	codec->dai = wm8753_dai;
  	codec->num_dai = 2;
@@ -19,8 +19,7 @@
 +	codec->reg_cache = wm8753->reg_cache;
  	codec->private_data = wm8753;
  
--	memcpy(codec->reg_cache, wm8753_reg, sizeof(codec->reg_cache));
-+	memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753_reg));
+	memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753_reg));
  	INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
  
  	ret = wm8753_reset(codec);
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/130-fix-s3c_gpiolib_getchip.patch b/recipes/linux/linux-openmoko-2.6.30.4/130-fix-s3c_gpiolib_getchip.patch
index 96730014ed..96730014ed 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/130-fix-s3c_gpiolib_getchip.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/130-fix-s3c_gpiolib_getchip.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/750-glamo-headers.patch b/recipes/linux/linux-openmoko-2.6.30.4/750-glamo-headers.patch
index 532e00a3a3..532e00a3a3 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/750-glamo-headers.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/750-glamo-headers.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/defconfig b/recipes/linux/linux-openmoko-2.6.30.4/defconfig
index 2ba450aa86..c9cb74f26d 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.30.4/defconfig
@@ -705,7 +705,16 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_HSO is not set
 # CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+# CONFIG_PPPOE is not set
+CONFIG_PPPOL2TP=m
 # CONFIG_SLIP is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/fix-install.patch b/recipes/linux/linux-openmoko-2.6.30.4/fix-install.patch
index b14ca7d740..b14ca7d740 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/fix-install.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.4/fix-install.patch
diff --git a/recipes/linux/linux-openmoko-2.6.30.4/openwrt-files.tgz b/recipes/linux/linux-openmoko-2.6.30.4/openwrt-files.tgz
new file mode 100644
index 0000000000..7fc974cec1
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.30.4/openwrt-files.tgz
diff --git a/recipes/linux/linux-openmoko_2.6.30.1.bb b/recipes/linux/linux-openmoko_2.6.30.4.bb
index 9f09f6ab84..4c7b2ed73c 100644
--- a/recipes/linux/linux-openmoko_2.6.30.1.bb
+++ b/recipes/linux/linux-openmoko_2.6.30.4.bb
@@ -5,7 +5,7 @@ DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Sma
 
 DEFAULT_PREFERENCE = "-1"
 
-KERNEL_VERSION = "2.6.30.1"
+KERNEL_VERSION = "2.6.30.4"
 
 SRC_URI = "\
   http://kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
@@ -39,7 +39,7 @@ SRC_URI = "\
   file://110-serial.patch;patch=1 \
   file://120-fix-wm8753-reg_cache.patch;patch=1 \
   file://130-fix-s3c_gpiolib_getchip.patch;patch=1 \
-#  file://750-glamo-headers.patch;patch=1 \
+  file://750-glamo-headers.patch;patch=1 \
 #  file://150-ignore-init-argument.patch;patch=1 \
 "