Browse Source

x86: coreboot: Move coreboot-specific defines from coreboot.h to Kconfig

There are many places in the U-Boot source tree which refer to
CONFIG_SYS_COREBOOT, CONFIG_CBMEM_CONSOLE and CONFIG_VIDEO_COREBOOT
that is currently defined in coreboot.h.

Move them to arch/x86/cpu/coreboot/Kconfig so that we can switch
to board configuration file to build U-Boot later.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Bin Meng 10 years ago
parent
commit
9d74f03460
3 changed files with 17 additions and 5 deletions
  1. 2 0
      arch/x86/Kconfig
  2. 15 0
      arch/x86/cpu/coreboot/Kconfig
  3. 0 5
      include/configs/coreboot.h

+ 2 - 0
arch/x86/Kconfig

@@ -344,6 +344,8 @@ config TSC_FREQ_IN_MHZ
 	help
 	  The running frequency in MHz of Time-Stamp Counter (TSC).
 
+source "arch/x86/cpu/coreboot/Kconfig"
+
 source "arch/x86/cpu/ivybridge/Kconfig"
 
 source "arch/x86/cpu/queensbay/Kconfig"

+ 15 - 0
arch/x86/cpu/coreboot/Kconfig

@@ -0,0 +1,15 @@
+if TARGET_COREBOOT
+
+config SYS_COREBOOT
+	bool
+	default y
+
+config CBMEM_CONSOLE
+	bool
+	default y
+
+config VIDEO_COREBOOT
+	bool
+	default y
+
+endif

+ 0 - 5
include/configs/coreboot.h

@@ -19,7 +19,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_SYS_COREBOOT
 #define CONFIG_LAST_STAGE_INIT
 #define CONFIG_SYS_EARLY_PCI_INIT
 
@@ -55,10 +54,6 @@
 					"stdout=vga,serial,cbmem\0" \
 					"stderr=vga,serial,cbmem\0"
 
-#define CONFIG_CBMEM_CONSOLE
-
-#define CONFIG_VIDEO_COREBOOT
-
 #define CONFIG_NR_DRAM_BANKS			4
 
 #define CONFIG_TRACE