linux-openmoko-{2.6.28/devel}: remove spourious -2.6.28 files and base config on gta02-packaging-defconfig

11 files changed, 28 insertions, 6812 deletions

diff --git a/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch b/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch
index faca44adef..109e9ec83d 100644
--- a/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch
+++ b/packages/linux/linux-openmoko-2.6.28/defconfig-oe.patch
@@ -1,203 +1,16 @@
---- defconfig-oe	2009-01-09 15:38:56.000000000 +0000
-+++ defconfig-oe	2009-01-09 16:37:51.000000000 +0000
-@@ -505,8 +505,8 @@
+--- gta02-packaging-defconfig	2009-01-12 13:09:33.000000000 +0000
++++ defconfig-oe	2009-01-12 13:18:23.000000000 +0000
+@@ -337,9 +337,6 @@
  #
- # IP: Netfilter Configuration
+ # At least one emulation must be selected
  #
--CONFIG_NF_DEFRAG_IPV4=y
--CONFIG_NF_CONNTRACK_IPV4=y
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
- # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
- # CONFIG_IP_NF_QUEUE is not set
- CONFIG_IP_NF_IPTABLES=m
-@@ -584,12 +584,12 @@
- # CONFIG_IP_SCTP is not set
- # CONFIG_TIPC is not set
- # CONFIG_ATM is not set
--CONFIG_STP=y
--CONFIG_BRIDGE=y
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
- # CONFIG_NET_DSA is not set
- # CONFIG_VLAN_8021Q is not set
- # CONFIG_DECNET is not set
--CONFIG_LLC=y
-+CONFIG_LLC=m
- # CONFIG_LLC2 is not set
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
-@@ -642,20 +642,20 @@
- # CONFIG_HAMRADIO is not set
- # CONFIG_CAN is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP=m
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
-+CONFIG_BT_HIDP=m
+-CONFIG_FPE_NWFPE=y
+-# CONFIG_FPE_NWFPE_XP is not set
+-# CONFIG_FPE_FASTFPE is not set
  
  #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIBTUSB=y
-+CONFIG_BT_HCIBTUSB=m
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
- # CONFIG_BT_HCIBCM203X is not set
-@@ -867,24 +867,10 @@
- # CONFIG_BONDING is not set
- # CONFIG_MACVLAN is not set
- # CONFIG_EQUALIZER is not set
--CONFIG_TUN=y
-+CONFIG_TUN=m
- # CONFIG_VETH is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
-+# CONFIG_NET_ETHERNET is not set
- CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_SMC911X is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
--# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
--# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
--# CONFIG_B44 is not set
- # CONFIG_NETDEV_1000 is not set
- # CONFIG_NETDEV_10000 is not set
- 
-@@ -922,18 +908,18 @@
- CONFIG_USB_NET_ZAURUS=m
- # CONFIG_USB_HSO is not set
- # CONFIG_WAN is not set
--CONFIG_PPP=y
-+CONFIG_PPP=m
- CONFIG_PPP_MULTILINK=y
- CONFIG_PPP_FILTER=y
--CONFIG_PPP_ASYNC=y
--CONFIG_PPP_SYNC_TTY=y
--CONFIG_PPP_DEFLATE=y
--CONFIG_PPP_BSDCOMP=y
--CONFIG_PPP_MPPE=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 is not set
- # CONFIG_SLIP is not set
--CONFIG_SLHC=y
-+CONFIG_SLHC=m
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
- # CONFIG_NET_POLL_CONTROLLER is not set
-@@ -1347,17 +1333,17 @@
- # CONFIG_FONT_SUN12x22 is not set
- # CONFIG_FONT_10x18 is not set
- # CONFIG_LOGO is not set
--CONFIG_SOUND=y
-+CONFIG_SOUND=m
- CONFIG_SOUND_OSS_CORE=y
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
- CONFIG_SND_HWDEP=m
- CONFIG_SND_RAWMIDI=m
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
- CONFIG_SND_PCM_OSS_PLUGINS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
- CONFIG_SND_SUPPORT_OLD_API=y
-@@ -1376,13 +1362,13 @@
- CONFIG_SND_USB=y
- CONFIG_SND_USB_AUDIO=m
- # CONFIG_SND_USB_CAIAQ is not set
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- # CONFIG_SND_SOC_ALL_CODECS is not set
--CONFIG_SND_SOC_WM8753=y
-+CONFIG_SND_SOC_WM8753=m
- # CONFIG_SOUND_PRIME is not set
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
-@@ -1462,7 +1448,7 @@
- #
- # USB Device Class drivers
- #
--CONFIG_USB_ACM=y
-+CONFIG_USB_ACM=m
- CONFIG_USB_PRINTER=m
- # CONFIG_USB_WDM is not set
- CONFIG_USB_TMC=m
-@@ -1474,7 +1460,7 @@
- #
- # may also be needed; see USB_STORAGE Help for more information
- #
--CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE=m
- # CONFIG_USB_STORAGE_DEBUG is not set
- CONFIG_USB_STORAGE_DATAFAB=y
- CONFIG_USB_STORAGE_FREECOM=y
-@@ -1499,8 +1485,7 @@
- #
- # USB port drivers
- #
--CONFIG_USB_SERIAL=y
--CONFIG_USB_SERIAL_CONSOLE=y
-+CONFIG_USB_SERIAL=m
- CONFIG_USB_EZUSB=y
- CONFIG_USB_SERIAL_GENERIC=y
- CONFIG_USB_SERIAL_AIRCABLE=m
-@@ -1541,7 +1526,7 @@
- CONFIG_USB_SERIAL_TI=m
- CONFIG_USB_SERIAL_CYBERJACK=m
- CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=y
-+CONFIG_USB_SERIAL_OPTION=m
- CONFIG_USB_SERIAL_OMNINET=m
- # CONFIG_USB_SERIAL_DEBUG is not set
- 
-@@ -1601,7 +1586,7 @@
- # CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_USB_G_PRINTER is not set
- # CONFIG_USB_CDC_COMPOSITE is not set
--CONFIG_AR6000_WLAN=y
-+CONFIG_AR6000_WLAN=m
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
-@@ -1641,9 +1626,10 @@
+ # Userspace binary formats
+@@ -1634,9 +1631,10 @@
  #
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=y
@@ -209,88 +22,16 @@
  CONFIG_RTC_LIB=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_HCTOSYS=y
