diff options
| author | Kinsey Moore <kinsey.moore@oarcorp.com> | 2021-07-08 19:43:04 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2021-07-15 10:07:16 -0500 |
| commit | a53aeb5eb939b22dd31a07aedf0ca720e56f3c40 (patch) | |
| tree | 47670141280962d37b5b57b84c7dacd3604a39cf | |
| parent | freebsd/if_cgem: Fail probe for unterminated MII (diff) | |
| download | rtems-libbsd-a53aeb5eb939b22dd31a07aedf0ca720e56f3c40.tar.bz2 | |
rtemsbsd: Present all ZynqMP interfaces by default
Now that the issue with false PHY detection on unterminated MII busses
has been resolved, present all hardware interfaces for use on ZynqMP.
| -rw-r--r-- | rtemsbsd/include/bsp/nexus-devices.h | 9 | ||||
| -rwxr-xr-x | testsuite/include/rtems/bsd/test/network-config.h.in | 8 | ||||
| -rw-r--r-- | waf_libbsd.py | 4 |
3 files changed, 1 insertions, 20 deletions
diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h index cbb3f48b..9486083b 100644 --- a/rtemsbsd/include/bsp/nexus-devices.h +++ b/rtemsbsd/include/bsp/nexus-devices.h @@ -38,7 +38,6 @@ #include <rtems/bsd/bsd.h> #include <rtems/bsd/modules.h> -#include <rtems/bsd/test/network-config.h> #include <machine/rtems-bsd-nexus-bus.h> @@ -116,18 +115,10 @@ RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SLCR; * CGEM3 is used for LibBSD because all Zynq Ultrascale+ MPSoC dev boards treat * the highest-mapped CGEM as the primary interface. */ -#if NET_CFG_ZYNQMP_USE_CGEM0 == '1' RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM0(ZYNQMP_IRQ_ETHERNET_0); -#endif -#if NET_CFG_ZYNQMP_USE_CGEM1 == '1' RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM1(ZYNQMP_IRQ_ETHERNET_1); -#endif -#if NET_CFG_ZYNQMP_USE_CGEM2 == '1' RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM2(ZYNQMP_IRQ_ETHERNET_2); -#endif -#if NET_CFG_ZYNQMP_USE_CGEM3 == '1' RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM3(ZYNQMP_IRQ_ETHERNET_3); -#endif RTEMS_BSD_DRIVER_E1000PHY; RTEMS_BSD_DRIVER_UKPHY; diff --git a/testsuite/include/rtems/bsd/test/network-config.h.in b/testsuite/include/rtems/bsd/test/network-config.h.in index da316e15..39bb5388 100755 --- a/testsuite/include/rtems/bsd/test/network-config.h.in +++ b/testsuite/include/rtems/bsd/test/network-config.h.in @@ -64,12 +64,4 @@ #define NET_CFG_GATEWAY_IP "@NET_CFG_GATEWAY_IP@" -#define NET_CFG_ZYNQMP_USE_CGEM0 '@NET_CFG_ZYNQMP_USE_CGEM0@' - -#define NET_CFG_ZYNQMP_USE_CGEM1 '@NET_CFG_ZYNQMP_USE_CGEM1@' - -#define NET_CFG_ZYNQMP_USE_CGEM2 '@NET_CFG_ZYNQMP_USE_CGEM2@' - -#define NET_CFG_ZYNQMP_USE_CGEM3 '@NET_CFG_ZYNQMP_USE_CGEM3@' - #endif /* _RTEMS_BSD_TEST_NETWORK_CONFIG_H_ */ diff --git a/waf_libbsd.py b/waf_libbsd.py index bb4182e3..e7222a03 100644 --- a/waf_libbsd.py +++ b/waf_libbsd.py @@ -289,9 +289,7 @@ class Builder(builder.ModuleManager): (bld.env.NET_CONFIG)) tags = [ 'NET_CFG_INTERFACE_0', 'NET_CFG_SELF_IP', 'NET_CFG_NETMASK', - 'NET_CFG_PEER_IP', 'NET_CFG_GATEWAY_IP', - 'NET_CFG_ZYNQMP_USE_CGEM0', 'NET_CFG_ZYNQMP_USE_CGEM1', - 'NET_CFG_ZYNQMP_USE_CGEM2', 'NET_CFG_ZYNQMP_USE_CGEM3' + 'NET_CFG_PEER_IP', 'NET_CFG_GATEWAY_IP' ] try: net_cfg_lines = open(bld.env.NET_CONFIG).readlines() |