From 93b259b129ab04623bdf8fb0947d7673b0b45586 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Tue, 8 Nov 2022 23:03:58 -0600 Subject: nexus/zynqmp: Use device trees for CGEM This moves the ZynqMP BSPs over to using device trees for CGEM instantiation now that all BSP variants provide appropriate device trees. --- rtemsbsd/include/bsp/nexus-devices.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h index 8be29a1c..8f3f437e 100644 --- a/rtemsbsd/include/bsp/nexus-devices.h +++ b/rtemsbsd/include/bsp/nexus-devices.h @@ -107,18 +107,14 @@ RTEMS_BSD_DRIVER_MMC; #include +RTEMS_BSD_DEFINE_NEXUS_DEVICE(ofwbus, 0, 0, NULL); +SYSINIT_DRIVER_REFERENCE(simplebus, ofwbus); RTEMS_BSD_DRIVER_XILINX_ZYNQMP_SLCR; /* Qemu only applies user-mode networking to the first interface by default, so * all 4 CGEM instances must be configured in the Qemu arguments using - * "-nic user,model=cadence_gem" for each nic. - * - * CGEM3 is used for LibBSD because all Zynq Ultrascale+ MPSoC dev boards treat - * the highest-mapped CGEM as the primary interface. + * "-nic user,model=cadence_gem" for each desired nic. */ -RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM0(ZYNQMP_IRQ_ETHERNET_0); -RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM1(ZYNQMP_IRQ_ETHERNET_1); -RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM2(ZYNQMP_IRQ_ETHERNET_2); -RTEMS_BSD_DRIVER_XILINX_ZYNQMP_CGEM3(ZYNQMP_IRQ_ETHERNET_3); +SYSINIT_DRIVER_REFERENCE(cgem, simplebus); RTEMS_BSD_DRIVER_E1000PHY; RTEMS_BSD_DRIVER_UKPHY; -- cgit v1.2.3