Browse Source

boards: x86: qemu_x86: optimize default HWMv2 configurations

Remove duplicated Kconfig default options from qemu_x86 board
variants' configuration keeping only differences in regard
of the appropriate board configurations.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
pull/69687/head
Dmitrii Golovanov 1 year ago committed by Jamie McCrae
parent
commit
eb724eb6a7
  1. 13
      boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig
  2. 12
      boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig
  3. 12
      boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig
  4. 12
      boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig
  5. 13
      boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig
  6. 12
      boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig

13
boards/qemu/qemu_x86/qemu_x86_64_ia32_nokpti_defconfig

@ -1,16 +1,3 @@ @@ -1,16 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_DEBUG_INFO=y
CONFIG_SMP=y
CONFIG_MP_MAX_NUM_CPUS=2
CONFIG_X86_MMU=y
CONFIG_X86_VERY_EARLY_CONSOLE=y
CONFIG_QEMU_ICOUNT=n
CONFIG_X86_KPTI=n

12
boards/qemu/qemu_x86/qemu_x86_ia32_nokpti_defconfig

@ -1,15 +1,3 @@ @@ -1,15 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y
CONFIG_X86_KPTI=n

12
boards/qemu/qemu_x86/qemu_x86_ia32_nommu_defconfig

@ -1,10 +1,6 @@ @@ -1,10 +1,6 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_DEBUG_INFO=y
CONFIG_X86_MMU=n
CONFIG_SCHED_DUMB=y
CONFIG_WAITQ_DUMB=y
CONFIG_X86_VERY_EARLY_CONSOLE=n

12
boards/qemu/qemu_x86/qemu_x86_ia32_nopae_defconfig

@ -1,15 +1,3 @@ @@ -1,15 +1,3 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y
CONFIG_X86_PAE=n

13
boards/qemu/qemu_x86/qemu_x86_ia32_virt_defconfig

@ -1,18 +1,5 @@ @@ -1,18 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_X86_MMU=y
CONFIG_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y
CONFIG_SRAM_OFFSET=0x100000
CONFIG_KERNEL_VM_SIZE=0x400000
CONFIG_KERNEL_VM_BASE=0x40000000

12
boards/qemu/qemu_x86/qemu_x86_ia32_xip_defconfig

@ -1,14 +1,4 @@ @@ -1,14 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_DEBUG_INFO=y
CONFIG_SCHED_SCALABLE=y
CONFIG_WAITQ_SCALABLE=y
CONFIG_X86_VERY_EARLY_CONSOLE=y
CONFIG_X86_MMU=n
CONFIG_XIP=y

Loading…
Cancel
Save