From 5c4ef9286d53263764a46a7d0f46870ef02bc487 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 20 May 2006 15:49:36 +0000 Subject: linux-ezx: we no longer keep own copies of the patches, refresh defconfigs --- packages/linux/linux-ezx/defconfig-e680 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'packages/linux/linux-ezx/defconfig-e680') diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680 index d59985244e..560530a1ce 100644 --- a/packages/linux/linux-ezx/defconfig-e680 +++ b/packages/linux/linux-ezx/defconfig-e680 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16.5 -# Thu May 4 17:12:53 2006 +# Linux kernel version: 2.6.16.13 +# Thu May 18 19:40:25 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -19,7 +19,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="-ezx3" +CONFIG_LOCALVERSION="-ezx6" # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y @@ -116,11 +116,13 @@ CONFIG_PXA_EZX=y # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set # CONFIG_PXA_SHARPSL is not set -CONFIG_PXA_EZX_E680=y -# CONFIG_PXA_EZX_A780 is not set +# CONFIG_PXA_EZX_E680 is not set +CONFIG_PXA_EZX_A780=y CONFIG_PXA27x=y CONFIG_IWMMXT=y -CONFIG_PXA_SSP=y +CONFIG_PXA_SPI=y +CONFIG_PXA_EZX_PCAP=y +CONFIG_PXA_EZX_PCAP_EMU=m # # Processor Type @@ -169,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=tty0 console=ttyS2,115200n8" +CONFIG_CMDLINE="mem=32M root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=1 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=ttyS2,115200n8 console=tty0" # CONFIG_XIP_KERNEL is not set # @@ -236,7 +238,7 @@ CONFIG_TCP_CONG_BIC=y # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set -CONFIG_IPV6=y +CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -692,11 +694,12 @@ CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m +# CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_TOUCHSCREEN_PCAP=m # CONFIG_INPUT_MISC is not set # -- cgit v1.2.3