[rtems-lwip commit] Alter ownership of components in uLan
Joel Sherrill
joel at rtems.org
Mon Jul 3 14:52:56 UTC 2023
Module: rtems-lwip
Branch: master
Commit: d0cb3185afd962a034f0818c73f2becf6fe05bfc
Changeset: http://git.rtems.org/rtems-lwip/commit/?id=d0cb3185afd962a034f0818c73f2becf6fe05bfc
Author: Kinsey Moore <kinsey.moore at oarcorp.com>
Date: Tue Jun 27 14:03:30 2023 -0500
Alter ownership of components in uLan
This commit breaks up the uLan directory and removes its ORIGIN and
COPYING metadata in favor of this repository being the authoritative
source of these sources as per the wishes of the originator of these
files. More information can be found here:
https://lists.rtems.org/pipermail/devel/2023-March/074525.html
Closes #4867
---
COPYING.uLan | 33 ----------------------
ORIGIN.uLan | 2 --
defs/bsps/arm/tms570_base.json | 10 +++----
defs/common/lwip.json | 4 +--
.../os/rtems/arch => rtemslwip/common}/sys_arch.c | 0
.../ports/os/rtems => rtemslwip/include}/arch/cc.h | 0
.../os/rtems => rtemslwip/include}/arch/perf.h | 0
.../os/rtems => rtemslwip/include}/arch/sys_arch.h | 0
.../tms570_emac => rtemslwip/tms570}/eth_lwip.c | 0
.../tms570/include}/eth_lwip.h | 0
.../tms570/include}/eth_lwip_default.h | 0
rtemslwip/tms570/{ => include}/lwipbspopts.h | 0
.../tms570/include}/phy_dp83848h.h | 0
.../tms570/include}/ti_drv_emac.h | 0
.../tms570/include}/ti_drv_mdio.h | 0
.../tms570/include}/tms570_emac.h | 0
.../tms570/include}/tms570_netif.h | 0
.../tms570}/phy_dp83848h.c | 0
.../tms570}/tms570_netif.c | 0
19 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/COPYING.uLan b/COPYING.uLan
deleted file mode 100644
index e23898b..0000000
--- a/COPYING.uLan
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam at sics.se>
- *
- */
-
-
diff --git a/ORIGIN.uLan b/ORIGIN.uLan
deleted file mode 100644
index 8111d3d..0000000
--- a/ORIGIN.uLan
+++ /dev/null
@@ -1,2 +0,0 @@
-The files under the uLan/ directory are sourced from:
-git://git.code.sf.net/p/ulan/lwip-omk ulan-lwip-omk
diff --git a/defs/bsps/arm/tms570_base.json b/defs/bsps/arm/tms570_base.json
index e618d5c..93b421d 100644
--- a/defs/bsps/arm/tms570_base.json
+++ b/defs/bsps/arm/tms570_base.json
@@ -1,14 +1,12 @@
{
"header-paths-to-import": [
- "uLan/ports/driver/tms570_emac",
- "uLan/ports/os",
- "rtemslwip/tms570",
+ "rtemslwip/tms570/include",
"cpsw/src/include"
],
"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",
+ "rtemslwip/tms570/eth_lwip.c",
+ "rtemslwip/tms570/phy_dp83848h.c",
+ "rtemslwip/tms570/tms570_netif.c",
"cpsw/src/locator.c",
"cpsw/src/perf.c",
"cpsw/src/delay.c",
diff --git a/defs/common/lwip.json b/defs/common/lwip.json
index 2dd5614..37e45b4 100644
--- a/defs/common/lwip.json
+++ b/defs/common/lwip.json
@@ -2,11 +2,11 @@
"header-paths-to-import": [
"rtemslwip/bsd_compat_include",
"lwip/src/include",
- "uLan/ports/os/rtems",
+ "rtemslwip/include/arch",
"rtemslwip/include"
],
"source-files-to-import" : [
- "uLan/ports/os/rtems/arch/sys_arch.c",
+ "rtemslwip/common/sys_arch.c",
"rtemslwip/common/syslog.c",
"rtemslwip/common/rtems_lwip_io.c",
"rtemslwip/common/netstart_shared.c",
diff --git a/uLan/ports/os/rtems/arch/sys_arch.c b/rtemslwip/common/sys_arch.c
similarity index 100%
rename from uLan/ports/os/rtems/arch/sys_arch.c
rename to rtemslwip/common/sys_arch.c
diff --git a/uLan/ports/os/rtems/arch/cc.h b/rtemslwip/include/arch/cc.h
similarity index 100%
rename from uLan/ports/os/rtems/arch/cc.h
rename to rtemslwip/include/arch/cc.h
diff --git a/uLan/ports/os/rtems/arch/perf.h b/rtemslwip/include/arch/perf.h
similarity index 100%
rename from uLan/ports/os/rtems/arch/perf.h
rename to rtemslwip/include/arch/perf.h
diff --git a/uLan/ports/os/rtems/arch/sys_arch.h b/rtemslwip/include/arch/sys_arch.h
similarity index 100%
rename from uLan/ports/os/rtems/arch/sys_arch.h
rename to rtemslwip/include/arch/sys_arch.h
diff --git a/uLan/ports/driver/tms570_emac/eth_lwip.c b/rtemslwip/tms570/eth_lwip.c
similarity index 100%
rename from uLan/ports/driver/tms570_emac/eth_lwip.c
rename to rtemslwip/tms570/eth_lwip.c
diff --git a/uLan/ports/driver/tms570_emac/eth_lwip.h b/rtemslwip/tms570/include/eth_lwip.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/eth_lwip.h
rename to rtemslwip/tms570/include/eth_lwip.h
diff --git a/uLan/ports/driver/tms570_emac/eth_lwip_default.h b/rtemslwip/tms570/include/eth_lwip_default.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/eth_lwip_default.h
rename to rtemslwip/tms570/include/eth_lwip_default.h
diff --git a/rtemslwip/tms570/lwipbspopts.h b/rtemslwip/tms570/include/lwipbspopts.h
similarity index 100%
rename from rtemslwip/tms570/lwipbspopts.h
rename to rtemslwip/tms570/include/lwipbspopts.h
diff --git a/uLan/ports/driver/tms570_emac/phy_dp83848h.h b/rtemslwip/tms570/include/phy_dp83848h.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/phy_dp83848h.h
rename to rtemslwip/tms570/include/phy_dp83848h.h
diff --git a/uLan/ports/driver/tms570_emac/ti_drv_emac.h b/rtemslwip/tms570/include/ti_drv_emac.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/ti_drv_emac.h
rename to rtemslwip/tms570/include/ti_drv_emac.h
diff --git a/uLan/ports/driver/tms570_emac/ti_drv_mdio.h b/rtemslwip/tms570/include/ti_drv_mdio.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/ti_drv_mdio.h
rename to rtemslwip/tms570/include/ti_drv_mdio.h
diff --git a/uLan/ports/driver/tms570_emac/tms570_emac.h b/rtemslwip/tms570/include/tms570_emac.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/tms570_emac.h
rename to rtemslwip/tms570/include/tms570_emac.h
diff --git a/uLan/ports/driver/tms570_emac/tms570_netif.h b/rtemslwip/tms570/include/tms570_netif.h
similarity index 100%
rename from uLan/ports/driver/tms570_emac/tms570_netif.h
rename to rtemslwip/tms570/include/tms570_netif.h
diff --git a/uLan/ports/driver/tms570_emac/phy_dp83848h.c b/rtemslwip/tms570/phy_dp83848h.c
similarity index 100%
rename from uLan/ports/driver/tms570_emac/phy_dp83848h.c
rename to rtemslwip/tms570/phy_dp83848h.c
diff --git a/uLan/ports/driver/tms570_emac/tms570_netif.c b/rtemslwip/tms570/tms570_netif.c
similarity index 100%
rename from uLan/ports/driver/tms570_emac/tms570_netif.c
rename to rtemslwip/tms570/tms570_netif.c
More information about the vc
mailing list