atheros: add fstype to combined image file name

[openwrt.git] / target / linux / ps3 / config-2.6.30

diff --git a/target/linux/ps3/config-2.6.30 b/target/linux/ps3/config-2.6.30
index cd88b80..565e807 100644 (file)
--- a/target/linux/ps3/config-2.6.30
+++ b/target/linux/ps3/config-2.6.30
@@ -18,16 +18,15 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ARPD is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ARPD is not set
 CONFIG_AUDIT_ARCH=y

-CONFIG_BASE_SMALL=0

 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_LOOP=y

-CONFIG_BLK_DEV_RAM=y

 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65535
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65535

+CONFIG_BLK_DEV_RAM=y

 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SD=y

-CONFIG_BLK_DEV_SR=y

 # CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_BLK_DEV_SR_VENDOR is not set

+CONFIG_BLK_DEV_SR=y

 CONFIG_BLOCK_COMPAT=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
 CONFIG_BLOCK_COMPAT=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y


@@ -36,14 +35,12 @@ CONFIG_BOUNCE=y
 # CONFIG_CGROUP_SCHED is not set
 CONFIG_CMDLINE=""
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CGROUP_SCHED is not set
 CONFIG_CMDLINE=""
 CONFIG_CMDLINE_BOOL=y

-CONFIG_COMPAT=y

 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_BRK=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_BRK=y

+CONFIG_COMPAT=y

 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONSOLE_TRANSLATIONS=y

-# CONFIG_CPU_FREQ is not set

 CONFIG_CRC16=y
 # CONFIG_CRYPTO is not set
 CONFIG_CRC16=y
 # CONFIG_CRYPTO is not set

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y


@@ -57,33 +54,33 @@ CONFIG_ELF_CORE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT4DEV_COMPAT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT4DEV_COMPAT is not set

-CONFIG_EXT4_FS=y

 # CONFIG_EXT4_FS_XATTR is not set
 # CONFIG_EXT4_FS_XATTR is not set

+CONFIG_EXT4_FS=y

 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_FAT_FS=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_FAT_FS=y

-CONFIG_FB=y
-CONFIG_FB_PS3=y

 CONFIG_FB_PS3_DEFAULT_SIZE_M=9
 CONFIG_FB_PS3_DEFAULT_SIZE_M=9

+CONFIG_FB_PS3=y

 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_SYS_IMAGEBLIT=y

+CONFIG_FB=y

 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FLATMEM_MANUAL is not set

-# CONFIG_FONTS is not set

 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y

+# CONFIG_FONTS is not set

 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FORCE_MAX_ZONEORDER=13

-CONFIG_FRAMEBUFFER_CONSOLE=y

 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

+CONFIG_FRAMEBUFFER_CONSOLE=y

 CONFIG_FRAME_WARN=2048
 # CONFIG_FSL_ULI1575 is not set
 CONFIG_GELIC_NET=y
 # CONFIG_GELIC_WIRELESS is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_FRAME_WARN=2048
 # CONFIG_FSL_ULI1575 is not set
 CONFIG_GELIC_NET=y
 # CONFIG_GELIC_WIRELESS is not set
 CONFIG_GENERIC_BUG=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y


@@ -119,7 +116,6 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_SYSCALL_WRAPPERS=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_SYSCALL_WRAPPERS=y

-CONFIG_HID=y

 CONFIG_HID_APPLE=y
 CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_BELKIN=y
 CONFIG_HID_CHERRY=y


@@ -129,39 +125,39 @@ CONFIG_HID_MICROSOFT=y
 CONFIG_HID_SONY=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID_SONY=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_SUPPORT=y

+CONFIG_HID=y

 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HUGETLBFS is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HUGETLBFS is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set

-CONFIG_HZ=250

 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_100 is not set

+CONFIG_HZ=250

 CONFIG_HZ_250=y
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 CONFIG_INITRAMFS_ROOT_GID=500
 CONFIG_INITRAMFS_ROOT_UID=500
 CONFIG_INITRAMFS_ROOT_GID=500
 CONFIG_INITRAMFS_ROOT_UID=500

