diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-09-02 04:50:00 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-02 09:04:46 -0400 |
commit | c5de16c0b769753a6df20465bd53bd53ad7c9c8a (patch) | |
tree | e86504c2d9dd0ed171c1a49c662ba20056a448ff | |
parent | 825f30bc22f946db988848cc981fbdc8f66f6042 (diff) |
ARM: at91: at91sam9263: 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>
-rw-r--r-- | arch/arm/configs/at91sam9263_defconfig | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig index e40026364e57..8b671c977b81 100644 --- a/arch/arm/configs/at91sam9263_defconfig +++ b/arch/arm/configs/at91sam9263_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_MACH_AT91SAM9263EK=y | |||
18 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 18 | CONFIG_MTD_AT91_DATAFLASH_CARD=y |
19 | # CONFIG_ARM_THUMB is not set | 19 | # CONFIG_ARM_THUMB is not set |
20 | CONFIG_AEABI=y | 20 | CONFIG_AEABI=y |
21 | # CONFIG_OABI_COMPAT is not set | ||
22 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 21 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
23 | CONFIG_ZBOOT_ROM_BSS=0x0 | 22 | CONFIG_ZBOOT_ROM_BSS=0x0 |
24 | CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" | 23 | CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" |
@@ -51,7 +50,6 @@ CONFIG_DEVTMPFS=y | |||
51 | CONFIG_DEVTMPFS_MOUNT=y | 50 | CONFIG_DEVTMPFS_MOUNT=y |
52 | CONFIG_MTD=y | 51 | CONFIG_MTD=y |
53 | CONFIG_MTD_CMDLINE_PARTS=y | 52 | CONFIG_MTD_CMDLINE_PARTS=y |
54 | CONFIG_MTD_CHAR=y | ||
55 | CONFIG_MTD_BLOCK=y | 53 | CONFIG_MTD_BLOCK=y |
56 | CONFIG_NFTL=y | 54 | CONFIG_NFTL=y |
57 | CONFIG_NFTL_RW=y | 55 | CONFIG_NFTL_RW=y |
@@ -64,13 +62,10 @@ CONFIG_MTD_UBI_GLUEBI=y | |||
64 | CONFIG_BLK_DEV_LOOP=y | 62 | CONFIG_BLK_DEV_LOOP=y |
65 | CONFIG_BLK_DEV_RAM=y | 63 | CONFIG_BLK_DEV_RAM=y |
66 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 64 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
67 | CONFIG_ATMEL_PWM=y | ||
68 | CONFIG_ATMEL_TCLIB=y | 65 | CONFIG_ATMEL_TCLIB=y |
69 | CONFIG_SCSI=y | 66 | CONFIG_SCSI=y |
70 | CONFIG_BLK_DEV_SD=y | 67 | CONFIG_BLK_DEV_SD=y |
71 | CONFIG_SCSI_MULTI_LUN=y | ||
72 | CONFIG_NETDEVICES=y | 68 | CONFIG_NETDEVICES=y |
73 | CONFIG_MII=y | ||
74 | CONFIG_MACB=y | 69 | CONFIG_MACB=y |
75 | CONFIG_SMSC_PHY=y | 70 | CONFIG_SMSC_PHY=y |
76 | # CONFIG_WLAN is not set | 71 | # CONFIG_WLAN is not set |
@@ -92,6 +87,8 @@ CONFIG_I2C_GPIO=y | |||
92 | CONFIG_SPI=y | 87 | CONFIG_SPI=y |
93 | CONFIG_SPI_ATMEL=y | 88 | CONFIG_SPI_ATMEL=y |
94 | CONFIG_GPIO_SYSFS=y | 89 | CONFIG_GPIO_SYSFS=y |
90 | CONFIG_POWER_SUPPLY=y | ||
91 | CONFIG_POWER_RESET=y | ||
95 | # CONFIG_HWMON is not set | 92 | # CONFIG_HWMON is not set |
96 | CONFIG_WATCHDOG=y | 93 | CONFIG_WATCHDOG=y |
97 | CONFIG_WATCHDOG_NOWAYOUT=y | 94 | CONFIG_WATCHDOG_NOWAYOUT=y |
@@ -103,7 +100,6 @@ CONFIG_LCD_CLASS_DEVICE=y | |||
103 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 100 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
104 | CONFIG_FRAMEBUFFER_CONSOLE=y | 101 | CONFIG_FRAMEBUFFER_CONSOLE=y |
105 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | 102 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y |
106 | CONFIG_FONTS=y | ||
107 | CONFIG_LOGO=y | 103 | CONFIG_LOGO=y |
108 | CONFIG_SOUND=y | 104 | CONFIG_SOUND=y |
109 | CONFIG_SND=y | 105 | CONFIG_SND=y |
@@ -129,12 +125,14 @@ CONFIG_SDIO_UART=m | |||
129 | CONFIG_MMC_ATMELMCI=m | 125 | CONFIG_MMC_ATMELMCI=m |
130 | CONFIG_NEW_LEDS=y | 126 | CONFIG_NEW_LEDS=y |
131 | CONFIG_LEDS_CLASS=y | 127 | CONFIG_LEDS_CLASS=y |
132 | CONFIG_LEDS_ATMEL_PWM=y | ||
133 | CONFIG_LEDS_GPIO=y | 128 | CONFIG_LEDS_GPIO=y |
129 | CONFIG_LEDS_PWM=y | ||
134 | CONFIG_LEDS_TRIGGERS=y | 130 | CONFIG_LEDS_TRIGGERS=y |
135 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 131 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
136 | CONFIG_RTC_CLASS=y | 132 | CONFIG_RTC_CLASS=y |
137 | CONFIG_RTC_DRV_AT91SAM9=y | 133 | CONFIG_RTC_DRV_AT91SAM9=y |
134 | CONFIG_PWM=y | ||
135 | CONFIG_PWM_ATMEL=y | ||
138 | CONFIG_EXT4_FS=y | 136 | CONFIG_EXT4_FS=y |
139 | CONFIG_VFAT_FS=y | 137 | CONFIG_VFAT_FS=y |
140 | CONFIG_TMPFS=y | 138 | CONFIG_TMPFS=y |
@@ -150,3 +148,4 @@ CONFIG_NLS_ISO8859_1=y | |||
150 | CONFIG_NLS_UTF8=y | 148 | CONFIG_NLS_UTF8=y |
151 | CONFIG_DEBUG_USER=y | 149 | CONFIG_DEBUG_USER=y |
152 | CONFIG_XZ_DEC=y | 150 | CONFIG_XZ_DEC=y |
151 | CONFIG_FONTS=y | ||