-@@ -1738,21 +1724,21 @@
- #
- # File systems
- #
--CONFIG_EXT2_FS=y
-+CONFIG_EXT2_FS=m
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS=m
- # CONFIG_EXT3_FS_XATTR is not set
--CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS=m
- CONFIG_EXT4DEV_COMPAT=y
- CONFIG_EXT4_FS_XATTR=y
- # CONFIG_EXT4_FS_POSIX_ACL is not set
- CONFIG_EXT4_FS_SECURITY=y
--CONFIG_JBD=y
-+CONFIG_JBD=m
- # CONFIG_JBD_DEBUG is not set
--CONFIG_JBD2=y
-+CONFIG_JBD2=m
- # CONFIG_JBD2_DEBUG is not set
--CONFIG_FS_MBCACHE=y
-+CONFIG_FS_MBCACHE=m
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
- CONFIG_FS_POSIX_ACL=y
-@@ -1778,9 +1764,9 @@
- #
- # DOS/FAT/NT Filesystems
- #
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
- CONFIG_FAT_DEFAULT_CODEPAGE=437
- CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
- # CONFIG_NTFS_FS is not set
-@@ -1828,15 +1814,19 @@
+@@ -1822,7 +1820,11 @@
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
 -# CONFIG_NFS_FS is not set
--CONFIG_NFSD=y
-+CONFIG_NFS_FS=y
++CONFIG_NFS_FS=m
 +CONFIG_NFS_V3=y
 +CONFIG_NFS_V3_ACL=y
 +# CONFIG_NFS_V4 is not set
 +CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=m
+ CONFIG_NFSD=m
  CONFIG_NFSD_V2_ACL=y
  CONFIG_NFSD_V3=y