-CONFIG_INOTIFY=y

 CONFIG_INOTIFY_USER=y
 CONFIG_INOTIFY_USER=y

-CONFIG_INPUT=y
+CONFIG_INOTIFY=y

 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_JOYSTICK=y

-CONFIG_INPUT_MOUSEDEV=y

 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT=y

 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_VMERGE is not set
 # CONFIG_INPUT_YEALINK is not set
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_VMERGE is not set

-# CONFIG_IPIC is not set

 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set

+# CONFIG_IPIC is not set

 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_MULTICAST is not set

-# CONFIG_IRQSTACKS is not set

 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_IRQ_PER_CPU=y

+# CONFIG_IRQSTACKS is not set

 CONFIG_ISA_DMA_API=y
 # CONFIG_ISDN is not set
 CONFIG_ISO9660_FS=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISDN is not set
 CONFIG_ISO9660_FS=y

-CONFIG_JBD=y

 CONFIG_JBD2=y
 CONFIG_JBD2=y

+CONFIG_JBD=y

 # CONFIG_JOYSTICK_A3D is not set
 # CONFIG_JOYSTICK_ADI is not set
 # CONFIG_JOYSTICK_ANALOG is not set
 # CONFIG_JOYSTICK_A3D is not set
 # CONFIG_JOYSTICK_ADI is not set
 # CONFIG_JOYSTICK_ANALOG is not set


@@ -187,11 +183,11 @@ CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y
 # CONFIG_LEDS_TRIGGERS is not set
 CONFIG_LOCK_KERNEL=y
 CONFIG_KEXEC=y
 # CONFIG_LEDS_TRIGGERS is not set
 CONFIG_LOCK_KERNEL=y

-# CONFIG_LOGO is not set

 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_LOG_BUF_SHIFT=15

+# CONFIG_LOGO is not set

 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MACINTOSH_DRIVERS is not set

-CONFIG_MEMORY_HOTPLUG=y

 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y

+CONFIG_MEMORY_HOTPLUG=y

 # CONFIG_MEMORY_HOTREMOVE is not set
 CONFIG_MIGRATION=y
 # CONFIG_MINI_FO is not set
 # CONFIG_MEMORY_HOTREMOVE is not set
 CONFIG_MIGRATION=y
 # CONFIG_MINI_FO is not set


@@ -201,35 +197,35 @@ CONFIG_MIGRATION=y
 # CONFIG_MPIC_WEIRD is not set
 CONFIG_MSDOS_FS=y
 # CONFIG_MTD is not set
 # CONFIG_MPIC_WEIRD is not set
 CONFIG_MSDOS_FS=y
 # CONFIG_MTD is not set

+# CONFIG_NET_ETHERNET is not set

 # CONFIG_NETFILTER is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set

-# CONFIG_NET_ETHERNET is not set
-CONFIG_NLS=y

 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y

+CONFIG_NLS=y

 CONFIG_NR_CPUS=2
 # CONFIG_NUMA is not set
 CONFIG_NR_CPUS=2
 # CONFIG_NUMA is not set

-CONFIG_OF=y

 CONFIG_OF_DEVICE=y
 CONFIG_OF_DEVICE=y

+CONFIG_OF=y

 # CONFIG_PACKET_MMAP is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCI_DOMAINS is not set
 # CONFIG_PACKET_MMAP is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCI_DOMAINS is not set

+# CONFIG_PCI is not set

 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PCI_SYSCALL is not set

-CONFIG_PHYSICAL_START=0x00000000

 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PHYS_ADDR_T_64BIT=y

+CONFIG_PHYSICAL_START=0x00000000

 CONFIG_POWER3=y
 CONFIG_POWER3=y

-CONFIG_POWER4=y

 # CONFIG_POWER4_ONLY is not set
 # CONFIG_POWER4_ONLY is not set

