aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-09-02 04:50:02 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-09-02 09:05:00 -0400
commitc92e99f0bc1cd9feefaa93ce9245db8abdeca836 (patch)
treec831c3d361c18160bf96cf20e109155f5d349ba2 /arch/arm/configs
parent31bcf0a63994081a3a315d02379528701c0a0e43 (diff)
ARM: at91: at91sam9rl: update defconfig
Update defconfig, adding: - USB gadget - PWM support using the generic framework - generic PWM leds - LEDs triggers - 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')
-rw-r--r--arch/arm/configs/at91sam9rl_defconfig19
1 files changed, 14 insertions, 5 deletions
diff --git a/arch/arm/configs/at91sam9rl_defconfig b/arch/arm/configs/at91sam9rl_defconfig
index 5d7797d43d23..4c26d344ae88 100644
--- a/arch/arm/configs/at91sam9rl_defconfig
+++ b/arch/arm/configs/at91sam9rl_defconfig
@@ -2,8 +2,8 @@
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EMBEDDED=y
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
6CONFIG_EMBEDDED=y
7CONFIG_SLAB=y 7CONFIG_SLAB=y
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
@@ -37,7 +37,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
37CONFIG_BLK_DEV_RAM_SIZE=24576 37CONFIG_BLK_DEV_RAM_SIZE=24576
38CONFIG_SCSI=y 38CONFIG_SCSI=y
39CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
40CONFIG_SCSI_MULTI_LUN=y
41# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 40# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
42CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 41CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
43CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 42CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
@@ -54,20 +53,31 @@ CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_GPIO=y 53CONFIG_I2C_GPIO=y
55CONFIG_SPI=y 54CONFIG_SPI=y
56CONFIG_SPI_ATMEL=y 55CONFIG_SPI_ATMEL=y
56CONFIG_POWER_SUPPLY=y
57CONFIG_POWER_RESET=y
57# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
58CONFIG_WATCHDOG=y 59CONFIG_WATCHDOG=y
59CONFIG_WATCHDOG_NOWAYOUT=y 60CONFIG_WATCHDOG_NOWAYOUT=y
60CONFIG_AT91SAM9X_WATCHDOG=y 61CONFIG_AT91SAM9X_WATCHDOG=y
61CONFIG_FB=y 62CONFIG_FB=y
62CONFIG_FB_ATMEL=y 63CONFIG_FB_ATMEL=y
64CONFIG_USB_GADGET=y
65CONFIG_USB_ATMEL_USBA=y
63CONFIG_MMC=y 66CONFIG_MMC=y
64CONFIG_MMC_ATMELMCI=m 67CONFIG_MMC_ATMELMCI=m
68CONFIG_NEW_LEDS=y
69CONFIG_LEDS_CLASS=y
70CONFIG_LEDS_GPIO=y
71CONFIG_LEDS_PWM=y
72CONFIG_LEDS_TRIGGERS=y
73CONFIG_LEDS_TRIGGER_HEARTBEAT=y
65CONFIG_RTC_CLASS=y 74CONFIG_RTC_CLASS=y
66CONFIG_RTC_DRV_AT91SAM9=y 75CONFIG_RTC_DRV_AT91SAM9=y
67CONFIG_IIO=y 76CONFIG_IIO=y
68CONFIG_AT91_ADC=y 77CONFIG_AT91_ADC=y
69CONFIG_EXT2_FS=y 78CONFIG_PWM=y
70CONFIG_MSDOS_FS=y 79CONFIG_PWM_ATMEL=y
80CONFIG_EXT4_FS=y
71CONFIG_VFAT_FS=y 81CONFIG_VFAT_FS=y
72CONFIG_TMPFS=y 82CONFIG_TMPFS=y
73CONFIG_UBIFS_FS=y 83CONFIG_UBIFS_FS=y
@@ -77,7 +87,6 @@ CONFIG_NLS_CODEPAGE_850=y
77CONFIG_NLS_ISO8859_1=y 87CONFIG_NLS_ISO8859_1=y
78CONFIG_NLS_ISO8859_15=y 88CONFIG_NLS_ISO8859_15=y
79CONFIG_NLS_UTF8=y 89CONFIG_NLS_UTF8=y
80CONFIG_DEBUG_KERNEL=y
81CONFIG_DEBUG_INFO=y 90CONFIG_DEBUG_INFO=y
82CONFIG_DEBUG_USER=y 91CONFIG_DEBUG_USER=y
83CONFIG_DEBUG_LL=y 92CONFIG_DEBUG_LL=y