rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-06-05 15:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtemsbsd: Present all ZynqMP interfaces by default

Browse Source 
Now that the issue with false PHY detection on unterminated MII busses
has been resolved, present all hardware interfaces for use on ZynqMP.
This commit is contained in:
Kinsey Moore 2021-07-08 19:43:04 -05:00 committed by Joel Sherrill
parent 14576608a9
commit a53aeb5eb9
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtemsbsd/include/bsp/nexus-devices.h
View File

@ -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;

8
testsuite/include/rtems/bsd/test/network-config.h.in
View File

@ -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_ */

4
waf_libbsd.py
View File

@ -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()