This removes directory scanning from rtems-lwip for a more robust build system.
Closes #4889 --- defs/bsps/aarch64/xilinx_zynqmp_base.json | 6 +++--- .../aarch64/xilinx_zynqmp_hardware_base.json | 8 ++++++++ defs/bsps/aarch64/xilinx_zynqmp_ilp32_qemu.json | 9 ++------- .../bsps/aarch64/xilinx_zynqmp_ilp32_zu3eg.json | 9 ++------- .../aarch64/xilinx_zynqmp_lp64_cfc400x.json | 4 ++-- defs/bsps/aarch64/xilinx_zynqmp_lp64_qemu.json | 9 ++------- defs/bsps/aarch64/xilinx_zynqmp_lp64_zu3eg.json | 9 ++------- defs/bsps/aarch64/xilinx_zynqmp_qemu_base.json | 8 ++++++++ defs/bsps/arm/beaglebone_bw_base.json | 17 ++++++++++++++--- defs/bsps/arm/tms570_base.json | 6 ++++-- lwip.py | 3 --- 11 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 defs/bsps/aarch64/xilinx_zynqmp_hardware_base.json create mode 100644 defs/bsps/aarch64/xilinx_zynqmp_qemu_base.json diff --git a/defs/bsps/aarch64/xilinx_zynqmp_base.json b/defs/bsps/aarch64/xilinx_zynqmp_base.json index 515ad6e..c18b339 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_base.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_base.json @@ -11,10 +11,10 @@ "embeddedsw/lib/bsp/standalone/src/arm/common/gcc", "embeddedsw/lib/bsp/standalone/src/arm/common" ], - "source-paths-to-import": [ - "rtemslwip/zynqmp" - ], "source-files-to-import": [ + "rtemslwip/zynqmp/xemacps_g.c", + "rtemslwip/zynqmp/xil_shims.c", + "rtemslwip/zynqmp/xtopology_g.c", "embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xadapter.c", "embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xpqueue.c", "embeddedsw/ThirdParty/sw_services/lwip211/src/contrib/ports/xilinx/netif/xemacpsif.c", diff --git a/defs/bsps/aarch64/xilinx_zynqmp_hardware_base.json b/defs/bsps/aarch64/xilinx_zynqmp_hardware_base.json new file mode 100644 index 0000000..f60a911 --- /dev/null +++ b/defs/bsps/aarch64/xilinx_zynqmp_hardware_base.json @@ -0,0 +1,8 @@ +{ + "header-paths-to-import": [ + "rtemslwip/zynqmp_hardware" + ], + "source-files-to-import": [ + "rtemslwip/zynqmp_hardware/netstart.c" + ] +} diff --git a/defs/bsps/aarch64/xilinx_zynqmp_ilp32_qemu.json b/defs/bsps/aarch64/xilinx_zynqmp_ilp32_qemu.json index ed8667d..a096668 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_ilp32_qemu.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_ilp32_qemu.json @@ -1,11 +1,6 @@ { "includes": [ - "xilinx_zynqmp_base" - ], - "header-paths-to-import": [ - "rtemslwip/zynqmp_qemu" - ], - "source-paths-to-import": [ - "rtemslwip/zynqmp_qemu" + "xilinx_zynqmp_base", + "xilinx_zynqmp_qemu_base" ] } diff --git a/defs/bsps/aarch64/xilinx_zynqmp_ilp32_zu3eg.json b/defs/bsps/aarch64/xilinx_zynqmp_ilp32_zu3eg.json index 4438ed2..01d7021 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_ilp32_zu3eg.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_ilp32_zu3eg.json @@ -1,11 +1,6 @@ { "includes": [ - "xilinx_zynqmp_base" - ], - "header-paths-to-import": [ - "rtemslwip/zynqmp_hardware" - ], - "source-paths-to-import": [ - "rtemslwip/zynqmp_hardware" + "xilinx_zynqmp_base", + "xilinx_zynqmp_hardware_base" ] } diff --git a/defs/bsps/aarch64/xilinx_zynqmp_lp64_cfc400x.json b/defs/bsps/aarch64/xilinx_zynqmp_lp64_cfc400x.json index 5fe676c..c4d86e7 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_lp64_cfc400x.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_lp64_cfc400x.json @@ -5,7 +5,7 @@ "header-paths-to-import": [ "rtemslwip/zynqmp_cfc400x" ], - "source-paths-to-import": [ - "rtemslwip/zynqmp_cfc400x" + "source-files-to-import": [ + "rtemslwip/zynqmp_cfc400x/netstart.c" ] } diff --git a/defs/bsps/aarch64/xilinx_zynqmp_lp64_qemu.json b/defs/bsps/aarch64/xilinx_zynqmp_lp64_qemu.json index ed8667d..a096668 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_lp64_qemu.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_lp64_qemu.json @@ -1,11 +1,6 @@ { "includes": [ - "xilinx_zynqmp_base" - ], - "header-paths-to-import": [ - "rtemslwip/zynqmp_qemu" - ], - "source-paths-to-import": [ - "rtemslwip/zynqmp_qemu" + "xilinx_zynqmp_base", + "xilinx_zynqmp_qemu_base" ] } diff --git a/defs/bsps/aarch64/xilinx_zynqmp_lp64_zu3eg.json b/defs/bsps/aarch64/xilinx_zynqmp_lp64_zu3eg.json index 4438ed2..01d7021 100644 --- a/defs/bsps/aarch64/xilinx_zynqmp_lp64_zu3eg.json +++ b/defs/bsps/aarch64/xilinx_zynqmp_lp64_zu3eg.json @@ -1,11 +1,6 @@ { "includes": [ - "xilinx_zynqmp_base" - ], - "header-paths-to-import": [ - "rtemslwip/zynqmp_hardware" - ], - "source-paths-to-import": [ - "rtemslwip/zynqmp_hardware" + "xilinx_zynqmp_base", + "xilinx_zynqmp_hardware_base" ] } diff --git a/defs/bsps/aarch64/xilinx_zynqmp_qemu_base.json b/defs/bsps/aarch64/xilinx_zynqmp_qemu_base.json new file mode 100644 index 0000000..7bf24b8 --- /dev/null +++ b/defs/bsps/aarch64/xilinx_zynqmp_qemu_base.json @@ -0,0 +1,8 @@ +{ + "header-paths-to-import": [ + "rtemslwip/zynqmp_qemu" + ], + "source-files-to-import": [ + "rtemslwip/zynqmp_qemu/netstart.c" + ] +} diff --git a/defs/bsps/arm/beaglebone_bw_base.json b/defs/bsps/arm/beaglebone_bw_base.json index 9d25a67..ca474fd 100644 --- a/defs/bsps/arm/beaglebone_bw_base.json +++ b/defs/bsps/arm/beaglebone_bw_base.json @@ -3,8 +3,19 @@ "rtemslwip/beaglebone", "cpsw/src/include" ], - "source-paths-to-import": [ - "rtemslwip/beaglebone", - "cpsw/src" + "source-files-to-import": [ + "rtemslwip/beaglebone/netstart.c", + "cpsw/src/locator.c", + "cpsw/src/perf.c", + "cpsw/src/delay.c", + "cpsw/src/netif/cpsw_bb.c", + "cpsw/src/netif/cache.c", + "cpsw/src/netif/cpsw.c", + "cpsw/src/netif/cpswif.c", + "cpsw/src/netif/delay.c", + "cpsw/src/netif/phy.c", + "cpsw/src/netif/mdio.c", + "cpsw/src/netif/mmu.c", + "cpsw/src/lwiplib.c" ] } diff --git a/defs/bsps/arm/tms570_base.json b/defs/bsps/arm/tms570_base.json index 33cd969..5f1f73e 100644 --- a/defs/bsps/arm/tms570_base.json +++ b/defs/bsps/arm/tms570_base.json @@ -3,7 +3,9 @@ "uLan/ports/driver/tms570_emac", "uLan/ports/os" ], - "source-paths-to-import": [ - "uLan/ports/driver/tms570_emac" + "source-files-to-import": [ + "uLan/ports/driver/tms570_emac/eth_lwip.c", + "uLan/ports/driver/tms570_emac/phy_dp83848h.c", + "uLan/ports/driver/tms570_emac/tms570_netif.c" ] } diff --git a/lwip.py b/lwip.py index bcd898f..bd743a1 100644 --- a/lwip.py +++ b/lwip.py @@ -68,9 +68,6 @@ def build(bld): includes.extend(tmpincl) if 'source-files-to-import' in files: sources.extend(files['source-files-to-import']) - if 'source-paths-to-import' in files: - for f in files['source-paths-to-import']: - sources.extend(walk_sources(f)) if 'header-paths-to-import' in files: includes.extend(files['header-paths-to-import']) return (sources, includes) -- 2.30.2 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel