From f5cea44e676ae255adbbc7c4c766309ea071a5ff Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Mon, 23 May 2011 23:41:50 +0200 Subject: nokia900: move more kernel drivers that were built in the kernel(=y) to modules(=m) * JaMa: minimize defconfig with savedefconfig Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Martin Jansa --- conf/machine/nokia900.conf | 29 ++++- recipes/linux/linux-nokia900-meego/defconfig | 153 ++++++++++++++++++++------- recipes/tasks/task-base.bb | 2 +- 3 files changed, 141 insertions(+), 43 deletions(-) diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 7ea3c9c2fb..30d5d16365 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -48,6 +48,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-twl4030-pwrbutton \ kernel-module-wl1251-spi \ kernel-module-ubifs \ + kernel-module-af-packet \ + kernel-module-snd-soc-rx51 \ + kernel-module-snd-soc-tlv320aic3x \ + kernel-module-snd-soc-omap \ + kernel-module-musb-hdrc \ + kernel-module-twl4030-usb \ + kernel-module-bq27x00-battery \ + kernel-module-cmt-speech \ + kernel-module-hsi-char \ " GUI_MACHINE_CLASS = "bigscreen" @@ -90,11 +99,21 @@ ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat keyboard" -module_autoload_g_ether = "g_ether" -module_autoload_omap_ssi = "omap_ssi" -module_autoload_isp1704_charger = "isp1704_charger" - +module_autoload_rtc-twl = "rtc-twl" +module_autoload_g-nokia = "g-nokia" +module_autoload_musb-hdrc = "musb-hdrc" +module_autoload_twl4030-usb = "twl4030-usb" +module_autoload_omap-ssi = "omap-ssi" +module_autoload_isp1704-charger = "isp1704-charger" +module_autoload_bq27x00-battery = "bq27x00-battery" +module_autoload_af-packet = "af-packet" +module_autoload_snd-soc-rx51 = "snd-soc-rx51" +module_autoload_snd-soc-tlv320aic3x = "snd-soc-tlv320aic3x" +module_autoload_wl1251-spi = "wl1251-spi" +module_autoload_snd-soc-omap = "snd-soc-omap" +module_autoload_cmt-speech = "cmt-speech" +module_autoload_hsi-char = "hsi-char" # 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 = "r62" +MACHINE_KERNEL_PR = "r63" diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig index 2111b4f2bb..913b3adfef 100644 --- a/recipes/linux/linux-nokia900-meego/defconfig +++ b/recipes/linux/linux-nokia900-meego/defconfig @@ -14,7 +14,6 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_EXTRA_PASS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y @@ -62,6 +61,7 @@ CONFIG_KEXEC=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_IDLE=y CONFIG_VFP=y @@ -72,10 +72,10 @@ CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y CONFIG_PM_RUNTIME=y CONFIG_NET=y -CONFIG_PACKET=y +CONFIG_PACKET=m CONFIG_UNIX=y -CONFIG_XFRM_USER=y -CONFIG_NET_KEY=y +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -83,7 +83,11 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m # CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=m CONFIG_NETFILTER=y CONFIG_PHONET=m CONFIG_BT=m @@ -104,7 +108,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_CONNECTOR=y CONFIG_MTD=y CONFIG_MTD_CONCAT=y -CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_OOPS=y @@ -121,10 +124,7 @@ CONFIG_MISC_DEVICES=y CONFIG_CMT=m CONFIG_NETDEVICES=y CONFIG_TUN=m -CONFIG_PHYLIB=m -CONFIG_SMSC_PHY=m -CONFIG_NET_ETHERNET=y -CONFIG_SMC91X=m +CONFIG_MII=m # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set CONFIG_WL1251=m @@ -163,13 +163,13 @@ CONFIG_OMAP_SSI=m CONFIG_SSI_PROTOCOL=m CONFIG_HSI_CHAR=m CONFIG_HSI_CMT_SPEECH=m -CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TWL4030=y CONFIG_POWER_SUPPLY=m CONFIG_BATTERY_BQ27x00=m # CONFIG_BATTERY_BQ27X00_PLATFORM is not set CONFIG_CHARGER_ISP1704=m +CONFIG_HWMON=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y @@ -217,30 +217,34 @@ CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_DISPLAY_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_SOUND=y -CONFIG_SND=y +CONFIG_SOUND=m +CONFIG_SND=m +CONFIG_SND_HRTIMER=m # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set -CONFIG_SND_SOC=y -CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_RX51=y +CONFIG_SND_SOC=m +CONFIG_SND_OMAP_SOC=m +CONFIG_SND_OMAP_SOC_RX51=m # CONFIG_HID_SUPPORT is not set -CONFIG_USB=y +CONFIG_USB=m # CONFIG_USB_DEVICE_CLASS is not set -CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_PERIPHERAL=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_GADGET=y +CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set CONFIG_USB_GADGETFS=m CONFIG_USB_FUNCTIONFS=m CONFIG_USB_FILE_STORAGE=m CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_NOKIA=m -CONFIG_TWL4030_USB=y +CONFIG_TWL4030_USB=m CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_OMAP_HS=y @@ -249,8 +253,11 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_LP5523=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_RTC_CLASS=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_RTC_CLASS=m CONFIG_RTC_DRV_TWL4030=m CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set @@ -272,30 +279,102 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y CONFIG_ROOT_NFS=y +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +CONFIG_CIFS_STATS2=y +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_DEBUG2=y +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_EXPERIMENTAL=y CONFIG_PARTITION_ADVANCED=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y +CONFIG_NLS=y +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=y +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -# CONFIG_SCHED_DEBUG is not set -CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y -# CONFIG_DEBUG_PREEMPT is not set +CONFIG_DEBUG_FS=y # CONFIG_BKL is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_PROFILER=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_ZLIB=m # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRC_CCITT=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=y -CONFIG_CRC7=y +CONFIG_CRYPTO_DEV_OMAP_SHAM=m +CONFIG_CRYPTO_DEV_OMAP_AES=m +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb index fdb0fb5628..8157db07ad 100644 --- a/recipes/tasks/task-base.bb +++ b/recipes/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r96" +PR = "r97" inherit task -- cgit 1.2.3-korg