diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-15 11:19:21 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-05-17 09:05:08 -0400 |
commit | b3f442b0eedbc20b5ce3f4a96530588d14901199 (patch) | |
tree | 0c5da47086f672f31365985dd5502a9b9dfed63b /arch/arm/configs/sama5_defconfig | |
parent | 5e8b3bc392180c89da15c7d73915517fba7cc140 (diff) |
ARM: at91: udpate defconfigs
Merge 9g20 with 9260 and 9g10 with 9261 as those SoCs can run from the same
kernel even in non DT world.
Fix the sam9261ek to allow 9g10 and sam9261 to compile together.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/configs/sama5_defconfig')
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 4d0dc3c16063..f6e78f83c3c3 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig | |||
@@ -26,7 +26,9 @@ CONFIG_AEABI=y | |||
26 | CONFIG_UACCESS_WITH_MEMCPY=y | 26 | CONFIG_UACCESS_WITH_MEMCPY=y |
27 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 27 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
28 | CONFIG_ZBOOT_ROM_BSS=0x0 | 28 | CONFIG_ZBOOT_ROM_BSS=0x0 |
29 | CONFIG_ARM_APPENDED_DTB=y | ||
29 | CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" | 30 | CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" |
31 | CONFIG_KEXEC=y | ||
30 | CONFIG_AUTO_ZRELADDR=y | 32 | CONFIG_AUTO_ZRELADDR=y |
31 | CONFIG_VFP=y | 33 | CONFIG_VFP=y |
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
@@ -39,6 +41,9 @@ CONFIG_UNIX=y | |||
39 | CONFIG_INET=y | 41 | CONFIG_INET=y |
40 | CONFIG_IP_MULTICAST=y | 42 | CONFIG_IP_MULTICAST=y |
41 | CONFIG_IP_PNP=y | 43 | CONFIG_IP_PNP=y |
44 | CONFIG_IP_PNP_DHCP=y | ||
45 | CONFIG_IP_PNP_BOOTP=y | ||
46 | CONFIG_IP_PNP_RARP=y | ||
42 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 47 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
43 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 48 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
44 | # CONFIG_INET_XFRM_MODE_BEET is not set | 49 | # CONFIG_INET_XFRM_MODE_BEET is not set |
@@ -68,6 +73,8 @@ CONFIG_MTD_M25P80=y | |||
68 | CONFIG_MTD_NAND=y | 73 | CONFIG_MTD_NAND=y |
69 | CONFIG_MTD_NAND_ATMEL=y | 74 | CONFIG_MTD_NAND_ATMEL=y |
70 | CONFIG_MTD_UBI=y | 75 | CONFIG_MTD_UBI=y |
76 | CONFIG_MTD_UBI_GLUEBI=y | ||
77 | CONFIG_PROC_DEVICETREE=y | ||
71 | CONFIG_BLK_DEV_LOOP=y | 78 | CONFIG_BLK_DEV_LOOP=y |
72 | CONFIG_BLK_DEV_RAM=y | 79 | CONFIG_BLK_DEV_RAM=y |
73 | CONFIG_BLK_DEV_RAM_COUNT=4 | 80 | CONFIG_BLK_DEV_RAM_COUNT=4 |
@@ -95,7 +102,19 @@ CONFIG_MACB=y | |||
95 | # CONFIG_NET_VENDOR_STMICRO is not set | 102 | # CONFIG_NET_VENDOR_STMICRO is not set |
96 | # CONFIG_NET_VENDOR_WIZNET is not set | 103 | # CONFIG_NET_VENDOR_WIZNET is not set |
97 | CONFIG_MICREL_PHY=y | 104 | CONFIG_MICREL_PHY=y |
98 | # CONFIG_WLAN is not set | 105 | CONFIG_LIBERTAS_THINFIRM=m |
106 | CONFIG_LIBERTAS_THINFIRM_USB=m | ||
107 | CONFIG_RTL8187=m | ||
108 | CONFIG_RT2X00=m | ||
109 | CONFIG_RT2500USB=m | ||
110 | CONFIG_RT73USB=m | ||
111 | CONFIG_RT2800USB=m | ||
112 | CONFIG_RT2800USB_RT53XX=y | ||
113 | CONFIG_RT2800USB_RT55XX=y | ||
114 | CONFIG_RT2800USB_UNKNOWN=y | ||
115 | CONFIG_MWIFIEX=m | ||
116 | CONFIG_MWIFIEX_SDIO=m | ||
117 | CONFIG_MWIFIEX_USB=m | ||
99 | # CONFIG_INPUT_MOUSEDEV is not set | 118 | # CONFIG_INPUT_MOUSEDEV is not set |
100 | CONFIG_INPUT_EVDEV=y | 119 | CONFIG_INPUT_EVDEV=y |
101 | # CONFIG_KEYBOARD_ATKBD is not set | 120 | # CONFIG_KEYBOARD_ATKBD is not set |
@@ -133,9 +152,13 @@ CONFIG_USB_EHCI_HCD=y | |||
133 | CONFIG_USB_OHCI_HCD=y | 152 | CONFIG_USB_OHCI_HCD=y |
134 | CONFIG_USB_ACM=y | 153 | CONFIG_USB_ACM=y |
135 | CONFIG_USB_STORAGE=y | 154 | CONFIG_USB_STORAGE=y |
155 | CONFIG_USB_SERIAL=y | ||
156 | CONFIG_USB_SERIAL_GENERIC=y | ||
157 | CONFIG_USB_SERIAL_FTDI_SIO=y | ||
158 | CONFIG_USB_SERIAL_PL2303=y | ||
136 | CONFIG_USB_GADGET=y | 159 | CONFIG_USB_GADGET=y |
137 | CONFIG_USB_AT91=y | 160 | CONFIG_USB_ATMEL_USBA=y |
138 | CONFIG_USB_MASS_STORAGE=m | 161 | CONFIG_USB_G_SERIAL=y |
139 | CONFIG_MMC=y | 162 | CONFIG_MMC=y |
140 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 163 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
141 | CONFIG_MMC_ATMELMCI=y | 164 | CONFIG_MMC_ATMELMCI=y |
@@ -151,18 +174,18 @@ CONFIG_DMADEVICES=y | |||
151 | # CONFIG_IOMMU_SUPPORT is not set | 174 | # CONFIG_IOMMU_SUPPORT is not set |
152 | CONFIG_IIO=y | 175 | CONFIG_IIO=y |
153 | CONFIG_AT91_ADC=y | 176 | CONFIG_AT91_ADC=y |
154 | CONFIG_EXT2_FS=y | 177 | CONFIG_EXT4_FS=y |
155 | CONFIG_FANOTIFY=y | 178 | CONFIG_FANOTIFY=y |
156 | CONFIG_VFAT_FS=y | 179 | CONFIG_VFAT_FS=y |
157 | CONFIG_TMPFS=y | 180 | CONFIG_TMPFS=y |
158 | CONFIG_JFFS2_FS=y | ||
159 | CONFIG_JFFS2_SUMMARY=y | ||
160 | CONFIG_UBIFS_FS=y | 181 | CONFIG_UBIFS_FS=y |
182 | CONFIG_UBIFS_FS_ADVANCED_COMPR=y | ||
161 | CONFIG_NFS_FS=y | 183 | CONFIG_NFS_FS=y |
162 | CONFIG_ROOT_NFS=y | 184 | CONFIG_ROOT_NFS=y |
163 | CONFIG_NLS_CODEPAGE_437=y | 185 | CONFIG_NLS_CODEPAGE_437=y |
164 | CONFIG_NLS_CODEPAGE_850=y | 186 | CONFIG_NLS_CODEPAGE_850=y |
165 | CONFIG_NLS_ISO8859_1=y | 187 | CONFIG_NLS_ISO8859_1=y |
188 | CONFIG_NLS_UTF8=y | ||
166 | CONFIG_STRIP_ASM_SYMS=y | 189 | CONFIG_STRIP_ASM_SYMS=y |
167 | CONFIG_DEBUG_FS=y | 190 | CONFIG_DEBUG_FS=y |
168 | # CONFIG_SCHED_DEBUG is not set | 191 | # CONFIG_SCHED_DEBUG is not set |