diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index 3756bc032d6..d10e7b937b9 100644 --- a/configs/arduino-due/README.txt +++ b/configs/arduino-due/README.txt @@ -817,7 +817,7 @@ Arduino DUE-specific Configuration Options CONFIG_SAM34_PWM - Pulse Width Modulation CONFIG_SAM34_ADC12B - 12-bit Analog To Digital Converter CONFIG_SAM34_DACC - Digital To Analog Converter - CONFIG_SAM34_DMAC - DMA Controller + CONFIG_SAM34_DMAC0 - DMA Controller CONFIG_SAM34_UOTGHS - USB OTG High Speed CONFIG_SAM34_TRNG - True Random Number Generator CONFIG_SAM34_EMAC - Ethernet MAC diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig index 8506fade6e5..13574c9bb4a 100644 --- a/configs/arduino-due/nsh/defconfig +++ b/configs/arduino-due/nsh/defconfig @@ -164,7 +164,7 @@ CONFIG_SAM34_UART0=y # CONFIG_SAM34_CAN1 is not set # CONFIG_SAM34_SMC is not set # CONFIG_SAM34_SDRAMC is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set # CONFIG_SAM34_UOTGHS is not set # CONFIG_SAM34_RTC is not set # CONFIG_SAM34_RTT is not set diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt index 5dcd92d1d9a..0a3f0191bc3 100644 --- a/configs/sam3u-ek/README.txt +++ b/configs/sam3u-ek/README.txt @@ -381,7 +381,7 @@ SAM3U-EK-specific Configuration Options CONFIG_SAM34_PWM - Pulse Width Modulation Controller CONFIG_SAM34_ADC12B - 12-bit ADC Controller CONFIG_SAM34_ADC - 10-bit ADC Controller - CONFIG_SAM34_DMAC - DMA Controller + CONFIG_SAM34_DMAC0 - DMA Controller CONFIG_SAM34_UDPHS - USB Device High Speed Some subsystems can be configured to operate in different ways. The drivers @@ -646,25 +646,25 @@ Configurations System Type->ATSAM3/4 Peripheral Support CONFIG_SAM34_HSMCI=y : Enable HSMCI support - CONFIG_SAM34_DMAC=y : DMAC support is needed by HSMCI + CONFIG_SAM34_DMAC0=y : DMAC support is needed by HSMCI System Type CONFIG_SAM34_GPIO_IRQ=y : PIO interrupts needed CONFIG_SAM34_GPIOA_IRQ=y : Card detect pin is on PIOA Device Drivers -> MMC/SD Driver Support - CONFIG_MMCSD=y : Enable MMC/SD support - CONFIG_MMSCD_NSLOTS=1 : One slot per driver instance - CONFIG_MMCSD_HAVECARDDETECT=y : Supports card-detect PIOs - CONFIG_MMCSD_SDIO=y : SDIO-based MMC/SD support - CONFIG_SDIO_DMA=y : Use SDIO DMA - CONFIG_SDIO_BLOCKSETUP=y : Needs to know block sizes + CONFIG_MMCSD=y : Enable MMC/SD support + CONFIG_MMSCD_NSLOTS=1 : One slot per driver instance + CONFIG_MMCSD_HAVECARDDETECT=y : Supports card-detect PIOs + CONFIG_MMCSD_SDIO=y : SDIO-based MMC/SD support + CONFIG_SDIO_DMA=y : Use SDIO DMA + CONFIG_SDIO_BLOCKSETUP=y : Needs to know block sizes Library Routines - CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support + CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support Application Configuration -> NSH Library - CONFIG_NSH_ARCHINIT=y : NSH board-initialization + CONFIG_NSH_ARCHINIT=y : NSH board-initialization STATUS: 2013-6-28: The touchscreen is functional. diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig index dbab1478790..4e706f04813 100644 --- a/configs/sam3u-ek/knsh/defconfig +++ b/configs/sam3u-ek/knsh/defconfig @@ -191,7 +191,7 @@ CONFIG_SAM34_UART0=y # CONFIG_SAM34_ADC is not set # CONFIG_SAM34_SMC is not set # CONFIG_SAM34_NAND is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_UOTGHS is not set # CONFIG_SAM34_RTC is not set diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig index 0f2c45c400a..0b295f3ea6e 100644 --- a/configs/sam3u-ek/nsh/defconfig +++ b/configs/sam3u-ek/nsh/defconfig @@ -185,7 +185,7 @@ CONFIG_SAM34_UART0=y # CONFIG_SAM34_ADC is not set # CONFIG_SAM34_SMC is not set # CONFIG_SAM34_NAND is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_UOTGHS is not set # CONFIG_SAM34_RTC is not set diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index adfe39487dd..f60732cce6b 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -185,7 +185,7 @@ CONFIG_SAM34_UART0=y # CONFIG_SAM34_ADC is not set # CONFIG_SAM34_SMC is not set # CONFIG_SAM34_NAND is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_UOTGHS is not set # CONFIG_SAM34_RTC is not set diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 271b1a1c47a..b026c33744d 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -185,7 +185,7 @@ CONFIG_SAM34_UART0=y # CONFIG_SAM34_ADC is not set # CONFIG_SAM34_SMC is not set # CONFIG_SAM34_NAND is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_UOTGHS is not set # CONFIG_SAM34_RTC is not set diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt index a7c14ed37c5..d8e7669fa4f 100644 --- a/configs/sam4e-ek/README.txt +++ b/configs/sam4e-ek/README.txt @@ -610,7 +610,7 @@ SAM4E-EK-specific Configuration Options CONFIG_SAM34_SMC - Static Memory Controller CONFIG_SAM34_NAND - NAND support CONFIG_SAM34_PDCA - Peripheral DMA controller - CONFIG_SAM34_DMAC - DMA controller + CONFIG_SAM34_DMAC0 - DMA controller CONFIG_SAM34_UDP - USB 2.0 Full-Speed device CONFIG_SAM34_CHIPID - Chip ID CONFIG_SAM34_RTC - Real Time Clock @@ -843,25 +843,25 @@ Configurations System Type->ATSAM3/4 Peripheral Support CONFIG_SAM34_HSMCI=y : Enable HSMCI support - CONFIG_SAM34_DMAC=y : DMAC support is needed by HSMCI + CONFIG_SAM34_DMAC0=y : DMAC support is needed by HSMCI System Type CONFIG_SAM34_GPIO_IRQ=y : PIO interrupts needed CONFIG_SAM34_GPIOA_IRQ=y : Card detect pin is on PIOA Device Drivers -> MMC/SD Driver Support - CONFIG_MMCSD=y : Enable MMC/SD support - CONFIG_MMSCD_NSLOTS=1 : One slot per driver instance - CONFIG_MMCSD_HAVECARDDETECT=y : Supports card-detect PIOs - CONFIG_MMCSD_SDIO=y : SDIO-based MMC/SD support - CONFIG_SDIO_DMA=y : Use SDIO DMA - CONFIG_SDIO_BLOCKSETUP=y : Needs to know block sizes + CONFIG_MMCSD=y : Enable MMC/SD support + CONFIG_MMSCD_NSLOTS=1 : One slot per driver instance + CONFIG_MMCSD_HAVECARDDETECT=y : Supports card-detect PIOs + CONFIG_MMCSD_SDIO=y : SDIO-based MMC/SD support + CONFIG_SDIO_DMA=y : Use SDIO DMA + CONFIG_SDIO_BLOCKSETUP=y : Needs to know block sizes Library Routines - CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support + CONFIG_SCHED_WORKQUEUE=y : Driver needs work queue support Application Configuration -> NSH Library - CONFIG_NSH_ARCHINIT=y : NSH board-initialization + CONFIG_NSH_ARCHINIT=y : NSH board-initialization STATUS: 2014-3-13: The basic NSH serial console is working. Network support diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index c08c1eb4613..7add460a3ba 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -188,7 +188,7 @@ CONFIG_ARCH_CHIP_SAM4E=y # CONFIG_SAM34_CMCC is not set # CONFIG_SAM34_DACC is not set # CONFIG_SAM34_EIC is not set -# CONFIG_SAM34_DMAC is not set +# CONFIG_SAM34_DMAC0 is not set CONFIG_SAM34_EMAC=y # CONFIG_SAM34_HSMCI is not set # CONFIG_SAM34_NAND is not set