- CONFIG_NFSD_V3_ACL=y
- # CONFIG_NFSD_V4 is not set
- CONFIG_LOCKD=y
- CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=y
-+CONFIG_EXPORTFS=m
- CONFIG_NFS_ACL_SUPPORT=y
- CONFIG_NFS_COMMON=y
- CONFIG_SUNRPC=y
-@@ -1875,9 +1865,9 @@
- # CONFIG_KARMA_PARTITION is not set
- # CONFIG_EFI_PARTITION is not set
- # CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
-+CONFIG_NLS=m
- CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_437=m
- # CONFIG_NLS_CODEPAGE_737 is not set
- # CONFIG_NLS_CODEPAGE_775 is not set
- CONFIG_NLS_CODEPAGE_850=m
-@@ -1901,7 +1891,7 @@
- # CONFIG_NLS_CODEPAGE_1250 is not set
- # CONFIG_NLS_CODEPAGE_1251 is not set
- # CONFIG_NLS_ASCII is not set
--CONFIG_NLS_ISO8859_1=y
-+CONFIG_NLS_ISO8859_1=m
- # CONFIG_NLS_ISO8859_2 is not set
- # CONFIG_NLS_ISO8859_3 is not set
- # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-openmoko-2.6.28_git.bb b/packages/linux/linux-openmoko-2.6.28_git.bb
index 2389db2bcd..e37742caa2 100644
--- a/packages/linux/linux-openmoko-2.6.28_git.bb
+++ b/packages/linux/linux-openmoko-2.6.28_git.bb
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 OEV = "oe1"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
@@ -18,7 +18,7 @@ SRC_URI = "\
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/gta02-moredrivers-defconfig ${WORKDIR}/defconfig-oe
+	install -m 644 ./arch/arm/configs/gta02-packaging-defconfig ${WORKDIR}/defconfig-oe
 	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
 }
 
diff --git a/packages/linux/linux-openmoko-devel/defconfig-oe.patch b/packages/linux/linux-openmoko-devel/defconfig-oe.patch
index 1bcf4463d0..109e9ec83d 100644
--- a/packages/linux/linux-openmoko-devel/defconfig-oe.patch
+++ b/packages/linux/linux-openmoko-devel/defconfig-oe.patch
@@ -1,212 +1,16 @@
---- defconfig-oe	2009-01-09 15:38:56.000000000 +0000
-+++ defconfig-oe	2009-01-09 16:37:51.000000000 +0000
-@@ -1,7 +1,7 @@
+--- gta02-packaging-defconfig	2009-01-12 13:09:33.000000000 +0000
++++ defconfig-oe	2009-01-12 13:18:23.000000000 +0000
+@@ -337,9 +337,6 @@
  #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.28-rc4
--# Thu Jan  8 20:00:01 2009
-+# Fri Jan  9 16:37:51 2009
+ # At least one emulation must be selected
  #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -505,8 +505,8 @@
- #
- # IP: Netfilter Configuration
- #
--CONFIG_NF_DEFRAG_IPV4=y
--CONFIG_NF_CONNTRACK_IPV4=y
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
- # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
- # CONFIG_IP_NF_QUEUE is not set
- CONFIG_IP_NF_IPTABLES=m
-@@ -584,12 +584,12 @@
- # CONFIG_IP_SCTP is not set
- # CONFIG_TIPC is not set
- # CONFIG_ATM is not set
--CONFIG_STP=y
--CONFIG_BRIDGE=y
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
- # CONFIG_NET_DSA is not set
- # CONFIG_VLAN_8021Q is not set
- # CONFIG_DECNET is not set
--CONFIG_LLC=y
-+CONFIG_LLC=m
- # CONFIG_LLC2 is not set
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
-@@ -642,20 +642,20 @@
- # CONFIG_HAMRADIO is not set
- # CONFIG_CAN is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP=m
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
-+CONFIG_BT_HIDP=m
- 
- #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIBTUSB=y
-+CONFIG_BT_HCIBTUSB=m
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
- # CONFIG_BT_HCIBCM203X is not set
-@@ -867,24 +867,10 @@
- # CONFIG_BONDING is not set
- # CONFIG_MACVLAN is not set
- # CONFIG_EQUALIZER is not set
--CONFIG_TUN=y
-+CONFIG_TUN=m
- # CONFIG_VETH is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
-+# CONFIG_NET_ETHERNET is not set
- CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_ENC28J60 is not set
--# CONFIG_SMC911X is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
--# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
--# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
--# CONFIG_B44 is not set
- # CONFIG_NETDEV_1000 is not set
- # CONFIG_NETDEV_10000 is not set
+-CONFIG_FPE_NWFPE=y
+-# CONFIG_FPE_NWFPE_XP is not set
+-# CONFIG_FPE_FASTFPE is not set
  