-CONFIG_PPC=y
+CONFIG_POWER4=y

 CONFIG_PPC64=y
 # CONFIG_PPC_970_NAP is not set
 CONFIG_PPC_BOOK3S=y
 CONFIG_PPC64=y
 # CONFIG_PPC_970_NAP is not set
 CONFIG_PPC_BOOK3S=y

-CONFIG_PPC_CELL=y

 # CONFIG_PPC_CELLEB is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_CELL_QPACE is not set
 # CONFIG_PPC_CELLEB is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_CELL_QPACE is not set

+CONFIG_PPC_CELL=y

 # CONFIG_PPC_CLOCK is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_CLOCK is not set
 # CONFIG_PPC_DCR_MMIO is not set
 # CONFIG_PPC_DCR_NATIVE is not set


@@ -243,17 +239,18 @@ CONFIG_PPC_FPU=y
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_MM_SLICES is not set
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_MM_SLICES is not set
 # CONFIG_PPC_MPC106 is not set

-CONFIG_PPC_OF=y

 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

+CONFIG_PPC_OF=y

 # CONFIG_PPC_PASEMI is not set
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_PS3=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_RTAS is not set
 # CONFIG_PPC_PASEMI is not set
 CONFIG_PPC_PCI_CHOICE=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_PS3=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_RTAS is not set

-CONFIG_PPC_STD_MMU=y

 CONFIG_PPC_STD_MMU_64=y
 CONFIG_PPC_STD_MMU_64=y

+CONFIG_PPC_STD_MMU=y

 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_PPC_UDBG_16550 is not set

+CONFIG_PPC=y

 # CONFIG_PQ2ADS is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_PQ2ADS is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y


@@ -277,17 +274,17 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCHED_SMT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCHED_SMT is not set

-CONFIG_SCSI=y

 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_PROC_FS is not set
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_PROC_FS is not set

+CONFIG_SCSI=y

 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SMP=y
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SMP=y

-CONFIG_SPARSEMEM=y

 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_MANUAL=y

-# CONFIG_SPARSEMEM_VMEMMAP is not set

 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

+# CONFIG_SPARSEMEM_VMEMMAP is not set
+CONFIG_SPARSEMEM=y

 # CONFIG_SPU_BASE is not set
 # CONFIG_SPU_FS is not set
 # CONFIG_SQUASHFS is not set
 # CONFIG_SPU_BASE is not set
 # CONFIG_SPU_FS is not set
 # CONFIG_SQUASHFS is not set


@@ -299,18 +296,16 @@ CONFIG_SYSVIPC_COMPAT=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TUNE_CELL=y
 # CONFIG_U3_DART is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TUNE_CELL=y
 # CONFIG_U3_DART is not set

-CONFIG_USB=y

 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y

-CONFIG_USB_EHCI_HCD=y

 CONFIG_USB_EHCI_HCD_PPC_OF=y
 CONFIG_USB_EHCI_HCD_PPC_OF=y

+CONFIG_USB_EHCI_HCD=y

 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_HID=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 CONFIG_USB_HID=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y

-CONFIG_USB_OHCI_HCD=y

 # CONFIG_USB_OHCI_HCD_PPC_OF is not set
 # CONFIG_USB_OHCI_HCD_PPC_OF is not set

-CONFIG_USB_STORAGE=y
+CONFIG_USB_OHCI_HCD=y

 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
 # CONFIG_USB_STORAGE_ALAUDA is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set


@@ -319,9 +314,11 @@ CONFIG_USB_STORAGE=y
 # 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_STORAGE=y

 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUPPORT=y

-CONFIG_USER_SCHED=y
+CONFIG_USB=y

 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y

+CONFIG_USER_SCHED=y

 CONFIG_VFAT_FS=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_VFAT_FS=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y


@@ -329,9 +326,9 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VSX is not set
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VSX 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_WATCHDOG is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN_80211 is not set