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