-@@ -922,18 +908,18 @@
- CONFIG_USB_NET_ZAURUS=m
- # CONFIG_USB_HSO is not set
- # CONFIG_WAN is not set
--CONFIG_PPP=y
-+CONFIG_PPP=m
- CONFIG_PPP_MULTILINK=y
- CONFIG_PPP_FILTER=y
--CONFIG_PPP_ASYNC=y
--CONFIG_PPP_SYNC_TTY=y
--CONFIG_PPP_DEFLATE=y
--CONFIG_PPP_BSDCOMP=y
--CONFIG_PPP_MPPE=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 is not set
- # CONFIG_SLIP is not set
--CONFIG_SLHC=y
-+CONFIG_SLHC=m
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
- # CONFIG_NET_POLL_CONTROLLER is not set
-@@ -1347,17 +1333,17 @@
- # CONFIG_FONT_SUN12x22 is not set
- # CONFIG_FONT_10x18 is not set
- # CONFIG_LOGO is not set
--CONFIG_SOUND=y
-+CONFIG_SOUND=m
- CONFIG_SOUND_OSS_CORE=y
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
- CONFIG_SND_HWDEP=m
- CONFIG_SND_RAWMIDI=m
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
- CONFIG_SND_PCM_OSS_PLUGINS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
- CONFIG_SND_SUPPORT_OLD_API=y
-@@ -1376,13 +1362,13 @@
- CONFIG_SND_USB=y
- CONFIG_SND_USB_AUDIO=m
- # CONFIG_SND_USB_CAIAQ is not set
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- # CONFIG_SND_SOC_ALL_CODECS is not set
--CONFIG_SND_SOC_WM8753=y
-+CONFIG_SND_SOC_WM8753=m
- # CONFIG_SOUND_PRIME is not set
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
-@@ -1462,7 +1448,7 @@
- #
- # USB Device Class drivers
- #
--CONFIG_USB_ACM=y
-+CONFIG_USB_ACM=m
- CONFIG_USB_PRINTER=m
- # CONFIG_USB_WDM is not set
- CONFIG_USB_TMC=m
-@@ -1474,7 +1460,7 @@
- #
- # may also be needed; see USB_STORAGE Help for more information
  #
--CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE=m
- # CONFIG_USB_STORAGE_DEBUG is not set
- CONFIG_USB_STORAGE_DATAFAB=y
- CONFIG_USB_STORAGE_FREECOM=y
-@@ -1499,8 +1485,7 @@
- #
- # USB port drivers
- #
--CONFIG_USB_SERIAL=y
--CONFIG_USB_SERIAL_CONSOLE=y
-+CONFIG_USB_SERIAL=m
- CONFIG_USB_EZUSB=y
- CONFIG_USB_SERIAL_GENERIC=y
- CONFIG_USB_SERIAL_AIRCABLE=m
-@@ -1541,7 +1526,7 @@
- CONFIG_USB_SERIAL_TI=m
- CONFIG_USB_SERIAL_CYBERJACK=m
- CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=y
-+CONFIG_USB_SERIAL_OPTION=m
- CONFIG_USB_SERIAL_OMNINET=m
- # CONFIG_USB_SERIAL_DEBUG is not set
- 
-@@ -1601,7 +1586,7 @@
- # CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_USB_G_PRINTER is not set
- # CONFIG_USB_CDC_COMPOSITE is not set
--CONFIG_AR6000_WLAN=y
-+CONFIG_AR6000_WLAN=m
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
-@@ -1641,9 +1626,10 @@
+ # Userspace binary formats
+@@ -1634,9 +1631,10 @@
  #
  CONFIG_LEDS_TRIGGERS=y
  CONFIG_LEDS_TRIGGER_TIMER=y
@@ -218,88 +22,16 @@
  CONFIG_RTC_LIB=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_HCTOSYS=y
