[coreboot] r578 - in coreboot-v3: . mainboard/emulation/qemu-x86 util/kconfig

[svn at coreboot.org]

Author: myles
Date: 2008-02-07 17:50:44 +0100 (Thu, 07 Feb 2008)
New Revision: 578

Added:
   coreboot-v3/mainboard/emulation/qemu-x86/defconfig
Modified:
   coreboot-v3/Makefile
   coreboot-v3/util/kconfig/confdata.c
   coreboot-v3/util/kconfig/symbol.c
Log:
This patch adds support for make defconfig in v3.  Those that port v3
to a board should add a defconfig in mainboard/vendor/board/defconfig.
 I think that the defconfig should:

1. Use the ROM size that comes with the board
2. Enable compression
3. Not include a payload

This will make it easy for buildrom or anyone who wants to build it
manually to use lar to add their payloads. It also allows buildrom to
keep the configs in the coreboot tree.

The patch also adds mainboard/emulation/qemu-x86/defconfig

Signed-off-by: Myles Watson <myles at pel.cs.byu.edu>
Acked-by: Ward Vandewege <ward at gnu.org>


Modified: coreboot-v3/Makefile
===================================================================
--- coreboot-v3/Makefile	2008-02-07 16:17:21 UTC (rev 577)
+++ coreboot-v3/Makefile	2008-02-07 16:50:44 UTC (rev 578)
@@ -80,6 +80,7 @@
 
 ARCH:=$(shell echo $(CONFIG_ARCH))
 MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_NAME))
+export MAINBOARDDIR
 
 COREBOOTINCLUDE    :=   -I$(src) -Iinclude \
 			-I$(src)/include \

Added: coreboot-v3/mainboard/emulation/qemu-x86/defconfig
===================================================================
--- coreboot-v3/mainboard/emulation/qemu-x86/defconfig	                        (rev 0)
+++ coreboot-v3/mainboard/emulation/qemu-x86/defconfig	2008-02-07 16:50:44 UTC (rev 578)
@@ -0,0 +1,88 @@
+#
+# Automatically generated make config: don't edit
+# coreboot version: 3.0.0
+# Wed Feb  6 13:55:31 2008
+#
+
+#
+# General setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_EXPERT is not set
+CONFIG_LOCALVERSION=""
+
+#
+# Mainboard
+#
+# CONFIG_VENDOR_ADL is not set
+# CONFIG_VENDOR_AMD is not set
+# CONFIG_VENDOR_ARTECGROUP is not set
+CONFIG_VENDOR_EMULATION=y
+# CONFIG_VENDOR_PCENGINES is not set
+CONFIG_MAINBOARD_NAME="emulation/qemu-x86"
+CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x15ad
+CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1976
+CONFIG_BOARD_EMULATION_QEMU_X86=y
+# CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
+CONFIG_COREBOOT_ROMSIZE_KB_1024=y
+# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
+CONFIG_COREBOOT_ROMSIZE_KB=1024
+CONFIG_ARCH_X86=y
+CONFIG_ARCH="x86"
+CONFIG_CPU_I586=y
+CONFIG_OPTION_TABLE=y
+
+#
+# Compression
+#
+CONFIG_COMPRESSION_LZMA=y
+# CONFIG_COMPRESSION_NRV2B is not set
+CONFIG_DEFAULT_COMPRESSION_LZMA=y
+# CONFIG_DEFAULT_COMPRESSION_NRV2B is not set
+# CONFIG_DEFAULT_COMPRESSION_NONE is not set
+
+#
+# Console
+#
+CONFIG_CONSOLE=y
+CONFIG_CONSOLE_LOGLEVEL_8=y
+# CONFIG_CONSOLE_LOGLEVEL_7 is not set
+# CONFIG_CONSOLE_LOGLEVEL_6 is not set
+# CONFIG_CONSOLE_LOGLEVEL_5 is not set
+# CONFIG_CONSOLE_LOGLEVEL_4 is not set
+# CONFIG_CONSOLE_LOGLEVEL_3 is not set
+# CONFIG_CONSOLE_LOGLEVEL_2 is not set
+# CONFIG_CONSOLE_LOGLEVEL_1 is not set
+# CONFIG_CONSOLE_LOGLEVEL_0 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
+CONFIG_CONSOLE_SERIAL=y
+CONFIG_CONSOLE_SERIAL_COM1=y
+# CONFIG_CONSOLE_SERIAL_COM2 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+
+#
+# Devices
+#
+CONFIG_PCI_OPTION_ROM_RUN=y
+# CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set
+CONFIG_PCI_OPTION_ROM_RUN_VM86=y
+# CONFIG_PCI_OPTION_ROM_RUN_NONE is not set
+# CONFIG_MULTIPLE_VGA_INIT is not set
+# CONFIG_INITIALIZE_ONBOARD_VGA_FIRST is not set
+CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION=y
+CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_SUPERIO_WINBOND_W83627HF=y
+CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE=32
+
+#
+# Payload
+#
+# CONFIG_PAYLOAD_PREPARSE_ELF is not set
+# CONFIG_PAYLOAD_ELF is not set
+CONFIG_PAYLOAD_NONE=y

Modified: coreboot-v3/util/kconfig/confdata.c
===================================================================
--- coreboot-v3/util/kconfig/confdata.c	2008-02-07 16:17:21 UTC (rev 577)
+++ coreboot-v3/util/kconfig/confdata.c	2008-02-07 16:50:44 UTC (rev 578)
@@ -22,7 +22,7 @@
 
 const char conf_def_filename[] = ".config";
 
-const char conf_defname[] = "arch/$ARCH/defconfig";
+const char conf_defname[] = "mainboard/$MAINBOARDDIR/defconfig";
 
 const char *conf_confnames[] = {
 	".config",

Modified: coreboot-v3/util/kconfig/symbol.c
===================================================================
--- coreboot-v3/util/kconfig/symbol.c	2008-02-07 16:17:21 UTC (rev 577)
+++ coreboot-v3/util/kconfig/symbol.c	2008-02-07 16:50:44 UTC (rev 578)
@@ -54,6 +54,13 @@
 
 	uname(&uts);
 
+	sym = sym_lookup("MAINBOARDDIR", 0);
+	sym->type = S_STRING;
+	sym->flags |= SYMBOL_AUTO;
+	p = getenv("MAINBOARDDIR");
+	if (p)
+		sym_add_default(sym, p);
+
 	sym = sym_lookup("ARCH", 0);
 	sym->type = S_STRING;
 	sym->flags |= SYMBOL_AUTO;