diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt index 923db50542a..6336d637dec 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_DMA - DMA Controller + CONFIG_SAM34_DMAC - 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 704f8528721..8521661f137 100644 --- a/configs/arduino-due/nsh/defconfig +++ b/configs/arduino-due/nsh/defconfig @@ -165,7 +165,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_DMA is not set +# CONFIG_SAM34_DMAC 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/arduino-due/ostest/defconfig b/configs/arduino-due/ostest/defconfig index 1e1f66771f4..64cb4a92b89 100644 --- a/configs/arduino-due/ostest/defconfig +++ b/configs/arduino-due/ostest/defconfig @@ -165,7 +165,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_DMA is not set +# CONFIG_SAM34_DMAC 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 fc5874b30e3..a8d23ba7e01 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_DMA - DMA Controller + CONFIG_SAM34_DMAC - DMA Controller CONFIG_SAM34_UDPHS - USB Device High Speed Some subsystems can be configured to operate in different ways. The drivers @@ -646,7 +646,7 @@ Configurations System Type->ATSAM3/4 Peripheral Support CONFIG_SAM34_HSMCI=y : Enable HSMCI support - CONFIG_SAM34_DMA=y : DMAC support is needed by HSMCI + CONFIG_SAM34_DMAC=y : DMAC support is needed by HSMCI System Type CONFIG_SAM34_GPIO_IRQ=y : PIO interrupts needed diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig index 4ac7345fcbb..865f020752a 100644 --- a/configs/sam3u-ek/knsh/defconfig +++ b/configs/sam3u-ek/knsh/defconfig @@ -154,7 +154,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_DMA is not set +# CONFIG_SAM34_DMAC is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_RTC is not set # CONFIG_SAM34_RTT is not set diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig index f48ed59386e..8acd63b0716 100644 --- a/configs/sam3u-ek/nsh/defconfig +++ b/configs/sam3u-ek/nsh/defconfig @@ -165,7 +165,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_DMA is not set +# CONFIG_SAM34_DMAC 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 11314604a3c..92ef5066c7f 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -146,7 +146,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_DMA is not set +# CONFIG_SAM34_DMAC is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_RTC is not set # CONFIG_SAM34_RTT is not set diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 1214e2fafcc..eab2923394f 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -180,7 +180,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_DMA is not set +# CONFIG_SAM34_DMAC 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/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig index 40b1816aca1..190306f591c 100644 --- a/configs/sam3u-ek/ostest/defconfig +++ b/configs/sam3u-ek/ostest/defconfig @@ -146,7 +146,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_DMA is not set +# CONFIG_SAM34_DMAC is not set # CONFIG_SAM34_UDPHS is not set # CONFIG_SAM34_RTC is not set # CONFIG_SAM34_RTT is not set