-@@ -1738,21 +1724,21 @@
- #
- # File systems
- #
--CONFIG_EXT2_FS=y
-+CONFIG_EXT2_FS=m
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
-+CONFIG_EXT3_FS=m
- # CONFIG_EXT3_FS_XATTR is not set
--CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS=m
- CONFIG_EXT4DEV_COMPAT=y
- CONFIG_EXT4_FS_XATTR=y
- # CONFIG_EXT4_FS_POSIX_ACL is not set
- CONFIG_EXT4_FS_SECURITY=y
--CONFIG_JBD=y
-+CONFIG_JBD=m
- # CONFIG_JBD_DEBUG is not set
--CONFIG_JBD2=y
-+CONFIG_JBD2=m
- # CONFIG_JBD2_DEBUG is not set
--CONFIG_FS_MBCACHE=y
-+CONFIG_FS_MBCACHE=m
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
- CONFIG_FS_POSIX_ACL=y
-@@ -1778,9 +1764,9 @@
- #
- # DOS/FAT/NT Filesystems
- #
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
- CONFIG_FAT_DEFAULT_CODEPAGE=437
- CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
- # CONFIG_NTFS_FS is not set
-@@ -1828,15 +1814,19 @@
+@@ -1822,7 +1820,11 @@
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
 -# CONFIG_NFS_FS is not set
--CONFIG_NFSD=y
-+CONFIG_NFS_FS=y
++CONFIG_NFS_FS=m
 +CONFIG_NFS_V3=y
 +CONFIG_NFS_V3_ACL=y
 +# CONFIG_NFS_V4 is not set
 +CONFIG_ROOT_NFS=y
-+CONFIG_NFSD=m
+ CONFIG_NFSD=m
  CONFIG_NFSD_V2_ACL=y
  CONFIG_NFSD_V3=y
- CONFIG_NFSD_V3_ACL=y
- # CONFIG_NFSD_V4 is not set
- CONFIG_LOCKD=y
- CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=y
-+CONFIG_EXPORTFS=m
- CONFIG_NFS_ACL_SUPPORT=y
- CONFIG_NFS_COMMON=y
- CONFIG_SUNRPC=y
-@@ -1875,9 +1865,9 @@
- # CONFIG_KARMA_PARTITION is not set
- # CONFIG_EFI_PARTITION is not set
- # CONFIG_SYSV68_PARTITION is not set
--CONFIG_NLS=y
-+CONFIG_NLS=m
- CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_437=m
- # CONFIG_NLS_CODEPAGE_737 is not set
- # CONFIG_NLS_CODEPAGE_775 is not set
- CONFIG_NLS_CODEPAGE_850=m
-@@ -1901,7 +1891,7 @@
- # CONFIG_NLS_CODEPAGE_1250 is not set
- # CONFIG_NLS_CODEPAGE_1251 is not set
- # CONFIG_NLS_ASCII is not set
--CONFIG_NLS_ISO8859_1=y
-+CONFIG_NLS_ISO8859_1=m
- # CONFIG_NLS_ISO8859_2 is not set
- # CONFIG_NLS_ISO8859_3 is not set
- # CONFIG_NLS_ISO8859_4 is not set
diff --git a/packages/linux/linux-openmoko-devel/linux-openmoko-2.6.28/0001-squashfs-with-lzma.patch b/packages/linux/linux-openmoko-devel/linux-openmoko-2.6.28/0001-squashfs-with-lzma.patch
deleted file mode 100644
index 04d47fe16f..0000000000
--- a/packages/linux/linux-openmoko-devel/linux-openmoko-2.6.28/0001-squashfs-with-lzma.patch
+++ /dev/null
@@ -1,5342 +0,0 @@
-
-diff -urN linux-2.6.23/fs/squashfs/LzmaDecode.c linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.c
---- linux-2.6.23/fs/squashfs/LzmaDecode.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.sqlzma-ng/fs/squashfs/LzmaDecode.c	2007-11-13 19:45:12.000000000 -0500
-@@ -0,0 +1,584 @@
-+/*

-+  LzmaDecode.c

-+  LZMA Decoder (optimized for Speed version)

-+  

-+  LZMA SDK 4.40 Copyright (c) 1999-2006 Igor Pavlov (2006-05-01)

-+  http://www.7-zip.org/

-+

-+  LZMA SDK is licensed under two licenses:

-+  1) GNU Lesser General Public License (GNU LGPL)

-+  2) Common Public License (CPL)

-+  It means that you can select one of these two licenses and 

-+  follow rules of that license.

-+

-+  SPECIAL EXCEPTION:

-+  Igor Pavlov, as the author of this Code, expressly permits you to 

-+  statically or dynamically link your Code (or bind by name) to the 

-+  interfaces of this file without subjecting your linked Code to the 

-+  terms of the CPL or GNU LGPL. Any modifications or additions 

-+  to this file, however, are subject to the LGPL or CPL terms.

-+*/

