Add support for ethernet in imxrt1064-evk

JIRA: RTOS-507
phoenix-rtos · Sep 2, 2024 · b8059e4 · b8059e4
1 parent 00751e7
commit b8059e4
Show file tree

Hide file tree

Showing 13 changed files with 2,340 additions and 1,280 deletions.
diff --git a/_targets/Makefile.armv7a7-imx6ull b/_targets/Makefile.armv7a7-imx6ull
@@ -9,4 +9,4 @@
 NET_DRIVERS_SUPPORTED := enet tuntap
 NET_DRIVERS ?= $(NET_DRIVERS_SUPPORTED)
 
-DRIVERS_SRCS_enet = imx6-enet.c ephy.c gpio.c imx6ull-gpio.c $(DRIVERS_SRCS_UTIL) hw-debug.c
+DRIVERS_SRCS_enet = enet.c ephy.c imx6ull-gpio.c $(DRIVERS_SRCS_UTIL) hw-debug.c
diff --git a/_targets/Makefile.armv7m7-imxrt106x b/_targets/Makefile.armv7m7-imxrt106x
@@ -6,6 +6,8 @@
 # Copyright 2021 Phoenix Systems
 #
 
-NET_DRIVERS_SUPPORTED := pppou pppos
+NET_DRIVERS_SUPPORTED := pppou pppos enet
 NET_DRIVERS ?= $(NET_DRIVERS_SUPPORTED)
 PPPOS_MODEM := huawei
+
+DRIVERS_SRCS_enet = enet.c ephy.c imxrt106x-gpio.c $(DRIVERS_SRCS_UTIL)
diff --git a/drivers/Makefile b/drivers/Makefile
@@ -6,6 +6,9 @@ endif
 ifeq ($(EPHY_KSZ8081),RND)
   LOCAL_CFLAGS := -DEPHY_KSZ8081RND
 endif
+ifeq ($(EPHY_KSZ8081),RNB)
+  LOCAL_CFLAGS := -DEPHY_KSZ8081RNB
+endif
 
 # make possible to specify defalult APN name externally
 ifneq ($(PPPOS_DEFAULT_APN),)

diff --git a/drivers/bdring.h b/drivers/bdring.h
@@ -3,8 +3,8 @@
  *
  * Buffer descriptor ring handling
  *
- * Copyright 2018 Phoenix Systems
- * Author: Michał Mirosław
+ * Copyright 2018/2024 Phoenix Systems
+ * Author: Michał Mirosław, Julian Uziembło
  *
  * %LICENSE%
  */
@@ -27,8 +27,7 @@ enum {
 };
 
 
-typedef struct net_bufdesc_ops_
-{
+typedef struct net_bufdesc_ops_ {
 	size_t (*nextRxBufferSize)(const net_bufdesc_ring_t *ring, size_t i);
 	int (*pktRxFinished)(const net_bufdesc_ring_t *ring, size_t i);
 	void (*fillRxDesc)(const net_bufdesc_ring_t *ring, size_t i, addr_t pa, size_t sz, unsigned seg /* = zero */);
@@ -42,11 +41,10 @@ typedef struct net_bufdesc_ops_
 } net_bufdesc_ops_t;
 
 
-struct net_bufdesc_ring_
-{
+struct net_bufdesc_ring_ {
 	volatile void *ring;
 	struct pbuf **bufp;
-	volatile unsigned head, tail;
+	_Atomic volatile unsigned head, tail;
 	unsigned last;
 	addr_t phys;
 	const net_bufdesc_ops_t *ops;