svn commit: r368159 - in head/sys: arm/conf conf

Michal Meloun mmel at FreeBSD.org
Sun Nov 29 17:42:34 UTC 2020


Author: mmel
Date: Sun Nov 29 17:42:32 2020
New Revision: 368159
URL: https://svnweb.freebsd.org/changeset/base/368159

Log:
  Remove unused options.
  
  Marvell files and their related SOC_MV_<foo> options should be cleaned up
  in another pass.

Modified:
  head/sys/arm/conf/NOTES
  head/sys/arm/conf/std.armv6
  head/sys/arm/conf/std.armv7
  head/sys/conf/options.arm

Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES	Sun Nov 29 16:44:22 2020	(r368158)
+++ head/sys/arm/conf/NOTES	Sun Nov 29 17:42:32 2020	(r368159)
@@ -9,7 +9,6 @@ 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

Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6	Sun Nov 29 16:44:22 2020	(r368158)
+++ head/sys/arm/conf/std.armv6	Sun Nov 29 17:42:32 2020	(r368159)
@@ -3,7 +3,6 @@
 # $FreeBSD$
 
 options 	HZ=1000
-options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET

Modified: head/sys/arm/conf/std.armv7
==============================================================================
--- head/sys/arm/conf/std.armv7	Sun Nov 29 16:44:22 2020	(r368158)
+++ head/sys/arm/conf/std.armv7	Sun Nov 29 17:42:32 2020	(r368159)
@@ -3,7 +3,6 @@
 # $FreeBSD$
 
 options 	HZ=1000
-options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 options 	INTRNG			# All arm systems use INTRNG these days
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Sun Nov 29 16:44:22 2020	(r368158)
+++ head/sys/conf/options.arm	Sun Nov 29 17:42:32 2020	(r368159)
@@ -1,13 +1,7 @@
 #$FreeBSD$
 ARMV6			opt_global.h
 ARMV7			opt_global.h
-ARM_CACHE_LOCK_ENABLE	opt_global.h
-ARM_KERN_DIRECTMAP	opt_vm.h
-ARM_L2_PIPT		opt_global.h
-ARM_MANY_BOARD		opt_global.h
-ARM_WANT_TP_ADDRESS	opt_global.h
 CPSW_ETHERSWITCH	opt_cpsw.h
-CPU_ARM9E		opt_global.h
 CPU_ARM1176		opt_global.h
 CPU_CORTEXA		opt_global.h
 CPU_KRAIT		opt_global.h
@@ -23,7 +17,6 @@ FREEBSD_BOOT_LOADER	opt_global.h
 KERNBASE		opt_global.h
 KERNVIRTADDR		opt_global.h
 LINUX_BOOT_ABI		opt_global.h
-LOADERRAMADDR		opt_global.h
 LOCORE_MAP_MB		opt_locore.h
 NKPT2PG			opt_pmap.h
 PHYSADDR		opt_global.h
@@ -31,7 +24,6 @@ PLATFORM		opt_global.h
 SOCDEV_PA		opt_global.h
 SOCDEV_VA		opt_global.h
 PV_STATS		opt_pmap.h
-QEMU_WORKAROUNDS	opt_global.h
 SOC_ALLWINNER_A10	opt_global.h
 SOC_ALLWINNER_A13	opt_global.h
 SOC_ALLWINNER_A20	opt_global.h
@@ -56,13 +48,6 @@ SOC_MV_KIRKWOOD		opt_global.h
 SOC_MV_ORION		opt_global.h
 SOC_OMAP3		opt_global.h
 SOC_OMAP4		opt_global.h
-SOC_ROCKCHIP_RK3188	opt_global.h
 SOC_TI_AM335X		opt_global.h
-SOC_TEGRA2		opt_global.h
-XSCALE_CACHE_READ_WRITE_ALLOCATE	opt_global.h
-VERBOSE_INIT_ARM	opt_global.h
 VM_MAXUSER_ADDRESS	opt_global.h
-GFB_DEBUG		opt_gfb.h
-GFB_NO_FONT_LOADING	opt_gfb.h
-GFB_NO_MODE_CHANGE	opt_gfb.h
 VFP			opt_global.h


More information about the svn-src-all mailing list