From 1dfa6cffb1bb04386aa4443d37b51ed398181096 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 22 Aug 2010 23:22:08 +0000 Subject: [PATCH] refresh config SVN-Revision: 22777 --- target/linux/xburst/config-2.6.35 | 51 +++++++++++++---------- target/linux/xburst/qi_lb60/config-2.6.35 | 7 ---- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/target/linux/xburst/config-2.6.35 b/target/linux/xburst/config-2.6.35 index 567ed6a2e15..62052f438ff 100644 --- a/target/linux/xburst/config-2.6.35 +++ b/target/linux/xburst/config-2.6.35 @@ -1,3 +1,4 @@ + CONFIG_32BIT=y # CONFIG_64BIT is not set # CONFIG_ALCHEMY_GPIO_INDIRECT is not set @@ -76,6 +77,7 @@ CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_IMAGEBLIT=y CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set +CONFIG_FONTS=y # CONFIG_FONT_10x18 is not set # CONFIG_FONT_6x11 is not set # CONFIG_FONT_7x14 is not set @@ -86,19 +88,11 @@ CONFIG_FB=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_SUN12x22 is not set CONFIG_FONT_SUN8x16=y -CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=12 +# CONFIG_FRAMEBUFFER_CONSOLE is not set # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FRAMEBUFFER_CONSOLE is not set CONFIG_FREEZER=y -# CONFIG_INLINE_READ_UNLOCK is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -CONFIG_INOTIFY_USER=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y @@ -126,9 +120,17 @@ CONFIG_HAVE_PWM=y # CONFIG_HIGH_RES_TIMERS is not set CONFIG_HW_CONSOLE=y # CONFIG_HW_RANDOM is not set +# CONFIG_INLINE_READ_UNLOCK is not set +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +# CONFIG_INLINE_SPIN_UNLOCK is not set +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +# CONFIG_INLINE_WRITE_UNLOCK is not set +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +CONFIG_INOTIFY_USER=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_GPIO_BUTTONS is not set CONFIG_INPUT_KEYBOARD=y +# CONFIG_INPUT_PWM_BEEPER is not set CONFIG_INPUT=y CONFIG_IRQ_CPU=y CONFIG_JBD=y @@ -136,8 +138,6 @@ CONFIG_JBD=y # CONFIG_JZ4740_N516 is not set # CONFIG_JZ4740_N526 is not set # CONFIG_JZ4740_QI_LB60 is not set -CONFIG_JZRISC=y -CONFIG_JZSOC=y CONFIG_KALLSYMS=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_GPIO is not set @@ -157,14 +157,14 @@ CONFIG_KALLSYMS=y # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set # CONFIG_LEDS_PWM is not set -CONFIG_LEGACY_PTY_COUNT=2 CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=2 CONFIG_LOCK_KERNEL=y +# CONFIG_LOGO is not set # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_OPENWRT_CLUT224 is not set -# CONFIG_LOGO is not set # CONFIG_LOONGSON_MC146818 is not set CONFIG_LOONGSON_UART_BASE=y CONFIG_LZO_COMPRESS=y @@ -172,11 +172,12 @@ CONFIG_LZO_DECOMPRESS=y # CONFIG_MACH_ALCHEMY is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set -CONFIG_MACH_JZ=y +CONFIG_MACH_JZ4740=y # CONFIG_MACH_LOONGSON is not set # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set +# CONFIG_MFD_JZ4740_ADC is not set # CONFIG_MIKROTIK_RB532 is not set # CONFIG_MINI_FO is not set # CONFIG_MIPS_COBALT is not set @@ -192,7 +193,7 @@ CONFIG_MIPS=y # CONFIG_MMC_ATMELMCI is not set # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_BLOCK=y -CONFIG_MMC_JZ=y +CONFIG_MMC_JZ4740=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC=y # CONFIG_MTD_CFI is not set @@ -200,18 +201,19 @@ CONFIG_MMC=y CONFIG_MTD_NAND_JZ4740=y # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_SM_COMMON is not set CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI=y -# CONFIG_MTD_SM_COMMON is not set # CONFIG_N516_LPC is not set CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NETDEV_1000 is not set +# CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NET_ETHERNET is not set # CONFIG_NET_SCHED is not set -# CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NEW_LEDS is not set CONFIG_NLS_ASCII=y CONFIG_NLS_CODEPAGE_1250=y @@ -278,8 +280,8 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_CMOS is not set CONFIG_RTC_DRV_JZ4740=y CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_SCSI_MOD=y # CONFIG_SCSI_DMA is not set +CONFIG_SCSI_MOD=y # CONFIG_SDIO_UART is not set # CONFIG_SENSORS_JZ4740 is not set # CONFIG_SERIAL_8250_EXTENDED is not set @@ -295,16 +297,16 @@ CONFIG_SCSI_MOD=y # CONFIG_SIBYTE_RHONE is not set # CONFIG_SIBYTE_SENTOSA is not set # CONFIG_SIBYTE_SWARM is not set -# CONFIG_SND_SOC_ALL_CODECS is not set -# CONFIG_SND_SOC_JZ4740 is not set # CONFIG_SND_JZ4740_SOC_N516 is not set # CONFIG_SND_JZ4740_SOC_N526 is not set # CONFIG_SND_JZ4740_SOC_QI_LB60 is not set -CONFIG_MACH_JZ4740=y +# CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SND_SOC_JZ4740 is not set # CONFIG_SPI_SPIDEV is not set # CONFIG_SQUASHFS is not set # CONFIG_STAGING is not set CONFIG_SUSPEND_FREEZER=y +CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y # CONFIG_SYN_COOKIES is not set CONFIG_SYS_HAS_CPU_MIPS32_R1=y @@ -318,8 +320,8 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y # CONFIG_UBIFS_FS_DEBUG is not set CONFIG_UBIFS_FS_LZO=y # CONFIG_UBIFS_FS_XATTR is not set -CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_FS=y # CONFIG_USB_ARCH_HAS_EHCI is not set CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -330,6 +332,7 @@ CONFIG_USB_ETH_RNDIS=y CONFIG_USB_ETH=y # CONFIG_USB_FILE_STORAGE is not set # CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set @@ -338,7 +341,6 @@ CONFIG_USB_ETH=y # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_GADGET_DUMMY_HCD is not set -# CONFIG_USB_GADGETFS is not set # CONFIG_USB_GADGET_FSL_QE is not set # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_GOKU is not set @@ -358,8 +360,10 @@ CONFIG_USB_GADGET_JZ4740=y CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET=y +# CONFIG_USB_G_HID is not set # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_G_WEBCAM is not set CONFIG_USB_JZ4740=y # CONFIG_USB_MIDI_GADGET is not set CONFIG_USB_SUPPORT=y @@ -373,3 +377,4 @@ CONFIG_VT=y # CONFIG_WATCHDOG is not set # CONFIG_WLAN_80211 is not set CONFIG_ZONE_DMA_FLAG=0 + diff --git a/target/linux/xburst/qi_lb60/config-2.6.35 b/target/linux/xburst/qi_lb60/config-2.6.35 index 3673ed598c5..f313550ad59 100644 --- a/target/linux/xburst/qi_lb60/config-2.6.35 +++ b/target/linux/xburst/qi_lb60/config-2.6.35 @@ -1,5 +1,4 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BATTERY_JZ4740=y CONFIG_FB_JZ4740=y # CONFIG_FB_TMIO is not set CONFIG_FRAMEBUFFER_CONSOLE=y @@ -10,15 +9,9 @@ CONFIG_KEYBOARD_MATRIX=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_ILI8960=y CONFIG_LOGO=y -CONFIG_LOGO_OPENWRT_CLUT224=y CONFIG_MFD_CORE=y CONFIG_MFD_JZ4740_ADC=y -CONFIG_MMC_JZ4740=y -CONFIG_MTD_NAND_ECC=y CONFIG_SPI=y CONFIG_SPI_BITBANG=y CONFIG_SPI_GPIO=y CONFIG_SPI_MASTER=y -CONFIG_SUSPEND_NVS=y -# CONFIG_USB_G_HID is not set -# CONFIG_USB_G_WEBCAM is not set -- 2.30.2