diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-09-02 04:50:02 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-02 09:05:00 -0400 |
commit | c92e99f0bc1cd9feefaa93ce9245db8abdeca836 (patch) | |
tree | c831c3d361c18160bf96cf20e109155f5d349ba2 /arch/arm/configs | |
parent | 31bcf0a63994081a3a315d02379528701c0a0e43 (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_defconfig | 19 |
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 |
3 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
4 | CONFIG_LOG_BUF_SHIFT=14 | 4 | CONFIG_LOG_BUF_SHIFT=14 |
5 | CONFIG_EMBEDDED=y | ||
6 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
6 | CONFIG_EMBEDDED=y | ||
7 | CONFIG_SLAB=y | 7 | CONFIG_SLAB=y |
8 | CONFIG_MODULES=y | 8 | CONFIG_MODULES=y |
9 | CONFIG_MODULE_UNLOAD=y | 9 | CONFIG_MODULE_UNLOAD=y |
@@ -37,7 +37,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4 | |||
37 | CONFIG_BLK_DEV_RAM_SIZE=24576 | 37 | CONFIG_BLK_DEV_RAM_SIZE=24576 |
38 | CONFIG_SCSI=y | 38 | CONFIG_SCSI=y |
39 | CONFIG_BLK_DEV_SD=y | 39 | CONFIG_BLK_DEV_SD=y |
40 | CONFIG_SCSI_MULTI_LUN=y | ||
41 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 40 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
42 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | 41 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 |
43 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | 42 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 |
@@ -54,20 +53,31 @@ CONFIG_I2C_CHARDEV=y | |||
54 | CONFIG_I2C_GPIO=y | 53 | CONFIG_I2C_GPIO=y |
55 | CONFIG_SPI=y | 54 | CONFIG_SPI=y |
56 | CONFIG_SPI_ATMEL=y | 55 | CONFIG_SPI_ATMEL=y |
56 | CONFIG_POWER_SUPPLY=y | ||
57 | CONFIG_POWER_RESET=y | ||
57 | # CONFIG_HWMON is not set | 58 | # CONFIG_HWMON is not set |
58 | CONFIG_WATCHDOG=y | 59 | CONFIG_WATCHDOG=y |
59 | CONFIG_WATCHDOG_NOWAYOUT=y | 60 | CONFIG_WATCHDOG_NOWAYOUT=y |
60 | CONFIG_AT91SAM9X_WATCHDOG=y | 61 | CONFIG_AT91SAM9X_WATCHDOG=y |
61 | CONFIG_FB=y | 62 | CONFIG_FB=y |
62 | CONFIG_FB_ATMEL=y | 63 | CONFIG_FB_ATMEL=y |
64 | CONFIG_USB_GADGET=y | ||
65 | CONFIG_USB_ATMEL_USBA=y | ||
63 | CONFIG_MMC=y | 66 | CONFIG_MMC=y |
64 | CONFIG_MMC_ATMELMCI=m | 67 | CONFIG_MMC_ATMELMCI=m |
68 | CONFIG_NEW_LEDS=y | ||
69 | CONFIG_LEDS_CLASS=y | ||
70 | CONFIG_LEDS_GPIO=y | ||
71 | CONFIG_LEDS_PWM=y | ||
72 | CONFIG_LEDS_TRIGGERS=y | ||
73 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
65 | CONFIG_RTC_CLASS=y | 74 | CONFIG_RTC_CLASS=y |
66 | CONFIG_RTC_DRV_AT91SAM9=y | 75 | CONFIG_RTC_DRV_AT91SAM9=y |
67 | CONFIG_IIO=y | 76 | CONFIG_IIO=y |
68 | CONFIG_AT91_ADC=y | 77 | CONFIG_AT91_ADC=y |
69 | CONFIG_EXT2_FS=y | 78 | CONFIG_PWM=y |
70 | CONFIG_MSDOS_FS=y | 79 | CONFIG_PWM_ATMEL=y |
80 | CONFIG_EXT4_FS=y | ||
71 | CONFIG_VFAT_FS=y | 81 | CONFIG_VFAT_FS=y |
72 | CONFIG_TMPFS=y | 82 | CONFIG_TMPFS=y |
73 | CONFIG_UBIFS_FS=y | 83 | CONFIG_UBIFS_FS=y |
@@ -77,7 +87,6 @@ CONFIG_NLS_CODEPAGE_850=y | |||
77 | CONFIG_NLS_ISO8859_1=y | 87 | CONFIG_NLS_ISO8859_1=y |
78 | CONFIG_NLS_ISO8859_15=y | 88 | CONFIG_NLS_ISO8859_15=y |
79 | CONFIG_NLS_UTF8=y | 89 | CONFIG_NLS_UTF8=y |
80 | CONFIG_DEBUG_KERNEL=y | ||
81 | CONFIG_DEBUG_INFO=y | 90 | CONFIG_DEBUG_INFO=y |
82 | CONFIG_DEBUG_USER=y | 91 | CONFIG_DEBUG_USER=y |
83 | CONFIG_DEBUG_LL=y | 92 | CONFIG_DEBUG_LL=y |