diff options
Diffstat (limited to 'libbsd.py')
| -rw-r--r-- | libbsd.py | 662 |
1 files changed, 400 insertions, 262 deletions
@@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2016, 2018 Chris Johns <chrisj@rtems.org>. +# Copyright (c) 2015, 2020 Chris Johns <chrisj@rtems.org>. # All rights reserved. # # Copyright (c) 2009, 2018 embedded brains GmbH. All rights reserved. @@ -56,42 +56,57 @@ _defaults = { # # Includes # - 'include-paths': ['rtemsbsd/include', - 'freebsd/sys', - 'freebsd/sys/contrib/ck/include', - 'freebsd/sys/contrib/libsodium/src/libsodium/include', - 'freebsd/sys/contrib/libsodium/src/libsodium/include/sodium', - 'freebsd/sys/contrib/pf', - 'freebsd/crypto', - 'freebsd/crypto/openssl/include', - 'freebsd/sys/net', - 'freebsd/include', - 'freebsd/lib', - 'freebsd/lib/libbsdstat', - 'freebsd/lib/libcapsicum', - 'freebsd/lib/libcasper', - 'freebsd/lib/libc/include', - 'freebsd/lib/libc/isc/include', - 'freebsd/lib/libc/resolv', - 'freebsd/lib/libutil', - 'freebsd/lib/libkvm', - 'freebsd/lib/libmemstat', - 'freebsd/contrib/expat/lib', - 'freebsd/contrib/libpcap', - 'freebsd/contrib/libxo', - 'ipsec-tools/src/libipsec', - 'linux/include', - 'linux/drivers/net/ethernet/freescale/fman', - 'rtemsbsd/sys', - 'mDNSResponder/mDNSCore', - 'mDNSResponder/mDNSShared', - 'mDNSResponder/mDNSPosix', - 'testsuite/include'], - 'cpu-include-paths': ['rtemsbsd/@CPU@/include', - 'freebsd/sys/@CPU@/include'], - - # The path where headers will be copied during build. - 'build-include-path': ['build-include'], + 'include-paths': { + # The path where headers will be copied during the build. + 'build': ['build-include'], + # Kernel header paths + 'kernel': ['rtemsbsd/include', + 'freebsd/sys', + 'freebsd/sys/contrib/ck/include', + 'freebsd/sys/contrib/libsodium/src/libsodium/include', + 'freebsd/sys/contrib/libsodium/src/libsodium/include/sodium', + 'freebsd/sys/contrib/pf', + 'freebsd/sys/net', + 'ipsec-tools/src/libipsec', + 'linux/include', + 'linux/drivers/net/ethernet/freescale/fman', + 'rtemsbsd/sys'], + # User header paths + 'user': ['freebsd/crypto', + 'freebsd/crypto/openssl/include', + 'freebsd/include', + 'freebsd/lib', + 'freebsd/lib/libbsdstat', + 'freebsd/lib/libcapsicum', + 'freebsd/lib/libcasper', + 'freebsd/lib/libc/include', + 'freebsd/lib/libc/isc/include', + 'freebsd/lib/libc/resolv', + 'freebsd/lib/libutil', + 'freebsd/lib/libkvm', + 'freebsd/lib/libmemstat', + 'freebsd/contrib/expat/lib', + 'freebsd/contrib/libpcap', + 'freebsd/contrib/libxo', + 'mDNSResponder/mDNSCore', + 'mDNSResponder/mDNSShared', + 'mDNSResponder/mDNSPosix', + 'testsuite/include'], + # CPU specific path, assumed to be in the kernel context + 'cpu': ['rtemsbsd/@CPU@/include', + 'freebsd/sys/@CPU@/include'], + }, + + # + # Map paths based on RTEMS naming to FreeBSD naming. + # + 'path-mappings': [ + # (source, [targets..]) + # i386 + ('freebsd/sys/i386/include', ['freebsd/sys/x86/include', 'freebsd/sys/i386/include']), + # arm64 + ('freebsd/sys/aarch64/include', ['freebsd/sys/aarch64/include', 'freebsd/sys/arm64/include']), + ], # # Install headers @@ -129,6 +144,7 @@ _defaults = { ('freebsd/sys/dev/pci', '**/*.h', 'dev/pci'), ('freebsd/sys/dev/nvme', '**/*.h', 'dev/nvme'), ('freebsd/sys/dev/evdev', '**/*.h', 'dev/evdev'), + ('freebsd/sys/@CPU@/include', '**/*.h', ''), ('linux/include', '**/*.h', ''), ('mDNSResponder/mDNSCore', 'mDNSDebug.h', ''), ('mDNSResponder/mDNSCore', 'mDNSEmbeddedAPI.h', ''), @@ -146,7 +162,7 @@ class rtems(builder.Module): def generate(self): mm = self.manager - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/bus_if.c', 'local/cryptodev_if.c', @@ -162,35 +178,11 @@ class rtems(builder.Module): 'local/mmcbr_if.c', 'local/if_dwc_if.c', 'local/gpio_if.c', - 'rtems/ipsec_get_policylen.c', - 'rtems/rtems-bsd-arp-processor.c', 'rtems/rtems-bsd-allocator-domain-size.c', - 'rtems/rtems-bsd-cxx.cc', 'rtems/rtems-bsd-get-allocator-domain-size.c', - 'rtems/rtems-bsd-get-ethernet-addr.c', 'rtems/rtems-bsd-get-mac-address.c', 'rtems/rtems-bsd-get-task-priority.c', 'rtems/rtems-bsd-get-task-stack-size.c', - 'rtems/rtems-bsd-ifconfig.c', - 'rtems/rtems-bsd-ifconfig-lo0.c', - 'rtems/rtems-bsd-init-dhcp.c', - 'rtems/rtems-bsd-rc-conf-net.c', - 'rtems/rtems-bsd-rc-conf-pf.c', - 'rtems/rtems-bsd-rc-conf.c', - 'rtems/rtems-bsd-set-if-input.c', - 'rtems/rtems-bsd-shell-arp.c', - 'rtems/rtems-bsd-shell-i2c.c', - 'rtems/rtems-bsd-shell-ifconfig.c', - 'rtems/rtems-bsd-shell-netstat.c', - 'rtems/rtems-bsd-shell-nvmecontrol.c', - 'rtems/rtems-bsd-shell-pfctl.c', - 'rtems/rtems-bsd-shell-ping.c', - 'rtems/rtems-bsd-shell-route.c', - 'rtems/rtems-bsd-shell-stty.c', - 'rtems/rtems-bsd-shell-sysctl.c', - 'rtems/rtems-bsd-shell-tcpdump.c', - 'rtems/rtems-bsd-shell-vmstat.c', - 'rtems/rtems-bsd-shell-wlanstats.c', 'rtems/rtems-bsd-syscall-api.c', 'rtems/rtems-kernel-assert.c', 'rtems/rtems-kernel-autoconf.c', @@ -229,16 +221,65 @@ class rtems(builder.Module): 'rtems/rtems-legacy-rtrequest.c', 'rtems/rtems-legacy-newproc.c', 'rtems/rtems-legacy-mii.c', + 'sys/arm/lpc/if_lpe.c', + 'sys/arm/lpc/lpc_pwr.c', + 'sys/dev/atsam/if_atsam.c', + 'sys/dev/atsam/if_atsam_media.c', + 'sys/dev/dw_mmc/dw_mmc.c', + 'sys/dev/ffec/if_ffec_mcf548x.c', + 'sys/dev/ffec/if_ffec_mpc8xx.c', + 'sys/dev/input/touchscreen/tsc_lpc32xx.c', + 'sys/dev/mmc/st-sdmmc.c', + 'sys/dev/mmc/st-sdmmc-config.c', + 'sys/dev/smc/if_smc_nexus.c', + 'sys/dev/stmac/if_stmac.c', + 'sys/dev/tsec/if_tsec_nexus.c', + 'sys/dev/usb/controller/ehci_mpc83xx.c', + 'sys/dev/usb/controller/dwc_otg_nexus.c', + 'sys/dev/usb/controller/dwc_otg_stm32h7.c', + 'sys/dev/usb/controller/ohci_lpc32xx.c', + 'sys/dev/usb/controller/ohci_lpc.c', + 'sys/dev/usb/controller/usb_otg_transceiver.c', + 'sys/dev/usb/controller/usb_otg_transceiver_dump.c', + 'sys/fs/devfs/devfs_devs.c', + 'sys/net/if_ppp.c', + 'sys/net/ppp_tty.c', + ], + mm.generator['source']() + ) + self.addRTEMSUserSourceFiles( + [ + 'rtems/ipsec_get_policylen.c', + 'rtems/rtems-bsd-arp-processor.c', + 'rtems/rtems-bsd-cxx.cc', + 'rtems/rtems-bsd-get-ethernet-addr.c', + 'rtems/rtems-bsd-ifconfig.c', + 'rtems/rtems-bsd-ifconfig-lo0.c', + 'rtems/rtems-bsd-init-dhcp.c', + 'rtems/rtems-bsd-rc-conf-net.c', + 'rtems/rtems-bsd-rc-conf-pf.c', + 'rtems/rtems-bsd-rc-conf.c', + 'rtems/rtems-bsd-set-if-input.c', + 'rtems/rtems-bsd-shell-arp.c', + 'rtems/rtems-bsd-shell-i2c.c', + 'rtems/rtems-bsd-shell-ifconfig.c', + 'rtems/rtems-bsd-shell-ifmcstat.c', + 'rtems/rtems-bsd-shell-netstat.c', + 'rtems/rtems-bsd-shell-nvmecontrol.c', + 'rtems/rtems-bsd-shell-pfctl.c', + 'rtems/rtems-bsd-shell-ping.c', + 'rtems/rtems-bsd-shell-route.c', + 'rtems/rtems-bsd-shell-stty.c', + 'rtems/rtems-bsd-shell-sysctl.c', + 'rtems/rtems-bsd-shell-tcpdump.c', + 'rtems/rtems-bsd-shell-vmstat.c', + 'rtems/rtems-bsd-shell-wlanstats.c', 'rtems/rtems-kvm.c', 'rtems/rtems-program.c', 'rtems/rtems-program-socket.c', 'rtems/rtems-routes.c', 'rtems/syslog.c', 'ftpd/ftpd-service.c', - 'nfsclient/mount_prot_xdr.c', - 'nfsclient/nfs.c', - 'nfsclient/nfs_prot_xdr.c', - 'nfsclient/rpcio.c', 'pppd/auth.c', 'pppd/ccp.c', 'pppd/chap.c', @@ -255,39 +296,24 @@ class rtems(builder.Module): 'pppd/sys-rtems.c', 'pppd/upap.c', 'pppd/utils.c', - 'sys/arm/lpc/if_lpe.c', - 'sys/arm/lpc/lpc_pwr.c', - 'sys/dev/atsam/if_atsam.c', - 'sys/dev/atsam/if_atsam_media.c', - 'sys/dev/dw_mmc/dw_mmc.c', - 'sys/dev/ffec/if_ffec_mcf548x.c', - 'sys/dev/ffec/if_ffec_mpc8xx.c', - 'sys/dev/input/touchscreen/tsc_lpc32xx.c', - 'sys/dev/smc/if_smc_nexus.c', - 'sys/dev/tsec/if_tsec_nexus.c', - 'sys/dev/usb/controller/ehci_mpc83xx.c', - 'sys/dev/usb/controller/ohci_lpc32xx.c', - 'sys/dev/usb/controller/ohci_lpc.c', - 'sys/dev/usb/controller/usb_otg_transceiver.c', - 'sys/dev/usb/controller/usb_otg_transceiver_dump.c', - 'sys/fs/devfs/devfs_devs.c', - 'sys/net/if_ppp.c', - 'sys/net/ppp_tty.c', 'telnetd/telnetd-service.c', ], mm.generator['source']() ) - self.addFile(mm.generator['file']('rtems/rtems-kernel-kvm-symbols.c', + self.addFile(mm.generator['file']('kernel', + 'rtems/rtems-kernel-kvm-symbols.c', mm.generator['rtems-path'](), mm.generator['no-convert'](), mm.generator['no-convert'](), mm.generator['kvm-symbols'](includes = 'rtemsbsd/rtems'))) - self.addFile(mm.generator['file']('lib/libc/net/nslexer.l', + self.addFile(mm.generator['file']('user', + 'lib/libc/net/nslexer.l', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), mm.generator['lex']('_nsyy', 'nsparser.c'))) - self.addFile(mm.generator['file']('lib/libc/net/nsparser.y', + self.addFile(mm.generator['file']('user', + 'lib/libc/net/nsparser.y', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -322,6 +348,8 @@ class base(builder.Module): 'sys/contrib/ck/include/ck_string.h', 'sys/contrib/ck/include/gcc/aarch64/ck_f_pr.h', 'sys/contrib/ck/include/gcc/aarch64/ck_pr.h', + 'sys/contrib/ck/include/gcc/aarch64/ck_pr_lse.h', + 'sys/contrib/ck/include/gcc/aarch64/ck_pr_llsc.h', 'sys/contrib/ck/include/gcc/arm/ck_f_pr.h', 'sys/contrib/ck/include/gcc/arm/ck_pr.h', 'sys/contrib/ck/include/gcc/ck_cc.h', @@ -338,8 +366,6 @@ class base(builder.Module): 'sys/contrib/ck/include/gcc/x86/ck_f_pr.h', 'sys/contrib/ck/include/gcc/x86/ck_pr.h', 'sys/fs/devfs/devfs_int.h', - 'sys/rpc/netconfig.h', - 'sys/rpc/types.h', 'sys/security/audit/audit.h', 'sys/security/mac/mac_framework.h', 'sys/sys/acl.h', @@ -527,7 +553,7 @@ class base(builder.Module): ], mm.generator['source']() ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'COPYRIGHT' ] @@ -570,7 +596,7 @@ class fdt(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'rtems/ofw_machdep.c', ], @@ -607,7 +633,7 @@ class tty(builder.Module): ], mm.generator['source']() ) -# self.addRTEMSSourceFiles( +# self.addRTEMSKernelSourceFiles( # [ # 'rtems/ofw_machdep.c', # ], @@ -644,7 +670,7 @@ class mmc(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'sys/arm/at91/at91_mci.c', ], @@ -683,7 +709,7 @@ class mmc_ti(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/sdhci_if.c', 'local/gpiobus_if.c', @@ -773,7 +799,7 @@ class iic(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/iicbus_if.c', 'sys/dev/iicbus/rtems-i2c.c', @@ -827,7 +853,7 @@ class display(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/clknode_if.c', 'local/hdmi_if.c', @@ -848,20 +874,16 @@ class pinmux(builder.Module): mm = self.manager self.addKernelSpaceHeaderFiles( [ - 'sys/arm/ti/ti_pinmux.h', 'sys/arm/ti/omap4/omap4_scm_padconf.h', - 'sys/arm/ti/am335x/am335x_scm_padconf.h', ] ) self.addKernelSpaceSourceFiles( [ - 'sys/arm/ti/ti_pinmux.c', 'sys/dev/fdt/fdt_pinctrl.c', - 'sys/arm/ti/am335x/am335x_scm_padconf.c', ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/fdt_pinctrl_if.c', ], @@ -869,6 +891,24 @@ class pinmux(builder.Module): ) # +# MV643XX Ethernet driver +# +class if_mve(builder.Module): + + def __init__(self, manager): + super(if_mve, self).__init__(manager, type(self).__name__) + + def generate(self): + mm = self.manager + self.addRTEMSKernelSourceFiles( + [ + 'sys/dev/mve/if_mve.c', + 'sys/dev/mve/if_mve_nexus.c', + ], + mm.generator['source']() + ) + +# # USB # class dev_usb(builder.Module): @@ -903,6 +943,7 @@ class dev_usb(builder.Module): 'sys/dev/usb/usb_ioctl.h', 'sys/dev/usb/usb_mbuf.h', 'sys/dev/usb/usb_msctest.h', + 'sys/dev/usb/usb_pci.h', 'sys/dev/usb/usb_pf.h', 'sys/dev/usb/usb_process.h', 'sys/dev/usb/usb_request.h', @@ -945,7 +986,7 @@ class dev_usb_controller(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/controller/ohci.h', @@ -965,6 +1006,7 @@ class dev_usb_controller(builder.Module): [ 'sys/dev/usb/controller/ohci.c', 'sys/dev/usb/controller/ehci.c', + 'sys/dev/usb/controller/ehci_pci.c', 'sys/dev/usb/controller/usb_controller.c', 'sys/dev/usb/controller/dwc_otg.c', 'sys/dev/usb/controller/dwc_otg_fdt.c', @@ -984,7 +1026,7 @@ class dev_usb_input(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/input/usb_rdesc.h', @@ -1012,7 +1054,7 @@ class dev_usb_net(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/net/if_auereg.h', @@ -1062,7 +1104,7 @@ class dev_usb_quirk(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/quirk/usb_quirk.h', @@ -1085,7 +1127,7 @@ class dev_usb_serial(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/serial/uftdi_reg.h', @@ -1130,7 +1172,7 @@ class dev_usb_storage(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceSourceFiles( [ 'sys/dev/usb/storage/umass.c', @@ -1148,7 +1190,7 @@ class dev_usb_controller_bbb(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/arm/ti/ti_cpuid.h', @@ -1185,7 +1227,7 @@ class dev_usb_wlan(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/usb/wlan/if_rsureg.h', @@ -1205,7 +1247,7 @@ class dev_usb_wlan(builder.Module): 'sys/dev/usb/wlan/if_zydreg.h', ] ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/runfw.c', ], @@ -1235,7 +1277,7 @@ class dev_wlan_rtwn(builder.Module): def generate(self): mm = self.manager - self.addDependency(mm['dev_usb']) + self.addDependency('dev_usb') self.addKernelSpaceHeaderFiles( [ 'sys/dev/rtwn/if_rtwn_beacon.h', @@ -1317,7 +1359,7 @@ class dev_wlan_rtwn(builder.Module): 'sys/dev/rtwn/usb/rtwn_usb_var.h', ] ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/rtwn-rtl8192cfwT.c', 'local/rtwn-rtl8188eufw.c', @@ -1498,10 +1540,14 @@ class dev_net(builder.Module): 'sys/net/if_types.h', 'sys/net/if_var.h', 'sys/net/vnet.h', + 'sys/net/mp_ring.h', + 'sys/net/iflib_private.h', ] ) self.addKernelSpaceSourceFiles( [ + 'sys/net/iflib.c', + 'sys/net/mp_ring.c', 'sys/arm/ti/cpsw/if_cpsw.c', 'sys/dev/ffec/if_ffec.c', 'sys/dev/mii/mii.c', @@ -1522,7 +1568,7 @@ class dev_net(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'sys/dev/mii/ksz8091rnb_50MHz.c', ], @@ -1553,13 +1599,16 @@ class dev_nic(builder.Module): ) self.addCPUDependentFreeBSDHeaderFiles( [ + 'sys/arm64/include/armreg.h', + 'sys/arm64/include/cpufunc.h', + 'sys/arm64/include/cpu.h', 'sys/arm/include/cpufunc.h', - 'sys/i386/include/specialreg.h', 'sys/i386/include/md_var.h', - 'sys/i386/include/intr_machdep.h', 'sys/x86/include/intr_machdep.h', - 'sys/x86/include/metadata.h', 'sys/i386/include/cpufunc.h', + 'sys/x86/include/intr_machdep.h', + 'sys/x86/include/specialreg.h', + 'sys/x86/include/x86_var.h', 'sys/mips/include/cpufunc.h', 'sys/mips/include/cpuregs.h', 'sys/powerpc/include/cpufunc.h', @@ -1683,7 +1732,7 @@ class dev_nic_e1000(builder.Module): ], mm.generator['source']() ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'sys/dev/e1000/LICENSE' ] @@ -1821,7 +1870,7 @@ class nvme(builder.Module): ], mm.generator['source']() ) - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'sys/dev/nvd/nvd.c', ], @@ -2230,14 +2279,16 @@ class netipsec(builder.Module): ], mm.generator['source'](libipsec_cflags) ) - self.addFile(mm.generator['file']('ipsec-tools/src/libipsec/policy_token.l', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/libipsec/policy_token.l', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), mm.generator['lex']('__libipsec', 'policy_parse.c', libipsec_cflags))) - self.addFile(mm.generator['file']('ipsec-tools/src/libipsec/policy_parse.y', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/libipsec/policy_parse.y', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2299,7 +2350,8 @@ class netipsec(builder.Module): mm.generator['source'](racoon_cflags, ['freebsd/crypto/openssl']) ) - self.addFile(mm.generator['file']('ipsec-tools/src/racoon/cftoken.l', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/racoon/cftoken.l', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2307,7 +2359,8 @@ class netipsec(builder.Module): 'cftoken.c', racoon_cflags, build=False))) - self.addFile(mm.generator['file']('ipsec-tools/src/racoon/cfparse.y', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/racoon/cfparse.y', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2315,7 +2368,8 @@ class netipsec(builder.Module): 'cfparse.h', racoon_cflags, build=False))) - self.addFile(mm.generator['file']('ipsec-tools/src/racoon/prsa_tok.l', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/racoon/prsa_tok.l', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2323,7 +2377,8 @@ class netipsec(builder.Module): 'prsa_tok.c', racoon_cflags, build=False))) - self.addFile(mm.generator['file']('ipsec-tools/src/racoon/prsa_par.y', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/racoon/prsa_par.y', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2336,7 +2391,7 @@ class netipsec(builder.Module): 'rtems/ipsec.h', ] ) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-racoon.c', 'rtems/rtems-bsd-rc-conf-ipsec.c', @@ -2356,7 +2411,8 @@ class netipsec(builder.Module): ], mm.generator['source'](setkey_cflags) ) - self.addFile(mm.generator['file']('ipsec-tools/src/setkey/token.l', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/setkey/token.l', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2364,7 +2420,8 @@ class netipsec(builder.Module): 'token.c', setkey_cflags, build=False))) - self.addFile(mm.generator['file']('ipsec-tools/src/setkey/parse.y', + self.addFile(mm.generator['file']('user', + 'ipsec-tools/src/setkey/parse.y', mm.generator['path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2372,7 +2429,7 @@ class netipsec(builder.Module): 'parse.h', setkey_cflags, build=False))) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-shell-setkey.c', ], @@ -2555,7 +2612,7 @@ class opencrypto(builder.Module): ], mm.generator['source']() ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'sys/contrib/libsodium/LICENSE' ] @@ -2715,6 +2772,156 @@ class pf(builder.Module): ) # +# RPC for user space, remove when NFSv2 is removed +# +class rpc_user(builder.Module): + + def __init__(self, manager): + super(rpc_user, self).__init__(manager, type(self).__name__) + + def generate(self): + mm = self.manager + # User space support for legacy nfsv2 client, remove when nfsv2 is removed + self.addUserSpaceHeaderFiles( + [ + 'include/rpc/clnt.h', + 'include/rpc/pmap_rmt.h', + 'include/rpc/svc_soc.h', + 'include/rpc/nettype.h', + 'include/rpc/xdr.h', + 'include/rpc/svc.h', + 'include/rpc/rpc_msg.h', + 'include/rpc/rpcsec_gss.h', + 'include/rpc/raw.h', + 'include/rpc/clnt_stat.h', + 'include/rpc/auth.h', + 'include/rpc/svc_dg.h', + 'include/rpc/auth_kerb.h', + 'include/rpc/auth_des.h', + 'include/rpc/rpcb_clnt.h', + 'include/rpc/rpc.h', + 'include/rpc/des.h', + 'include/rpc/des_crypt.h', + 'include/rpc/svc_auth.h', + 'include/rpc/pmap_clnt.h', + 'include/rpc/clnt_soc.h', + 'include/rpc/pmap_prot.h', + 'include/rpc/auth_unix.h', + 'include/rpc/rpc_com.h', + 'include/rpc/rpcent.h', + 'include/rpcsvc/nis_db.h', + 'include/rpcsvc/nislib.h', + 'include/rpcsvc/nis_tags.h', + 'include/rpcsvc/ypclnt.h', + 'include/rpcsvc/yp_prot.h', + 'lib/libc/rpc/mt_misc.h', + 'lib/libc/rpc/rpc_com.h', + ] + ) + self.addFile(mm.generator['file']('user', + 'include/rpc/rpcb_prot.x', + mm.generator['freebsd-path'](), + mm.generator['convert'](), + mm.generator['convert'](), + mm.generator['rpc-gen']())) + self.addFile(mm.generator['file']('user', + 'include/rpcsvc/nis.x', + mm.generator['freebsd-path'](), + mm.generator['convert'](), + mm.generator['convert'](), + mm.generator['rpc-gen']())) + self.addUserSpaceSourceFiles( + [ + 'lib/libc/rpc/auth_des.c', + 'lib/libc/rpc/authdes_prot.c', + 'lib/libc/rpc/auth_none.c', + 'lib/libc/rpc/auth_time.c', + 'lib/libc/rpc/auth_unix.c', + 'lib/libc/rpc/authunix_prot.c', + 'lib/libc/rpc/bindresvport.c', + 'lib/libc/rpc/clnt_bcast.c', + 'lib/libc/rpc/clnt_dg.c', + 'lib/libc/rpc/clnt_generic.c', + 'lib/libc/rpc/clnt_perror.c', + 'lib/libc/rpc/clnt_raw.c', + 'lib/libc/rpc/clnt_simple.c', + 'lib/libc/rpc/clnt_vc.c', + 'lib/libc/rpc/crypt_client.c', + 'lib/libc/rpc/des_crypt.c', + 'lib/libc/rpc/des_soft.c', + 'lib/libc/rpc/getnetconfig.c', + 'lib/libc/rpc/getnetpath.c', + 'lib/libc/rpc/getpublickey.c', + 'lib/libc/rpc/getrpcent.c', + 'lib/libc/rpc/getrpcport.c', + 'lib/libc/rpc/key_call.c', + 'lib/libc/rpc/key_prot_xdr.c', + 'lib/libc/rpc/mt_misc.c', + 'lib/libc/rpc/netname.c', + 'lib/libc/rpc/netnamer.c', + 'lib/libc/rpc/pmap_clnt.c', + 'lib/libc/rpc/pmap_getmaps.c', + 'lib/libc/rpc/pmap_getport.c', + 'lib/libc/rpc/pmap_prot2.c', + 'lib/libc/rpc/pmap_prot.c', + 'lib/libc/rpc/pmap_rmt.c', + 'lib/libc/rpc/rpcb_clnt.c', + 'lib/libc/rpc/rpcb_prot.c', + 'lib/libc/rpc/rpcb_st_xdr.c', + 'lib/libc/rpc/rpc_callmsg.c', + 'lib/libc/rpc/rpc_commondata.c', + 'lib/libc/rpc/rpcdname.c', + 'lib/libc/rpc/rpc_dtablesize.c', + 'lib/libc/rpc/rpc_generic.c', + 'lib/libc/rpc/rpc_prot.c', + 'lib/libc/rpc/rpcsec_gss_stub.c', + 'lib/libc/rpc/rpc_soc.c', + 'lib/libc/rpc/rtime.c', + 'lib/libc/rpc/svc_auth.c', + 'lib/libc/rpc/svc_auth_des.c', + 'lib/libc/rpc/svc_auth_unix.c', + 'lib/libc/rpc/svc.c', + 'lib/libc/rpc/svc_dg.c', + 'lib/libc/rpc/svc_generic.c', + 'lib/libc/rpc/svc_raw.c', + 'lib/libc/rpc/svc_run.c', + 'lib/libc/rpc/svc_simple.c', + 'lib/libc/rpc/svc_vc.c', + 'lib/libc/xdr/xdr_array.c', + 'lib/libc/xdr/xdr.c', + 'lib/libc/xdr/xdr_float.c', + 'lib/libc/xdr/xdr_mem.c', + 'lib/libc/xdr/xdr_rec.c', + 'lib/libc/xdr/xdr_reference.c', + 'lib/libc/xdr/xdr_sizeof.c', + 'lib/libc/xdr/xdr_stdio.c', + ], + mm.generator['source'](['-DINET']) + ) + +# +# NFSv2 Client +# +class nfsv2(builder.Module): + + def __init__(self, manager): + super(nfsv2, self).__init__(manager, type(self).__name__) + + def generate(self): + mm = self.manager + self.addDependency('rpc_user') + self.addRTEMSUserSourceFiles( + [ + 'nfsclient/mount_prot_xdr.c', + 'nfsclient/nfs.c', + 'nfsclient/nfs_prot_xdr.c', + 'nfsclient/rpcio.c', + ], + mm.generator['source']() + ) + + +# # PCI # class pci(builder.Module): @@ -2745,14 +2952,13 @@ class pci(builder.Module): self.addCPUDependentFreeBSDHeaderFiles( [ 'sys/i386/include/_bus.h', - 'sys/i386/include/bus.h', 'sys/x86/include/legacyvar.h', 'sys/x86/include/bus.h', 'sys/x86/include/pci_cfgreg.h', ] ) self.addCPUDependentFreeBSDSourceFiles( - [ 'i386' ], + [ 'i386', 'powerpc' ], [ 'sys/x86/x86/legacy.c', 'sys/x86/pci/pci_bus.c', @@ -2760,6 +2966,7 @@ class pci(builder.Module): mm.generator['source']() ) + # # User space # @@ -2796,36 +3003,6 @@ class user_space(builder.Module): 'include/nsswitch.h', 'include/resolv.h', 'include/res_update.h', - 'include/rpc/clnt.h', - 'include/rpc/pmap_rmt.h', - 'include/rpc/svc_soc.h', - 'include/rpc/nettype.h', - 'include/rpc/xdr.h', - 'include/rpc/svc.h', - 'include/rpc/rpc_msg.h', - 'include/rpc/rpcsec_gss.h', - 'include/rpc/raw.h', - 'include/rpc/clnt_stat.h', - 'include/rpc/auth.h', - 'include/rpc/svc_dg.h', - 'include/rpc/auth_kerb.h', - 'include/rpc/auth_des.h', - 'include/rpc/rpcb_clnt.h', - 'include/rpc/rpc.h', - 'include/rpc/des.h', - 'include/rpc/des_crypt.h', - 'include/rpc/svc_auth.h', - 'include/rpc/pmap_clnt.h', - 'include/rpc/clnt_soc.h', - 'include/rpc/pmap_prot.h', - 'include/rpc/auth_unix.h', - 'include/rpc/rpc_com.h', - 'include/rpc/rpcent.h', - 'include/rpcsvc/nis_db.h', - 'include/rpcsvc/nislib.h', - 'include/rpcsvc/nis_tags.h', - 'include/rpcsvc/ypclnt.h', - 'include/rpcsvc/yp_prot.h', 'include/sysexits.h', 'lib/lib80211/lib80211_ioctl.h', 'lib/lib80211/lib80211_regdomain.h', @@ -2855,8 +3032,6 @@ class user_space(builder.Module): 'lib/libc/net/res_config.h', 'lib/libc/resolv/res_debug.h', 'lib/libc/resolv/res_private.h', - 'lib/libc/rpc/mt_misc.h', - 'lib/libc/rpc/rpc_com.h', 'lib/libc/stdio/local.h', 'lib/libkvm/kvm.h', 'lib/libmemstat/memstat.h', @@ -2872,22 +3047,14 @@ class user_space(builder.Module): 'usr.bin/netstat/netstat.h' ] ) - self.addFile(mm.generator['file']('include/rpc/rpcb_prot.x', - mm.generator['freebsd-path'](), - mm.generator['convert'](), - mm.generator['convert'](), - mm.generator['rpc-gen']())) - self.addFile(mm.generator['file']('include/rpcsvc/nis.x', - mm.generator['freebsd-path'](), - mm.generator['convert'](), - mm.generator['convert'](), - mm.generator['rpc-gen']())) - self.addFile(mm.generator['file']('sbin/route/keywords', + self.addFile(mm.generator['file']('user', + 'sbin/route/keywords', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), mm.generator['route-keywords']())) - self.addFile(mm.generator['file']('sbin/pfctl/parse.y', + self.addFile(mm.generator['file']('user', + 'sbin/pfctl/parse.y', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -2927,7 +3094,7 @@ class user_space(builder.Module): 'include/machine/rtems-bsd-regdomain.h', ] ) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-regdomain.c', ], @@ -3022,72 +3189,9 @@ class user_space(builder.Module): 'lib/libc/resolv/res_send.c', 'lib/libc/resolv/res_state.c', 'lib/libc/resolv/res_update.c', - 'lib/libc/rpc/auth_des.c', - 'lib/libc/rpc/authdes_prot.c', - 'lib/libc/rpc/auth_none.c', - 'lib/libc/rpc/auth_time.c', - 'lib/libc/rpc/auth_unix.c', - 'lib/libc/rpc/authunix_prot.c', - 'lib/libc/rpc/bindresvport.c', - 'lib/libc/rpc/clnt_bcast.c', - 'lib/libc/rpc/clnt_dg.c', - 'lib/libc/rpc/clnt_generic.c', - 'lib/libc/rpc/clnt_perror.c', - 'lib/libc/rpc/clnt_raw.c', - 'lib/libc/rpc/clnt_simple.c', - 'lib/libc/rpc/clnt_vc.c', - 'lib/libc/rpc/crypt_client.c', - 'lib/libc/rpc/des_crypt.c', - 'lib/libc/rpc/des_soft.c', - 'lib/libc/rpc/getnetconfig.c', - 'lib/libc/rpc/getnetpath.c', - 'lib/libc/rpc/getpublickey.c', - 'lib/libc/rpc/getrpcent.c', - 'lib/libc/rpc/getrpcport.c', - 'lib/libc/rpc/key_call.c', - 'lib/libc/rpc/key_prot_xdr.c', - 'lib/libc/rpc/mt_misc.c', - 'lib/libc/rpc/netname.c', - 'lib/libc/rpc/netnamer.c', - 'lib/libc/rpc/pmap_clnt.c', - 'lib/libc/rpc/pmap_getmaps.c', - 'lib/libc/rpc/pmap_getport.c', - 'lib/libc/rpc/pmap_prot2.c', - 'lib/libc/rpc/pmap_prot.c', - 'lib/libc/rpc/pmap_rmt.c', - 'lib/libc/rpc/rpcb_clnt.c', - 'lib/libc/rpc/rpcb_prot.c', - 'lib/libc/rpc/rpcb_st_xdr.c', - 'lib/libc/rpc/rpc_callmsg.c', - 'lib/libc/rpc/rpc_commondata.c', - 'lib/libc/rpc/rpcdname.c', - 'lib/libc/rpc/rpc_dtablesize.c', - 'lib/libc/rpc/rpc_generic.c', - 'lib/libc/rpc/rpc_prot.c', - 'lib/libc/rpc/rpcsec_gss_stub.c', - 'lib/libc/rpc/rpc_soc.c', - 'lib/libc/rpc/rtime.c', - 'lib/libc/rpc/svc_auth.c', - 'lib/libc/rpc/svc_auth_des.c', - 'lib/libc/rpc/svc_auth_unix.c', - 'lib/libc/rpc/svc.c', - 'lib/libc/rpc/svc_dg.c', - 'lib/libc/rpc/svc_generic.c', - 'lib/libc/rpc/svc_raw.c', - 'lib/libc/rpc/svc_run.c', - 'lib/libc/rpc/svc_simple.c', - 'lib/libc/rpc/svc_vc.c', 'lib/libc/stdio/fgetln.c', 'lib/libc/stdlib/strtonum.c', 'lib/libc/string/strsep.c', - 'lib/libc/xdr/xdr_array.c', - 'lib/libc/xdr/xdr.c', - 'lib/libc/xdr/xdr_float.c', - 'lib/libc/xdr/xdr_mem.c', - 'lib/libc/xdr/xdr_rec.c', - 'lib/libc/xdr/xdr_reference.c', - 'lib/libc/xdr/xdr_sizeof.c', - 'lib/libc/xdr/xdr_stdio.c', 'lib/libmemstat/memstat_all.c', 'lib/libmemstat/memstat.c', 'lib/libmemstat/memstat_malloc.c', @@ -3159,10 +3263,12 @@ class user_space(builder.Module): 'usr.bin/vmstat/vmstat.c', 'usr.sbin/arp/arp.c', 'usr.sbin/i2c/i2c.c', + 'usr.sbin/ifmcstat/ifmcstat.c', + 'usr.sbin/ifmcstat/printb.c', ], mm.generator['source'](['-DINET']) ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'contrib/libxo/LICENSE' ] @@ -3203,6 +3309,7 @@ class crypto_openssl(builder.Module): def generate(self): mm = self.manager + self.addDependency('user_space') self.addUserSpaceHeaderFiles( [ 'crypto/openssl/crypto/aes/aes_locl.h', @@ -4156,17 +4263,19 @@ class crypto_openssl(builder.Module): 'freebsd/crypto/openssl/crypto/ec/curve448', 'freebsd/crypto/openssl/crypto/ec/curve448/arch_32']) ) - self.addFile(mm.generator['file']('crypto/openssl/crypto/LPdir_unix.c', + self.addFile(mm.generator['file']('user', + 'crypto/openssl/crypto/LPdir_unix.c', mm.generator['freebsd-path'](), mm.generator['from-FreeBSD-to-RTEMS-UserSpaceSourceConverter'](), mm.generator['from-RTEMS-To-FreeBSD-SourceConverter'](), - mm.generator['buildSystemFragmentComposer']())) - self.addFile(mm.generator['file']('crypto/openssl/crypto/ec/ecp_nistz256_table.c', + mm.generator['buildSystemComposer']())) + self.addFile(mm.generator['file']('user', + 'crypto/openssl/crypto/ec/ecp_nistz256_table.c', mm.generator['freebsd-path'](), mm.generator['from-FreeBSD-to-RTEMS-UserSpaceSourceConverter'](), mm.generator['from-RTEMS-To-FreeBSD-SourceConverter'](), - mm.generator['buildSystemFragmentComposer']())) - self.addPlainTextFile( + mm.generator['buildSystemComposer']())) + self.addPlainTextFiles( [ 'crypto/openssl/LICENSE' ] @@ -4175,7 +4284,6 @@ class crypto_openssl(builder.Module): # # /usr/bin/openssl # -# depends on crypto_openssl, user_space class usr_bin_openssl(builder.Module): def __init__(self, manager): @@ -4183,6 +4291,7 @@ class usr_bin_openssl(builder.Module): def generate(self): mm = self.manager + self.addDependency('crypto_openssl') self.addUserSpaceHeaderFiles( [ 'crypto/openssl/apps/apps.h', @@ -4255,7 +4364,7 @@ class usr_bin_openssl(builder.Module): ['freebsd/crypto/openssl'] ) ) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-shell-openssl.c', ], @@ -4304,7 +4413,7 @@ class contrib_expat(builder.Module): ], mm.generator['source'](cflags) ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'contrib/expat/COPYING' ] @@ -4375,14 +4484,16 @@ class contrib_libpcap(builder.Module): ) gen_cflags = cflags + ['-DNEED_YYPARSE_WRAPPER=1', '-Dyylval=pcap_lval'] - self.addFile(mm.generator['file']('contrib/libpcap/scanner.l', + self.addFile(mm.generator['file']('user', + 'contrib/libpcap/scanner.l', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), mm.generator['lex']('pcap', 'scanner.c', gen_cflags))) - self.addFile(mm.generator['file']('contrib/libpcap/grammar.y', + self.addFile(mm.generator['file']('user', + 'contrib/libpcap/grammar.y', mm.generator['freebsd-path'](), mm.generator['convert'](), mm.generator['convert'](), @@ -4407,7 +4518,7 @@ class contrib_libpcap(builder.Module): ], mm.generator['source'](cflags) ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'contrib/libpcap/LICENSE' ] @@ -4652,7 +4763,7 @@ class usr_sbin_tcpdump(builder.Module): ['freebsd/contrib/tcpdump', 'freebsd/usr.sbin/tcpdump/tcpdump']) ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'contrib/tcpdump/LICENSE' ] @@ -4963,7 +5074,7 @@ class usr_sbin_wpa_supplicant(builder.Module): 'freebsd/usr.sbin/wpa/wpa_supplicant', 'freebsd/crypto/openssl/crypto']) ) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-shell-wpa_supplicant.c', 'rtems/rtems-wpa_supplicant_mutex.c', @@ -4971,7 +5082,7 @@ class usr_sbin_wpa_supplicant(builder.Module): ], mm.generator['source']() ) - self.addPlainTextFile( + self.addPlainTextFiles( [ 'contrib/wpa/COPYING' ] @@ -5000,6 +5111,13 @@ class in_cksum(builder.Module): ] ) self.addTargetSourceCPUDependentHeaderFiles( + [ 'arm64' ], + 'arm64', + [ + 'sys/arm64/include/in_cksum.h', + ] + ) + self.addTargetSourceCPUDependentHeaderFiles( [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', 'nios2', 'sh', 'sparc', 'v850' ], 'mips', @@ -5008,6 +5126,13 @@ class in_cksum(builder.Module): ] ) self.addCPUDependentFreeBSDSourceFiles( + [ 'aarch64', 'arm64' ], + [ + 'sys/arm64/arm64/in_cksum.c', + ], + mm.generator['source']() + ) + self.addCPUDependentFreeBSDSourceFiles( [ 'i386' ], [ 'sys/i386/i386/in_cksum.c', @@ -5031,7 +5156,8 @@ class in_cksum(builder.Module): self.addCPUDependentFreeBSDSourceFiles( [ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k', - 'mips', 'nios2', 'riscv', 'sh', 'sparc', 'v850' + 'mips', 'moxie', 'nios2', 'or1k', 'riscv', 'sh', 'sparc', + 'v850' ], [ 'sys/mips/mips/in_cksum.c', @@ -5077,7 +5203,7 @@ class dhcpcd(builder.Module): ], mm.generator['source']('-D__FreeBSD__ -DTHERE_IS_NO_FORK -DMASTER_ONLY -DINET') ) - self.addRTEMSSourceFiles( + self.addRTEMSUserSourceFiles( [ 'rtems/rtems-bsd-shell-dhcpcd.c', ], @@ -5115,6 +5241,7 @@ class mdnsresponder(builder.Module): mm.generator['source']() ) + class dpaa(builder.Module): def __init__(self, manager): @@ -5207,6 +5334,12 @@ class imx(builder.Module): ], mm.generator['source']() ) + self.addRTEMSKernelSourceFiles( + [ + 'sys/arm/freescale/imx/imxrt1166_usbphy.c', + ], + mm.generator['source']() + ) class regulator(builder.Module): def __init__(self, manager): @@ -5214,7 +5347,7 @@ class regulator(builder.Module): def generate(self): mm = self.manager - self.addRTEMSSourceFiles( + self.addRTEMSKernelSourceFiles( [ 'local/regdev_if.c', 'local/regnode_if.c', @@ -5249,7 +5382,8 @@ class tests(builder.Module): def generate(self): mm = self.manager self.addTest(mm.generator['test']('epoch01', ['test_main'], extraLibs = ['rtemstest'])) - self.addTest(mm.generator['test']('nfs01', ['test_main'], netTest = True)) + self.addTest(mm.generator['test']('nfs01', ['test_main'], + netTest = True, modules = ['nfsv2'])) self.addTest(mm.generator['test']('foobarclient', ['test_main'], runTest = False, netTest = True)) self.addTest(mm.generator['test']('foobarserver', ['test_main'], @@ -5295,9 +5429,10 @@ class tests(builder.Module): runTest = False, netTest = True, extraLibs = ['telnetd'])) self.addTest(mm.generator['test']('smp01', ['test_main'], extraLibs = ['rtemstest'])) - self.addTest(mm.generator['test']('media01', ['test_main'], + self.addTest(mm.generator['test']('media01', ['test_main', 'pattern-test'], runTest = False, - extraLibs = ['ftpd', 'telnetd'])) + extraLibs = ['tftpfs', 'ftpd', 'telnetd'])) + self.addTest(mm.generator['test']('mcast01', ['test_main'])) self.addTest(mm.generator['test']('vlan01', ['test_main'], netTest = True)) self.addTest(mm.generator['test']('lagg01', ['test_main'], netTest = True)) self.addTest(mm.generator['test']('log01', ['test_main'])) @@ -5338,6 +5473,7 @@ class tests(builder.Module): self.addTest(mm.generator['test']('ipsec01', ['test_main'])) self.addTest(mm.generator['test']('openssl01', ['test_main'])) self.addTest(mm.generator['test']('openssl02', ['test_main'])) + self.addTest(mm.generator['test']('tcpdump01', ['test_main'])) def load(mm): @@ -5355,6 +5491,7 @@ def load(mm): mm.addModule(evdev(mm)) mm.addModule(iic(mm)) mm.addModule(pinmux(mm)) + mm.addModule(if_mve(mm)) mm.addModule(display(mm)) mm.addModule(dev_usb(mm)) @@ -5382,6 +5519,9 @@ def load(mm): mm.addModule(pf(mm)) mm.addModule(dev_net(mm)) + mm.addModule(rpc_user(mm)) + mm.addModule(nfsv2(mm)) + # Add PCI mm.addModule(pci(mm)) @@ -5415,7 +5555,5 @@ def load(mm): mm.addModule(tests(mm)) - mm.setModuleConfigiuration() - # XXX TODO Check that no file is also listed in empty # XXX TODO Check that no file in in two modules |