-+

-+#include "LzmaDecode.h"

-+

-+#define kNumTopBits 24

-+#define kTopValue ((UInt32)1 << kNumTopBits)

-+

-+#define kNumBitModelTotalBits 11

-+#define kBitModelTotal (1 << kNumBitModelTotalBits)

-+#define kNumMoveBits 5

-+

-+#define RC_READ_BYTE (*Buffer++)

-+

-+#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \

-+  { int i; for(i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) | RC_READ_BYTE; }}

-+

-+#ifdef _LZMA_IN_CB

-+

-+#define RC_TEST { if (Buffer == BufferLim) \

-+  { SizeT size; int result = InCallback->Read(InCallback, &Buffer, &size); if (result != LZMA_RESULT_OK) return result; \

-+  BufferLim = Buffer + size; if (size == 0) return LZMA_RESULT_DATA_ERROR; }}

-+

-+#define RC_INIT Buffer = BufferLim = 0; RC_INIT2

-+

-+#else

-+

-+#define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; }

-+

-+#define RC_INIT(buffer, bufferSize) Buffer = buffer; BufferLim = buffer + bufferSize; RC_INIT2

-+ 

-+#endif

-+

-+#define RC_NORMALIZE if (Range < kTopValue) { RC_TEST; Range <<= 8; Code = (Code << 8) | RC_READ_BYTE; }

-+

-+#define IfBit0(p) RC_NORMALIZE; bound = (Range >> kNumBitModelTotalBits) * *(p); if (Code < bound)

-+#define UpdateBit0(p) Range = bound; *(p) += (kBitModelTotal - *(p)) >> kNumMoveBits;

-+#define UpdateBit1(p) Range -= bound; Code -= bound; *(p) -= (*(p)) >> kNumMoveBits;

-+

-+#define RC_GET_BIT2(p, mi, A0, A1) IfBit0(p) \

-+  { UpdateBit0(p); mi <<= 1; A0; } else \

-+  { UpdateBit1(p); mi = (mi + mi) + 1; A1; } 

-+  

-+#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;)               

-+

-+#define RangeDecoderBitTreeDecode(probs, numLevels, res) \

-+  { int i = numLevels; res = 1; \

-+  do { CProb *p = probs + res; RC_GET_BIT(p, res) } while(--i != 0); \

-+  res -= (1 << numLevels); }

-+

-+

-+#define kNumPosBitsMax 4

-+#define kNumPosStatesMax (1 << kNumPosBitsMax)

-+

-+#define kLenNumLowBits 3

-+#define kLenNumLowSymbols (1 << kLenNumLowBits)

-+#define kLenNumMidBits 3

-+#define kLenNumMidSymbols (1 << kLenNumMidBits)

-+#define kLenNumHighBits 8

-+#define kLenNumHighSymbols (1 << kLenNumHighBits)

-+

-+#define LenChoice 0

-+#define LenChoice2 (LenChoice + 1)

-+#define LenLow (LenChoice2 + 1)

-+#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits))

-+#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits))

-+#define kNumLenProbs (LenHigh + kLenNumHighSymbols) 

-+

-+

-+#define kNumStates 12

-+#define kNumLitStates 7

-+

-+#define kStartPosModelIndex 4

-+#define kEndPosModelIndex 14

-+#define kNumFullDistances (1 << (kEndPosModelIndex >> 1))

-+

-+#define kNumPosSlotBits 6

-+#define kNumLenToPosStates 4

-+

-+#define kNumAlignBits 4

-+#define kAlignTableSize (1 << kNumAlignBits)

-+

-+#define kMatchMinLen 2

-+

-+#define IsMatch 0

-+#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax))

-+#define IsRepG0 (IsRep + kNumStates)

-+#define IsRepG1 (IsRepG0 + kNumStates)

-+#define IsRepG2 (IsRepG1 + kNumStates)

-+#define IsRep0Long (IsRepG2 + kNumStates)

-+#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax))

-+#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits))

-+#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex)

-+#define LenCoder (Align + kAlignTableSize)

-+#define RepLenCoder (LenCoder + kNumLenProbs)

