Index: head/sys/arm/conf/NOTES.armv7 =================================================================== --- head/sys/arm/conf/NOTES.armv7 (revision 357397) +++ head/sys/arm/conf/NOTES.armv7 (nonexistent) @@ -1,64 +0,0 @@ -# armv7-specific changes for doing a LINT build. -# -# The contents of sys/conf/NOTES, sys/arm/conf/NOTES, and this file are -# concatenated (in that order) to create the LINT-V7 kernel config file. -# -# $FreeBSD$ - - -#NO_UNIVERSE - -machine arm armv7 -cpu CPU_CORTEXA -cpu CPU_MV_PJ4B -makeoptions CONF_CFLAGS+="-march=armv7a" - -# Add options for armv7 that are not in sys/conf/NOTES... - -options ARM_L2_PIPT # Only L2 PIPT is supported -options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) -options INTRNG # Include INTRNG framework -options LINUX_BOOT_ABI # Process metadata passed from U-Boot -options PLATFORM # Include platform_if support -options SMP # Most v7 SoCs are multicore -options VFP # Enable floating point hardware support - -# NOTE: dtrace introduces CDDL-licensed components into the kernel -device dtrace # dtrace core -device dtraceall # include all dtrace modules -options KDTRACE_HOOKS - -# Add misc devices which are specific to various arm platforms... - -device generic_timer # ARM Generic Timer -device gic # Interrupt controller -device gpio # gpio interface and bus -device mpcore_timer # ARM MPCore Timer -device pl310 # PL310 L2 cache controller -device pmu # PMU support (for CCNT). - -# Add EXT_RESOURCES pseudo devices... - -options EXT_RESOURCES -device clk -device phy -device hwreset -device nvmem -device regulator -device syscon - -# Build SOC-specific modules... - -makeoptions MODULES_EXTRA+="allwinner" -makeoptions MODULES_EXTRA+="arm_ti" -makeoptions MODULES_EXTRA+="imx" - -# Build dtb files... - -makeoptions MODULES_EXTRA+="dtb/allwinner" -makeoptions MODULES_EXTRA+="dtb/am335x" -makeoptions MODULES_EXTRA+="dtb/imx6" -makeoptions MODULES_EXTRA+="dtb/nvidia" -makeoptions MODULES_EXTRA+="dtb/omap4" -makeoptions MODULES_EXTRA+="dtb/rpi" -makeoptions MODULES_EXTRA+="dtb/zynq" Property changes on: head/sys/arm/conf/NOTES.armv7 ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/sys/arm/conf/NOTES =================================================================== --- head/sys/arm/conf/NOTES (revision 357397) +++ head/sys/arm/conf/NOTES (revision 357398) @@ -1,34 +1,82 @@ +# arm-specific changes for doing a LINT build. # $FreeBSD$ -options FDT +machine arm armv7 +cpu CPU_CORTEXA +cpu CPU_MV_PJ4B +makeoptions CONF_CFLAGS+="-march=armv7a" + +# Add options for armv7 that are not in sys/conf/NOTES... + +options ARM_L2_PIPT # Only L2 PIPT is supported +options FDT # Flattened device tree support +options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) +options INTRNG # Include INTRNG framework +options LINUX_BOOT_ABI # Process metadata passed from U-Boot +options PLATFORM # Include platform_if support +options SMP # Nearly all v7 SoCs are multicore +options VFP # Enable floating point hardware support + +# NOTE: dtrace introduces CDDL-licensed components into the kernel +device dtrace # dtrace core +device dtraceall # include all dtrace modules +options KDTRACE_HOOKS + +# Add misc devices which are specific to various arm platforms... + +device generic_timer # ARM Generic Timer +device gic # Interrupt controller +device gpio # gpio interface and bus +device mpcore_timer # ARM MPCore Timer +device pl310 # PL310 L2 cache controller +device pl330 # ARM PL330 dma controller +device pmu # PMU support (for CCNT). +device twsi # i2c controller on Marvel and Allwinner +device xdma # xDMA framework for SoC on-chip dma controllers + +# Add EXT_RESOURCES pseudo devices... + +options EXT_RESOURCES +device clk +device phy +device hwreset +device nvmem +device regulator +device syscon + # Undo options from sys/conf/NOTES that we do not want... nooptions COMPAT_FREEBSD4 nooptions COMPAT_FREEBSD5 nooptions COMPAT_FREEBSD6 nooptions COMPAT_FREEBSD7 nooptions COMPAT_FREEBSD9 nooptions PPC_PROBE_CHIPSET nooptions MAXCPU # value is set in machine/param.h -# Devices in sys/conf/NOTES for which no such hardware exists on arm, -# or the drivers don't compile... - nodevice sym nodevice ccr nodevice cxgbe nodevice cxgbev nodevice snd_cmi nodevice mpr nodevice mps -# Add devices which are specific to various arm platforms... +# Build SOC-specific modules... -device twsi # i2c controller on Marvel and Allwinner +makeoptions MODULES_EXTRA+="allwinner" +makeoptions MODULES_EXTRA+="arm_ti" +makeoptions MODULES_EXTRA+="imx" -device pl330 # ARM PL330 dma controller -device xdma # xDMA framework for SoC on-chip dma controllers +# Build dtb files... +makeoptions MODULES_EXTRA+="dtb/allwinner" +makeoptions MODULES_EXTRA+="dtb/am335x" +makeoptions MODULES_EXTRA+="dtb/imx6" +makeoptions MODULES_EXTRA+="dtb/nvidia" +makeoptions MODULES_EXTRA+="dtb/omap4" +makeoptions MODULES_EXTRA+="dtb/rpi" +makeoptions MODULES_EXTRA+="dtb/zynq" Index: head/sys/conf/makeLINT.mk =================================================================== --- head/sys/conf/makeLINT.mk (revision 357397) +++ head/sys/conf/makeLINT.mk (revision 357398) @@ -1,76 +1,72 @@ # $FreeBSD$ # The LINT files need to end up in the kernel source directory. .OBJDIR: ${.CURDIR} all: @echo "make LINT only" clean: rm -f LINT .if ${TARGET} == "amd64" || ${TARGET} == "i386" rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP .endif .if ${TARGET} == "arm" # LINT-V5 removed 2019-11-26. The clean rule is left here temporarily - # to avoid having stale copies left behind. + # to avoid having stale copies left behind. LINT-V7 left the tree on + # 2020-02-02. rm -f LINT-V5 LINT-V7 .endif .if ${TARGET} == "powerpc" rm -f LINT64 .endif NOTES+= ${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES MAKELINT_SED= ${.CURDIR}/../../conf/makeLINT.sed LINT: ${NOTES} ${MAKELINT_SED} cat ${NOTES} | sed -E -n -f ${MAKELINT_SED} > ${.TARGET} .if ${TARGET} == "amd64" || ${TARGET} == "i386" echo "include ${.TARGET}" > ${.TARGET}-NOINET echo "ident ${.TARGET}-NOINET" >> ${.TARGET}-NOINET echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="' >> ${.TARGET}-NOINET echo "nooptions INET" >> ${.TARGET}-NOINET echo "nodevice gre" >> ${.TARGET}-NOINET echo "nodevice netmap" >> ${.TARGET}-NOINET echo "include ${.TARGET}" > ${.TARGET}-NOINET6 echo "ident ${.TARGET}-NOINET6" >> ${.TARGET}-NOINET6 echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6 echo "nooptions INET6" >> ${.TARGET}-NOINET6 echo "include ${.TARGET}" > ${.TARGET}-NOIP echo "ident ${.TARGET}-NOIP" >> ${.TARGET}-NOIP echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="' >> ${.TARGET}-NOIP echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOIP echo "nooptions INET" >> ${.TARGET}-NOIP echo "nooptions INET6" >> ${.TARGET}-NOIP echo "nodevice age" >> ${.TARGET}-NOIP echo "nodevice alc" >> ${.TARGET}-NOIP echo "nodevice ale" >> ${.TARGET}-NOIP echo "nodevice bxe" >> ${.TARGET}-NOIP echo "nodevice em" >> ${.TARGET}-NOIP echo "nodevice fxp" >> ${.TARGET}-NOIP echo "nodevice jme" >> ${.TARGET}-NOIP echo "nodevice msk" >> ${.TARGET}-NOIP echo "nodevice mxge" >> ${.TARGET}-NOIP echo "nodevice sge" >> ${.TARGET}-NOIP echo "nodevice sk" >> ${.TARGET}-NOIP echo "nodevice txp" >> ${.TARGET}-NOIP echo "nodevice netmap" >> ${.TARGET}-NOIP -.endif -.if ${TARGET} == "arm" - cat ${NOTES} ${.CURDIR}/NOTES.armv7 | sed -E -n -f ${MAKELINT_SED} > \ - ${.TARGET}-V7 - rm ${.TARGET} .endif .if ${TARGET} == "mips" echo "machine ${TARGET} ${TARGET_ARCH}" >> ${.TARGET} .endif .if ${TARGET} == "powerpc" # cat is available, not sure if cp is? cat ${.TARGET} > ${.TARGET}64 echo "machine ${TARGET} powerpc" >> ${.TARGET} echo "machine ${TARGET} powerpc64" >> ${.TARGET}64 # mlx5 needs 64-bit atomics, so exclude from 32-bit PPC echo "nodevice mlx5" >> ${.TARGET} echo "nodevice mlx5en" >> ${.TARGET} echo "nodevice mlx5ib" >> ${.TARGET} echo "nooptions RATELIMIT" >> ${.TARGET} .endif