diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-10 17:40:25 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-10 17:40:25 -0600 |
| commit | 1d01482f916e0cca0a919475f883551bf1c1d5ef (patch) | |
| tree | a3dd87b1a4809bd8312530b024acb87caa170242 | |
| parent | 978c5f340d8ad09b0d88384fe3dc081494d9858f (diff) | |
| download | nuttx-1d01482f916e0cca0a919475f883551bf1c1d5ef.tar.gz nuttx-1d01482f916e0cca0a919475f883551bf1c1d5ef.tar.bz2 nuttx-1d01482f916e0cca0a919475f883551bf1c1d5ef.zip | |
SAMA5D3/4: More renaming. Change SAMA5D3 EMAC to EMACA and SAMA5D4 to EMACB so that the configuration and build system can configure them. I might come up with something better later
32 files changed, 470 insertions, 257 deletions
diff --git a/nuttx/arch/arm/include/sama5/sama5d3_irq.h b/nuttx/arch/arm/include/sama5/sama5d3_irq.h index 1cb0ed1eb..23038a7b3 100644 --- a/nuttx/arch/arm/include/sama5/sama5d3_irq.h +++ b/nuttx/arch/arm/include/sama5/sama5d3_irq.h @@ -85,7 +85,7 @@ #define SAM_PID_UHPHS (32) /* USB Host High Speed */ #define SAM_PID_UDPHS (33) /* USB Device High Speed */ #define SAM_PID_GMAC (34) /* Gigabit Ethernet MAC */ -#define SAM_PID_EMAC0 (35) /* Ethernet MAC 0 */ +#define SAM_PID_EMAC (35) /* Ethernet MAC */ #define SAM_PID_LCDC (36) /* LCD Controller */ #define SAM_PID_ISI (37) /* Image Sensor Interface */ #define SAM_PID_SSC0 (38) /* Synchronous Serial Controller 0 */ @@ -139,7 +139,7 @@ #define SAM_IRQ_UHPHS SAM_PID_UHPHS /* USB Host High Speed */ #define SAM_IRQ_UDPHS SAM_PID_UDPHS /* USB Device High Speed */ #define SAM_IRQ_GMAC SAM_PID_GMAC /* Gigabit Ethernet MAC */ -#define SAM_IRQ_EMAC0 SAM_PID_EMAC /* Ethernet MAC 0 */ +#define SAM_IRQ_EMAC SAM_PID_EMAC /* Ethernet MAC */ #define SAM_IRQ_LCDC SAM_PID_LCDC /* LCD Controller */ #define SAM_IRQ_ISI SAM_PID_ISI /* Image Sensor Interface */ #define SAM_IRQ_SSC0 SAM_PID_SSC0 /* Synchronous Serial Controller 0 */ diff --git a/nuttx/arch/arm/src/sama5/Kconfig b/nuttx/arch/arm/src/sama5/Kconfig index 7a21f3dfe..029b98e4e 100644 --- a/nuttx/arch/arm/src/sama5/Kconfig +++ b/nuttx/arch/arm/src/sama5/Kconfig @@ -61,11 +61,11 @@ config SAMA5_HAVE_GMAC bool default n -config SAMA5_HAVE_EMAC +config SAMA5_HAVE_EMACA bool default n -config SAMA5_HAVE_EMAC0 +config SAMA5_HAVE_EMACB bool default n @@ -120,7 +120,7 @@ config ARCH_CHIP_SAMA5D4 bool default n select SAMA5_HAVE_AESB - select SAMA5_HAVE_EMAC0 + select SAMA5_HAVE_EMACB select SAMA5_HAVE_EMAC1 select SAMA5_HAVE_ICM select SAMA5_HAVE_LCDC @@ -145,7 +145,7 @@ choice config ARCH_CHIP_ATSAMA5D31 bool "Atmel ATSAMA5D31" select ARCH_CHIP_SAMA5D3 - select SAMA5_HAVE_EMAC + select SAMA5_HAVE_EMACA select SAMA5_HAVE_HSMCI2 select SAMA5_HAVE_LCDC select SAMA5_HAVE_UART0 @@ -172,7 +172,7 @@ config ARCH_CHIP_ATSAMA5D34 config ARCH_CHIP_ATSAMA5D35 bool "Atmel ATSAMA5D35" select ARCH_CHIP_SAMA5D3 - select SAMA5_HAVE_EMAC + select SAMA5_HAVE_EMACA select SAMA5_HAVE_GMAC select SAMA5_HAVE_HSMCI2 select SAMA5_HAVE_UART0 @@ -185,7 +185,7 @@ config ARCH_CHIP_ATSAMA5D35 config ARCH_CHIP_ATSAMA5D36 bool "Atmel ATSAMA5D356" select ARCH_CHIP_SAMA5D3 - select SAMA5_HAVE_EMAC + select SAMA5_HAVE_EMACA select SAMA5_HAVE_GMAC select SAMA5_HAVE_HSMCI2 select SAMA5_HAVE_LCDC @@ -422,24 +422,30 @@ config SAMA5_GMAC select NETDEVICES select ARCH_HAVE_PHY -config SAMA5_EMAC - bool "10/100MBps Ethernet MAC (EMAC0)" +config SAMA5_EMACA + bool "10/100MBps Ethernet MAC (EMAC)" default n - depends on SAMA5_HAVE_EMAC + depends on SAMA5_HAVE_EMACA select NETDEVICES select ARCH_HAVE_PHY +config SAMA5_EMACB + bool + default n + config SAMA5_EMAC0 bool "10/100MBps Ethernet MAC (EMAC0)" default n - depends on SAMA5_HAVE_EMAC0 + depends on SAMA5_HAVE_EMACB + select SAMA5_EMACB select NETDEVICES select ARCH_HAVE_PHY config SAMA5_EMAC1 bool "10/100MBps Ethernet MAC (EMAC1)" default n - depends on SAMA5_HAVE_EMAC1 + depends on SAMA5_HAVE_EMACB && SAMA5_HAVE_EMAC1 + select SAMA5_EMACB select NETDEVICES select ARCH_HAVE_PHY @@ -1157,7 +1163,7 @@ config SAMA5_GMAC_REGDEBUG endmenu # GMAC device driver options endif # SAMA5_GMAC -if SAMA5_EMAC +if SAMA5_EMACA menu "EMAC device driver options" @@ -1326,7 +1332,7 @@ config SAMA5_EMAC_PHYSR_100FD This must be provided if SAMA5_EMAC_AUTONEG is defined. This is the value under the bit mask that represents the 100Mbps, full duplex setting. -config SAMA5_EMAC_REGDEBUG +config SAMA5_EMACA_REGDEBUG bool "Register-Level Debug" default n depends on DEBUG @@ -1334,8 +1340,9 @@ config SAMA5_EMAC_REGDEBUG Enable very low-level register access debug. Depends on DEBUG. endmenu # EMAC device driver options -endif # SAMA5_EMAC +endif # SAMA5_EMACA +if SAMA5_EMACB if SAMA5_EMAC0 menu "EMAC0 device driver options" @@ -1359,20 +1366,6 @@ config SAMA5_EMAC0_NTXBUFFERS that can be in flight. This is also equal to the number of TX descriptors that will be allocated. -config SAMA5_EMAC0_PREALLOCATE - bool "Preallocate buffers" - default n - ---help--- - Buffer an descriptor many may either be allocated from the memory - pool or pre-allocated to lie in .bss. This options selected pre- - allocated buffer memory. - -config SAMA5_EMAC0_NBC - bool "Disable Broadcast" - default n - ---help--- - Select to disable receipt of broadcast packets. - config SAMA5_EMAC0_PHYADDR int "PHY address" default 1 @@ -1532,13 +1525,6 @@ config SAMA5_EMAC0_PHYSR_100FD This must be provided if SAMA5_EMAC0_AUTONEG is defined. This is the value under the bit mask that represents the 100Mbps, full duplex setting. -config SAMA5_EMAC0_REGDEBUG - bool "Register-Level Debug" - default n - depends on DEBUG - ---help--- - Enable very low-level register access debug. Depends on DEBUG. - endmenu # EMAC0 device driver options endif # SAMA5_EMAC0 @@ -1565,20 +1551,6 @@ config SAMA5_EMAC1_NTXBUFFERS that can be in flight. This is also equal to the number of TX descriptors that will be allocated. -config SAMA5_EMAC1_PREALLOCATE - bool "Preallocate buffers" - default n - ---help--- - Buffer an descriptor many may either be allocated from the memory - pool or pre-allocated to lie in .bss. This options selected pre- - allocated buffer memory. - -config SAMA5_EMAC1_NBC - bool "Disable Broadcast" - default n - ---help--- - Select to disable receipt of broadcast packets. - config SAMA5_EMAC1_PHYADDR int "PHY address" default 1 @@ -1738,27 +1710,45 @@ config SAMA5_EMAC1_PHYSR_100FD This must be provided if SAMA5_EMAC1_AUTONEG is defined. This is the value under the bit mask that represents the 100Mbps, full duplex setting. -config SAMA5_EMAC1_REGDEBUG +endmenu # EMAC1 device driver options +endif # SAMA5_EMAC1 + +# These apply to both EMAC0 and EMAC1 + +config SAMA5_EMACB_PREALLOCATE + bool "Preallocate buffers" + default n + ---help--- + Buffer an descriptor many may either be allocated from the memory + pool or pre-allocated to lie in .bss. This options selected pre- + allocated buffer memory. + +config SAMA5_EMACB_NBC + bool "Disable Broadcast" + default n + ---help--- + Select to disable receipt of broadcast packets. + +config SAMA5_EMACB_REGDEBUG bool "Register-Level Debug" default n depends on DEBUG ---help--- Enable very low-level register access debug. Depends on DEBUG. -endmenu # EMAC1 device driver options -endif # SAMA5_EMAC1 +endif # SAMA5_EMACB -if SAMA5_EMAC || SAMA5_EMAC0 || SAMA5_EMAC1 || SAMA5_GMAC +if SAMA5_EMACA || SAMA5_EMAC0 || SAMA5_EMAC1 || SAMA5_GMAC choice prompt "Which device is eth0" default SAMA5_GMAC_ISETH0 if SAMA5_GMAC - default SAMA5_EMAC_ISETH0 if SAMA5_EMAC && !SAMA5_GMAC + default SAMA5_EMAC_ISETH0 if SAMA5_EMACA && !SAMA5_GMAC default SAMA5_EMAC0_ISETH0 if SAMA5_EMAC0 && !SAM_EMAC && !SAMA5_GMAC default SAMA5_EMAC1_ISETH0 if SAMA5_EMAC1 && !SAM_EMAC && !SAMA5_EMAC0 && !SAMA5_GMAC config SAMA5_EMAC_ISETH0 bool "EMAC is eth0" - depends on SAMA5_EMAC + depends on SAMA5_EMACA config SAMA5_EMAC0_ISETH0 bool "EMAC0 is eth0" diff --git a/nuttx/arch/arm/src/sama5/Make.defs b/nuttx/arch/arm/src/sama5/Make.defs index 0183f7565..ae3cada4e 100644 --- a/nuttx/arch/arm/src/sama5/Make.defs +++ b/nuttx/arch/arm/src/sama5/Make.defs @@ -190,8 +190,11 @@ endif ifeq ($(CONFIG_NET),y) CHIP_CSRCS += sam_ethernet.c -ifeq ($(CONFIG_SAMA5_EMAC),y) -CHIP_CSRCS += sam_emac.c +ifeq ($(CONFIG_SAMA5_EMACA),y) +CHIP_CSRCS += sam_emaca.c +endif +ifeq ($(CONFIG_SAMA5_EMACB),y) +CHIP_CSRCS += sam_emacb.c endif ifeq ($(CONFIG_SAMA5_GMAC),y) CHIP_CSRCS += sam_gmac.c diff --git a/nuttx/arch/arm/src/sama5/chip/sam_emac.h b/nuttx/arch/arm/src/sama5/chip/sam_emac.h index fb5529a9a..aaed94414 100644 --- a/nuttx/arch/arm/src/sama5/chip/sam_emac.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_emac.h @@ -41,14 +41,11 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <arch/sama5/chip.h> -#if defined(ATSAMA5D3) -# include "chip/sama5d3x_emac.h" -#elif defined(ATSAMA5D4) -# include "chip/sama5d4x_emac.h" -#else -# error Unrecognized SAMA5 architecture +#if defined(CONFIG_SAMA5_EMACA) +# include "chip/sam_emaca.h" +#elif defined(CONFIG_SAMA5_EMACB) +# include "chip/sam_emacb.h" #endif #endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H */ diff --git a/nuttx/arch/arm/src/sama5/chip/sama5d3x_emac.h b/nuttx/arch/arm/src/sama5/chip/sam_emaca.h index ff9a273ca..536b0cc91 100644 --- a/nuttx/arch/arm/src/sama5/chip/sama5d3x_emac.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_emaca.h @@ -1,5 +1,6 @@ /************************************************************************************ - * arch/arm/src/sama5/chip/sama5d3x_emac.h + * arch/arm/src/sama5/chip/sam_emaca.h + * This is the form of the EMAC interface used the the SAMA5D3 * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_EMAC_H -#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_EMAC_H +#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H +#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H /************************************************************************************ * Included Files @@ -453,4 +454,4 @@ struct emac_txdesc_s uint32_t status; /* TX status and controls */ }; -#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D3X_EMAC_H */ +#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H */ diff --git a/nuttx/arch/arm/src/sama5/chip/sama5d4x_emac.h b/nuttx/arch/arm/src/sama5/chip/sam_emacb.h index 950af8535..b6f85ab73 100644 --- a/nuttx/arch/arm/src/sama5/chip/sama5d4x_emac.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_emacb.h @@ -1,5 +1,8 @@ /************************************************************************************ - * arch/arm/src/sama5/chip/sama5d4x_emac.h + * arch/arm/src/sama5/chip/sam_emacb.h + * This is the form of the EMAC interface used the the SAMA5D4 (and also the SAM43). + * This is referred as GMAC in the documentation even though it does not support + * Gibabit Ethernet. * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +36,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_EMAC_H -#define __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_EMAC_H +#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H +#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H /************************************************************************************ * Included Files @@ -677,4 +680,4 @@ struct emac_txdesc_s uint32_t status; /* TX status and controls */ }; -#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAMA5D4X_EMAC_H */ +#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H */ diff --git a/nuttx/arch/arm/src/sama5/sam_emac.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index b62f39b63..195c7b182 100644 --- a/nuttx/arch/arm/src/sama5/sam_emac.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/sama5/sam_emac.c + * arch/arm/src/sama5/sam_emaca.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -78,7 +78,7 @@ #include <arch/board/board.h> -#if defined(CONFIG_NET) && defined(CONFIG_SAMA5_EMAC) +#if defined(CONFIG_NET) && defined(CONFIG_SAMA5_EMACA) /**************************************************************************** * Definitions @@ -212,7 +212,7 @@ */ #ifndef CONFIG_DEBUG -# undef CONFIG_SAMA5_EMAC_REGDEBUG +# undef CONFIG_SAMA5_EMACA_REGDEBUG #endif #ifdef CONFIG_NET_DUMPPACKET @@ -274,7 +274,7 @@ struct sam_emac_s /* Debug stuff */ -#ifdef CONFIG_SAMA5_EMAC_REGDEBUG +#ifdef CONFIG_SAMA5_EMACA_REGDEBUG bool wrlast; /* Last was a write */ uintptr_t addrlast; /* Last address */ uint32_t vallast; /* Last value */ @@ -324,7 +324,7 @@ static uint8_t g_rxbuffer[CONFIG_SAMA5_EMAC_NRXBUFFERS * EMAC_RX_UNITSIZE] ****************************************************************************/ /* Register operations ******************************************************/ -#if defined(CONFIG_SAMA5_EMAC_REGDEBUG) && defined(CONFIG_DEBUG) +#if defined(CONFIG_SAMA5_EMACA_REGDEBUG) && defined(CONFIG_DEBUG) static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, uintptr_t address); static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t addr); @@ -415,7 +415,7 @@ static int sam_emac_configure(struct sam_emac_s *priv); * ****************************************************************************/ -#ifdef CONFIG_SAMA5_EMAC_REGDEBUG +#ifdef CONFIG_SAMA5_EMACA_REGDEBUG static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, uintptr_t address) { @@ -461,7 +461,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval, * ****************************************************************************/ -#ifdef CONFIG_SAMA5_EMAC_REGDEBUG +#ifdef CONFIG_SAMA5_EMACA_REGDEBUG static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address) { uint32_t regval = getreg32(address); @@ -483,7 +483,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address) * ****************************************************************************/ -#ifdef CONFIG_SAMA5_EMAC_REGDEBUG +#ifdef CONFIG_SAMA5_EMACA_REGDEBUG static void sam_putreg(struct sam_emac_s *priv, uintptr_t address, uint32_t regval) { @@ -2965,4 +2965,4 @@ errout: return ret; } -#endif /* CONFIG_NET && CONFIG_SAMA5_EMAC */ +#endif /* CONFIG_NET && CONFIG_SAMA5_EMACA */ diff --git a/nuttx/arch/arm/src/sama5/sam_ethernet.c b/nuttx/arch/arm/src/sama5/sam_ethernet.c index d9696eeed..3ce03ba99 100644 --- a/nuttx/arch/arm/src/sama5/sam_ethernet.c +++ b/nuttx/arch/arm/src/sama5/sam_ethernet.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/sama5/sam_ethernet.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -109,7 +109,7 @@ static inline void up_gmac_initialize(void) * ****************************************************************************/ -#ifdef CONFIG_SAMA5_EMAC +#if defined(CONFIG_SAMA5_EMACA) || defined(CONFIG_SAMA5_EMACB) static inline void up_emac_initialize(void) { int ret; diff --git a/nuttx/arch/arm/src/sama5/sam_ethernet.h b/nuttx/arch/arm/src/sama5/sam_ethernet.h index adb85c4a6..f1417eb88 100644 --- a/nuttx/arch/arm/src/sama5/sam_ethernet.h +++ b/nuttx/arch/arm/src/sama5/sam_ethernet.h @@ -51,8 +51,13 @@ ************************************************************************************/ /* Definitions for use with sam_phy_boardinitialize */ -#define GMAC_INTF 0 -#define EMAC_INTF 1 +#if defined(SAMA5_HAVE_EMACA) +# define GMAC_INTF 0 +# define EMAC_INTF 1 +#elif defined(SAMA5_HAVE_EMACB) +# define EMAC0_INTF 0 +# define EMAC1_INTF 1 +#endif /* Which is ETH0 and which is ETH1? */ @@ -60,10 +65,15 @@ # undef CONFIG_SAMA5_GMAC_ISETH0 #endif -#ifndef CONFIG_SAMA5_EMAC +#ifndef CONFIG_SAMA5_EMACA # undef CONFIG_SAMA5_EMAC_ISETH0 #endif +#ifndef CONFIG_SAMA5_EMACB +# undef CONFIG_SAMA5_EMAC0_ISETH0 +# undef CONFIG_SAMA5_EMAC1_ISETH0 +#endif + #if defined(CONFIG_SAMA5_GMAC_ISETH0) && defined(CONFIG_SAMA5_EMAC_ISETH0) # error GMAC and EMAC cannot both be ETH0 #endif @@ -106,7 +116,7 @@ # else # error ETH0 PHY unrecognized # endif -#elif defined(CONFIG_SAMA5_EMAC) +#elif defined(CONFIG_SAMA5_EMACA) # if defined(CONFIG_ETH1_PHY_DM9161) # define SAMA5_EMAC_PHY_DM9161 1 # elif defined(CONFIG_ETH1_PHY_LAN8700) @@ -129,7 +139,8 @@ #undef EXTERN #if defined(__cplusplus) #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif @@ -172,7 +183,7 @@ int sam_gmac_initialize(void); * ****************************************************************************/ -#ifdef CONFIG_SAMA5_EMAC +#if defined(CONFIG_SAMA5_EMACA) || defined(CONFIG_SAMA5_EMACB) int sam_emac_initialize(void); #endif diff --git a/nuttx/configs/sama5d3-xplained/README.txt b/nuttx/configs/sama5d3-xplained/README.txt index 564d631f7..925011160 100644 --- a/nuttx/configs/sama5d3-xplained/README.txt +++ b/nuttx/configs/sama5d3-xplained/README.txt @@ -752,7 +752,7 @@ Networking ----------------------------- System Type -> SAMA5 Peripheral Support - CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral + CONFIG_SAMA5_EMACA=y : Enable the EMAC A peripheral System Type -> EMAC device driver options CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers @@ -2477,7 +2477,7 @@ SAMA5D3-Xplained Configuration Options CONFIG_SAMA5_UHPHS - USB Host High Speed CONFIG_SAMA5_UDPHS - USB Device High Speed CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC - CONFIG_SAMA5_EMAC - Ethernet MAC + CONFIG_SAMA5_EMACA - Ethernet MAC (type A) CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 diff --git a/nuttx/configs/sama5d3-xplained/include/board.h b/nuttx/configs/sama5d3-xplained/include/board.h index 05a78f14d..3693c62d3 100644 --- a/nuttx/configs/sama5d3-xplained/include/board.h +++ b/nuttx/configs/sama5d3-xplained/include/board.h @@ -335,7 +335,7 @@ void sam_boardinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC) || defined(CONFIG_SAMA5_GMAC)) && \ +#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMACA) || defined(CONFIG_SAMA5_GMAC)) && \ defined(CONFIG_SAMA5_PIOE_IRQ) xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); #endif diff --git a/nuttx/configs/sama5d3-xplained/nsh/defconfig b/nuttx/configs/sama5d3-xplained/nsh/defconfig index 6ee397aac..7e36ba50f 100644 --- a/nuttx/configs/sama5d3-xplained/nsh/defconfig +++ b/nuttx/configs/sama5d3-xplained/nsh/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set CONFIG_SAMA5_HAVE_UART0=y CONFIG_SAMA5_HAVE_UART1=y +# CONFIG_SAMA5_HAVE_USART4 is not set CONFIG_SAMA5_HAVE_CAN0=y CONFIG_SAMA5_HAVE_CAN1=y +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -CONFIG_SAMA5_HAVE_EMAC=y +CONFIG_SAMA5_HAVE_EMACA=y +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set CONFIG_SAMA5_HAVE_HSMCI2=y +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set CONFIG_SAMA5_HAVE_TC1=y +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # 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=y +# 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set CONFIG_SAMA5_DBGU=y # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -169,14 +193,13 @@ CONFIG_SAMA5_HSMC=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set -# CONFIG_SAMA5_EMAC is not set +# CONFIG_SAMA5_EMACA is not set +# CONFIG_SAMA5_EMACB 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 @@ -220,6 +243,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 +413,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 +601,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 +629,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 @@ -795,6 +822,10 @@ CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3-xplained/src/Makefile b/nuttx/configs/sama5d3-xplained/src/Makefile index 6262b7c5e..56ad6277a 100644 --- a/nuttx/configs/sama5d3-xplained/src/Makefile +++ b/nuttx/configs/sama5d3-xplained/src/Makefile @@ -84,7 +84,7 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_SAMA5_EMAC),y) +ifeq ($(CONFIG_SAMA5_EMACA),y) CSRCS += sam_ethernet.c else ifeq ($(CONFIG_SAMA5_GMAC),y) diff --git a/nuttx/configs/sama5d3-xplained/src/sam_ethernet.c b/nuttx/configs/sama5d3-xplained/src/sam_ethernet.c index 2f337689e..37a77b292 100644 --- a/nuttx/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/nuttx/configs/sama5d3-xplained/src/sam_ethernet.c @@ -55,7 +55,7 @@ ************************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMACA static xcpt g_emac_handler; #endif #ifdef CONFIG_SAMA5_GMAC @@ -81,8 +81,8 @@ static xcpt g_gmac_handler; void weak_function sam_netinitialize(void) { -#ifdef CONFIG_SAMA4_EMAC - /* Ethernet 10/100 (EMAC) Port +#ifdef CONFIG_SAMA4_EMACA + /* Ethernet 10/100 (EMAC A) Port * * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. * The board supports MII and RMII interface modes. @@ -138,7 +138,7 @@ xcpt_t sam_phyirq(int intf, xcpt_t irqhandler) xcpt_t oldhandler; int irq; -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMACA if (intf == EMAC_INTF) { handler = &g_emac_handler; diff --git a/nuttx/configs/sama5d3-xplained/src/sama5d3-xplained.h b/nuttx/configs/sama5d3-xplained/src/sama5d3-xplained.h index 1d51ae7c0..bc32ec8d8 100644 --- a/nuttx/configs/sama5d3-xplained/src/sama5d3-xplained.h +++ b/nuttx/configs/sama5d3-xplained/src/sama5d3-xplained.h @@ -255,7 +255,7 @@ /* Networking */ -#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC) && !defined(CONFIG_SAMA5_GMAC)) +#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMACA) && !defined(CONFIG_SAMA5_GMAC)) # undef HAVE_NETWORK #endif @@ -418,8 +418,8 @@ /* Ethernet */ -#ifdef CONFIG_SAMA4_EMAC - /* ETH1: Ethernet 10/100 (EMAC) Port +#ifdef CONFIG_SAMA4_EMACA + /* ETH1: Ethernet 10/100 (EMAC A) Port * * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. * The board supports MII and RMII interface modes. diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index 052965d30..31c667af2 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/configs/sama5d3x-ek/README.txt @@ -899,7 +899,7 @@ Networking CONFIG_ARCH_CHIP_ATSAMA5D35=y : (others do not) System Type -> SAMA5 Peripheral Support - CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral + CONFIG_SAMA5_EMACA=y : Enable the EMAC (type A) peripheral System Type -> EMAC device driver options CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers @@ -2822,7 +2822,7 @@ SAMA5D3x-EK Configuration Options CONFIG_SAMA5_UHPHS - USB Host High Speed CONFIG_SAMA5_UDPHS - USB Device High Speed CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC - CONFIG_SAMA5_EMAC - Ethernet MAC + CONFIG_SAMA5_EMACA - Ethernet MAC (Type A) CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 diff --git a/nuttx/configs/sama5d3x-ek/demo/defconfig b/nuttx/configs/sama5d3x-ek/demo/defconfig index 0895fe84f..0cc77b9ff 100644 --- a/nuttx/configs/sama5d3x-ek/demo/defconfig +++ b/nuttx/configs/sama5d3x-ek/demo/defconfig @@ -140,8 +140,8 @@ CONFIG_SAMA5_HAVE_DMA=y # CONFIG_SAMA5_HAVE_L2CC 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_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set # CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_SAIC is not set @@ -194,6 +194,7 @@ CONFIG_SAMA5_DMAC1=y CONFIG_SAMA5_UHPHS=y CONFIG_SAMA5_UDPHS=y # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB is not set # CONFIG_SAMA5_LCDC is not set # CONFIG_SAMA5_ISI is not set # CONFIG_SAMA5_SSC0 is not set diff --git a/nuttx/configs/sama5d3x-ek/hello/defconfig b/nuttx/configs/sama5d3x-ek/hello/defconfig index 720cdb92b..b3f3c7b1f 100644 --- a/nuttx/configs/sama5d3x-ek/hello/defconfig +++ b/nuttx/configs/sama5d3x-ek/hello/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_USART1=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB 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 @@ -202,6 +223,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 @@ -262,6 +284,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y # CONFIG_SAMA5D3xEK_384MHZ is not set CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set +# CONFIG_SAMA5D3xEK_NOREDLED is not set # CONFIG_SAMA5D3xEK_NOR_MAIN is not set # @@ -371,6 +394,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 @@ -554,6 +578,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # 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_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set @@ -579,7 +604,6 @@ CONFIG_EXAMPLES_HELLO=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_POLL is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set @@ -587,6 +611,8 @@ CONFIG_EXAMPLES_HELLO=y # 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 is not set @@ -697,6 +723,10 @@ CONFIG_EXAMPLES_HELLO=y # CONFIG_SYSTEM_READLINE is not set # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/include/board.h b/nuttx/configs/sama5d3x-ek/include/board.h index d054a8ce3..83f146295 100644 --- a/nuttx/configs/sama5d3x-ek/include/board.h +++ b/nuttx/configs/sama5d3x-ek/include/board.h @@ -376,7 +376,7 @@ void sam_boardinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC) || defined(CONFIG_SAMA5_GMAC)) && \ +#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMACA) || defined(CONFIG_SAMA5_GMAC)) && \ defined(CONFIG_SAMA5_PIOE_IRQ) xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); #endif diff --git a/nuttx/configs/sama5d3x-ek/norboot/defconfig b/nuttx/configs/sama5d3x-ek/norboot/defconfig index ff2aae5ec..ad051d1dc 100644 --- a/nuttx/configs/sama5d3x-ek/norboot/defconfig +++ b/nuttx/configs/sama5d3x-ek/norboot/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_USART1=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB 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 @@ -215,6 +236,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 @@ -275,6 +297,7 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y # CONFIG_SAMA5D3xEK_384MHZ is not set CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set +# CONFIG_SAMA5D3xEK_NOREDLED is not set CONFIG_SAMA5D3xEK_NOR_MAIN=y # CONFIG_SAMA5D3xEK_NOR_START is not set @@ -385,6 +408,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 @@ -568,6 +592,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # 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_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set @@ -593,7 +618,6 @@ CONFIG_EXAMPLES_HELLO=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_POLL is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set @@ -601,6 +625,8 @@ CONFIG_EXAMPLES_HELLO=y # 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 is not set @@ -711,6 +737,10 @@ CONFIG_EXAMPLES_HELLO=y # CONFIG_SYSTEM_READLINE is not set # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/nsh/defconfig b/nuttx/configs/sama5d3x-ek/nsh/defconfig index e01f95ecd..c92181e20 100644 --- a/nuttx/configs/sama5d3x-ek/nsh/defconfig +++ b/nuttx/configs/sama5d3x-ek/nsh/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_USART1=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB 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 @@ -216,12 +237,13 @@ 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 # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set -# CONFIG_ARCH_HAVE_RAMFUNCS is not set +CONFIG_ARCH_HAVE_RAMFUNCS=y CONFIG_ARCH_RAMFUNCS=y # CONFIG_ARCH_HAVE_RAMVECTORS is not set @@ -281,6 +303,7 @@ CONFIG_NSH_MMCSDMINOR=0 # CONFIG_SAMA5D3xEK_384MHZ is not set CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set +# CONFIG_SAMA5D3xEK_NOREDLED is not set # # RTOS Features @@ -389,6 +412,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 @@ -591,6 +615,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 @@ -618,13 +643,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 @@ -810,6 +836,10 @@ CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/nx/defconfig b/nuttx/configs/sama5d3x-ek/nx/defconfig index cd5876442..bf73b88af 100644 --- a/nuttx/configs/sama5d3x-ek/nx/defconfig +++ b/nuttx/configs/sama5d3x-ek/nx/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_USART1=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB is not set CONFIG_SAMA5_LCDC=y # 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 @@ -255,12 +276,13 @@ 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 # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set -# CONFIG_ARCH_HAVE_RAMFUNCS is not set +CONFIG_ARCH_HAVE_RAMFUNCS=y CONFIG_ARCH_RAMFUNCS=y # CONFIG_ARCH_HAVE_RAMVECTORS is not set @@ -322,6 +344,7 @@ CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set CONFIG_SAMA5D3xEK_MT47H128M16RT=y # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set +# CONFIG_SAMA5D3xEK_NOREDLED is not set # # RTOS Features @@ -430,6 +453,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 @@ -683,6 +707,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 @@ -717,7 +742,6 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16 # 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_POLL is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set @@ -725,6 +749,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16 # 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 is not set @@ -837,6 +863,10 @@ CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index 9264d8f07..858354ada 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_ADC=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB is not set CONFIG_SAMA5_LCDC=y # 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 @@ -284,12 +305,13 @@ 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 # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set -# CONFIG_ARCH_HAVE_RAMFUNCS is not set +CONFIG_ARCH_HAVE_RAMFUNCS=y CONFIG_ARCH_RAMFUNCS=y # CONFIG_ARCH_HAVE_RAMVECTORS is not set @@ -352,6 +374,7 @@ CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set CONFIG_SAMA5D3xEK_MT47H128M16RT=y # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set +# CONFIG_SAMA5D3xEK_NOREDLED is not set CONFIG_SAMA5D3xEK_TSD_DEVMINOR=0 # @@ -463,6 +486,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=y CONFIG_ADC=y CONFIG_ADC_FIFOSIZE=8 @@ -754,6 +778,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 @@ -780,7 +805,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # 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_POLL is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set @@ -788,6 +812,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # 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 is not set @@ -1141,6 +1167,10 @@ CONFIG_SYSTEM_READLINE=y CONFIG_READLINE_ECHO=y # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/ov2640/defconfig b/nuttx/configs/sama5d3x-ek/ov2640/defconfig index 00287e9d4..5f31a956f 100644 --- a/nuttx/configs/sama5d3x-ek/ov2640/defconfig +++ b/nuttx/configs/sama5d3x-ek/ov2640/defconfig @@ -122,24 +122,48 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y # # SAMA5 Configuration Options # +# CONFIG_SAMA5_HAVE_AESB is not set +# CONFIG_SAMA5_HAVE_ICM is not set # CONFIG_SAMA5_HAVE_UART0 is not set # CONFIG_SAMA5_HAVE_UART1 is not set +# CONFIG_SAMA5_HAVE_USART4 is not set # CONFIG_SAMA5_HAVE_CAN0 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set +CONFIG_SAMA5_HAVE_DMA=y +# CONFIG_SAMA5_HAVE_DDR32 is not set +# CONFIG_SAMA5_HAVE_XDMA is not set +# CONFIG_SAMA5_HAVE_L2CC is not set CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_GMAC=y -# CONFIG_SAMA5_HAVE_EMAC is not set +# CONFIG_SAMA5_HAVE_EMACA is not set +# CONFIG_SAMA5_HAVE_EMACB is not set +# CONFIG_SAMA5_HAVE_EMAC1 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set +# CONFIG_SAMA5_HAVE_SAIC is not set +# CONFIG_SAMA5_HAVE_SBM is not set +# CONFIG_SAMA5_HAVE_SFC is not set +# CONFIG_SAMA5_HAVE_SPI2 is not set # CONFIG_SAMA5_HAVE_TC1 is not set +# CONFIG_SAMA5_HAVE_TC2 is not set +# CONFIG_SAMA5_HAVE_TWI3 is not set +# CONFIG_SAMA5_HAVE_VDEC is not set +CONFIG_ARCH_CHIP_SAMA5D3=y +# CONFIG_ARCH_CHIP_SAMA5D4 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set CONFIG_ARCH_CHIP_ATSAMA5D33=y # 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 is not set # # SAMA5 Peripheral Support # +# CONFIG_SAMA5_AES is not set +# CONFIG_SAMA5_TDES is not set # CONFIG_SAMA5_DBGU is not set # CONFIG_SAMA5_PIT is not set # CONFIG_SAMA5_WDT is not set @@ -165,13 +189,10 @@ CONFIG_SAMA5_TWI1=y # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_GMAC is not set +# CONFIG_SAMA5_EMACB is not set CONFIG_SAMA5_LCDC=y CONFIG_SAMA5_ISI=y -# 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 @@ -260,12 +281,13 @@ 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 # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set -# CONFIG_ARCH_HAVE_RAMFUNCS is not set +CONFIG_ARCH_HAVE_RAMFUNCS=y CONFIG_ARCH_RAMFUNCS=y # CONFIG_ARCH_HAVE_RAMVECTORS is not set @@ -327,6 +349,7 @@ CONFIG_SAMA5D3xEK_396MHZ=y # CONFIG_SAMA5D3xEK_528MHZ is not set CONFIG_SAMA5D3xEK_MT47H128M16RT=y # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set +CONFIG_SAMA5D3xEK_NOREDLED=y CONFIG_SAMA5D3xEK_OV2640_DEMO=y # @@ -441,6 +464,7 @@ CONFIG_I2C_TRANSFER=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=y @@ -638,6 +662,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # 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_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set @@ -663,7 +688,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # 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_POLL is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set @@ -671,6 +695,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # 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 is not set @@ -782,6 +808,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_SYSTEM_READLINE is not set # +# P-Code Support +# + +# # Power Off # # CONFIG_SYSTEM_POWEROFF is not set diff --git a/nuttx/configs/sama5d3x-ek/src/Makefile b/nuttx/configs/sama5d3x-ek/src/Makefile index ab20d97a5..d49463996 100644 --- a/nuttx/configs/sama5d3x-ek/src/Makefile +++ b/nuttx/configs/sama5d3x-ek/src/Makefile @@ -98,7 +98,7 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_SAMA5_EMAC),y) +ifeq ($(CONFIG_SAMA5_EMACA),y) CSRCS += sam_ethernet.c else ifeq ($(CONFIG_SAMA5_GMAC),y) diff --git a/nuttx/configs/sama5d3x-ek/src/sam_ethernet.c b/nuttx/configs/sama5d3x-ek/src/sam_ethernet.c index 2a72207ce..4e5927d5d 100644 --- a/nuttx/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/nuttx/configs/sama5d3x-ek/src/sam_ethernet.c @@ -55,7 +55,7 @@ ************************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMACA static xcpt g_emac_handler; #endif #ifdef CONFIG_SAMA5_GMAC @@ -81,8 +81,8 @@ static xcpt g_gmac_handler; void weak_function sam_netinitialize(void) { -#ifdef CONFIG_SAMA4_EMAC - /* Ethernet 10/100 (EMAC) Port +#ifdef CONFIG_SAMA4_EMACA + /* Ethernet 10/100 (EMAC A) Port * * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. * The board supports MII and RMII interface modes. @@ -138,7 +138,7 @@ xcpt_t sam_phyirq(int intf, xcpt_t irqhandler) xcpt_t oldhandler; int irq; -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMACA if (intf == EMAC_INTF) { handler = &g_emac_handler; diff --git a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h index d41e169d9..3bbc1cbc9 100644 --- a/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h +++ b/nuttx/configs/sama5d3x-ek/src/sama5d3x-ek.h @@ -314,7 +314,7 @@ /* Networking */ -#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC) && !defined(CONFIG_SAMA5_GMAC)) +#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMACA) && !defined(CONFIG_SAMA5_GMAC)) # undef HAVE_NETWORK #endif @@ -504,8 +504,8 @@ /* Ethernet */ -#ifdef CONFIG_SAMA4_EMAC - /* ETH1: Ethernet 10/100 (EMAC) Port +#ifdef CONFIG_SAMA4_EMACA + /* ETH1: Ethernet 10/100 (EMAC A) Port * * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. * The board supports MII and RMII interface modes. diff --git a/nuttx/configs/sama5d4-ek/include/board.h b/nuttx/configs/sama5d4-ek/include/board.h index daf8d1014..ccf74ca24 100644 --- a/nuttx/configs/sama5d4-ek/include/board.h +++ b/nuttx/configs/sama5d4-ek/include/board.h @@ -230,7 +230,7 @@ void sam_boardinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC0) || defined(CONFIG_SAMA5_GMAC)) && \ +#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMACB) || defined(CONFIG_SAMA5_GMAC)) && \ defined(CONFIG_SAMA5_PIOE_IRQ) xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); #endif diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig index bf0e062ac..d58b6701a 100644 --- a/nuttx/configs/sama5d4-ek/nsh/defconfig +++ b/nuttx/configs/sama5d4-ek/nsh/defconfig @@ -135,7 +135,8 @@ CONFIG_SAMA5_HAVE_XDMA=y CONFIG_SAMA5_HAVE_L2CC=y CONFIG_SAMA5_HAVE_LCDC=y # CONFIG_SAMA5_HAVE_GMAC is not set -CONFIG_SAMA5_HAVE_EMAC0=y +# CONFIG_SAMA5_HAVE_EMACA is not set +CONFIG_SAMA5_HAVE_EMACB=y CONFIG_SAMA5_HAVE_EMAC1=y # CONFIG_SAMA5_HAVE_HSMCI2 is not set CONFIG_SAMA5_HAVE_SAIC=y @@ -185,7 +186,6 @@ CONFIG_SAMA5_USART4=y # CONFIG_SAMA5_TWI3 is not set # CONFIG_SAMA5_HSMCI0 is not set # CONFIG_SAMA5_HSMCI1 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 @@ -199,6 +199,7 @@ CONFIG_SAMA5_USART4=y # CONFIG_SAMA5_XDMAC is not set # CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UDPHS is not set +# CONFIG_SAMA5_EMACB is not set # CONFIG_SAMA5_EMAC0 is not set # CONFIG_SAMA5_EMAC1 is not set # CONFIG_SAMA5_LCDC is not set diff --git a/nuttx/configs/sama5d4-ek/src/Makefile b/nuttx/configs/sama5d4-ek/src/Makefile index 49e66a4da..9aafca9e8 100644 --- a/nuttx/configs/sama5d4-ek/src/Makefile +++ b/nuttx/configs/sama5d4-ek/src/Makefile @@ -84,12 +84,8 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_SAMA5_EMAC0),y) +ifeq ($(CONFIG_SAMA5_EMACB),y) CSRCS += sam_ethernet.c -else -ifeq ($(CONFIG_SAMA5_GMAC),y) -CSRCS += sam_ethernet.c -endif endif ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/sama5d4-ek/src/sam_ethernet.c b/nuttx/configs/sama5d4-ek/src/sam_ethernet.c index 1a20a2a6f..aa53a25e3 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_ethernet.c +++ b/nuttx/configs/sama5d4-ek/src/sam_ethernet.c @@ -1,7 +1,7 @@ /************************************************************************************ * configs/sama5d4-ek/src/sam_ethernet.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -56,10 +56,10 @@ #ifdef CONFIG_SAMA5_PIOE_IRQ #ifdef CONFIG_SAMA5_EMAC0 -static xcpt g_emac_handler; +static xcpt g_emac0_handler; #endif -#ifdef CONFIG_SAMA5_GMAC -static xcpt g_gmac_handler; +#ifdef CONFIG_SAMA5_EMAC1 +static xcpt g_emac1_handler; #endif #endif @@ -81,43 +81,12 @@ static xcpt g_gmac_handler; void weak_function sam_netinitialize(void) { -#ifdef CONFIG_SAMA4_EMAC - /* Ethernet 10/100 (EMAC) Port - * - * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. - * The board supports MII and RMII interface modes. - * - * The two independent PHY devices embedded on CM and MB boards are connected to - * independent RJ-45 connectors with built-in magnetic and status LEDs. - * - * At the De-Assertion of Reset: - * PHY ADD[2:0]:001 - * CONFIG[2:0]:001,Mode:RMII - * Duplex Mode:Half Duplex - * Isolate Mode:Disable - * Speed Mode:100Mbps - * Nway Auto-Negotiation:Enable - * - * The KSZ8051 PHY interrtup is available on PE30 INT_ETH1 - */ - - sam_configpio(PIO_INT_ETH1); +#ifdef CONFIG_SAMA4_EMAC0 + sam_configpio(PIO_INT_ETH0); #endif -#ifdef CONFIG_SAMA4_GMAC - /* Tri-Speed Ethernet PHY - * - * The SAMA5D4-EK board is equipped with a MICREL PHY devices (MICREL - * KSZ9021/31) operating at 10/100/1000 Mbps. The board supports RGMII interface - * mode. The Ethernet interface consists of 4 pairs of low voltage differential - * pair signals designated from GRX± and GTx± plus control signals for link - * activity indicators. These signals can be used to connect to a 10/100/1000 - * BaseT RJ45 connector integrated on the main board. - * - * The KSZ9021/31 interrupt is available on PB35 INT_GETH0 - */ - - sam_configpio(PIO_INT_ETH0); +#ifdef CONFIG_SAMA4_EMAC1 + sam_configpio(PIO_INT_ETH1); #endif } @@ -139,18 +108,18 @@ xcpt_t sam_phyirq(int intf, xcpt_t irqhandler) int irq; #ifdef CONFIG_SAMA5_EMAC0 - if (intf == EMAC_INTF) + if (intf == EMAC0_INTF) { - handler = &g_emac_handler; - irq = IRQ_INT_ETH1; + handler = &g_emac0_handler; + irq = IRQ_INT_ETH0; } else #endif -#ifdef CONFIG_SAMA5_GMAC - if (intf == GMAC_INTF) +#ifdef CONFIG_SAMA5_EMAC1 + if (intf == EMAC1_INTF) { - handler = &g_gmac_handler; - irq = IRQ_INT_ETH0; + handler = &g_emac1_handler; + irq = IRQ_INT_ETH1; } else #endif diff --git a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h index 9efea8c1d..3d4c5cfb7 100644 --- a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h +++ b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h @@ -255,7 +255,7 @@ /* Networking */ -#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC0) && !defined(CONFIG_SAMA5_GMAC)) +#if !defined(CONFIG_NET) || !defined(CONFIG_SAMA5_EMACB) # undef HAVE_NETWORK #endif @@ -419,49 +419,79 @@ /* Ethernet */ -#ifdef CONFIG_SAMA4_EMAC - /* ETH1: Ethernet 10/100 (EMAC) Port - * - * The main board contains a MICREL PHY device (KSZ8051) operating at 10/100 Mbps. - * The board supports MII and RMII interface modes. - * - * The two independent PHY devices embedded on CM and MB boards are connected to - * independent RJ-45 connectors with built-in magnetic and status LEDs. - * - * At the De-Assertion of Reset: - * PHY ADD[2:0]:001 - * CONFIG[2:0]:001,Mode:RMII - * Duplex Mode:Half Duplex - * Isolate Mode:Disable - * Speed Mode:100Mbps - * Nway Auto-Negotiation:Enable - * - * The KSZ8051 PHY interrtup is available on PE30 INT_ETH1 - */ - -#define PIO_INT_ETH1 (PIO_INPUT | PIO_CFG_PULLUP | PIO_CFG_DEGLITCH | \ - PIO_INT_BOTHEDGES | PIO_PORT_PIOE | PIO_PIN30) -#define IRQ_INT_ETH1 SAM_IRQ_PE30 - -#endif - -#ifdef CONFIG_SAMA4_GMAC - /* ETH0: Tri-Speed Ethernet PHY - * - * The SAMA5D4 series-CM board is equipped with a MICREL PHY devices (MICREL - * KSZ9021/31) operating at 10/100/1000 Mbps. The board supports RGMII interface - * mode. The Ethernet interface consists of 4 pairs of low voltage differential - * pair signals designated from GRX± and GTx± plus control signals for link - * activity indicators. These signals can be used to connect to a 10/100/1000 - * BaseT RJ45 connector integrated on the main board. - * - * The KSZ9021/31 interrupt is available on PB35 INT_GETH0 - */ - -#define PIO_INT_ETH0 (PIO_INPUT | PIO_CFG_PULLUP | PIO_CFG_DEGLITCH | \ - PIO_INT_BOTHEDGES | PIO_PORT_PIOB | PIO_PIN25) -#define IRQ_INT_ETH0 SAM_IRQ_PB25 +#ifdef CONFIG_SAMA4_EMACB +/* ETH0/1: Ethernet 10/100 (EMAC) Ports + * + * Networking support via the can be added to NSH by selecting the following + * configuration options. The SAMA5D44 supports two different 10/100Base-T + * Ethernet MAC peripherals. + * + * ------------------------------ ------------------- ------------------------- + * SAMA5D4 PIO SIGNAL USAGE + * ------------------------------ ------------------- ------------------------- + * PB0/G0_TXCK PB0 G0_TXCK, EXP + * PB1/G0_RXCK/SCK2/ISI_PCK ISI_PCK_PB1 ISI_PCK + * PB2/G0_TXEN PB2 G0_TXEN,EXP + * PB3/G0_TXER/CTS2/ISI_VSYNC ISI_VSYNC_PB3 ISI_VSYNC + * PB4/G0_CRS/RXD2/ISI_HSYNC ISI_HSYNC_PB4 ISI_HSYNC + * PB5/G0_COL/TXD2/PCK2 ISI_PWD_PB5 ISI_PWD + * PB6/G0_RXDV PB6 G0_RXDV, EXP + * PB7/G0_RXER PB7 G0_RXER, EXP + * PB8/G0_RX0 PB8 G0_RX0, EXP + * PB9/G0_RX1 PB9 G0_RX1, EXP + * PB10/G0_RX2/PCK2/PWML1 PB10 AUDIO_PCK2, EXP + * PB11/G0_RX3/RTS2/PWMH1 ISI_RST_PB11 ISI_RST + * PB12/G0_TX0 PB12 G0_TX0, EXP + * PB13/G0_TX1 PB13 G0_TX1, EXP + * PB14/G0_TX2/SPI2_NPCS1/PWMH0 ZIG_SPI2_NPCS1 ZIG_SPI2_NPCS1 + * PB15/G0_TX3/SPI2_NPCS2/PWML0 HDMI_RST_PB15 HDMI_RST + * PB16/G0_MDC PB16 G0_MDC, EXP + * PB17/G0_MDIO PB17 G0_MDIO, EXP + * PE1/A1/MCI0_DB0 G0_IRQ_PE1 G0_IRQ + * ------------------------------ ------------------- ------------------------- + * PA2/LCDDAT2/G1_TXCK PA LCDDAT2, G1_TXCK + * PA3/LCDDAT3/G1_RXCK PA3 LCDDAT3 + * PA4/LCDDAT4/G1_TXEN PA4 LCDDAT4, G1_TXEN + * PA5/LCDDAT5/G1_TXER PA5 LCDDAT5 + * PA6/LCDDAT6/G1_CRS PA6 LCDDAT6 + * PA9/LCDDAT9/G1_COL PA9 LCDDAT9 + * PA10/LCDDAT10/G1_RXDV PA10 LCDDAT10, G1_RXDV + * PA11/LCDDAT11/G1_RXER PA11 LCDDAT11, G1_RXER + * PA12/LCDDAT12/G1_RX0 PA12 LCDDAT12, G1_RX0 + * PA13/LCDDAT13/G1_RX1 PA13 LCDDAT13, G1_RX1 + * PA14/LCDDAT14/G1_TX0 PA14 LCDDAT14, G1_TX0 + * PA15/LCDDAT15/G1_TX1 PA15 LCDDAT15, G1_TX1 + * PA18/LCDDAT18/G1_RX2 PA18 LCDDAT18 + * PA19/LCDDAT19/G1_RX3 PA19 LCDDAT19 + * PA20/LCDDAT20/G1_TX2 PA20 LCDDAT20 + * PA21/LCDDAT21/G1_TX3 PA21 LCDDAT21 + * PA22/LCDDAT22/G1_MDC PA22 LCDDAT22, G1_MDC + * PA23/LCDDAT23/G1_MDIO PA23 LCDDAT23, G1_MDIO + * PE2/A2/MCI0_DB1 G1_IRQ_PE2 G1_IRQ + * ------------------------------ ------------------- ------------------------- + * + * EMAC2 connects (directly) to a KSZ8081RNB PHY (U10) and is available at + * the ETH0 connector. + * + * EMAC1 connects (indirectly) to another KSZ8081RNB PHY (U7) and is available + * at the ETH1 connector. The ETH1 signals go through a line driver that is + * enabled via LCD_ETH1_CONFIG when an LCD is detected: + * + * - LCD_ETH1_CONFIG = 0: LCD 5v disable + * - LCD_ETH1_CONFIG = 1 & LCD_DETECT# =0: LCD 5v enable + */ +#ifdef CONFIG_SAMA4_EMAC0 +# define PIO_INT_ETH0 (PIO_INPUT | PIO_CFG_PULLUP | PIO_CFG_DEGLITCH | \ + PIO_INT_BOTHEDGES | PIO_PORT_PIOE | PIO_PIN1) +# define IRQ_INT_ETH0 SAM_IRQ_PE1 +#endif + +#ifdef CONFIG_SAMA4_EMAC1 +# define PIO_INT_ETH1 (PIO_INPUT | PIO_CFG_PULLUP | PIO_CFG_DEGLITCH | \ + PIO_INT_BOTHEDGES | PIO_PORT_PIOE | PIO_PIN2) +# define IRQ_INT_ETH1 SAM_IRQ_PE2 +#endif #endif /* SPI Chip Selects *****************************************************************/ |