From: Michael Büsch Date: Mon, 9 Aug 2010 18:43:43 +0000 (+0000) Subject: omap24xx: Update kernel config. This also fixes module loading. X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8b934b8d898b482bc52ab6f9d1081b9a7c750d11;p=openwrt%2Fstaging%2Fblocktrron.git omap24xx: Update kernel config. This also fixes module loading. SVN-Revision: 22564 --- diff --git a/target/linux/omap24xx/config-2.6.35 b/target/linux/omap24xx/config-2.6.35 index f5a301a4ac..cf1fb7e883 100644 --- a/target/linux/omap24xx/config-2.6.35 +++ b/target/linux/omap24xx/config-2.6.35 @@ -43,16 +43,13 @@ CONFIG_ARM_UNWIND=y CONFIG_ATAGS_PROC=y CONFIG_BINFMT_MISC=y CONFIG_BITREVERSE=y +# CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_SD=y -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_BRANCH_PROFILE_NONE is not set CONFIG_BRIDGE=m CONFIG_BRIDGE_NETFILTER=y # CONFIG_BSD_PROCESS_ACCT is not set @@ -67,7 +64,7 @@ CONFIG_BT_RFCOMM=m CONFIG_BT_SCO=m CONFIG_CBUS=y CONFIG_CBUS_RETU=y -# CONFIG_CBUS_RETU_HEADSET is not set +CONFIG_CBUS_RETU_HEADSET=y CONFIG_CBUS_RETU_POWERBUTTON=y CONFIG_CBUS_RETU_RTC=y CONFIG_CBUS_RETU_USER=y @@ -78,7 +75,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootfstype=ext3,ext2,squashfs,jffs2 console=tty0 console=ttyS2,115200n8" CONFIG_CMDLINE_FORCE=y CONFIG_COMMON_CLKDEV=y -CONFIG_COMPAT_BRK=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CPU_32v6=y # CONFIG_CPU_32v6K is not set @@ -89,6 +85,11 @@ CONFIG_CPU_CACHE_VIPT=y CONFIG_CPU_COPY_V6=y CONFIG_CPU_CP15=y CONFIG_CPU_CP15_MMU=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPU_HAS_ASID=y CONFIG_CPU_HAS_PMU=y # CONFIG_CPU_ICACHE_DISABLE is not set @@ -117,26 +118,18 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_ZLIB is not set -CONFIG_CUSE=m CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_FS is not set CONFIG_DEBUG_GPIO=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DEBUG_PREEMPT=y CONFIG_DEBUG_USER=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_LZO=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DEVKMEM=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -144,7 +137,6 @@ CONFIG_DNOTIFY=y CONFIG_DUMMY_CONSOLE=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_POSIX_ACL=y @@ -193,8 +185,6 @@ CONFIG_FREEZER=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FS_XIP=y -CONFIG_FTRACE=y -CONFIG_FUSE_FS=m CONFIG_GENERIC_ACL=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -252,7 +242,6 @@ CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INITRAMFS_SOURCE="" # CONFIG_INLINE_READ_UNLOCK is not set # CONFIG_INLINE_READ_UNLOCK_IRQ is not set # CONFIG_INLINE_SPIN_UNLOCK is not set @@ -308,9 +297,8 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_GPIO=y # CONFIG_LIS3L02DQ is not set CONFIG_LLC=m -CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCK_KERNEL=y -CONFIG_LOG_BUF_SHIFT=21 +CONFIG_LOG_BUF_SHIFT=17 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_NOKIA_N800=y @@ -349,8 +337,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SPI=y CONFIG_MMC_UNSAFE_RESUME=y -CONFIG_MODULE_FORCE_LOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MSDOS_FS=y CONFIG_MTD_BLOCK2MTD=y # CONFIG_MTD_CFI is not set @@ -413,17 +399,12 @@ CONFIG_PPP_MPPE=m CONFIG_PPP_SYNC_TTY=m CONFIG_PREEMPT=y # CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_TRACER is not set CONFIG_PRINTK_TIME=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_RAMZSWAP=m CONFIG_RAMZSWAP_STATS=y -CONFIG_RD_BZIP2=y -CONFIG_RD_GZIP=y -CONFIG_RD_LZO=y -CONFIG_SCHED_DEBUG=y CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_SCSI_MOD=y diff --git a/target/linux/omap24xx/patches-2.6.35/500-cbus.patch b/target/linux/omap24xx/patches-2.6.35/500-cbus.patch index 04ab3d2a83..e490974ea0 100644 --- a/target/linux/omap24xx/patches-2.6.35/500-cbus.patch +++ b/target/linux/omap24xx/patches-2.6.35/500-cbus.patch @@ -5,7 +5,7 @@ drivers/cbus/Makefile | 14 drivers/cbus/cbus.c | 309 ++++++++++++++++ drivers/cbus/cbus.h | 36 + - drivers/cbus/retu-headset.c | 355 ++++++++++++++++++ + drivers/cbus/retu-headset.c | 356 ++++++++++++++++++ drivers/cbus/retu-pwrbutton.c | 118 ++++++ drivers/cbus/retu-rtc.c | 477 +++++++++++++++++++++++++ drivers/cbus/retu-user.c | 425 ++++++++++++++++++++++ @@ -17,7 +17,7 @@ drivers/cbus/tahvo.c | 443 +++++++++++++++++++++++ drivers/cbus/tahvo.h | 61 +++ drivers/cbus/user_retu_tahvo.h | 75 +++ - 18 files changed, 4524 insertions(+), 1 deletion(-) + 18 files changed, 4525 insertions(+), 1 deletion(-) --- /dev/null +++ linux-2.6.35/drivers/cbus/cbus.c @@ -1032,7 +1032,7 @@ +#endif /* __DRIVERS_CBUS_RETU_H */ --- /dev/null +++ linux-2.6.35/drivers/cbus/retu-headset.c -@@ -0,0 +1,355 @@ +@@ -0,0 +1,356 @@ +/** + * Retu/Vilma headset detection + * @@ -1060,6 +1060,7 @@ +#include +#include +#include ++#include + +#include "retu.h" +