diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt index fbfe255e6ed..532d13b813e 100644 --- a/configs/sama5d3-xplained/README.txt +++ b/configs/sama5d3-xplained/README.txt @@ -752,21 +752,21 @@ Networking ----------------------------- System Type -> SAMA5 Peripheral Support - CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral + CONFIG_SAMA5_EMAC0=y : Enable the EMAC peripheral System Type -> EMAC device driver options - CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers - CONFIG_SAMA5_EMAC_NTXBUFFERS=4 - CONFIG_SAMA5_EMAC_PHYADDR=1 : KSZ9031 PHY is at address 1 - CONFIG_SAMA5_EMAC_AUTONEG=y : Use autonegotiation - CONFIG_SAMA5_EMAC_RMII=y : Either MII or RMII interface should work - CONFIG_SAMA5_EMAC_PHYSR=30 : Address of PHY status register on KSZ9031 - CONFIG_SAMA5_EMAC_PHYSR_ALTCONFIG=y : Needed for KSZ9031 - CONFIG_SAMA5_EMAC_PHYSR_ALTMODE=0x7 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_10HD=0x1 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_100HD=0x2 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_10FD=0x5 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_100FD=0x6 : " " " " " " + CONFIG_SAMA5_EMAC0_NRXBUFFERS=16 : Set aside some RS and TX buffers + CONFIG_SAMA5_EMAC0_NTXBUFFERS=4 + CONFIG_SAMA5_EMAC0_PHYADDR=1 : KSZ9031 PHY is at address 1 + CONFIG_SAMA5_EMAC0_AUTONEG=y : Use autonegotiation + CONFIG_SAMA5_EMAC0_RMII=y : Either MII or RMII interface should work + CONFIG_SAMA5_EMAC0_PHYSR=30 : Address of PHY status register on KSZ9031 + CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG=y : Needed for KSZ9031 + CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE=0x7 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_10HD=0x1 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_100HD=0x2 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_10FD=0x5 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6 : " " " " " " PHY selection. Later in the configuration steps, you will need to select the KSZ9031 PHY for EMAC (See below) @@ -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_EMAC0 - Ethernet MAC 0 CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 diff --git a/configs/sama5d3-xplained/include/board.h b/configs/sama5d3-xplained/include/board.h index 0d976802a97..7694a1a7f15 100644 --- a/configs/sama5d3-xplained/include/board.h +++ b/configs/sama5d3-xplained/include/board.h @@ -334,7 +334,7 @@ void sam_boardinitialize(void); * ************************************************************************************/ -#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC) || defined(CONFIG_SAMA5_GMAC)) && \ +#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC0) || defined(CONFIG_SAMA5_GMAC)) && \ defined(CONFIG_SAMA5_PIOE_IRQ) xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); #endif diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig index 6ee397aac1d..e057b5b9e8a 100644 --- a/configs/sama5d3-xplained/nsh/defconfig +++ b/configs/sama5d3-xplained/nsh/defconfig @@ -169,7 +169,7 @@ 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_EMAC0 is not set # CONFIG_SAMA5_LCDC is not set # CONFIG_SAMA5_ISI is not set # CONFIG_SAMA5_CAN0 is not set diff --git a/configs/sama5d3-xplained/src/Makefile b/configs/sama5d3-xplained/src/Makefile index 6262b7c5e26..a745658c61b 100644 --- a/configs/sama5d3-xplained/src/Makefile +++ b/configs/sama5d3-xplained/src/Makefile @@ -84,7 +84,7 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_SAMA5_EMAC),y) +ifeq ($(CONFIG_SAMA5_EMAC0),y) CSRCS += sam_ethernet.c else ifeq ($(CONFIG_SAMA5_GMAC),y) diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c index 2f337689e8d..9c0058c56d9 100644 --- a/configs/sama5d3-xplained/src/sam_ethernet.c +++ b/configs/sama5d3-xplained/src/sam_ethernet.c @@ -55,7 +55,7 @@ ************************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMAC0 static xcpt g_emac_handler; #endif #ifdef CONFIG_SAMA5_GMAC @@ -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_EMAC0 if (intf == EMAC_INTF) { handler = &g_emac_handler; diff --git a/configs/sama5d3-xplained/src/sama5d3-xplained.h b/configs/sama5d3-xplained/src/sama5d3-xplained.h index 1d51ae7c0d6..0e8c700e25e 100644 --- a/configs/sama5d3-xplained/src/sama5d3-xplained.h +++ b/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_EMAC0) && !defined(CONFIG_SAMA5_GMAC)) # undef HAVE_NETWORK #endif diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index 9165626c064..80a11364e1c 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -895,25 +895,25 @@ Networking ----------------------------- System Type - CONFIG_ARCH_CHIP_ATSAMA5D31=y : SAMA5D31 or SAMAD35 support EMAC - CONFIG_ARCH_CHIP_ATSAMA5D35=y : (others do not) + CONFIG_ARCH_CHIP_ATSAMA5D31=y : SAMA5D31 or SAMAD35 support EMAC + CONFIG_ARCH_CHIP_ATSAMA5D35=y : (others do not) System Type -> SAMA5 Peripheral Support - CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral + CONFIG_SAMA5_EMAC0=y : Enable the EMAC peripheral System Type -> EMAC device driver options - CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers - CONFIG_SAMA5_EMAC_NTXBUFFERS=4 - CONFIG_SAMA5_EMAC_PHYADDR=1 : KSZ8021/31 PHY is at address 1 - CONFIG_SAMA5_EMAC_AUTONEG=y : Use autonegotiation - CONFIG_SAMA5_EMAC_RMII=y : Either MII or RMII interface should work - CONFIG_SAMA5_EMAC_PHYSR=30 : Address of PHY status register on KSZ8021/31 - CONFIG_SAMA5_EMAC_PHYSR_ALTCONFIG=y : Needed for KSZ8021/31 - CONFIG_SAMA5_EMAC_PHYSR_ALTMODE=0x7 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_10HD=0x1 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_100HD=0x2 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_10FD=0x5 : " " " " " " - CONFIG_SAMA5_EMAC_PHYSR_100FD=0x6 : " " " " " " + CONFIG_SAMA5_EMAC0_NRXBUFFERS=16 : Set aside some RS and TX buffers + CONFIG_SAMA5_EMAC0_NTXBUFFERS=4 + CONFIG_SAMA5_EMAC0_PHYADDR=1 : KSZ8021/31 PHY is at address 1 + CONFIG_SAMA5_EMAC0_AUTONEG=y : Use autonegotiation + CONFIG_SAMA5_EMAC0_RMII=y : Either MII or RMII interface should work + CONFIG_SAMA5_EMAC0_PHYSR=30 : Address of PHY status register on KSZ8021/31 + CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG=y : Needed for KSZ8021/31 + CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE=0x7 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_10HD=0x1 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_100HD=0x2 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_10FD=0x5 : " " " " " " + CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6 : " " " " " " PHY selection. Later in the configuration steps, you will need to select the KSZ8021/31 PHY for EMAC (See below) @@ -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_EMAC0 - Ethernet MAC 0 CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 diff --git a/configs/sama5d3x-ek/include/board.h b/configs/sama5d3x-ek/include/board.h index d054a8ce33e..b59bdd50aaa 100644 --- a/configs/sama5d3x-ek/include/board.h +++ b/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_EMAC0) || defined(CONFIG_SAMA5_GMAC)) && \ defined(CONFIG_SAMA5_PIOE_IRQ) xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); #endif diff --git a/configs/sama5d3x-ek/src/Makefile b/configs/sama5d3x-ek/src/Makefile index ab20d97a53f..98ba5921fa4 100644 --- a/configs/sama5d3x-ek/src/Makefile +++ b/configs/sama5d3x-ek/src/Makefile @@ -98,7 +98,7 @@ CSRCS += sam_usb.c endif endif -ifeq ($(CONFIG_SAMA5_EMAC),y) +ifeq ($(CONFIG_SAMA5_EMAC0),y) CSRCS += sam_ethernet.c else ifeq ($(CONFIG_SAMA5_GMAC),y) diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c index 2a72207ce14..63b88f921ad 100644 --- a/configs/sama5d3x-ek/src/sam_ethernet.c +++ b/configs/sama5d3x-ek/src/sam_ethernet.c @@ -55,7 +55,7 @@ ************************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -#ifdef CONFIG_SAMA5_EMAC +#ifdef CONFIG_SAMA5_EMAC0 static xcpt g_emac_handler; #endif #ifdef CONFIG_SAMA5_GMAC @@ -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_EMAC0 if (intf == EMAC_INTF) { handler = &g_emac_handler; diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h index d41e169d975..0c6181de882 100644 --- a/configs/sama5d3x-ek/src/sama5d3x-ek.h +++ b/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_EMAC0) && !defined(CONFIG_SAMA5_GMAC)) # undef HAVE_NETWORK #endif