-+#define Literal (RepLenCoder + kNumLenProbs)

-+

-+#if Literal != LZMA_BASE_SIZE

-+StopCompilingDueBUG

-+#endif

-+

-+int LzmaDecodeProperties(CLzmaProperties *propsRes, const unsigned char *propsData, int size)

-+{

-+  unsigned char prop0;

-+  if (size < LZMA_PROPERTIES_SIZE)

-+    return LZMA_RESULT_DATA_ERROR;

-+  prop0 = propsData[0];

-+  if (prop0 >= (9 * 5 * 5))

-+    return LZMA_RESULT_DATA_ERROR;

-+  {

-+    for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5));

-+    for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9);

-+    propsRes->lc = prop0;

-+    /*

-+    unsigned char remainder = (unsigned char)(prop0 / 9);

-+    propsRes->lc = prop0 % 9;

-+    propsRes->pb = remainder / 5;

-+    propsRes->lp = remainder % 5;

-+    */

-+  }

-+

-+  #ifdef _LZMA_OUT_READ

-+  {

-+    int i;

-+    propsRes->DictionarySize = 0;

-+    for (i = 0; i < 4; i++)

-+      propsRes->DictionarySize += (UInt32)(propsData[1 + i]) << (i * 8);

-+    if (propsRes->DictionarySize == 0)

-+      propsRes->DictionarySize = 1;

-+  }

-+  #endif

-+  return LZMA_RESULT_OK;

-+}

-+

-+#define kLzmaStreamWasFinishedId (-1)

-+

-+int LzmaDecode(CLzmaDecoderState *vs,

-+    #ifdef _LZMA_IN_CB

-+    ILzmaInCallback *InCallback,

-+    #else

-+    const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,

-+    #endif

-+    unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed)

-+{

-+  CProb *p = vs->Probs;

-+  SizeT nowPos = 0;

-+  Byte previousByte = 0;

-+  UInt32 posStateMask = (1 << (vs->Properties.pb)) - 1;

-+  UInt32 literalPosMask = (1 << (vs->Properties.lp)) - 1;

-+  int lc = vs->Properties.lc;

-+

-+  #ifdef _LZMA_OUT_READ

-+  

-+  UInt32 Range = vs->Range;

-+  UInt32 Code = vs->Code;

-+  #ifdef _LZMA_IN_CB

-+  const Byte *Buffer = vs->Buffer;

-+  const Byte *BufferLim = vs->BufferLim;

-+  #else

-+  const Byte *Buffer = inStream;

-+  const Byte *BufferLim = inStream + inSize;

-+  #endif

-+  int state = vs->State;

-+  UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3];

-+  int len = vs->RemainLen;

-+  UInt32 globalPos = vs->GlobalPos;

-+  UInt32 distanceLimit = vs->DistanceLimit;

-+

-+  Byte *dictionary = vs->Dictionary;

-+  UInt32 dictionarySize = vs->Properties.DictionarySize;

-+  UInt32 dictionaryPos = vs->DictionaryPos;

-+

-+  Byte tempDictionary[4];

-+

-+  #ifndef _LZMA_IN_CB

-+  *inSizeProcessed = 0;

-+  #endif

-+  *outSizeProcessed = 0;

-+  if (len == kLzmaStreamWasFinishedId)

-+    return LZMA_RESULT_OK;

-+

-+  if (dictionarySize == 0)

-+  {

-+    dictionary = tempDictionary;

-+    dictionarySize = 1;

-+    tempDictionary[0] = vs->TempDictionary[0];

-+  }

-+

-+  if (len == kLzmaNeedInitId)

-+  {

-+    {

-+      UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));

-+      UInt32 i;

-+      for (i = 0; i < numProbs; i++)

-+        p[i] = kBitModelTotal >> 1; 

-+      rep0 = rep1 = rep2 = rep3 = 1;

-+      state = 0;

-+      globalPos = 0;

-+      distanceLimit = 0;

-+      dictionaryPos = 0;

-+      dictionary[dictionarySize - 1] = 0;

-+      #ifdef _LZMA_IN_CB

-+      RC_INIT;

-+      #else

-+      RC_INIT(inStream, inSize);

-+      #endif

-+    }

-+    len = 0;

-+  }

-+  while(len != 0 && nowPos < outSize)

