aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/at91_dt_defconfig3
-rw-r--r--arch/arm/configs/sama5_defconfig6
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 3b515c179487..a67375f24b21 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -80,6 +80,7 @@ CONFIG_BLK_DEV_SD=y
80CONFIG_NETDEVICES=y 80CONFIG_NETDEVICES=y
81CONFIG_MACB=y 81CONFIG_MACB=y
82# CONFIG_NET_VENDOR_BROADCOM is not set 82# CONFIG_NET_VENDOR_BROADCOM is not set
83CONFIG_DM9000=y
83# CONFIG_NET_VENDOR_FARADAY is not set 84# CONFIG_NET_VENDOR_FARADAY is not set
84# CONFIG_NET_VENDOR_INTEL is not set 85# CONFIG_NET_VENDOR_INTEL is not set
85# CONFIG_NET_VENDOR_MARVELL is not set 86# CONFIG_NET_VENDOR_MARVELL is not set
@@ -113,6 +114,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
113CONFIG_INPUT_JOYDEV=y 114CONFIG_INPUT_JOYDEV=y
114CONFIG_INPUT_EVDEV=y 115CONFIG_INPUT_EVDEV=y
115# CONFIG_KEYBOARD_ATKBD is not set 116# CONFIG_KEYBOARD_ATKBD is not set
117CONFIG_KEYBOARD_QT1070=y
116CONFIG_KEYBOARD_GPIO=y 118CONFIG_KEYBOARD_GPIO=y
117# CONFIG_INPUT_MOUSE is not set 119# CONFIG_INPUT_MOUSE is not set
118CONFIG_INPUT_TOUCHSCREEN=y 120CONFIG_INPUT_TOUCHSCREEN=y
@@ -186,6 +188,7 @@ CONFIG_IIO=y
186CONFIG_AT91_ADC=y 188CONFIG_AT91_ADC=y
187CONFIG_PWM=y 189CONFIG_PWM=y
188CONFIG_PWM_ATMEL=y 190CONFIG_PWM_ATMEL=y
191CONFIG_PWM_ATMEL_TCB=y
189CONFIG_EXT4_FS=y 192CONFIG_EXT4_FS=y
190CONFIG_FANOTIFY=y 193CONFIG_FANOTIFY=y
191CONFIG_VFAT_FS=y 194CONFIG_VFAT_FS=y
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index c9089c927daf..3d9ee7a69c37 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -12,7 +12,7 @@ CONFIG_MODULES=y
12CONFIG_MODULE_FORCE_LOAD=y 12CONFIG_MODULE_FORCE_LOAD=y
13CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
14CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
15# CONFIG_LBDAF is not set 15CONFIG_LBDAF=y
16# CONFIG_BLK_DEV_BSG is not set 16# CONFIG_BLK_DEV_BSG is not set
17# CONFIG_IOSCHED_DEADLINE is not set 17# CONFIG_IOSCHED_DEADLINE is not set
18# CONFIG_IOSCHED_CFQ is not set 18# CONFIG_IOSCHED_CFQ is not set
@@ -30,6 +30,8 @@ CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 r
30CONFIG_KEXEC=y 30CONFIG_KEXEC=y
31CONFIG_AUTO_ZRELADDR=y 31CONFIG_AUTO_ZRELADDR=y
32CONFIG_VFP=y 32CONFIG_VFP=y
33CONFIG_NEON=y
34CONFIG_KERNEL_MODE_NEON=y
33# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
34CONFIG_PM_RUNTIME=y 36CONFIG_PM_RUNTIME=y
35CONFIG_PM_DEBUG=y 37CONFIG_PM_DEBUG=y
@@ -176,11 +178,13 @@ CONFIG_LEDS_TRIGGER_GPIO=y
176CONFIG_RTC_CLASS=y 178CONFIG_RTC_CLASS=y
177CONFIG_RTC_DRV_AT91RM9200=y 179CONFIG_RTC_DRV_AT91RM9200=y
178CONFIG_DMADEVICES=y 180CONFIG_DMADEVICES=y
181CONFIG_AT_XDMAC=y
179# CONFIG_IOMMU_SUPPORT is not set 182# CONFIG_IOMMU_SUPPORT is not set
180CONFIG_IIO=y 183CONFIG_IIO=y
181CONFIG_AT91_ADC=y 184CONFIG_AT91_ADC=y
182CONFIG_PWM=y 185CONFIG_PWM=y
183CONFIG_PWM_ATMEL=y 186CONFIG_PWM_ATMEL=y
187CONFIG_PWM_ATMEL_TCB=y
184CONFIG_EXT4_FS=y 188CONFIG_EXT4_FS=y
185CONFIG_FANOTIFY=y 189CONFIG_FANOTIFY=y
186CONFIG_VFAT_FS=y 190CONFIG_VFAT_FS=y