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

2020-12-05 Thread Michal Meloun




On 05.12.2020 17:18, Mateusz Guzik wrote:

On 11/29/20, Michal Meloun  wrote:

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_ options should be cleaned up
   in another pass.



Since this change tinderbox fails to build VERSATILEPB and EFIKA_MX:
/usr/src/sys/dev/syscons/scgfbrndr.c:35:10: fatal error: 'opt_gfb.h'
file not found
#include "opt_gfb.h"
  ^~~


Fixed in r368373.
thanks for report.

Michal
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


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

2020-12-05 Thread Mateusz Guzik
On 11/29/20, Michal Meloun  wrote:
> 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_ options should be cleaned up
>   in another pass.
>

Since this change tinderbox fails to build VERSATILEPB and EFIKA_MX:
/usr/src/sys/dev/syscons/scgfbrndr.c:35:10: fatal error: 'opt_gfb.h'
file not found
#include "opt_gfb.h"
 ^~~


> 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$
>  ARMV6opt_global.h
>  ARMV7opt_global.h
> -ARM_CACHE_LOCK_ENABLEopt_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_ARM9Eopt_global.h
>  CPU_ARM1176  opt_global.h
>  CPU_CORTEXA  opt_global.h
>  CPU_KRAITopt_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
> -LOADERRAMADDRopt_global.h
>  LOCORE_MAP_MBopt_locore.h
>  NKPT2PG  opt_pmap.h
>  PHYSADDR opt_global.h
> @@ -31,7 +24,6 @@ PLATFORMopt_global.h
>  SOCDEV_PAopt_global.h
>  SOCDEV_VAopt_global.h
>  PV_STATS opt_pmap.h
> -QEMU_WORKAROUNDS opt_global.h
>  SOC_ALLWINNER_A10opt_global.h
>  SOC_ALLWINNER_A13opt_global.h
>  SOC_ALLWINNER_A20opt_global.h
> @@ -56,13 +48,6 @@ SOC_MV_KIRKWOODopt_global.h
>  SOC_MV_ORION opt_global.h
>  SOC_OMAP3opt_global.h
>  SOC_OMAP4opt_global.h
> -SOC_ROCKCHIP_RK3188  opt_global.h
>  SOC_TI_AM335Xopt_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_DEBUGopt_gfb.h
> -GFB_NO_FONT_LOADING  opt_gfb.h
> -GFB_NO_MODE_CHANGE   opt_gfb.h
>  VFP  opt_global.h
> ___
> svn-src-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
>


-- 
Mateusz Guzik 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send 

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

2020-11-29 Thread Michal Meloun
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_ 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...
 
-optionsARM_L2_PIPT # Only L2 PIPT is supported
 optionsFDT # Flattened device tree support
 optionsFREEBSD_BOOT_LOADER # Process metadata passed from loader(8)
 optionsINTRNG  # 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$
 
 optionsHZ=1000
-optionsARM_L2_PIPT # Only L2 PIPT is supported
 optionsINTRNG  # All arm systems use INTRNG these days
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsVIMAGE  # 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$
 
 optionsHZ=1000
-optionsARM_L2_PIPT # Only L2 PIPT is supported
 optionsINTRNG  # All arm systems use INTRNG these days
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsVIMAGE  # 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_PIPTopt_global.h
-ARM_MANY_BOARD opt_global.h
-ARM_WANT_TP_ADDRESSopt_global.h
 CPSW_ETHERSWITCH   opt_cpsw.h
-CPU_ARM9E  opt_global.h
 CPU_ARM1176opt_global.h
 CPU_CORTEXAopt_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
 NKPT2PGopt_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_RK3188opt_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_LOADINGopt_gfb.h
-GFB_NO_MODE_CHANGE opt_gfb.h
 VFPopt_global.h
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"