bios_emulator: Add Kconfig and adjust Makefile for SPL

The Kconfig for this is currently inside a particular board. Move it into
the correct place and allow use in SPL, so that video can be used there
if needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/board/google/Kconfig b/board/google/Kconfig
index a0f1a6097641e28520564a975ebdcdc879345f44..e4f9b5b68aabc71e765083315f79ecf1851b81c6 100644 (file)
--- a/board/google/Kconfig
+++ b/board/google/Kconfig
@@ -4,13 +4,6 @@
 
 if VENDOR_GOOGLE
 
-config BIOSEMU
-       bool
-       select X86EMU_RAW_IO
-
-config X86EMU_RAW_IO
-       bool
-
 choice
        prompt "Mainboard model"
        optional

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 75937fbb6d9b771b7cf6c35ac9dbd6ff6971bf9a..a25f6ae02fdfdc84cc4a8722cfa6984e00c077c1 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -10,6 +10,8 @@ source "drivers/ata/Kconfig"
 
 source "drivers/axi/Kconfig"
 
+source "drivers/bios_emulator/Kconfig"
+
 source "drivers/bus/Kconfig"
 
 source "drivers/block/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index 78dcf62f76af56624e2e387139036f5d75dab096..3bc6d279d7cbf797072bf5229d1320e58813931f 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 
+obj-$(CONFIG_$(SPL_TPL_)BIOSEMU) += bios_emulator/
 obj-$(CONFIG_$(SPL_TPL_)BLK) += block/
 obj-$(CONFIG_$(SPL_TPL_)BOOTCOUNT_LIMIT) += bootcount/
 obj-$(CONFIG_$(SPL_TPL_)BUTTON) += button/
@@ -80,7 +81,6 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
 obj-y += adc/
 obj-y += ata/
 obj-$(CONFIG_DM_DEMO) += demo/
-obj-$(CONFIG_BIOSEMU) += bios_emulator/
 obj-y += block/
 obj-y += cache/
 obj-$(CONFIG_CPU) += cpu/

diff --git a/drivers/bios_emulator/Kconfig b/drivers/bios_emulator/Kconfig
new file mode 100644 (file)
index 0000000..3660576
--- /dev/null
+++ b/drivers/bios_emulator/Kconfig
@@ -0,0 +1,10 @@
+config BIOSEMU
+       bool
+       select X86EMU_RAW_IO
+
+config SPL_BIOSEMU
+       bool
+       select X86EMU_RAW_IO
+
+config X86EMU_RAW_IO
+       bool