[oe-commits] Martin Jansa : linux-nokia900-meego: add few modules to defconfig and reenable CMDLINE

[git version control]

Module: openembedded.git
Branch: master
Commit: 5ea1842c89fee82835c72844a77a441446ad52f6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5ea1842c89fee82835c72844a77a441446ad52f6

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri May  6 09:12:37 2011 +0200

linux-nokia900-meego: add few modules to defconfig and reenable CMDLINE

* be aware that SRCPV sorts still lower because
  4dc381db40ecd82cf885515f3733767899948484 changed branch without PE
  bump and SRCPV started from 0 again..

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/nokia900.conf                   |    2 +-
 recipes/linux/linux-nokia900-meego/defconfig |   18 ++++++++++--------
 recipes/linux/linux-nokia900-meego_git.bb    |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index 67f955e..437362b 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -97,4 +97,4 @@ module_autoload_isp1704_charger = "isp1704_charger"
 # Copied from include/omap3.inc (as we do not use linux-omap recipes):
 #
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r60"
+MACHINE_KERNEL_PR = "r61"
diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig
index 64ad739..1015bbd 100644
--- a/recipes/linux/linux-nokia900-meego/defconfig
+++ b/recipes/linux/linux-nokia900-meego/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.37 Kernel Configuration
-# Thu Apr 28 17:40:42 2011
+# Fri May  6 10:23:30 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -160,7 +160,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
 #
@@ -417,7 +417,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rw console=ttyO2,115200n8 console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2"
+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait rw console=ttyO2,115200n8 console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 quiet"
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
@@ -666,7 +666,7 @@ CONFIG_RFKILL_INPUT=y
 #
 # Generic Driver Options
 #
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
@@ -853,7 +853,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_VETH is not set
 CONFIG_MII=m
 CONFIG_PHYLIB=m
@@ -1786,8 +1786,9 @@ CONFIG_USB_FUNCTIONFS=m
 # CONFIG_USB_FUNCTIONFS_ETH is not set
 # CONFIG_USB_FUNCTIONFS_RNDIS is not set
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
@@ -2060,6 +2061,7 @@ CONFIG_INOTIFY_USER=y
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
+CONFIG_GENERIC_ACL=y
 
 #
 # Caches
@@ -2089,7 +2091,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
diff --git a/recipes/linux/linux-nokia900-meego_git.bb b/recipes/linux/linux-nokia900-meego_git.bb
index 187637a..ace0c14 100644
--- a/recipes/linux/linux-nokia900-meego_git.bb
+++ b/recipes/linux/linux-nokia900-meego_git.bb
@@ -11,7 +11,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-#CMDLINE_nokia900 = "snd-soc-rx51.hp_lim=42 snd-soc-tlv320aic3x.hp_dac_lim=6 console=tty1 root=/dev/mmcblk0p1 rootdelay=10 panic=20"
+CMDLINE_nokia900 = "root=/dev/mmcblk0p1 rootwait rw console=ttyO2,115200n8 console=tty0 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2"
 
 # Mark archs/machines that this kernel supports
 COMPATIBLE_MACHINE = "nokia900"