Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

at91sam9263: merge all boards defconfig into only one

Tested on at91sam9263ek

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Grégory Hermant <gregory.hermant@calao-systems.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>

+73 -221
+73 -11
arch/arm/configs/at91sam9263ek_defconfig arch/arm/configs/at91sam9263_defconfig
··· 1 1 CONFIG_EXPERIMENTAL=y 2 2 # CONFIG_LOCALVERSION_AUTO is not set 3 + CONFIG_KERNEL_LZMA=y 3 4 # CONFIG_SWAP is not set 4 5 CONFIG_SYSVIPC=y 6 + CONFIG_IKCONFIG=y 7 + CONFIG_IKCONFIG_PROC=y 5 8 CONFIG_LOG_BUF_SHIFT=14 6 - CONFIG_BLK_DEV_INITRD=y 9 + CONFIG_NAMESPACES=y 10 + CONFIG_EMBEDDED=y 7 11 CONFIG_SLAB=y 8 12 CONFIG_MODULES=y 9 13 CONFIG_MODULE_UNLOAD=y ··· 17 13 CONFIG_ARCH_AT91=y 18 14 CONFIG_ARCH_AT91SAM9263=y 19 15 CONFIG_MACH_AT91SAM9263EK=y 16 + CONFIG_MACH_USB_A9263=y 17 + CONFIG_MACH_NEOCORE926=y 20 18 CONFIG_MTD_AT91_DATAFLASH_CARD=y 21 19 # CONFIG_ARM_THUMB is not set 20 + CONFIG_AEABI=y 21 + # CONFIG_OABI_COMPAT is not set 22 22 CONFIG_ZBOOT_ROM_TEXT=0x0 23 23 CONFIG_ZBOOT_ROM_BSS=0x0 24 24 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" 25 - CONFIG_FPE_NWFPE=y 25 + CONFIG_AUTO_ZRELADDR=y 26 26 CONFIG_NET=y 27 27 CONFIG_PACKET=y 28 28 CONFIG_UNIX=y 29 + CONFIG_NET_KEY=y 29 30 CONFIG_INET=y 31 + CONFIG_IP_MULTICAST=y 32 + CONFIG_IP_ADVANCED_ROUTER=y 33 + CONFIG_IP_ROUTE_VERBOSE=y 30 34 CONFIG_IP_PNP=y 35 + CONFIG_IP_PNP_DHCP=y 31 36 CONFIG_IP_PNP_BOOTP=y 32 37 CONFIG_IP_PNP_RARP=y 38 + CONFIG_NET_IPIP=y 39 + CONFIG_IP_MROUTE=y 40 + CONFIG_IP_PIMSM_V1=y 41 + CONFIG_IP_PIMSM_V2=y 33 42 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set 34 43 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 35 44 # CONFIG_INET_XFRM_MODE_BEET is not set 36 45 # CONFIG_INET_LRO is not set 37 46 # CONFIG_INET_DIAG is not set 38 - # CONFIG_IPV6 is not set 47 + CONFIG_IPV6=y 39 48 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40 49 CONFIG_MTD=y 41 50 CONFIG_MTD_PARTITIONS=y 42 51 CONFIG_MTD_CMDLINE_PARTS=y 43 52 CONFIG_MTD_CHAR=y 44 53 CONFIG_MTD_BLOCK=y 54 + CONFIG_NFTL=y 55 + CONFIG_NFTL_RW=y 45 56 CONFIG_MTD_DATAFLASH=y 57 + CONFIG_MTD_BLOCK2MTD=y 46 58 CONFIG_MTD_NAND=y 47 59 CONFIG_MTD_NAND_ATMEL=y 60 + CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y 61 + CONFIG_MTD_UBI=y 62 + CONFIG_MTD_UBI_GLUEBI=y 48 63 CONFIG_BLK_DEV_LOOP=y 49 64 CONFIG_BLK_DEV_RAM=y 50 65 CONFIG_BLK_DEV_RAM_SIZE=8192 51 - CONFIG_ATMEL_SSC=y 66 + CONFIG_MISC_DEVICES=y 67 + CONFIG_ATMEL_PWM=y 68 + CONFIG_ATMEL_TCLIB=y 52 69 CONFIG_SCSI=y 53 70 CONFIG_BLK_DEV_SD=y 54 71 CONFIG_SCSI_MULTI_LUN=y 55 72 CONFIG_NETDEVICES=y 56 - CONFIG_NET_ETHERNET=y 57 73 CONFIG_MII=y 74 + CONFIG_SMSC_PHY=y 75 + CONFIG_NET_ETHERNET=y 58 76 CONFIG_MACB=y 77 + # CONFIG_NETDEV_1000 is not set 78 + # CONFIG_NETDEV_10000 is not set 79 + CONFIG_USB_ZD1201=m 80 + CONFIG_INPUT_POLLDEV=m 59 81 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set 82 + CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 83 + CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 60 84 CONFIG_INPUT_EVDEV=y 61 85 # CONFIG_KEYBOARD_ATKBD is not set 62 86 CONFIG_KEYBOARD_GPIO=y 63 87 # CONFIG_INPUT_MOUSE is not set 64 88 CONFIG_INPUT_TOUCHSCREEN=y 65 89 CONFIG_TOUCHSCREEN_ADS7846=y 66 - # CONFIG_SERIO is not set 90 + CONFIG_LEGACY_PTY_COUNT=4 67 91 CONFIG_SERIAL_ATMEL=y 68 92 CONFIG_SERIAL_ATMEL_CONSOLE=y 69 93 CONFIG_HW_RANDOM=y ··· 106 74 CONFIG_AT91SAM9X_WATCHDOG=y 107 75 CONFIG_FB=y 108 76 CONFIG_FB_ATMEL=y 109 - # CONFIG_VGA_CONSOLE is not set 110 - # CONFIG_USB_HID is not set 77 + CONFIG_BACKLIGHT_LCD_SUPPORT=y 78 + CONFIG_LCD_CLASS_DEVICE=y 79 + CONFIG_BACKLIGHT_CLASS_DEVICE=y 80 + CONFIG_BACKLIGHT_ATMEL_LCDC=y 81 + CONFIG_FRAMEBUFFER_CONSOLE=y 82 + CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 83 + CONFIG_LOGO=y 84 + CONFIG_SOUND=y 85 + CONFIG_SND=y 86 + CONFIG_SND_SEQUENCER=y 87 + CONFIG_SND_MIXER_OSS=y 88 + CONFIG_SND_PCM_OSS=y 89 + # CONFIG_SND_SUPPORT_OLD_API is not set 90 + # CONFIG_SND_VERBOSE_PROCFS is not set 91 + # CONFIG_SND_DRIVERS is not set 92 + # CONFIG_SND_ARM is not set 93 + CONFIG_SND_ATMEL_AC97C=y 94 + # CONFIG_SND_SPI is not set 95 + CONFIG_SND_USB_AUDIO=m 111 96 CONFIG_USB=y 112 97 CONFIG_USB_DEVICEFS=y 113 98 CONFIG_USB_MON=y ··· 132 83 CONFIG_USB_STORAGE=y 133 84 CONFIG_USB_GADGET=y 134 85 CONFIG_USB_ZERO=m 86 + CONFIG_USB_ETH=m 135 87 CONFIG_USB_GADGETFS=m 136 88 CONFIG_USB_FILE_STORAGE=m 137 89 CONFIG_USB_G_SERIAL=m 138 90 CONFIG_MMC=y 91 + CONFIG_SDIO_UART=m 139 92 CONFIG_MMC_AT91=m 93 + CONFIG_NEW_LEDS=y 94 + CONFIG_LEDS_CLASS=y 95 + CONFIG_LEDS_ATMEL_PWM=y 96 + CONFIG_LEDS_GPIO=y 97 + CONFIG_LEDS_TRIGGERS=y 98 + CONFIG_LEDS_TRIGGER_HEARTBEAT=y 140 99 CONFIG_RTC_CLASS=y 141 100 CONFIG_RTC_DRV_AT91SAM9=y 142 101 CONFIG_EXT2_FS=y 143 - CONFIG_INOTIFY=y 102 + CONFIG_FUSE_FS=m 144 103 CONFIG_VFAT_FS=y 145 104 CONFIG_TMPFS=y 146 105 CONFIG_JFFS2_FS=y 106 + CONFIG_UBIFS_FS=y 107 + CONFIG_UBIFS_FS_ADVANCED_COMPR=y 147 108 CONFIG_CRAMFS=y 148 109 CONFIG_NFS_FS=y 110 + CONFIG_NFS_V3=y 111 + CONFIG_NFS_V3_ACL=y 112 + CONFIG_NFS_V4=y 149 113 CONFIG_ROOT_NFS=y 150 114 CONFIG_NLS_CODEPAGE_437=y 151 115 CONFIG_NLS_CODEPAGE_850=y 152 116 CONFIG_NLS_ISO8859_1=y 153 - CONFIG_DEBUG_KERNEL=y 117 + CONFIG_FTRACE=y 154 118 CONFIG_DEBUG_USER=y 155 - CONFIG_DEBUG_LL=y 119 + CONFIG_XZ_DEC=y
-104
arch/arm/configs/neocore926_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 - # CONFIG_LOCALVERSION_AUTO is not set 3 - # CONFIG_SWAP is not set 4 - CONFIG_SYSVIPC=y 5 - CONFIG_BLK_DEV_INITRD=y 6 - # CONFIG_COMPAT_BRK is not set 7 - CONFIG_MODULES=y 8 - CONFIG_MODULE_UNLOAD=y 9 - # CONFIG_BLK_DEV_BSG is not set 10 - # CONFIG_IOSCHED_DEADLINE is not set 11 - # CONFIG_IOSCHED_CFQ is not set 12 - CONFIG_ARCH_AT91=y 13 - CONFIG_ARCH_AT91SAM9263=y 14 - CONFIG_MACH_NEOCORE926=y 15 - CONFIG_MTD_AT91_DATAFLASH_CARD=y 16 - CONFIG_ZBOOT_ROM_TEXT=0x0 17 - CONFIG_ZBOOT_ROM_BSS=0x0 18 - CONFIG_FPE_NWFPE=y 19 - CONFIG_NET=y 20 - CONFIG_PACKET=y 21 - CONFIG_UNIX=y 22 - CONFIG_NET_KEY=y 23 - CONFIG_INET=y 24 - CONFIG_IP_PNP=y 25 - CONFIG_IP_PNP_DHCP=y 26 - CONFIG_IP_PNP_BOOTP=y 27 - CONFIG_IP_PNP_RARP=y 28 - CONFIG_NET_IPIP=y 29 - # CONFIG_INET_LRO is not set 30 - CONFIG_IPV6=y 31 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 32 - # CONFIG_PREVENT_FIRMWARE_BUILD is not set 33 - CONFIG_MTD=y 34 - CONFIG_MTD_PARTITIONS=y 35 - CONFIG_MTD_CHAR=y 36 - CONFIG_MTD_BLOCK=y 37 - CONFIG_NFTL=y 38 - CONFIG_NFTL_RW=y 39 - CONFIG_MTD_BLOCK2MTD=y 40 - CONFIG_MTD_NAND=y 41 - CONFIG_MTD_NAND_ECC_SMC=y 42 - CONFIG_MTD_NAND_VERIFY_WRITE=y 43 - CONFIG_MTD_NAND_ATMEL=y 44 - CONFIG_MTD_NAND_PLATFORM=y 45 - CONFIG_BLK_DEV_LOOP=y 46 - CONFIG_BLK_DEV_NBD=y 47 - CONFIG_ATMEL_PWM=y 48 - CONFIG_ATMEL_TCLIB=y 49 - CONFIG_SCSI=y 50 - CONFIG_CHR_DEV_SG=y 51 - CONFIG_NETDEVICES=y 52 - CONFIG_SMSC_PHY=y 53 - CONFIG_NET_ETHERNET=y 54 - CONFIG_MACB=y 55 - # CONFIG_NETDEV_1000 is not set 56 - # CONFIG_NETDEV_10000 is not set 57 - # CONFIG_INPUT_MOUSEDEV_PSAUX is not set 58 - CONFIG_INPUT_EVDEV=y 59 - CONFIG_INPUT_TOUCHSCREEN=y 60 - CONFIG_TOUCHSCREEN_ADS7846=y 61 - CONFIG_VT_HW_CONSOLE_BINDING=y 62 - # CONFIG_DEVKMEM is not set 63 - CONFIG_SERIAL_NONSTANDARD=y 64 - CONFIG_SERIAL_ATMEL=y 65 - CONFIG_SERIAL_ATMEL_CONSOLE=y 66 - # CONFIG_SERIAL_ATMEL_PDC is not set 67 - # CONFIG_HW_RANDOM is not set 68 - CONFIG_I2C=y 69 - CONFIG_I2C_CHARDEV=y 70 - CONFIG_SPI=y 71 - CONFIG_SPI_ATMEL=y 72 - # CONFIG_HWMON is not set 73 - CONFIG_VIDEO_OUTPUT_CONTROL=y 74 - CONFIG_FB=y 75 - CONFIG_FB_ATMEL=y 76 - CONFIG_BACKLIGHT_LCD_SUPPORT=y 77 - CONFIG_LCD_CLASS_DEVICE=y 78 - CONFIG_BACKLIGHT_CLASS_DEVICE=y 79 - CONFIG_BACKLIGHT_ATMEL_LCDC=y 80 - # CONFIG_VGA_CONSOLE is not set 81 - CONFIG_FRAMEBUFFER_CONSOLE=y 82 - CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 83 - CONFIG_LOGO=y 84 - CONFIG_USB=y 85 - CONFIG_USB_DEVICEFS=y 86 - CONFIG_USB_MON=y 87 - CONFIG_USB_OHCI_HCD=y 88 - CONFIG_USB_STORAGE=y 89 - CONFIG_MMC=y 90 - CONFIG_SDIO_UART=y 91 - CONFIG_MMC_AT91=m 92 - CONFIG_EXT2_FS=y 93 - # CONFIG_DNOTIFY is not set 94 - CONFIG_AUTOFS_FS=y 95 - CONFIG_VFAT_FS=y 96 - CONFIG_TMPFS=y 97 - CONFIG_JFFS2_FS=y 98 - CONFIG_JFFS2_FS_WBUF_VERIFY=y 99 - CONFIG_NFS_FS=y 100 - CONFIG_ROOT_NFS=y 101 - # CONFIG_ENABLE_WARN_DEPRECATED is not set 102 - # CONFIG_ENABLE_MUST_CHECK is not set 103 - CONFIG_SYSCTL_SYSCALL_CHECK=y 104 - # CONFIG_CRYPTO_HW is not set
-106
arch/arm/configs/usb-a9263_defconfig
··· 1 - CONFIG_EXPERIMENTAL=y 2 - # CONFIG_LOCALVERSION_AUTO is not set 3 - # CONFIG_SWAP is not set 4 - CONFIG_SYSVIPC=y 5 - CONFIG_LOG_BUF_SHIFT=14 6 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 7 - CONFIG_SLAB=y 8 - CONFIG_MODULES=y 9 - CONFIG_MODULE_UNLOAD=y 10 - # CONFIG_BLK_DEV_BSG is not set 11 - # CONFIG_IOSCHED_DEADLINE is not set 12 - # CONFIG_IOSCHED_CFQ is not set 13 - CONFIG_ARCH_AT91=y 14 - CONFIG_ARCH_AT91SAM9263=y 15 - CONFIG_MACH_USB_A9263=y 16 - CONFIG_AT91_SLOW_CLOCK=y 17 - # CONFIG_ARM_THUMB is not set 18 - CONFIG_AEABI=y 19 - CONFIG_ZBOOT_ROM_TEXT=0x0 20 - CONFIG_ZBOOT_ROM_BSS=0x0 21 - CONFIG_CMDLINE="mem=64M console=ttyS0,115200" 22 - CONFIG_FPE_NWFPE=y 23 - CONFIG_PM=y 24 - CONFIG_NET=y 25 - CONFIG_PACKET=y 26 - CONFIG_UNIX=y 27 - CONFIG_INET=y 28 - CONFIG_IP_MULTICAST=y 29 - CONFIG_IP_ADVANCED_ROUTER=y 30 - CONFIG_IP_ROUTE_VERBOSE=y 31 - CONFIG_IP_PNP=y 32 - CONFIG_IP_PNP_BOOTP=y 33 - CONFIG_IP_PNP_RARP=y 34 - CONFIG_IP_MROUTE=y 35 - CONFIG_IP_PIMSM_V1=y 36 - CONFIG_IP_PIMSM_V2=y 37 - # CONFIG_INET_XFRM_MODE_TRANSPORT is not set 38 - # CONFIG_INET_XFRM_MODE_TUNNEL is not set 39 - # CONFIG_INET_XFRM_MODE_BEET is not set 40 - # CONFIG_INET_LRO is not set 41 - # CONFIG_INET_DIAG is not set 42 - # CONFIG_IPV6 is not set 43 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 44 - CONFIG_MTD=y 45 - CONFIG_MTD_PARTITIONS=y 46 - CONFIG_MTD_CMDLINE_PARTS=y 47 - CONFIG_MTD_CHAR=y 48 - CONFIG_MTD_BLOCK=y 49 - CONFIG_MTD_DATAFLASH=y 50 - CONFIG_MTD_NAND=y 51 - CONFIG_MTD_NAND_ATMEL=y 52 - CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y 53 - CONFIG_BLK_DEV_LOOP=y 54 - # CONFIG_MISC_DEVICES is not set 55 - CONFIG_SCSI=y 56 - CONFIG_BLK_DEV_SD=y 57 - CONFIG_SCSI_MULTI_LUN=y 58 - CONFIG_NETDEVICES=y 59 - CONFIG_NET_ETHERNET=y 60 - CONFIG_MII=y 61 - CONFIG_MACB=y 62 - # CONFIG_INPUT_MOUSEDEV_PSAUX is not set 63 - CONFIG_INPUT_EVDEV=y 64 - CONFIG_INPUT_EVBUG=y 65 - # CONFIG_KEYBOARD_ATKBD is not set 66 - CONFIG_KEYBOARD_GPIO=y 67 - # CONFIG_INPUT_MOUSE is not set 68 - # CONFIG_SERIO is not set 69 - CONFIG_SERIAL_ATMEL=y 70 - CONFIG_SERIAL_ATMEL_CONSOLE=y 71 - CONFIG_HW_RANDOM=y 72 - CONFIG_SPI=y 73 - CONFIG_SPI_ATMEL=y 74 - # CONFIG_HWMON is not set 75 - # CONFIG_VGA_CONSOLE is not set 76 - # CONFIG_USB_HID is not set 77 - CONFIG_USB=y 78 - CONFIG_USB_DEVICEFS=y 79 - CONFIG_USB_MON=y 80 - CONFIG_USB_OHCI_HCD=y 81 - CONFIG_USB_STORAGE=y 82 - CONFIG_USB_GADGET=y 83 - CONFIG_USB_ETH=m 84 - CONFIG_NEW_LEDS=y 85 - CONFIG_LEDS_CLASS=y 86 - CONFIG_LEDS_GPIO=y 87 - CONFIG_LEDS_TRIGGERS=y 88 - CONFIG_LEDS_TRIGGER_HEARTBEAT=y 89 - CONFIG_EXT2_FS=y 90 - CONFIG_INOTIFY=y 91 - CONFIG_FUSE_FS=m 92 - CONFIG_VFAT_FS=y 93 - CONFIG_TMPFS=y 94 - CONFIG_JFFS2_FS=y 95 - CONFIG_NFS_FS=y 96 - CONFIG_NFS_V3=y 97 - CONFIG_NFS_V3_ACL=y 98 - CONFIG_NFS_V4=y 99 - CONFIG_ROOT_NFS=y 100 - CONFIG_NLS_CODEPAGE_437=y 101 - CONFIG_NLS_CODEPAGE_850=y 102 - CONFIG_NLS_ISO8859_1=y 103 - CONFIG_DEBUG_KERNEL=y 104 - CONFIG_DEBUG_USER=y 105 - CONFIG_DEBUG_LL=y 106 - # CONFIG_CRYPTO_HW is not set