git: b78807daaae2 - stable/13 - pcengines: Fix kernel config

[Warner Losh]

The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b78807daaae223bdb2ce45227fa71cc5dacaa0db

commit b78807daaae223bdb2ce45227fa71cc5dacaa0db
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-07-15 22:11:11 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-21 16:13:11 +0000

    pcengines: Fix kernel config
    
    Update the old ALIX config to remove devices, add iflib and remove
    trailing white space.
    
    Sponsored by:           Netflix
    
    (cherry picked from commit e44c62068170987e37ed2d8dea6a035fdc691fc2)
---
 tools/tools/nanobsd/pcengines/ALIX_DSK    | 127 +++++++++++++++---------------
 tools/tools/nanobsd/pcengines/common.conf |   3 +-
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/tools/tools/nanobsd/pcengines/ALIX_DSK b/tools/tools/nanobsd/pcengines/ALIX_DSK
index e11f7de4f2f4..f82bbfbd85d8 100644
--- a/tools/tools/nanobsd/pcengines/ALIX_DSK
+++ b/tools/tools/nanobsd/pcengines/ALIX_DSK
@@ -4,83 +4,84 @@
 
 cpu		I586_CPU
 ident		ALIX_DSK
-makeoptions	DEBUG=-g		
+makeoptions	DEBUG=-g
 options		CPU_GEODE
-options 	SCHED_ULE		
-options 	PREEMPTION		
-options 	INET			
-options 	INET6			
-options 	FFS			
-options 	SOFTUPDATES		
-options 	UFS_ACL			
-options 	UFS_DIRHASH		
+options 	SCHED_ULE
+options 	PREEMPTION
+options 	INET
+options 	INET6
+options 	FFS
+options 	SOFTUPDATES
+options 	UFS_ACL
+options 	UFS_DIRHASH
 options 	NFSCL			# Network Filesystem Client
-options 	NFSLOCKD		
-options 	MSDOSFS			
-options 	CD9660			
-options 	PROCFS			
-options 	PSEUDOFS		
-options 	GEOM_PART_GPT		
-options 	GEOM_LABEL		
-options 	COMPAT_43TTY		
+options 	NFSLOCKD
+options 	MSDOSFS
+options 	CD9660
+options 	PROCFS
+options 	PSEUDOFS
+options 	GEOM_PART_GPT
+options 	GEOM_LABEL
+options 	COMPAT_43TTY
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
 options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
-options 	SCSI_DELAY=5000		
-options 	SYSVSHM			
-options 	SYSVMSG			
-options 	SYSVSEM			
-options 	P1003_1B_SEMAPHORES	
+options 	COMPAT_FREEBSD11	# Compatible with FreeBSD11
+options 	COMPAT_FREEBSD12	# Compatible with FreeBSD12
+options 	SCSI_DELAY=5000
+options 	SYSVSHM
+options 	SYSVMSG
+options 	SYSVSEM
+options 	P1003_1B_SEMAPHORES
 options 	_KPOSIX_PRIORITY_SCHEDULING 
-options 	PRINTF_BUFR_SIZE=128	
-device		apic			
+options 	PRINTF_BUFR_SIZE=128
+device		apic
 device		cpufreq
 device		acpi
 device		pci
 device		fdc
 device		ata
-options 	ATA_STATIC_ID	
-device		scbus		
-device		da		
-device		sa		
-device		cd		
-device		pass		
-device		uart		
-device		em		
-device		miibus		
-device		vr		
-device		wlan		
-options 	IEEE80211_DEBUG	
-options 	IEEE80211_SUPPORT_MESH	
-device		wlan_wep	
-device		wlan_ccmp	
-device		wlan_tkip	
-device		wlan_amrr	
-device		an		
-device		ath		
-device		ath_hal		
-device		ath_rate_sample	
-device		wi		
-device		loop		
-device		ether		
-device		tun		
-device		pty		
-device		md		
-device		gif		
-device		firmware	
-device		bpf		
-device		uhci		
-device		ohci		
-device		ehci		
-device		usb		
-device		ulpt		
-device		umass		
-device		u3g		
-device		ubsa		
-device		uftdi		
+options 	ATA_STATIC_ID
+device		scbus
+device		da
+device		sa
+device		cd
+device		pass
+device		uart
+device		iflib
+device		em
+device		miibus
+device		vr
+device		wlan
+options 	IEEE80211_DEBUG
+options 	IEEE80211_SUPPORT_MESH
+device		wlan_wep
+device		wlan_ccmp
+device		wlan_tkip
+device		wlan_amrr
+device		ath
+device		ath_hal
+device		ath_rate_sample
+device		loop
+device		ether
+device		tuntap
+device		pty
+device		md
+device		gif
+device		firmware
+device		bpf
+device		uhci
+device		ohci
+device		ehci
+device		usb
+device		ulpt
+device		umass
+device		u3g
+device		ubsa
+device		uftdi
 
 options         INCLUDE_CONFIG_FILE
 
diff --git a/tools/tools/nanobsd/pcengines/common.conf b/tools/tools/nanobsd/pcengines/common.conf
index 8cd870b2dd7d..632ace1841cc 100644
--- a/tools/tools/nanobsd/pcengines/common.conf
+++ b/tools/tools/nanobsd/pcengines/common.conf
@@ -4,13 +4,12 @@
 
 NANO_SRC=$(pwd)
 NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/pcengines}
-NANO_OBJ=${NANO_SRC}/../${NANO_NAME}/obj
+NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj
 NANO_TOOLS=$(pwd)
 NANO_PACKAGE_DIR=$(pwd)/Pkg
 #NANO_RAM_TMPVARSIZE=20480
 #NANO_RAM_TMPVARSIZE=30720
 NANO_RAM_TMPVARSIZE=40960
-NANO_PMAKE="make -j 8"
 
 NANO_MD_BACKING="swap"