configs: correct cpu accounting configuration

The shipped .config files all have CONFIG_TICK_CPU_ACCOUNTING and
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE set. The x86_64 .config files
additionaly have CONFIG_VIRT_CPU_ACCOUNTING_GEN set.

This is wrong because each .config should have just one of these three
set. As a result the build generates
    [...]⚠️ override: VIRT_CPU_ACCOUNTING_NATIVE changes choice state

24 times and
    [...]⚠️ override: VIRT_CPU_ACCOUNTING_GEN changes choice state

4 times. So let's make sure the shipped .config files only have one of
these three Kconfig macros set (ie, the one that's relevant for that
.config target).

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
This commit is contained in:
Paul Bolle 2018-11-13 17:57:19 +01:00 committed by Justin M. Forbes
parent 23a14040db
commit 3e4010f25e
17 changed files with 19 additions and 15 deletions

View File

@ -1 +1 @@
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set

View File

@ -0,0 +1 @@
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y

View File

@ -0,0 +1 @@
# CONFIG_TICK_CPU_ACCOUNTING is not set

View File

@ -0,0 +1 @@
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y

View File

@ -0,0 +1 @@
# CONFIG_TICK_CPU_ACCOUNTING is not set

View File

@ -6850,7 +6850,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -6827,7 +6827,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -7320,7 +7320,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -6876,7 +6876,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -6854,7 +6854,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -7298,7 +7298,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -6380,7 +6380,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -6358,7 +6358,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -5304,7 +5304,7 @@ CONFIG_THRUSTMASTER_FF=y
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
# CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8688 is not set # CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TICK_CPU_ACCOUNTING is not set
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set # CONFIG_TI_DAC5571 is not set

View File

@ -5280,7 +5280,7 @@ CONFIG_THRUSTMASTER_FF=y
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
# CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8688 is not set # CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TICK_CPU_ACCOUNTING is not set
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set # CONFIG_TI_DAC5571 is not set

View File

@ -5778,7 +5778,7 @@ CONFIG_THUNDERBOLT_NET=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
# CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8688 is not set # CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TICK_CPU_ACCOUNTING is not set
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set # CONFIG_TI_DAC5571 is not set
@ -6425,7 +6425,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m

View File

@ -5756,7 +5756,7 @@ CONFIG_THUNDERBOLT_NET=m
CONFIG_TI_ADS1015=m CONFIG_TI_ADS1015=m
# CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS7950 is not set
# CONFIG_TI_ADS8688 is not set # CONFIG_TI_ADS8688 is not set
CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TICK_CPU_ACCOUNTING is not set
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
# CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC082S085 is not set
# CONFIG_TI_DAC5571 is not set # CONFIG_TI_DAC5571 is not set
@ -6403,7 +6403,7 @@ CONFIG_VIDEO_VIA_CAMERA=m
# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIPERBOARD_ADC is not set
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
CONFIG_VIRT_DRIVERS=y CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BALLOON=m
CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_BLK=m