aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/sama5_defconfig
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-09-02 04:50:03 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-09-02 09:06:11 -0400
commit7cc5f270ee6e271df466f9d3c1c4522593002ac4 (patch)
treed99177aed6aa1101f9d1476d638fc03a87090aa9 /arch/arm/configs/sama5_defconfig
parentc92e99f0bc1cd9feefaa93ce9245db8abdeca836 (diff)
ARM: at91: sama5: update defconfig
Update defconfig, adding: - PWM support using the generic framework - generic PWM leds - Power/reset and removing deprecated config options. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.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_defconfig11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 36021f29d160..96c15b775d57 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -21,7 +21,6 @@ CONFIG_SOC_SAM_V7=y
21CONFIG_SOC_SAMA5D3=y 21CONFIG_SOC_SAMA5D3=y
22CONFIG_MACH_SAMA5_DT=y 22CONFIG_MACH_SAMA5_DT=y
23CONFIG_AEABI=y 23CONFIG_AEABI=y
24# CONFIG_OABI_COMPAT is not set
25CONFIG_UACCESS_WITH_MEMCPY=y 24CONFIG_UACCESS_WITH_MEMCPY=y
26CONFIG_ZBOOT_ROM_TEXT=0x0 25CONFIG_ZBOOT_ROM_TEXT=0x0
27CONFIG_ZBOOT_ROM_BSS=0x0 26CONFIG_ZBOOT_ROM_BSS=0x0
@@ -73,7 +72,6 @@ CONFIG_MTD_NAND_ATMEL=y
73CONFIG_MTD_SPI_NOR=y 72CONFIG_MTD_SPI_NOR=y
74CONFIG_MTD_UBI=y 73CONFIG_MTD_UBI=y
75CONFIG_MTD_UBI_GLUEBI=y 74CONFIG_MTD_UBI_GLUEBI=y
76CONFIG_PROC_DEVICETREE=y
77CONFIG_BLK_DEV_LOOP=y 75CONFIG_BLK_DEV_LOOP=y
78CONFIG_BLK_DEV_RAM=y 76CONFIG_BLK_DEV_RAM=y
79CONFIG_BLK_DEV_RAM_COUNT=4 77CONFIG_BLK_DEV_RAM_COUNT=4
@@ -83,10 +81,8 @@ CONFIG_ATMEL_SSC=y
83CONFIG_EEPROM_AT24=y 81CONFIG_EEPROM_AT24=y
84CONFIG_SCSI=y 82CONFIG_SCSI=y
85CONFIG_BLK_DEV_SD=y 83CONFIG_BLK_DEV_SD=y
86CONFIG_SCSI_MULTI_LUN=y
87# CONFIG_SCSI_LOWLEVEL is not set 84# CONFIG_SCSI_LOWLEVEL is not set
88CONFIG_NETDEVICES=y 85CONFIG_NETDEVICES=y
89CONFIG_MII=y
90CONFIG_MACB=y 86CONFIG_MACB=y
91# CONFIG_NET_VENDOR_BROADCOM is not set 87# CONFIG_NET_VENDOR_BROADCOM is not set
92# CONFIG_NET_VENDOR_CIRRUS is not set 88# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -135,6 +131,8 @@ CONFIG_SPI=y
135CONFIG_SPI_ATMEL=y 131CONFIG_SPI_ATMEL=y
136CONFIG_SPI_GPIO=y 132CONFIG_SPI_GPIO=y
137CONFIG_GPIO_SYSFS=y 133CONFIG_GPIO_SYSFS=y
134CONFIG_POWER_SUPPLY=y
135CONFIG_POWER_RESET=y
138# CONFIG_HWMON is not set 136# CONFIG_HWMON is not set
139CONFIG_SSB=m 137CONFIG_SSB=m
140CONFIG_REGULATOR=y 138CONFIG_REGULATOR=y
@@ -170,6 +168,7 @@ CONFIG_MMC_ATMELMCI=y
170CONFIG_NEW_LEDS=y 168CONFIG_NEW_LEDS=y
171CONFIG_LEDS_CLASS=y 169CONFIG_LEDS_CLASS=y
172CONFIG_LEDS_GPIO=y 170CONFIG_LEDS_GPIO=y
171CONFIG_LEDS_PWM=y
173CONFIG_LEDS_TRIGGER_TIMER=y 172CONFIG_LEDS_TRIGGER_TIMER=y
174CONFIG_LEDS_TRIGGER_HEARTBEAT=y 173CONFIG_LEDS_TRIGGER_HEARTBEAT=y
175CONFIG_LEDS_TRIGGER_GPIO=y 174CONFIG_LEDS_TRIGGER_GPIO=y
@@ -179,6 +178,8 @@ CONFIG_DMADEVICES=y
179# CONFIG_IOMMU_SUPPORT is not set 178# CONFIG_IOMMU_SUPPORT is not set
180CONFIG_IIO=y 179CONFIG_IIO=y
181CONFIG_AT91_ADC=y 180CONFIG_AT91_ADC=y
181CONFIG_PWM=y
182CONFIG_PWM_ATMEL=y
182CONFIG_EXT4_FS=y 183CONFIG_EXT4_FS=y
183CONFIG_FANOTIFY=y 184CONFIG_FANOTIFY=y
184CONFIG_VFAT_FS=y 185CONFIG_VFAT_FS=y
@@ -193,8 +194,8 @@ CONFIG_NLS_ISO8859_1=y
193CONFIG_NLS_UTF8=y 194CONFIG_NLS_UTF8=y
194CONFIG_STRIP_ASM_SYMS=y 195CONFIG_STRIP_ASM_SYMS=y
195CONFIG_DEBUG_FS=y 196CONFIG_DEBUG_FS=y
196# CONFIG_SCHED_DEBUG is not set
197CONFIG_DEBUG_MEMORY_INIT=y 197CONFIG_DEBUG_MEMORY_INIT=y
198# CONFIG_SCHED_DEBUG is not set
198# CONFIG_FTRACE is not set 199# CONFIG_FTRACE is not set
199CONFIG_DEBUG_USER=y 200CONFIG_DEBUG_USER=y
200CONFIG_DEBUG_LL=y 201CONFIG_DEBUG_LL=y