From: Jarkko Nikula Date: Mon, 23 Apr 2007 06:00:23 +0000 (+0300) Subject: ARM: OMAP: Update Nokia N800 defconfig X-Git-Tag: v2.6.21-omap1~22 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e4e27765f60751936265cedc9b612c4a3a59640;p=linux-2.6-omap-h63xx.git ARM: OMAP: Update Nokia N800 defconfig - Enable Blizzard, EAC and TSC2301 drivers - Disable support for omap_generic boards Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/configs/n800_defconfig b/arch/arm/configs/n800_defconfig index 66641846f7b..87f6c96ebf4 100644 --- a/arch/arm/configs/n800_defconfig +++ b/arch/arm/configs/n800_defconfig @@ -1,11 +1,14 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc5-omap1 -# Wed Jan 17 17:19:12 2007 +# Linux kernel version: 2.6.21-rc7-omap1 +# Mon Apr 23 08:46:31 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y @@ -15,6 +18,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -33,6 +37,7 @@ CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set +CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set @@ -41,6 +46,7 @@ CONFIG_POSIX_MQUEUE=y # CONFIG_IKCONFIG is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y @@ -120,6 +126,7 @@ CONFIG_DEFAULT_IOSCHED="noop" # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -148,6 +155,8 @@ CONFIG_OMAP_GPIO_SWITCH=y CONFIG_OMAP_STI=y CONFIG_OMAP_STI_CONSOLE=y # CONFIG_OMAP_MCBSP is not set +CONFIG_OMAP_MMU_FWK=y +CONFIG_OMAP_MBOX_FWK=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 @@ -159,7 +168,7 @@ CONFIG_OMAP_DSP=y # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set CONFIG_OMAP_DSP_TASK_MULTIOPEN=y CONFIG_OMAP_DSP_FBEXPORT=y -CONFIG_MACH_OMAP_GENERIC=y +# CONFIG_MACH_OMAP_GENERIC is not set # # OMAP Core Type @@ -174,8 +183,8 @@ CONFIG_ARCH_OMAP2420=y CONFIG_MACH_NOKIA_N800=y CONFIG_MACH_OMAP2_TUSB6010=y # CONFIG_MACH_OMAP_H4 is not set -# CONFIG_MACH_OMAP_2430SDP is not set # CONFIG_MACH_OMAP_APOLLON is not set +# CONFIG_MACH_OMAP_2430SDP is not set # # Processor Type @@ -200,6 +209,7 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +# CONFIG_OUTER_CACHE is not set # # Bus support @@ -228,9 +238,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 CONFIG_LEDS=y -# CONFIG_LEDS_TIMER is not set -# CONFIG_LEDS_CPU is not set CONFIG_ALIGNMENT_TRAP=y # @@ -241,6 +250,7 @@ CONFIG_ZBOOT_ROM_BSS=0x10200000 # CONFIG_ZBOOT_ROM is not set CONFIG_CMDLINE="root=1f03 rootfstype=jffs2" # CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set # # CPU Frequency scaling @@ -273,7 +283,7 @@ CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set -# CONFIG_APM is not set +# CONFIG_APM_EMULATION is not set # # Networking @@ -290,6 +300,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set # CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -340,6 +351,7 @@ CONFIG_NETFILTER_XTABLES=y # CONFIG_NETFILTER_XT_TARGET_MARK is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set # CONFIG_NETFILTER_XT_MATCH_DSCP is not set @@ -376,7 +388,6 @@ CONFIG_IP_NF_FILTER=y # CONFIG_IP_NF_TARGET_REJECT is not set # CONFIG_IP_NF_TARGET_LOG is not set # CONFIG_IP_NF_TARGET_ULOG is not set -# CONFIG_IP_NF_TARGET_TCPMSS is not set CONFIG_IP_NF_TARGET_IDLETIMER=y # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set @@ -438,6 +449,7 @@ CONFIG_BT_HIDP=y # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIBRF6150 is not set +# CONFIG_BT_HCIH4P is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_IEEE80211 is not set CONFIG_WIRELESS_EXT=y @@ -453,6 +465,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set # @@ -475,6 +488,7 @@ CONFIG_MTD_CMDLINE_PARTS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set @@ -547,6 +561,7 @@ CONFIG_MTD_ONENAND_OTP=y # # Plug and Play support # +# CONFIG_PNPACPI is not set # # Block devices @@ -560,7 +575,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -727,6 +741,8 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_OMAP is not set +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_KEYBOARD_TSC2301=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -739,7 +755,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_UCB1400 is not set -# CONFIG_TOUCHSCREEN_TSC2102 is not set +CONFIG_TOUCHSCREEN_TSC2301=y # CONFIG_INPUT_MISC is not set # @@ -798,7 +814,6 @@ CONFIG_OMAP_WATCHDOG=y # # CONFIG_USBPCWATCHDOG is not set # CONFIG_HW_RANDOM is not set -CONFIG_OMAP_RNG=y # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -863,13 +878,16 @@ CONFIG_SPI_MASTER=y # SPI Master Controller Drivers # # CONFIG_SPI_BITBANG is not set -# CONFIG_SPI_OMAP_UWIRE is not set CONFIG_SPI_OMAP24XX=y # # SPI Protocol Masters # -# CONFIG_TSC2102 is not set +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_TSC2101 is not set +# CONFIG_SPI_TSC2102 is not set +CONFIG_SPI_TSC2301=y +CONFIG_SPI_TSC2301_AUDIO=y # # Dallas's 1-wire bus @@ -885,6 +903,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set @@ -926,7 +945,11 @@ CONFIG_HWMON=y # # Misc devices # -# CONFIG_TIFM_CORE is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set # # LED devices @@ -965,7 +988,6 @@ CONFIG_VIDEO_V4L2=y # # CONFIG_VIDEO_ADV_DEBUG is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -# CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set @@ -979,6 +1001,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # # Radio Adapters # +# CONFIG_RADIO_TEA5761 is not set # CONFIG_USB_DSBR is not set # @@ -990,24 +1013,32 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # # Graphics support # -# CONFIG_FIRMWARE_EDID is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set # CONFIG_FB_CFB_FILLRECT is not set # CONFIG_FB_CFB_COPYAREA is not set # CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set + +# +# Frambuffer hardware drivers +# # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_VIRTUAL is not set CONFIG_FB_OMAP=y CONFIG_FB_OMAP_LCDC_EXTERNAL=y # CONFIG_FB_OMAP_LCDC_HWA742 is not set +CONFIG_FB_OMAP_LCDC_BLIZZARD=y CONFIG_FB_OMAP_MANUAL_UPDATE=y CONFIG_FB_OMAP_LCD_MIPID=y CONFIG_FB_OMAP_BOOTLOADER_INIT=y CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4 +# CONFIG_FB_VIRTUAL is not set # # Console display driver support @@ -1020,7 +1051,6 @@ CONFIG_DUMMY_CONSOLE=y # Logo configuration # # CONFIG_LOGO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound @@ -1056,12 +1086,18 @@ CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_OMAP_TSC2101 is not set # CONFIG_SND_SX1 is not set # CONFIG_SND_OMAP_TSC2102 is not set +CONFIG_SND_OMAP24XX_EAC=y # # USB devices # # CONFIG_SND_USB_AUDIO is not set +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + # # Open Sound System # @@ -1071,6 +1107,7 @@ CONFIG_SND_SUPPORT_OLD_API=y # HID Devices # CONFIG_HID=y +# CONFIG_HID_DEBUG is not set # # USB support @@ -1085,10 +1122,8 @@ CONFIG_USB_DEBUG=y # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y -# CONFIG_USB_MULTITHREAD_PROBE is not set CONFIG_USB_OTG=y CONFIG_USB_OTG_WHITELIST=y # CONFIG_USB_OTG_BLACKLIST_HUB is not set @@ -1157,6 +1192,7 @@ CONFIG_USB_HID=y # CONFIG_USB_ATI_REMOTE2 is not set # CONFIG_USB_KEYSPAN_REMOTE is not set # CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set # # USB Imaging devices @@ -1174,6 +1210,7 @@ CONFIG_USB_RTL8150=y # CONFIG_USB_USBNET_MII is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_DM9601 is not set # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=y CONFIG_USB_NET_PLUSB=y @@ -1185,6 +1222,7 @@ CONFIG_USB_NET_CDC_SUBSET=y CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set CONFIG_USB_NET_ZAURUS=y CONFIG_USB_MON=y @@ -1207,6 +1245,7 @@ CONFIG_USB_MON=y # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -1216,6 +1255,7 @@ CONFIG_USB_MON=y # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1255,11 +1295,6 @@ CONFIG_USB_ETH_RNDIS=y CONFIG_RTC_LIB=y # CONFIG_RTC_CLASS is not set -# -# Synchronous Serial Interfaces (SSI) -# -# CONFIG_OMAP_TSC2101 is not set - # # CBUS support # @@ -1272,6 +1307,7 @@ CONFIG_CBUS_RETU_USER=y CONFIG_CBUS_RETU_POWERBUTTON=y CONFIG_CBUS_RETU_RTC=y CONFIG_CBUS_RETU_WDT=y +# CONFIG_CBUS_RETU_HEADSET is not set # # File systems @@ -1444,15 +1480,16 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set @@ -1463,6 +1500,7 @@ CONFIG_DEBUG_BUGVERBOSE=y CONFIG_FRAME_POINTER=y CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set CONFIG_DEBUG_USER=y CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_LL is not set @@ -1475,6 +1513,7 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_CAPABILITIES is not set # CONFIG_SECURITY_ROOTPLUG is not set +# CONFIG_SECURITY_LOWMEM is not set # # Cryptographic options @@ -1492,4 +1531,5 @@ CONFIG_CRC32=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_PLIST=y -CONFIG_IOMAP_COPY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y