atheros: add fstype to combined image file name

[openwrt.git] / target / linux / pxa / config-default

diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 08083c7..f7056d6 100644 (file)
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -5,32 +5,30 @@ CONFIG_ALIGNMENT_HANDLING=0x2
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_APM_EMULATION=m
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_APM_EMULATION=m
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

-CONFIG_ARCH_GUMSTIX=y

 # CONFIG_ARCH_GUMSTIX_F is not set
 # CONFIG_ARCH_GUMSTIX_ORIG is not set
 CONFIG_ARCH_GUMSTIX_VERDEX=y
 # CONFIG_ARCH_GUMSTIX_F is not set
 # CONFIG_ARCH_GUMSTIX_ORIG is not set
 CONFIG_ARCH_GUMSTIX_VERDEX=y

+CONFIG_ARCH_GUMSTIX=y

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_LUBBOCK is not set
 CONFIG_ARCH_MTD_XIP=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_LUBBOCK is not set
 CONFIG_ARCH_MTD_XIP=y

-CONFIG_ARCH_PXA=y

 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_ARCH_PXA_IDP is not set

-CONFIG_ARM=y
+CONFIG_ARCH_PXA=y

 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARM_THUMB is not set

+CONFIG_ARM=y

 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ATA=m
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ATA=m

-# CONFIG_ATA_NONSTANDARD is not set

 # CONFIG_ATM is not set
 # CONFIG_ATM is not set

-CONFIG_BASE_SMALL=0

 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_HD is not set

-CONFIG_BLK_DEV_IDE=m

 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDEDMA is not set
 CONFIG_BLK_DEV_IDECS=m
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDEDMA is not set

+CONFIG_BLK_DEV_IDE=m

 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BONDING is not set
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_BLK_DEV_INITRD is not set
 # CONFIG_BONDING is not set
 # CONFIG_BSD_DISKLABEL is not set


@@ -38,36 +36,33 @@ CONFIG_BLK_DEV_IDEDISK=m
 CONFIG_BT_GUMSTIX=m
 # CONFIG_CIFS is not set
 CONFIG_CMDLINE="console=ttyS0,115200n8"
 CONFIG_BT_GUMSTIX=m
 # CONFIG_CIFS is not set
 CONFIG_CMDLINE="console=ttyS0,115200n8"

-CONFIG_CPU_32=y

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32v5=y

+CONFIG_CPU_32=y

 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y

-CONFIG_CPU_CP15=y

 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15_MMU=y

+CONFIG_CPU_CP15=y

 # CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set

-# CONFIG_CPU_FREQ is not set

 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_USER is not set
 # CONFIG_DM9000 is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPOLL is not set
 # CONFIG_EXT2_FS is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DM9000 is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_EPOLL is not set
 # CONFIG_EXT2_FS is not set

-CONFIG_FB=y

 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y

-CONFIG_FB_PXA=y

 # CONFIG_FB_PXA_ALPS_CDOLLAR is not set
 # CONFIG_FB_PXA_NONEOFTHEABOVE is not set
 CONFIG_FB_PXA_PARAMETERS=y
 CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C=y
 # CONFIG_FB_PXA_SHARP_LQ043_PSP is not set
 # CONFIG_FB_PXA_ALPS_CDOLLAR is not set
 # CONFIG_FB_PXA_NONEOFTHEABOVE is not set
 CONFIG_FB_PXA_PARAMETERS=y
 CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C=y
 # CONFIG_FB_PXA_SHARP_LQ043_PSP is not set

+CONFIG_FB_PXA=y

 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_TILEBLITTING=y

+CONFIG_FB=y

 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_EDID is not set

-CONFIG_FONTS=y

 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_6x11=y
 # CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_6x11=y
 # CONFIG_FONT_7x14 is not set


@@ -78,10 +73,11 @@ CONFIG_FONT_6x11=y
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_SUN8x16 is not set

+CONFIG_FONTS=y

 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set

-CONFIG_FRAMEBUFFER_CONSOLE=y

 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

+CONFIG_FRAMEBUFFER_CONSOLE=y

 CONFIG_FRAME_POINTER=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_GPIO=y


@@ -90,31 +86,31 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HERMES is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HERMES is not set

-# CONFIG_HFSPLUS_FS is not set

 # CONFIG_HFS_FS is not set
 # CONFIG_HFS_FS is not set

+# CONFIG_HFSPLUS_FS is not set

 CONFIG_HID=m
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HID=m
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set

-CONFIG_I2C=m

 # CONFIG_I2C_ALGOBIT is not set
 CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_ALGOBIT is not set
 CONFIG_I2C_CHARDEV=m

+CONFIG_I2C=m

 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_SLAVE=y
 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_SLAVE=y

-CONFIG_IDE=m

 # CONFIG_IDE_ARM is not set
 CONFIG_IDE_GENERIC=m
 # CONFIG_IDE_ARM is not set
 CONFIG_IDE_GENERIC=m

