diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-12-20 10:14:26 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-12-20 11:22:26 +0100 |
commit | 5315d35d5e44d83b029c31f9bb660b9e3e3b2c1a (patch) | |
tree | 667ca686ca5ee1dd24030fc1e4f76c08aafb8c9b | |
parent | Add -Wno-format (diff) | |
download | rtems-libbsd-5315d35d5e44d83b029c31f9bb660b9e3e3b2c1a.tar.bz2 |
Always enable IPv6
Diffstat (limited to '')
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 13 | ||||
-rw-r--r-- | config.inc | 1 | ||||
-rwxr-xr-x | freebsd-to-rtems.py | 14 | ||||
-rw-r--r-- | rtemsbsd/include/machine/rtems-bsd-kernel-space.h (renamed from rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in) | 0 |
5 files changed, 2 insertions, 27 deletions
@@ -13,7 +13,6 @@ freebsd/lib/libc/net/nsparser.h freebsd/lib/libc/net/nslexer.c freebsd/lib/libc/net/nsparser.c rtemsbsd/rtems/rtems-kvm-symbols.c -rtemsbsd/include/machine/rtems-bsd-kernel-space.h testsuite/include/rtems/bsd/test/network-config.h /*.i /*.s @@ -28,9 +28,6 @@ CFLAGS += -std=gnu99 CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d NEED_DUMMY_PIC_IRQ=yes -# do nothing default so sed on rtems-bsd-kernel-space.h always works. -SED_PATTERN += -e 's/^//' - TEST_NETWORK_CONFIG = testsuite/include/rtems/bsd/test/network-config.h TESTS = @@ -43,7 +40,7 @@ O_FILES = D_FILES = LIB = libbsd.a -LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h +LIB_GEN_FILES = LIB_C_FILES = LIB_C_FILES += rtemsbsd/local/bus_if.c LIB_C_FILES += rtemsbsd/local/cryptodev_if.c @@ -294,7 +291,6 @@ LIB_C_FILES += freebsd/sys/netinet/libalias/alias_proxy.c LIB_C_FILES += freebsd/sys/netinet/libalias/alias.c LIB_C_FILES += freebsd/sys/netinet/libalias/alias_skinny.c LIB_C_FILES += freebsd/sys/netinet/libalias/alias_sctp.c -ifneq ($(DISABLE_IPV6),yes) LIB_C_FILES += freebsd/sys/net/if_stf.c LIB_C_FILES += freebsd/sys/netinet6/dest6.c LIB_C_FILES += freebsd/sys/netinet6/frag6.c @@ -323,9 +319,6 @@ LIB_C_FILES += freebsd/sys/netinet6/route6.c LIB_C_FILES += freebsd/sys/netinet6/scope6.c LIB_C_FILES += freebsd/sys/netinet6/sctp6_usrreq.c LIB_C_FILES += freebsd/sys/netinet6/udp6_usrreq.c -else -SED_PATTERN += -e 's/^\#define INET6 1/\/\/ \#define INET6 1/' -endif # DISABLE_IPV6 LIB_C_FILES += freebsd/sys/netipsec/ipsec.c LIB_C_FILES += freebsd/sys/netipsec/ipsec_input.c LIB_C_FILES += freebsd/sys/netipsec/ipsec_mbuf.c @@ -1310,10 +1303,6 @@ $(TEST_NETWORK_CONFIG): $(TEST_NETWORK_CONFIG).in config.inc -e 's/@NET_CFG_GATEWAY_IP@/$(NET_CFG_GATEWAY_IP)/' \ < $< > $@ -# The following targets use the MIPS Generic in_cksum routine -rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in - sed $(SED_PATTERN) <$< >$@ - CPU_SED = sed CPU_SED += -e '/arm/d' CPU_SED += -e '/i386/d' @@ -1,7 +1,6 @@ BSP = jmr3904 RTEMS_MAKEFILE_PATH = ${HOME}/newbsd/bsp-install/mips-rtems4.11/$(BSP) INSTALL_BASE = ${HOME}/newbsd/install -DISABLE_IPV6=no TEST_RUNNER = $(BSP) NET_CFG_SELF_IP = 10.0.2.1 NET_CFG_NETMASK = 255.255.0.0 diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index f1220e16..92e8531f 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -434,9 +434,6 @@ class ModuleManager: 'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \ 'NEED_DUMMY_PIC_IRQ=yes\n' \ '\n' \ - '# do nothing default so sed on rtems-bsd-kernel-space.h always works.\n' \ - 'SED_PATTERN += -e \'s/^//\'\n' \ - '\n' \ 'TEST_NETWORK_CONFIG = testsuite/include/rtems/bsd/test/network-config.h\n' \ '\n' \ 'TESTS =\n' \ @@ -449,7 +446,7 @@ class ModuleManager: 'D_FILES =\n' \ '\n' \ 'LIB = libbsd.a\n' \ - 'LIB_GEN_FILES = rtemsbsd/include/machine/rtems-bsd-kernel-space.h\n' \ + 'LIB_GEN_FILES =\n' \ 'LIB_C_FILES =\n' for m in self.modules: if m.conditionalOn != "none": @@ -465,8 +462,6 @@ class ModuleManager: data += 'NEED_DUMMY_PIC_IRQ=no\n' data += 'endif\n' if m.conditionalOn != "none": - data += 'else\n' - data += 'SED_PATTERN += -e \'' + m.cppPattern +'\'\n' data += 'endif # ' + m.conditionalOn +'\n' data += '\n' \ 'ifeq ($(NEED_DUMMY_PIC_IRQ),yes)\n' \ @@ -496,10 +491,6 @@ class ModuleManager: '\t-e \'s/@NET_CFG_GATEWAY_IP@/$(NET_CFG_GATEWAY_IP)/\' \\\n' \ '\t< $< > $@\n' \ '\n' \ - '# The following targets use the MIPS Generic in_cksum routine\n' \ - 'rtemsbsd/include/machine/rtems-bsd-kernel-space.h: rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in\n' \ - '\tsed $(SED_PATTERN) <$< >$@\n' \ - '\n' \ 'CPU_SED = sed\n' \ 'CPU_SED += -e \'/arm/d\'\n' \ 'CPU_SED += -e \'/i386/d\'\n' \ @@ -560,7 +551,6 @@ class Module: def __init__(self, name): self.name = name self.conditionalOn = "none" - self.cppPattern = "s///" self.files = [] self.cpuDependentSourceFiles = {} self.dependencies = [] @@ -1711,8 +1701,6 @@ netinet.addKernelSpaceSourceFiles( ) netinet6 = Module('netinet6') -netinet6.conditionalOn = "DISABLE_IPV6" -netinet6.cppPattern = 's/^\#define INET6 1/\/\/ \#define INET6 1/' netinet6.addKernelSpaceHeaderFiles( [ 'sys/netinet6/icmp6.h', diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h index 2191f36e..2191f36e 100644 --- a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h.in +++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h |