From ad1701d0f9bd00826599342cb2f8fa4a799de859 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 6 Jun 2014 15:39:40 -0600 Subject: [PATCH] SAMA5D4: Various changes to get the SAMA4D-EK to build --- configs/sama5d3-xplained/nsh/defconfig | 2 +- configs/sama5d3x-ek/demo/defconfig | 2 +- configs/sama5d3x-ek/hello/defconfig | 2 +- configs/sama5d3x-ek/norboot/defconfig | 2 +- configs/sama5d3x-ek/nsh/defconfig | 2 +- configs/sama5d3x-ek/nx/defconfig | 2 +- configs/sama5d3x-ek/nxwm/defconfig | 2 +- configs/sama5d3x-ek/ov2640/defconfig | 2 +- configs/sama5d4-ek/nsh/defconfig | 64 ++++++++++++++++++++------ 9 files changed, 58 insertions(+), 22 deletions(-) diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig index e057b5b9e8..fd4833382a 100644 --- a/configs/sama5d3-xplained/nsh/defconfig +++ b/configs/sama5d3-xplained/nsh/defconfig @@ -128,7 +128,7 @@ CONFIG_SAMA5_HAVE_CAN0=y CONFIG_SAMA5_HAVE_CAN1=y CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -CONFIG_SAMA5_HAVE_EMAC=y +CONFIG_SAMA5_HAVE_EMAC0=y CONFIG_SAMA5_HAVE_HSMCI2=y CONFIG_SAMA5_HAVE_TC1=y # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig index 90c402997b..2c76cad964 100644 --- a/configs/sama5d3x-ek/demo/defconfig +++ b/configs/sama5d3x-ek/demo/defconfig @@ -133,7 +133,7 @@ CONFIG_USBHOST_ISOC_DISABLE=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig index 720cdb92b0..198c5df3cf 100644 --- a/configs/sama5d3x-ek/hello/defconfig +++ b/configs/sama5d3x-ek/hello/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig index ff2aae5ec5..cbb6121489 100644 --- a/configs/sama5d3x-ek/norboot/defconfig +++ b/configs/sama5d3x-ek/norboot/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig index e01f95ecd0..573b2453d2 100644 --- a/configs/sama5d3x-ek/nsh/defconfig +++ b/configs/sama5d3x-ek/nsh/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index cd5876442b..7eb67e8815 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index 9264d8f079..b9b6bb8e3e 100644 --- a/configs/sama5d3x-ek/nxwm/defconfig +++ b/configs/sama5d3x-ek/nxwm/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig index 00287e9d4d..a5dc1aeb1a 100644 --- a/configs/sama5d3x-ek/ov2640/defconfig +++ b/configs/sama5d3x-ek/ov2640/defconfig @@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # CONFIG_SAMA5_HAVE_CAN1 is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index a4b9c8210e..2326b91fa8 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -122,28 +122,54 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +CONFIG_SAMA5_HAVE_AESB=y +CONFIG_SAMA5_HAVE_ICM=y CONFIG_SAMA5_HAVE_UART0=y CONFIG_SAMA5_HAVE_UART1=y -CONFIG_SAMA5_HAVE_CAN0=y -CONFIG_SAMA5_HAVE_CAN1=y +CONFIG_SAMA5_HAVE_USART4=y +# CONFIG_SAMA5_HAVE_CAN0 is not set +# CONFIG_SAMA5_HAVE_CAN1 is not set +# CONFIG_SAMA5_HAVE_DMA is not set +CONFIG_SAMA5_HAVE_DDR32=y +CONFIG_SAMA5_HAVE_XDMA=y +CONFIG_SAMA5_HAVE_L2CC=y CONFIG_SAMA5_HAVE_LCDC=y -CONFIG_SAMA5_HAVE_GMAC=y -CONFIG_SAMA5_HAVE_EMAC=y -CONFIG_SAMA5_HAVE_HSMCI2=y +# CONFIG_SAMA5_HAVE_GMAC is not set +CONFIG_SAMA5_HAVE_EMAC0=y +CONFIG_SAMA5_HAVE_EMAC1=y +# CONFIG_SAMA5_HAVE_HSMCI2 is not set +CONFIG_SAMA5_HAVE_SAIC=y +CONFIG_SAMA5_HAVE_SBM=y +CONFIG_SAMA5_HAVE_SFC=y +CONFIG_SAMA5_HAVE_SPI2=y CONFIG_SAMA5_HAVE_TC1=y +CONFIG_SAMA5_HAVE_TC2=y +CONFIG_SAMA5_HAVE_TWI3=y +CONFIG_SAMA5_HAVE_VDEC=y +# CONFIG_ARCH_CHIP_SAMA5D3 is not set +CONFIG_ARCH_CHIP_SAMA5D4=y # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D33 is not set # CONFIG_ARCH_CHIP_ATSAMA5D34 is not set # CONFIG_ARCH_CHIP_ATSAMA5D35 is not set +# CONFIG_ARCH_CHIP_ATSAMA5D36 is not set +# CONFIG_ARCH_CHIP_ATSAMA5D41 is not set +# CONFIG_ARCH_CHIP_ATSAMA5D42 is not set +# CONFIG_ARCH_CHIP_ATSAMA5D43 is not set CONFIG_ARCH_CHIP_ATSAMA5D44=y # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set +# CONFIG_SAMA5_AESB is not set CONFIG_SAMA5_DBGU=y +# CONFIG_SAMA5_L2CC is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set # CONFIG_SAMA5_RTC is not set +# CONFIG_SAMA5_ICM is not set CONFIG_SAMA5_HSMC=y # CONFIG_SAMA5_SMD is not set # CONFIG_SAMA5_UART0 is not set @@ -152,35 +178,37 @@ CONFIG_SAMA5_HSMC=y # CONFIG_SAMA5_USART1 is not set # CONFIG_SAMA5_USART2 is not set # CONFIG_SAMA5_USART3 is not set +# CONFIG_SAMA5_USART4 is not set # CONFIG_SAMA5_TWI0 is not set # CONFIG_SAMA5_TWI1 is not set # CONFIG_SAMA5_TWI2 is not set +# CONFIG_SAMA5_TWI3 is not set # CONFIG_SAMA5_HSMCI0 is not set # CONFIG_SAMA5_HSMCI1 is not set -# CONFIG_SAMA5_HSMCI2 is not set +# CONFIG_SAMA5_SAIC is not set +# CONFIG_SAMA5_SBM is not set +# CONFIG_SAMA5_SFC is not set # CONFIG_SAMA5_SPI0 is not set # CONFIG_SAMA5_SPI1 is not set +# CONFIG_SAMA5_SPI2 is not set # CONFIG_SAMA5_TC0 is not set # CONFIG_SAMA5_TC1 is not set +# CONFIG_SAMA5_TC2 is not set # CONFIG_SAMA5_PWM is not set # CONFIG_SAMA5_ADC is not set -# CONFIG_SAMA5_DMAC0 is not set -# CONFIG_SAMA5_DMAC1 is not set +# CONFIG_SAMA5_XDMAC is not set # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set -# CONFIG_SAMA5_GMAC is not set # CONFIG_SAMA5_EMAC0 is not set +# CONFIG_SAMA5_EMAC1 is not set # CONFIG_SAMA5_LCDC is not set # CONFIG_SAMA5_ISI is not set -# CONFIG_SAMA5_CAN0 is not set -# CONFIG_SAMA5_CAN1 is not set # CONFIG_SAMA5_SHA is not set -# CONFIG_SAMA5_AES is not set -# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_TRNG is not set # CONFIG_SAMA5_ARM is not set # CONFIG_SAMA5_FUSE is not set # CONFIG_SAMA5_MPDDRC is not set +# CONFIG_SAMA5_VDEC is not set # CONFIG_SAMA5_PIO_IRQ is not set # @@ -220,6 +248,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_MMU=y CONFIG_ARCH_NAND_HWECC=y +# CONFIG_ARCH_HAVE_EXTCLK is not set # CONFIG_PAGING is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y @@ -389,6 +418,7 @@ CONFIG_DEV_NULL=y # CONFIG_I2S is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set +# CONFIG_TIMER is not set # CONFIG_ANALOG is not set # CONFIG_AUDIO_DEVICES is not set # CONFIG_VIDEO_DEVICES is not set @@ -576,6 +606,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_CAN is not set # CONFIG_EXAMPLES_CONFIGDATA is not set +# CONFIG_EXAMPLES_CPUHOG is not set # CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set @@ -603,13 +634,14 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y # CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_OSTEST is not set -# CONFIG_EXAMPLES_PASHELLO is not set # CONFIG_EXAMPLES_PIPE is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set # CONFIG_EXAMPLES_QENCODER is not set # CONFIG_EXAMPLES_RGMP is not set # CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_SENDMAIL is not set +# CONFIG_EXAMPLES_SERIALBLASTER is not set +# CONFIG_EXAMPLES_SERIALRX is not set # CONFIG_EXAMPLES_SERLOOP is not set # CONFIG_EXAMPLES_SLCD is not set # CONFIG_EXAMPLES_SMART_TEST is not set @@ -794,6 +826,10 @@ CONFIG_NSH_CONSOLE=y CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y +# +# P-Code Support +# + # # Power Off #