-+  {

-+    UInt32 pos = dictionaryPos - rep0;

-+    if (pos >= dictionarySize)

-+      pos += dictionarySize;

-+    outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos];

-+    if (++dictionaryPos == dictionarySize)

-+      dictionaryPos = 0;

-+    len--;

-+  }

-+  if (dictionaryPos == 0)

-+    previousByte = dictionary[dictionarySize - 1];

-+  else

-+    previousByte = dictionary[dictionaryPos - 1];

-+

-+  #else /* if !_LZMA_OUT_READ */

-+

-+  int state = 0;

-+  UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;

-+  int len = 0;

-+  const Byte *Buffer;

-+  const Byte *BufferLim;

-+  UInt32 Range;

-+  UInt32 Code;

-+

-+  #ifndef _LZMA_IN_CB

-+  *inSizeProcessed = 0;

-+  #endif

-+  *outSizeProcessed = 0;

-+

-+  {

-+    UInt32 i;

-+    UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + vs->Properties.lp));

-+    for (i = 0; i < numProbs; i++)

-+      p[i] = kBitModelTotal >> 1;

-+  }

-+  

-+  #ifdef _LZMA_IN_CB

-+  RC_INIT;

-+  #else

-+  RC_INIT(inStream, inSize);

-+  #endif

-+

-+  #endif /* _LZMA_OUT_READ */

-+

-+  while(nowPos < outSize)

-+  {

-+    CProb *prob;

-+    UInt32 bound;

-+    int posState = (int)(

-+        (nowPos 

-+        #ifdef _LZMA_OUT_READ

-+        + globalPos

-+        #endif

-+        )

-+        & posStateMask);

-+

-+    prob = p + IsMatch + (state << kNumPosBitsMax) + posState;

-+    IfBit0(prob)

-+    {

-+      int symbol = 1;

-+      UpdateBit0(prob)

-+      prob = p + Literal + (LZMA_LIT_SIZE * 

-+        (((

-+        (nowPos 

-+        #ifdef _LZMA_OUT_READ

-+        + globalPos

-+        #endif

-+        )

-+        & literalPosMask) << lc) + (previousByte >> (8 - lc))));

-+

-+      if (state >= kNumLitStates)

-+      {

-+        int matchByte;

-+        #ifdef _LZMA_OUT_READ

-+        UInt32 pos = dictionaryPos - rep0;

-+        if (pos >= dictionarySize)

-+          pos += dictionarySize;

-+        matchByte = dictionary[pos];

-+        #else

-+        matchByte = outStream[nowPos - rep0];

-+        #endif

-+        do

-+        {

-+          int bit;

-+          CProb *probLit;

-+          matchByte <<= 1;

-+          bit = (matchByte & 0x100);

-+          probLit = prob + 0x100 + bit + symbol;

-+          RC_GET_BIT2(probLit, symbol, if (bit != 0) break, if (bit == 0) break)

-+        }

-+        while (symbol < 0x100);

-+      }

-+      while (symbol < 0x100)

-+      {

-+        CProb *probLit = prob + symbol;

-+        RC_GET_BIT(probLit, symbol)

-+      }

-+      previousByte = (Byte)symbol;

-+

-+      outStream[nowPos++] = previousByte;

-+      #ifdef _LZMA_OUT_READ

-+      if (distanceLimit < dictionarySize)

-+        distanceLimit++;

-+

-+      dictionary[dictionaryPos] = previousByte;

-+      if (++dictionaryPos == dictionarySize)

-+        dictionaryPos = 0;

-+      #endif

-+      if (state < 4) state = 0;

-+      else if (state < 10) state -= 3;

-+      else state -= 6;

-+    }

-+    else             

-+    {

-+      UpdateBit1(prob);

-+      prob = p + IsRep + state;

-+      IfBit0(prob)

-+      {

-+        UpdateBit0(prob);

-+        rep3 = rep2;

-+        rep2 = rep1;

-+        rep1 = rep0;

-+        state = state < kNumLitStates ? 0 : 3;

-+        prob = p + LenCoder;

-+      }

-+      else

-+      {

-+        UpdateBit1(prob);

-+        prob = p + IsRepG0 + state;

-+        IfBit0(prob)

-+        {

-+          UpdateBit0(prob);

-+          prob = p + IsRep0Long + (state << kNumPosBitsMax) + posState;

-+