sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5: Back out most of commit c37b5b7b97d0644743c04f2c3d9e2b7ef9f5d698. Things are going to have to be done differently

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-09 12:16:16 -06:00
parent a7afdd8e0d
commit ae142009da
18 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configs/sama5d3-xplained/README.txt
View File

@ -748,25 +748,25 @@ Networking
peripherals: (1) The 10/100Base-T EMAC peripheral and (2) the peripherals: (1) The 10/100Base-T EMAC peripheral and (2) the
10/100/1000Base-T GMAC peripheral. 10/100/1000Base-T GMAC peripheral.
Selecting the EMAC0 peripheral Selecting the EMAC peripheral
----------------------------- -----------------------------
System Type -> SAMA5 Peripheral Support System Type -> SAMA5 Peripheral Support
CONFIG_SAMA5_EMAC0=y : Enable the EMAC peripheral CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral
System Type -> EMAC device driver options System Type -> EMAC device driver options
CONFIG_SAMA5_EMAC0_NRXBUFFERS=16 : Set aside some RS and TX buffers CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers
CONFIG_SAMA5_EMAC0_NTXBUFFERS=4 CONFIG_SAMA5_EMAC_NTXBUFFERS=4
CONFIG_SAMA5_EMAC0_PHYADDR=1 : KSZ9031 PHY is at address 1 CONFIG_SAMA5_EMAC_PHYADDR=1 : KSZ9031 PHY is at address 1
CONFIG_SAMA5_EMAC0_AUTONEG=y : Use autonegotiation CONFIG_SAMA5_EMAC_AUTONEG=y : Use autonegotiation
CONFIG_SAMA5_EMAC0_RMII=y : Either MII or RMII interface should work CONFIG_SAMA5_EMAC_RMII=y : Either MII or RMII interface should work
CONFIG_SAMA5_EMAC0_PHYSR=30 : Address of PHY status register on KSZ9031 CONFIG_SAMA5_EMAC_PHYSR=30 : Address of PHY status register on KSZ9031
CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG=y : Needed for KSZ9031 CONFIG_SAMA5_EMAC_PHYSR_ALTCONFIG=y : Needed for KSZ9031
CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE=0x7 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_ALTMODE=0x7 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_10HD=0x1 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_10HD=0x1 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_100HD=0x2 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_100HD=0x2 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_10FD=0x5 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_10FD=0x5 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_100FD=0x6 : " " " " " "
PHY selection. Later in the configuration steps, you will need to select PHY selection. Later in the configuration steps, you will need to select
the KSZ9031 PHY for EMAC (See below) the KSZ9031 PHY for EMAC (See below)
@ -2477,7 +2477,7 @@ SAMA5D3-Xplained Configuration Options
CONFIG_SAMA5_UHPHS - USB Host High Speed CONFIG_SAMA5_UHPHS - USB Host High Speed
CONFIG_SAMA5_UDPHS - USB Device High Speed CONFIG_SAMA5_UDPHS - USB Device High Speed
CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC
CONFIG_SAMA5_EMAC0 - Ethernet MAC 0 CONFIG_SAMA5_EMAC - Ethernet MAC
CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_LCDC - LCD Controller
CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_ISI - Image Sensor Interface
CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0

2
configs/sama5d3-xplained/include/board.h
View File

@ -335,7 +335,7 @@ void sam_boardinitialize(void);
* *
************************************************************************************/ ************************************************************************************/
#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC0) || defined(CONFIG_SAMA5_GMAC)) && \ #if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC) || defined(CONFIG_SAMA5_GMAC)) && \
defined(CONFIG_SAMA5_PIOE_IRQ) defined(CONFIG_SAMA5_PIOE_IRQ)
xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); xcpt_t sam_phyirq(int intf, xcpt_t irqhandler);
#endif #endif

4
configs/sama5d3-xplained/nsh/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_SAMA5_HAVE_CAN0=y
CONFIG_SAMA5_HAVE_CAN1=y CONFIG_SAMA5_HAVE_CAN1=y
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
CONFIG_SAMA5_HAVE_EMAC0=y CONFIG_SAMA5_HAVE_EMAC=y
CONFIG_SAMA5_HAVE_HSMCI2=y CONFIG_SAMA5_HAVE_HSMCI2=y
CONFIG_SAMA5_HAVE_TC1=y CONFIG_SAMA5_HAVE_TC1=y
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set
@ -169,7 +169,7 @@ CONFIG_SAMA5_HSMC=y
# CONFIG_SAMA5_UHPHS is not set # CONFIG_SAMA5_UHPHS is not set
# CONFIG_SAMA5_UDPHS is not set # CONFIG_SAMA5_UDPHS is not set
# CONFIG_SAMA5_GMAC is not set # CONFIG_SAMA5_GMAC is not set
# CONFIG_SAMA5_EMAC0 is not set # CONFIG_SAMA5_EMAC is not set
# CONFIG_SAMA5_LCDC is not set # CONFIG_SAMA5_LCDC is not set
# CONFIG_SAMA5_ISI is not set # CONFIG_SAMA5_ISI is not set
# CONFIG_SAMA5_CAN0 is not set # CONFIG_SAMA5_CAN0 is not set

