From c37f9fba70085fedc8eede7559489d2321393005 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 7 Aug 2018 14:56:50 +0200
Subject: Update to FreeBSD head 2017-08-01

Git mirror commit f5002f5e5f78cae9f0269d812dc0aedb0339312c.

Update #3472.
---
 libbsd.py | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

(limited to 'libbsd.py')

diff --git a/libbsd.py b/libbsd.py
index 6f413855..ad97f48b 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -549,6 +549,7 @@ class fdt(builder.Module):
                 'sys/sys/slicer.h',
                 'sys/dev/fdt/fdt_common.h',
                 'sys/dev/fdt/simplebus.h',
+                'sys/dev/mii/mii_fdt.h',
                 'sys/dev/ofw/ofw_bus.h',
                 'sys/dev/ofw/ofw_bus_subr.h',
                 'sys/dev/ofw/ofw_subr.h',
@@ -561,6 +562,7 @@ class fdt(builder.Module):
             [
                 'sys/dev/fdt/simplebus.c',
                 'sys/dev/fdt/fdt_common.c',
+                'sys/dev/mii/mii_fdt.c',
                 'sys/dev/ofw/ofwbus.c',
                 'sys/dev/ofw/openfirm.c',
                 'sys/dev/ofw/ofw_fdt.c',
@@ -1304,19 +1306,23 @@ class cam(builder.Module):
         mm = self.manager
         self.addKernelSpaceHeaderFiles(
             [
-                'sys/dev/nvme/nvme.h',
-                'sys/sys/ata.h',
-                'sys/cam/cam.h',
+                'sys/cam/ata/ata_all.h',
                 'sys/cam/cam_ccb.h',
+                'sys/cam/cam_debug.h',
+                'sys/cam/cam.h',
+                'sys/cam/cam_periph.h',
                 'sys/cam/cam_sim.h',
+                'sys/cam/cam_xpt.h',
                 'sys/cam/cam_xpt_sim.h',
+                'sys/cam/mmc/mmc_all.h',
+                'sys/cam/mmc/mmc_bus.h',
+                'sys/cam/mmc/mmc.h',
+                'sys/cam/mmc/mmc_sdio.h',
                 'sys/cam/nvme/nvme_all.h',
                 'sys/cam/scsi/scsi_all.h',
                 'sys/cam/scsi/scsi_da.h',
-                'sys/cam/ata/ata_all.h',
-                'sys/cam/cam_periph.h',
-                'sys/cam/cam_debug.h',
-                'sys/cam/cam_xpt.h',
+                'sys/dev/nvme/nvme.h',
+                'sys/sys/ata.h',
             ]
         )
         self.addKernelSpaceSourceFiles(
@@ -1339,15 +1345,26 @@ class dev_net(builder.Module):
         mm = self.manager
         self.addKernelSpaceHeaderFiles(
             [
+                'sys/arm/lpc/if_lpereg.h',
+                'sys/arm/lpc/lpcreg.h',
+                'sys/arm/lpc/lpcvar.h',
+                'sys/arm/xilinx/zy7_slcr.h',
+                'sys/dev/cadence/if_cgem_hw.h',
+                'sys/dev/dwc/if_dwc.h',
+                'sys/dev/dwc/if_dwcvar.h',
                 'sys/dev/ffec/if_ffecreg.h',
-                'sys/dev/mii/mii.h',
-                'sys/dev/mii/mii_bitbang.h',
-                'sys/dev/mii/miivar.h',
+                'sys/dev/led/led.h',
                 'sys/dev/mii/brgphyreg.h',
                 'sys/dev/mii/e1000phyreg.h',
                 'sys/dev/mii/icsphyreg.h',
+                'sys/dev/mii/mii_bitbang.h',
+                'sys/dev/mii/mii_fdt.h',
+                'sys/dev/mii/mii.h',
+                'sys/dev/mii/miivar.h',
                 'sys/dev/mii/rgephyreg.h',
-                'sys/dev/led/led.h',
+                'sys/dev/ofw/openfirm.h',
+                'sys/dev/tsec/if_tsec.h',
+                'sys/dev/tsec/if_tsecreg.h',
                 'sys/net/bpf.h',
                 'sys/net/dlt.h',
                 'sys/net/ethernet.h',
@@ -1359,16 +1376,6 @@ class dev_net(builder.Module):
                 'sys/net/if_types.h',
                 'sys/net/if_var.h',
                 'sys/net/vnet.h',
-                'sys/dev/ofw/openfirm.h',
-                'sys/dev/tsec/if_tsec.h',
-                'sys/dev/tsec/if_tsecreg.h',
-                'sys/dev/cadence/if_cgem_hw.h',
-                'sys/dev/dwc/if_dwc.h',
-                'sys/dev/dwc/if_dwcvar.h',
-                'sys/arm/xilinx/zy7_slcr.h',
-                'sys/arm/lpc/if_lpereg.h',
-                'sys/arm/lpc/lpcreg.h',
-                'sys/arm/lpc/lpcvar.h',
             ]
         )
         self.addKernelSpaceSourceFiles(
@@ -1643,7 +1650,6 @@ class net(builder.Module):
                 'sys/net/ethernet.h',
                 'sys/net/fddi.h',
                 'sys/net/firewire.h',
-                'sys/net/flowtable.h',
                 'sys/net/ieee8023ad_lacp.h',
                 'sys/net/if_arc.h',
                 'sys/net/if_arp.h',
@@ -2877,7 +2883,6 @@ class user_space(builder.Module):
                 'sbin/route/route.c',
                 'sbin/sysctl/sysctl.c',
                 'usr.bin/netstat/bpf.c',
-                'usr.bin/netstat/flowtable.c',
                 'usr.bin/netstat/if.c',
                 'usr.bin/netstat/inet6.c',
                 'usr.bin/netstat/inet.c',
-- 
cgit v1.2.3