+CONFIG_IDE=m

 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set
 # CONFIG_INET_DIAG is not set

-CONFIG_INOTIFY=y

 CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY_USER=y

-CONFIG_INPUT=y
+CONFIG_INOTIFY=y

 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TSDEV=m
 CONFIG_INPUT_TSDEV_SCREEN_X=480
 CONFIG_INPUT_TSDEV_SCREEN_Y=272
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TSDEV=m
 CONFIG_INPUT_TSDEV_SCREEN_X=480
 CONFIG_INPUT_TSDEV_SCREEN_Y=272

+CONFIG_INPUT=y

 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 # CONFIG_ISDN is not set
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 # CONFIG_ISDN is not set


@@ -128,19 +124,18 @@ CONFIG_KEYBOARD_ATKBD=m
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_LLC2 is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_LLC2 is not set

-CONFIG_LOGO=y

 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set

+CONFIG_LOGO=y

 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set

-CONFIG_MMC=y

 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK=y

-# CONFIG_MMC_DEBUG is not set

 CONFIG_MMC_PXA=y
 CONFIG_MMC_PXA=y

+CONFIG_MMC=y

 CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 CONFIG_MOUSE_PS2=m
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set


@@ -158,47 +153,46 @@ CONFIG_MTD_GUMSTIX=y
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_NO_IOPORT is not set

-# CONFIG_NVRAM is not set

 # CONFIG_OUTER_CACHE is not set
 # CONFIG_PACKET is not set
 CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PLATFORM is not set
 CONFIG_PCCARD=m
 # CONFIG_OUTER_CACHE is not set
 # CONFIG_PACKET is not set
 CONFIG_PATA_PCMCIA=m
 # CONFIG_PATA_PLATFORM is not set
 CONFIG_PCCARD=m

-CONFIG_PCMCIA=m

 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_LOAD_CIS=y

+CONFIG_PCMCIA=m

 CONFIG_PCMCIA_PXA2XX=m
 CONFIG_PCMCIA_PXA2XX=m

-CONFIG_PM=y

 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set

+CONFIG_PM=y

 # CONFIG_PNPACPI is not set
 # CONFIG_PNPACPI is not set

-CONFIG_PROC_GPIO=m

 # CONFIG_PROC_GPIO_DEBUG is not set
 # CONFIG_PROC_GPIO_DEBUG is not set

+CONFIG_PROC_GPIO=m

 CONFIG_PXA27x=y
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_SA1100_WATCHDOG=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SERIAL_8250 is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_SA1100_WATCHDOG=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SERIAL_8250 is not set

-CONFIG_SERIAL_PXA=y

 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_PXA_CONSOLE=y

-CONFIG_SERIO=m
+CONFIG_SERIAL_PXA=y

 CONFIG_SERIO_LIBPS2=m
 CONFIG_SERIO_LIBPS2=m

+CONFIG_SERIO=m

 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=m
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=m

-CONFIG_SMC911X=m

 CONFIG_SMC911X_GUMSTIX=m
 CONFIG_SMC911X_GUMSTIX=m

-CONFIG_SMC91X=m
+CONFIG_SMC911X=m

 CONFIG_SMC91X_GUMSTIX=m
 CONFIG_SMC91X_GUMSTIX=m

+CONFIG_SMC91X=m

 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_PXA2XX_AC97=m
 CONFIG_SND_PXA2XX_PCM=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_PXA2XX_AC97=m
 CONFIG_SND_PXA2XX_PCM=m

-CONFIG_SND_PXA2XX_SOC=m

 CONFIG_SND_PXA2XX_SOC_AC97=m
 CONFIG_SND_PXA2XX_SOC_GUMSTIX=m
 CONFIG_SND_PXA2XX_SOC_AC97=m
 CONFIG_SND_PXA2XX_SOC_GUMSTIX=m

-CONFIG_SND_SOC=m
+CONFIG_SND_PXA2XX_SOC=m

 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=m

+CONFIG_SND_SOC=m

 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096


@@ -209,7 +203,6 @@ CONFIG_TOUCHSCREEN_UCB1400=m
 CONFIG_UID16=y
 CONFIG_UNIX=m
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UID16=y
 CONFIG_UNIX=m
 # CONFIG_UNUSED_SYMBOLS is not set

-# CONFIG_USBPCWATCHDOG is not set

 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_GTCO is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_GTCO is not set


@@ -217,6 +210,7 @@ CONFIG_UNIX=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m

+# CONFIG_USBPCWATCHDOG is not set

 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set


@@ -228,7 +222,6 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set

-# CONFIG_USB_SUSPEND is not set

 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_YEALINK is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_YEALINK is not set


@@ -236,9 +229,9 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_VGA_CONSOLE is not set
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_VLAN_8021Q is not set

-CONFIG_VT=y

 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y

+CONFIG_VT=y

 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set