2
configs/sama5d3-xplained/src/Makefile
View File

@ -84,7 +84,7 @@ CSRCS += sam_usb.c
endif endif
endif endif
ifeq ($(CONFIG_SAMA5_EMAC0),y) ifeq ($(CONFIG_SAMA5_EMAC),y)
CSRCS += sam_ethernet.c CSRCS += sam_ethernet.c
else else
ifeq ($(CONFIG_SAMA5_GMAC),y) ifeq ($(CONFIG_SAMA5_GMAC),y)

4
configs/sama5d3-xplained/src/sam_ethernet.c
View File

@ -55,7 +55,7 @@
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_SAMA5_PIOE_IRQ #ifdef CONFIG_SAMA5_PIOE_IRQ
#ifdef CONFIG_SAMA5_EMAC0 #ifdef CONFIG_SAMA5_EMAC
static xcpt g_emac_handler; static xcpt g_emac_handler;
#endif #endif
#ifdef CONFIG_SAMA5_GMAC #ifdef CONFIG_SAMA5_GMAC
@ -138,7 +138,7 @@ xcpt_t sam_phyirq(int intf, xcpt_t irqhandler)
xcpt_t oldhandler; xcpt_t oldhandler;
int irq; int irq;
#ifdef CONFIG_SAMA5_EMAC0 #ifdef CONFIG_SAMA5_EMAC
if (intf == EMAC_INTF) if (intf == EMAC_INTF)
{ {
handler = &g_emac_handler; handler = &g_emac_handler;

2
configs/sama5d3-xplained/src/sama5d3-xplained.h
View File

@ -255,7 +255,7 @@
/* Networking */ /* Networking */
#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC0) && !defined(CONFIG_SAMA5_GMAC)) #if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC) && !defined(CONFIG_SAMA5_GMAC))
# undef HAVE_NETWORK # undef HAVE_NETWORK
#endif #endif

34
configs/sama5d3x-ek/README.txt
View File

@ -891,29 +891,29 @@ Networking
the EMAC peripheral; Only the SAMA5D33, SAMA5D34, and SAMA5D35 support the EMAC peripheral; Only the SAMA5D33, SAMA5D34, and SAMA5D35 support
the GMAC perpheral! NOTE that the SAMA5D35 supports both! the GMAC perpheral! NOTE that the SAMA5D35 supports both!
Selecting the EMAC0 peripheral Selecting the EMAC peripheral
------------------------------ -----------------------------
System Type System Type
CONFIG_ARCH_CHIP_ATSAMA5D31=y : SAMA5D31 or SAMAD35 support EMAC CONFIG_ARCH_CHIP_ATSAMA5D31=y : SAMA5D31 or SAMAD35 support EMAC
CONFIG_ARCH_CHIP_ATSAMA5D35=y : (others do not) CONFIG_ARCH_CHIP_ATSAMA5D35=y : (others do not)
System Type -> SAMA5 Peripheral Support System Type -> SAMA5 Peripheral Support
CONFIG_SAMA5_EMAC0=y : Enable the EMAC peripheral CONFIG_SAMA5_EMAC=y : Enable the EMAC peripheral
System Type -> EMAC0 device driver options System Type -> EMAC device driver options
CONFIG_SAMA5_EMAC0_NRXBUFFERS=16 : Set aside some RS and TX buffers CONFIG_SAMA5_EMAC_NRXBUFFERS=16 : Set aside some RS and TX buffers
CONFIG_SAMA5_EMAC0_NTXBUFFERS=4 CONFIG_SAMA5_EMAC_NTXBUFFERS=4
CONFIG_SAMA5_EMAC0_PHYADDR=1 : KSZ8021/31 PHY is at address 1 CONFIG_SAMA5_EMAC_PHYADDR=1 : KSZ8021/31 PHY is at address 1
CONFIG_SAMA5_EMAC0_AUTONEG=y : Use autonegotiation CONFIG_SAMA5_EMAC_AUTONEG=y : Use autonegotiation
CONFIG_SAMA5_EMAC0_RMII=y : Either MII or RMII interface should work CONFIG_SAMA5_EMAC_RMII=y : Either MII or RMII interface should work
CONFIG_SAMA5_EMAC0_PHYSR=30 : Address of PHY status register on KSZ8021/31 CONFIG_SAMA5_EMAC_PHYSR=30 : Address of PHY status register on KSZ8021/31
CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG=y : Needed for KSZ8021/31 CONFIG_SAMA5_EMAC_PHYSR_ALTCONFIG=y : Needed for KSZ8021/31
CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE=0x7 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_ALTMODE=0x7 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_10HD=0x1 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_10HD=0x1 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_100HD=0x2 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_100HD=0x2 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_10FD=0x5 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_10FD=0x5 : " " " " " "
CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6 : " " " " " " CONFIG_SAMA5_EMAC_PHYSR_100FD=0x6 : " " " " " "
PHY selection. Later in the configuration steps, you will need to select PHY selection. Later in the configuration steps, you will need to select
the KSZ8021/31 PHY for EMAC (See below) 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_UHPHS - USB Host High Speed
CONFIG_SAMA5_UDPHS - USB Device High Speed CONFIG_SAMA5_UDPHS - USB Device High Speed
CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC CONFIG_SAMA5_GMAC - Gigabit Ethernet MAC
CONFIG_SAMA5_EMAC0 - Ethernet MAC 0 CONFIG_SAMA5_EMAC - Ethernet MAC
CONFIG_SAMA5_LCDC - LCD Controller CONFIG_SAMA5_LCDC - LCD Controller
CONFIG_SAMA5_ISI - Image Sensor Interface CONFIG_SAMA5_ISI - Image Sensor Interface
CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0 CONFIG_SAMA5_SSC0 - Synchronous Serial Controller 0

2
configs/sama5d3x-ek/demo/defconfig
View File

@ -133,7 +133,7 @@ CONFIG_USBHOST_ISOC_DISABLE=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/hello/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/include/board.h
View File

@ -376,7 +376,7 @@ void sam_boardinitialize(void);
* *
************************************************************************************/ ************************************************************************************/
#if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC0) || defined(CONFIG_SAMA5_GMAC)) && \ #if defined(CONFIG_NET) && (defined(CONFIG_SAMA5_EMAC) || defined(CONFIG_SAMA5_GMAC)) && \
defined(CONFIG_SAMA5_PIOE_IRQ) defined(CONFIG_SAMA5_PIOE_IRQ)
xcpt_t sam_phyirq(int intf, xcpt_t irqhandler); xcpt_t sam_phyirq(int intf, xcpt_t irqhandler);
#endif #endif

2
configs/sama5d3x-ek/norboot/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/nsh/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/nx/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/nxwm/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/ov2640/defconfig
View File

@ -128,7 +128,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_SAMA5_HAVE_CAN1 is not set # CONFIG_SAMA5_HAVE_CAN1 is not set
CONFIG_SAMA5_HAVE_LCDC=y CONFIG_SAMA5_HAVE_LCDC=y
CONFIG_SAMA5_HAVE_GMAC=y CONFIG_SAMA5_HAVE_GMAC=y
# CONFIG_SAMA5_HAVE_EMAC0 is not set # CONFIG_SAMA5_HAVE_EMAC is not set
# CONFIG_SAMA5_HAVE_HSMCI2 is not set # CONFIG_SAMA5_HAVE_HSMCI2 is not set
# CONFIG_SAMA5_HAVE_TC1 is not set # CONFIG_SAMA5_HAVE_TC1 is not set
# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set

2
configs/sama5d3x-ek/src/Makefile
View File

@ -98,7 +98,7 @@ CSRCS += sam_usb.c
endif endif
endif endif
ifeq ($(CONFIG_SAMA5_EMAC0),y) ifeq ($(CONFIG_SAMA5_EMAC),y)
CSRCS += sam_ethernet.c CSRCS += sam_ethernet.c
else else
ifeq ($(CONFIG_SAMA5_GMAC),y) ifeq ($(CONFIG_SAMA5_GMAC),y)

4
configs/sama5d3x-ek/src/sam_ethernet.c
View File

@ -55,7 +55,7 @@
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_SAMA5_PIOE_IRQ #ifdef CONFIG_SAMA5_PIOE_IRQ
#ifdef CONFIG_SAMA5_EMAC0 #ifdef CONFIG_SAMA5_EMAC
static xcpt g_emac_handler; static xcpt g_emac_handler;
#endif #endif
#ifdef CONFIG_SAMA5_GMAC #ifdef CONFIG_SAMA5_GMAC
@ -138,7 +138,7 @@ xcpt_t sam_phyirq(int intf, xcpt_t irqhandler)
xcpt_t oldhandler; xcpt_t oldhandler;
int irq; int irq;
#ifdef CONFIG_SAMA5_EMAC0 #ifdef CONFIG_SAMA5_EMAC
if (intf == EMAC_INTF) if (intf == EMAC_INTF)
{ {
handler = &g_emac_handler; handler = &g_emac_handler;

2
configs/sama5d3x-ek/src/sama5d3x-ek.h
View File

@ -314,7 +314,7 @@
/* Networking */ /* Networking */
#if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC0) && !defined(CONFIG_SAMA5_GMAC)) #if !defined(CONFIG_NET) || (!defined(CONFIG_SAMA5_EMAC) && !defined(CONFIG_SAMA5_GMAC))
# undef HAVE_NETWORK # undef HAVE_NETWORK
#endif #endif