Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

platform: goldfish: move the separate 'default' propery for CONFIG_GOLDFISH

Currently, there are two entries for CONFIG_GOLDFISH.

In arch/x86/Kconfig:

config GOLDFISH
def_bool y
depends on X86_GOLDFISH

In drivers/platform/goldfish/Kconfig:

menuconfig GOLDFISH
bool "Platform support for Goldfish virtual devices"
depends on HAS_IOMEM && HAS_DMA

While Kconfig allows multiple entries, it generally leads to tricky
code.

Prior to commit bd2f348db503 ("goldfish: refactor goldfish platform
configs"), CONFIG_GOLDFISH was an alias of CONFIG_X86_GOLDFISH.

After the mentioned commit added the second entry with a user prompt,
the former provides the 'default' property that is effective only when
X86_GOLDFISH=y.

Merge them tegether to clarify how it has worked in the past 8 years.

Cc: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20240204081004.33871-1-masahiroy@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Masahiro Yamada and committed by
Greg Kroah-Hartman
8af2d202 4a055328

+1 -4
-4
arch/x86/Kconfig
··· 471 471 For old smp systems that do not have proper acpi support. Newer systems 472 472 (esp with 64bit cpus) with acpi support, MADT and DSDT will override it 473 473 474 - config GOLDFISH 475 - def_bool y 476 - depends on X86_GOLDFISH 477 - 478 474 config X86_CPU_RESCTRL 479 475 bool "x86 CPU resource control support" 480 476 depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD)
+1
drivers/platform/goldfish/Kconfig
··· 2 2 menuconfig GOLDFISH 3 3 bool "Platform support for Goldfish virtual devices" 4 4 depends on HAS_IOMEM && HAS_DMA 5 + default X86_GOLDFISH 5 6 help 6 7 Say Y here to get to see options for the Goldfish virtual platform. 7 8 This option alone does not add any kernel code.