bsps: Move legacy network drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

63 files changed, 26 insertions, 26 deletions

diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/LICENSE b/bsps/powerpc/beatnik/net/if_em/LICENSE
index ba90c4a817..ba90c4a817 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/LICENSE
+++ b/bsps/powerpc/beatnik/net/if_em/LICENSE
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/README b/bsps/powerpc/beatnik/net/if_em/README
index b4eef8dbb7..b4eef8dbb7 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/README
+++ b/bsps/powerpc/beatnik/net/if_em/README
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c b/bsps/powerpc/beatnik/net/if_em/if_em.c
index db3607a20d..db3607a20d 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c
+++ b/bsps/powerpc/beatnik/net/if_em/if_em.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.h b/bsps/powerpc/beatnik/net/if_em/if_em.h
index 1dc09ce05f..1dc09ce05f 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.h
+++ b/bsps/powerpc/beatnik/net/if_em/if_em.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.c b/bsps/powerpc/beatnik/net/if_em/if_em_hw.c
index 0dcf349733..0dcf349733 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.c
+++ b/bsps/powerpc/beatnik/net/if_em/if_em_hw.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.h b/bsps/powerpc/beatnik/net/if_em/if_em_hw.h
index 98f4c5e6ba..98f4c5e6ba 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_hw.h
+++ b/bsps/powerpc/beatnik/net/if_em/if_em_hw.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_osdep.h b/bsps/powerpc/beatnik/net/if_em/if_em_osdep.h
index 4bc5843a73..4bc5843a73 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_osdep.h
+++ b/bsps/powerpc/beatnik/net/if_em/if_em_osdep.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_rtems.c b/bsps/powerpc/beatnik/net/if_em/if_em_rtems.c
index fde1de7dc7..fde1de7dc7 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em_rtems.c
+++ b/bsps/powerpc/beatnik/net/if_em/if_em_rtems.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h b/bsps/powerpc/beatnik/net/if_em/rtemscompat_defs.h
index 6a132a1b26..6a132a1b26 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/rtemscompat_defs.h
+++ b/bsps/powerpc/beatnik/net/if_em/rtemscompat_defs.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/gtethreg.h b/bsps/powerpc/beatnik/net/if_gfe/gtethreg.h
index d571eecd34..d571eecd34 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/gtethreg.h
+++ b/bsps/powerpc/beatnik/net/if_gfe/gtethreg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/gtvar.h b/bsps/powerpc/beatnik/net/if_gfe/gtvar.h
index 00d72bfa3a..00d72bfa3a 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/gtvar.h
+++ b/bsps/powerpc/beatnik/net/if_gfe/gtvar.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c b/bsps/powerpc/beatnik/net/if_gfe/if_gfe.c
index e642636d1e..e642636d1e 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c
+++ b/bsps/powerpc/beatnik/net/if_gfe/if_gfe.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_rtems.c b/bsps/powerpc/beatnik/net/if_gfe/if_gfe_rtems.c
index 9ed814eb28..9ed814eb28 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe_rtems.c
+++ b/bsps/powerpc/beatnik/net/if_gfe/if_gfe_rtems.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfevar.h b/bsps/powerpc/beatnik/net/if_gfe/if_gfevar.h
index cbb9609cf8..cbb9609cf8 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfevar.h
+++ b/bsps/powerpc/beatnik/net/if_gfe/if_gfevar.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h b/bsps/powerpc/beatnik/net/if_gfe/rtemscompat_defs.h
index 971b1d3cca..971b1d3cca 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/rtemscompat_defs.h
+++ b/bsps/powerpc/beatnik/net/if_gfe/rtemscompat_defs.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c b/bsps/powerpc/beatnik/net/if_mve/mv643xx_eth.c
index 85ab038bf5..85ab038bf5 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c
+++ b/bsps/powerpc/beatnik/net/if_mve/mv643xx_eth.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mve_smallbuf_tst.c b/bsps/powerpc/beatnik/net/if_mve/mve_smallbuf_tst.c
index 721ade30d1..721ade30d1 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mve_smallbuf_tst.c
+++ b/bsps/powerpc/beatnik/net/if_mve/mve_smallbuf_tst.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/testing.c b/bsps/powerpc/beatnik/net/if_mve/testing.c
index a1233bdb0b..a1233bdb0b 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/testing.c
+++ b/bsps/powerpc/beatnik/net/if_mve/testing.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/LICENSE b/bsps/powerpc/beatnik/net/porting/LICENSE
index 62b91ab03d..62b91ab03d 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/LICENSE
+++ b/bsps/powerpc/beatnik/net/porting/LICENSE
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/Makefile.template b/bsps/powerpc/beatnik/net/porting/Makefile.template
index 3c5d6e3e33..3c5d6e3e33 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/Makefile.template
+++ b/bsps/powerpc/beatnik/net/porting/Makefile.template
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/README b/bsps/powerpc/beatnik/net/porting/README
index b262d7797c..b262d7797c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/README
+++ b/bsps/powerpc/beatnik/net/porting/README
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx.modini.c b/bsps/powerpc/beatnik/net/porting/if_xxx.modini.c
index 1abad7dc22..1abad7dc22 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx.modini.c
+++ b/bsps/powerpc/beatnik/net/porting/if_xxx.modini.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c b/bsps/powerpc/beatnik/net/porting/if_xxx_rtems.c
index a0d459ff47..a0d459ff47 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/if_xxx_rtems.c
+++ b/bsps/powerpc/beatnik/net/porting/if_xxx_rtems.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/pcireg.h b/bsps/powerpc/beatnik/net/porting/pcireg.h
index 8487f5b8f6..8487f5b8f6 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/pcireg.h
+++ b/bsps/powerpc/beatnik/net/porting/pcireg.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat.h b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
index 62821eb9ff..62821eb9ff 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat.h
+++ b/bsps/powerpc/beatnik/net/porting/rtemscompat.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat1.h b/bsps/powerpc/beatnik/net/porting/rtemscompat1.h
index cee16522cc..cee16522cc 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat1.h
+++ b/bsps/powerpc/beatnik/net/porting/rtemscompat1.h
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat_defs.h.template b/bsps/powerpc/beatnik/net/porting/rtemscompat_defs.h.template
index 5dc8d1efff..5dc8d1efff 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/porting/rtemscompat_defs.h.template
+++ b/bsps/powerpc/beatnik/net/porting/rtemscompat_defs.h.template
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_attach.c b/bsps/powerpc/beatnik/net/support/bsp_attach.c
index 30329d90b3..30329d90b3 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/bsp_attach.c
+++ b/bsps/powerpc/beatnik/net/support/bsp_attach.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_link_status.c b/bsps/powerpc/beatnik/net/support/early_link_status.c
index 271f970212..271f970212 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/network/support/early_link_status.c
+++ b/bsps/powerpc/beatnik/net/support/early_link_status.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c b/bsps/powerpc/gen5200/net/network.c
index 2e11915b26..2e11915b26 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/network_5200/network.c
+++ b/bsps/powerpc/gen5200/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c b/bsps/powerpc/gen83xx/net/network.c
index b870673cd3..b870673cd3 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/network/network.c
+++ b/bsps/powerpc/gen83xx/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/network/network.c b/bsps/powerpc/haleakala/net/network.c
index f77b03648f..f77b03648f 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/network/network.c
+++ b/bsps/powerpc/haleakala/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c b/bsps/powerpc/mpc55xxevb/net/if_smc.c
index 995bf0b1b0..995bf0b1b0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/if_smc.c
+++ b/bsps/powerpc/mpc55xxevb/net/if_smc.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
index fb0b7aa113..fb0b7aa113 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c
+++ b/bsps/powerpc/mpc55xxevb/net/smsc9218i.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/README b/bsps/powerpc/mpc8260ads/net/README
index d5722557c3..d5722557c3 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/README
+++ b/bsps/powerpc/mpc8260ads/net/README
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
index 350efdbc22..350efdbc22 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
+++ b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.h
index 8289c4bf75..8289c4bf75 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h
+++ b/bsps/powerpc/mpc8260ads/net/if_hdlcsubr.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/bsps/powerpc/mpc8260ads/net/network.c
index fb87fc0e64..fb87fc0e64 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
+++ b/bsps/powerpc/mpc8260ads/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c b/bsps/powerpc/mvme3100/net/tsec.c
index 37a24099c0..37a24099c0 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
+++ b/bsps/powerpc/mvme3100/net/tsec.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
index fa1d9471dd..fa1d9471dd 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
+++ b/bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
index dc89399b6c..dc89399b6c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
+++ b/bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c b/bsps/powerpc/mvme5500/net/if_1GHz/pci_map.c
index 26b143ea1a..26b143ea1a 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c
+++ b/bsps/powerpc/mvme5500/net/if_1GHz/pci_map.c
diff --git a/c/src/lib/libbsp/powerpc/psim/network/README b/bsps/powerpc/psim/net/README
index 4ca287788c..4ca287788c 100644
--- a/c/src/lib/libbsp/powerpc/psim/network/README
+++ b/bsps/powerpc/psim/net/README
diff --git a/c/src/lib/libbsp/powerpc/psim/network/gdb-6.8-psim-hw_ethtap.diff b/bsps/powerpc/psim/net/gdb-6.8-psim-hw_ethtap.diff
index d0aae6ede1..d0aae6ede1 100644
--- a/c/src/lib/libbsp/powerpc/psim/network/gdb-6.8-psim-hw_ethtap.diff
+++ b/bsps/powerpc/psim/net/gdb-6.8-psim-hw_ethtap.diff
diff --git a/c/src/lib/libbsp/powerpc/psim/network/if_sim.c b/bsps/powerpc/psim/net/if_sim.c
index 3bb1ec362d..3bb1ec362d 100644
--- a/c/src/lib/libbsp/powerpc/psim/network/if_sim.c
+++ b/bsps/powerpc/psim/net/if_sim.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/network/if_intercom.c b/bsps/powerpc/qoriq/net/if_intercom.c
index b692ced655..b692ced655 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/network/if_intercom.c
+++ b/bsps/powerpc/qoriq/net/if_intercom.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/network/network.c b/bsps/powerpc/qoriq/net/network.c
index 208b1a5434..208b1a5434 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/network/network.c
+++ b/bsps/powerpc/qoriq/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c b/bsps/powerpc/tqm8xx/net/network_fec.c
index a2a3016801..a2a3016801 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
+++ b/bsps/powerpc/tqm8xx/net/network_fec.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c b/bsps/powerpc/tqm8xx/net/network_scc.c
index 98acbb3e7a..98acbb3e7a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
+++ b/bsps/powerpc/tqm8xx/net/network_scc.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c b/bsps/powerpc/virtex/net/xiltemac.c
index 1c3a461466..1c3a461466 100644
--- a/c/src/lib/libbsp/powerpc/virtex/network/xiltemac.c
+++ b/bsps/powerpc/virtex/net/xiltemac.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index e5c57f8dc3..4de5536771 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -84,14 +84,14 @@ librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
 
 #network
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/if_em/if_em.c
-librtemsbsp_a_SOURCES += network/if_em/if_em_hw.c
-librtemsbsp_a_SOURCES += network/if_em/if_em_rtems.c
-librtemsbsp_a_SOURCES += network/if_gfe/if_gfe.c
-librtemsbsp_a_SOURCES += network/if_gfe/if_gfe_rtems.c
-librtemsbsp_a_SOURCES += network/if_mve/mv643xx_eth.c
-librtemsbsp_a_SOURCES += network/support/bsp_attach.c
-librtemsbsp_a_SOURCES += network/support/early_link_status.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_em/if_em.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_em/if_em_hw.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_em/if_em_rtems.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_gfe/if_gfe.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_gfe/if_gfe_rtems.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/if_mve/mv643xx_eth.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/support/bsp_attach.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/net/support/early_link_status.c
 endif
 
 # tod
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 66c7379c36..f72583af21 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -104,7 +104,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/uboot_supp
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bestcomm.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network_5200/network.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/net/network.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 7f5131c4a0..88500631d3 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -70,7 +70,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cd
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/net/network.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 8c2f7fb5c4..4cd0c83a3f 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -38,7 +38,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/irq/irq_init.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/irq/irq.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network.c 
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/net/network.c 
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index ac5cc2c73c..43bb7a7911 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -80,7 +80,7 @@ librtemsbsp_a_SOURCES += ../shared/residual/residual.c
 
 if QEMU
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/net/ne2000.c
 endif
 endif
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 3838063aef..eecf682c62 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -88,8 +88,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/i2c/i2c_init.
 
 # Network
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/smsc9218i.c
-librtemsbsp_a_SOURCES += network/if_smc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/net/smsc9218i.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/net/if_smc.c
 endif
 
 # BSP library
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 6fe77e9ed4..cac9650005 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -42,8 +42,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/if_hdlcsubr.c
-librtemsbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/net/if_hdlcsubr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/net/network.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 6cd02dceab..88b1f81212 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -81,7 +81,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/i2c/i2c_init.c
 librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/tsec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/net/tsec.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 8d7e85945c..6344139e30 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -55,9 +55,9 @@ librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c
 librtemsbsp_a_SOURCES += GT64260/MVME5500I2C.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/if_100MHz/GT64260eth.c
-librtemsbsp_a_SOURCES += network/if_1GHz/if_wm.c
-librtemsbsp_a_SOURCES += network/if_1GHz/pci_map.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/net/if_100MHz/GT64260eth.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/net/if_1GHz/if_wm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/net/if_1GHz/pci_map.c
 endif
 
 rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index fc9ee6eec8..f8577635bc 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -55,7 +55,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/mpisr.c
 endif
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/if_sim.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/net/if_sim.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 3e18139f32..abc6e0177c 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -84,8 +84,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network.c
-librtemsbsp_a_SOURCES += network/if_intercom.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/net/network.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/net/if_intercom.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index b95f56f26a..9b98782168 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -49,8 +49,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network_fec.c
-librtemsbsp_a_SOURCES += network/network_scc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/net/network_fec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/net/network_scc.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index c16d057bb5..54cef149a7 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -52,7 +52,7 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += =
-librtemsbsp_a_SOURCES += network/xiltemac.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex/net/xiltemac.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c