Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11366
-gerrit
commit 049bac56fccff2b64b7a58a0d62634ce4d0b0e7d
Author: Martin Roth <martinroth(a)google.com>
Date: Wed Aug 26 13:00:38 2015 -0600
Update VGA_ROM_RUN & ALWAYS_LOAD_OPROM Kconfig symbols
- Add a prompt for ALWAYS_LOAD_OPROM so it can be enabled / disabled in
the Kconfig front-end.
- Change the selects of VGA_ROM_RUN & ALWAYS_LOAD_OPROM for the
broadwell and skylake SOC mainboards to configs, defaulted to enabled.
This allows the options to be turned off, and removes the explicit
dependency on !PAYLOAD_SEABIOS. For Skylake, only set these if the
system isn't using GOP.
- Remove the SOC configuration of VGA_ROM_RUN & ALWAYS_LOAD_OPROM. These
should only be set by the mainboard.
Change-Id: I52c41a10dcf883d6cecaa83a47c4fce6d8f2f288
Signed-off-by: Martin Roth <martinroth(a)google.com>
---
src/device/Kconfig | 3 ++-
src/mainboard/google/cyan/Kconfig | 11 ++++++++---
src/mainboard/google/rambi/Kconfig | 6 ++++++
src/mainboard/intel/strago/Kconfig | 13 ++++++++++---
src/soc/intel/broadwell/Kconfig | 2 --
src/soc/intel/skylake/Kconfig | 2 --
6 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/device/Kconfig b/src/device/Kconfig
index d780d13..b2db243 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -77,7 +77,8 @@ config S3_VGA_ROM_RUN
If unsure, say N when using SeaBIOS as payload, Y otherwise.
config ALWAYS_LOAD_OPROM
- def_bool n
+ bool "Always load discovered option ROMs"
+ default n
depends on VGA_ROM_RUN
help
Always load option ROMs if any are found. The decision to run
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index f3bb851..362d423 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -2,8 +2,6 @@ if BOARD_GOOGLE_CYAN
config BOARD_SPECIFIC_OPTIONS
def_bool y
- select VGA_ROM_RUN if !PAYLOAD_SEABIOS
- select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_MEC
@@ -69,6 +67,13 @@ config VGA_BIOS_ID
string
default "8086,22b1" if C0_DISP_SUPPORT
default "8086,22b0" if !C0_DISP_SUPPORT
-endif
+
+config VGA_ROM_RUN
+ def_bool y
+
+config ALWAYS_LOAD_OPROM
+ def_bool y
+
+endif # !CONFIG_GOP_SUPPORT
endif # BOARD_GOOGLE_CYAN
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 1ad2d6d..d6eff50 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -40,4 +40,10 @@ config HAVE_ME_BIN
bool
default n
+config VGA_ROM_RUN
+ def_bool y
+
+config ALWAYS_LOAD_OPROM
+ def_bool y
+
endif # BOARD_INTEL_BAYLEYBAY
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 1d4d4d8..36d54d2 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -2,8 +2,6 @@ if BOARD_INTEL_STRAGO
config BOARD_SPECIFIC_OPTIONS
def_bool y
- select VGA_ROM_RUN if !PAYLOAD_SEABIOS
- select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_MEC
@@ -55,6 +53,7 @@ config VBOOT_RAMSTAGE_INDEX
config VBOOT_REFCODE_INDEX
hex
default 0x3
+
if !CONFIG_GOP_SUPPORT
config VGA_BIOS_FILE
string
@@ -64,5 +63,13 @@ config VGA_BIOS_ID
string
default "8086,22b1" if C0_DISP_SUPPORT
default "8086,22b0" if !C0_DISP_SUPPORT
-endif
+
+config VGA_ROM_RUN
+ def_bool y
+
+config ALWAYS_LOAD_OPROM
+ def_bool y
+
+endif #!CONFIG_GOP_SUPPORT
+
endif # BOARD_INTEL_STRAGO
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 524366c..0106255 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -11,8 +11,6 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_VERSTAGE_X86_32
select ARCH_ROMSTAGE_X86_32
select ARCH_RAMSTAGE_X86_32
- select VGA_ROM_RUN if !PAYLOAD_SEABIOS
- select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
select BACKUP_DEFAULT_SMM_REGION
select CACHE_MRC_SETTINGS
select MRC_SETTINGS_PROTECT
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index f42d3ab..9805b6d 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -11,8 +11,6 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_RAMSTAGE_X86_32
select ARCH_ROMSTAGE_X86_32
select ARCH_VERSTAGE_X86_32
- select VGA_ROM_RUN if !PAYLOAD_SEABIOS
- select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
select BACKUP_DEFAULT_SMM_REGION
select CACHE_MRC_SETTINGS
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11292
-gerrit
commit 6fe1695e628e9e09ca77d1a02e0538fe4c787e77
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Thu Aug 20 14:44:48 2015 -0400
cbfstool/Makefile.inc: Specify output filename in fmd_parser rule
The fmd_parser.c rule called $(YACC), assuming that the output
filename is "y.tab.c". This isn't always the case as illustrated by
$ YACC=bison make
When the output file is specified, cbfstool compiles with the above.
Change-Id: I4e892773f380d99705a2b752bd88e964cf8553eb
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
util/cbfstool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 65d5710..b487c5a 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -61,7 +61,7 @@ fmd_scanner.c: fmd_scanner.l
fmd_parser.h: fmd_parser.c
fmd_parser.c: fmd_parser.y
- $(YACC) $(YFLAGS) -d $<
+ $(YACC) $(YFLAGS) -o "y.tab.c" -d $<
mv -f y.tab.c $*.c
mv -f y.tab.h $*.h
Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11365
-gerrit
commit 54f31f38a250c18e0c1e45449046175439e06ef4
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Wed Aug 26 10:11:02 2015 -0400
Kconfig: Remove EXPERT mode
After much consideration, and many years of an EXPERT mode sitting
almost completely unused, we've seen that it doesn't work for us.
There is no standard on what constitutes EXPERT, and most of
coreboot's options Kconfig are expert-level.
We even joked that not selecting "EXPERT" should prevent coreboot
from compiling:
@echo $(shell whoami) is not permitted to compile coreboot
Change-Id: Ic22dd54a48190b81d711625efb6b9f3078f41778
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
payloads/external/SeaBIOS/Kconfig | 1 -
src/Kconfig | 11 -----------
src/device/Kconfig | 11 +++--------
src/northbridge/amd/amdfam10/Kconfig | 2 +-
src/northbridge/amd/amdht/h3finit.c | 4 ++--
5 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig
index b2ff21e..699b986 100644
--- a/payloads/external/SeaBIOS/Kconfig
+++ b/payloads/external/SeaBIOS/Kconfig
@@ -18,7 +18,6 @@ endchoice
config SEABIOS_PS2_TIMEOUT
prompt "PS/2 keyboard controller initialization timeout (milliseconds)"
default 0
- depends on EXPERT
int
help
Some PS/2 keyboard controllers don't respond to commands immediately
diff --git a/src/Kconfig b/src/Kconfig
index 9c01687..2c75750 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -22,14 +22,6 @@ mainmenu "coreboot configuration"
menu "General setup"
-config EXPERT
- bool "Expert mode"
- help
- This allows you to select certain advanced configuration options.
-
- Warning: Only enable this option if you really know what you are
- doing! You have been warned!
-
config LOCALVERSION
string "Local version string"
help
@@ -111,7 +103,6 @@ config CCACHE
config FMD_GENPARSER
bool "Generate flashmap descriptor parser using flex and bison"
default n
- depends on EXPERT
help
Enable this option if you are working on the flashmap descriptor
parser and made changes to fmd_scanner.l or fmd_parser.y.
@@ -121,7 +112,6 @@ config FMD_GENPARSER
config SCONFIG_GENPARSER
bool "Generate SCONFIG parser using flex and bison"
default n
- depends on EXPERT
help
Enable this option if you are working on the sconfig device tree
parser and made changes to sconfig.l or sconfig.y.
@@ -283,7 +273,6 @@ config BOOTBLOCK_SOURCE
config SKIP_MAX_REBOOT_CNT_CLEAR
bool "Do not clear reboot count after successful boot"
default n
- depends on EXPERT
help
Do not clear the reboot count immediately after successful boot.
Set to allow the payload to control normal/fallback image recovery.
diff --git a/src/device/Kconfig b/src/device/Kconfig
index d780d13..aee5e11 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -51,7 +51,7 @@ config VGA_ROM_RUN
bool "Run VGA Option ROMs"
default n if PAYLOAD_SEABIOS
default y if !PAYLOAD_SEABIOS
- depends on PCI && !PAYLOAD_SEABIOS && !MAINBOARD_DO_NATIVE_VGA_INIT || EXPERT
+ depends on PCI && !PAYLOAD_SEABIOS && !MAINBOARD_DO_NATIVE_VGA_INIT
help
Execute VGA Option ROMs in coreboot if found. This is required
to enable PCI/AGP/PCI-E video cards when not using a SeaBIOS
@@ -92,7 +92,7 @@ config ON_DEVICE_ROM_RUN
bool "Run Option ROMs on PCI devices"
default n if PAYLOAD_SEABIOS
default y if !PAYLOAD_SEABIOS
- depends on PCI && !PAYLOAD_SEABIOS || EXPERT
+ depends on PCI && !PAYLOAD_SEABIOS
help
Execute Option ROMs stored on PCI/PCIe/AGP devices in coreboot.
@@ -165,17 +165,12 @@ config YABEL_PCI_FAKE_WRITING_OTHER_DEVICES_CONFIG
config YABEL_VIRTMEM_LOCATION
prompt "Location of YABEL's virtual memory"
hex
- depends on PCI_OPTION_ROM_RUN_YABEL && EXPERT
+ depends on PCI_OPTION_ROM_RUN_YABEL
default 0x1000000
help
YABEL requires 1MB memory for its CPU emulation. This memory is
normally located at 16MB.
-config YABEL_VIRTMEM_LOCATION
- hex
- depends on PCI_OPTION_ROM_RUN_YABEL && !EXPERT
- default 0x1000000
-
config YABEL_DIRECTHW
prompt "Direct hardware access"
bool
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index 13954d4..4d7147d 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -120,7 +120,7 @@ config SVI_HIGH_FREQ
menu "HyperTransport setup"
#could be implemented for K8 (NORTHBRIDGE_AMD_AMDK8)
- depends on (NORTHBRIDGE_AMD_AMDFAM10) && EXPERT
+ depends on (NORTHBRIDGE_AMD_AMDFAM10)
choice
prompt "HyperTransport downlink width"
diff --git a/src/northbridge/amd/amdht/h3finit.c b/src/northbridge/amd/amdht/h3finit.c
index 0138cd9..849f4a8 100644
--- a/src/northbridge/amd/amdht/h3finit.c
+++ b/src/northbridge/amd/amdht/h3finit.c
@@ -1399,13 +1399,13 @@ static void selectOptimalWidthAndFrequency(sMainData *pDat)
cbPCBFreqLimit = ht_speed_mhz_to_hw(pDat->HtBlock->ht_link_configuration->ht_speed_limit);
cbPCBFreqLimit = min(cbPCBFreqLimit, cbPCBFreqLimit_NVRAM);
-#if CONFIG_EXPERT && CONFIG_LIMIT_HT_DOWN_WIDTH_8
+#if CONFIG_LIMIT_HT_DOWN_WIDTH_8
cbPCBABDownstreamWidth = 8;
#else
cbPCBABDownstreamWidth = 16;
#endif
-#if CONFIG_EXPERT && CONFIG_LIMIT_HT_UP_WIDTH_8
+#if CONFIG_LIMIT_HT_UP_WIDTH_8
cbPCBBAUpstreamWidth = 8;
#else
cbPCBBAUpstreamWidth = 16;
the following patch was just integrated into master:
commit 5cd34e2f15e1bf562fa80f013995d77429ea784f
Author: Roger Pau Monne <roger.pau(a)citrix.com>
Date: Wed Aug 26 16:51:01 2015 +0200
inteltool: fix build for FreeBSD
Replace usage of u<bitness> types with proper uint<bitness>_t types.
Change-Id: I8359d70304a138b29bfc1358af77af26b2bc8682
Signed-off-by: Roger Pau Monne <roger.pau(a)citrix.com>
Reviewed-on: http://review.coreboot.org/11364
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer(a)gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/11364 for details.
-gerrit
the following patch was just integrated into master:
commit e2473c5950b95864879b84619a446394cf8c69be
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Aug 24 16:12:47 2015 -0600
Chromeos: Remove Kconfig workaround for VIRTUAL_DEV_SWITCH warnings
With VIRTUAL_DEV_SWITCH moved under 'config CHROMEOS' in all of the
mainboards, this is no longer needed.
Change-Id: I5fbea17969f6b0c3b8a5dcd519ab9d36eb2ad6f1
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: http://review.coreboot.org/11337
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/11337 for details.
-gerrit
the following patch was just integrated into master:
commit 8c12d6e823652631912d696068b8236dbc69fa1e
Author: Martin Roth <martinroth(a)google.com>
Date: Mon Aug 24 15:55:29 2015 -0600
ChromeOS mainboards: Move more Kconfig symbols under CHROMEOS
Move the CHROMEOS dependent symbols VIRTUAL_DEV_SWITCH and
VBOOT_DYNAMIC_WORK_BUFFER under the CHROMEOS config options for the
mainboards that use them.
Change-Id: Iad126cf045cb3a312319037aff3c4b1f15f6529d
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: http://review.coreboot.org/11336
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/11336 for details.
-gerrit
the following patch was just integrated into master:
commit 870d3de270e40e2758a7fcb504bbe7b0cc59b5b3
Author: Martin Roth <martinroth(a)google.com>
Date: Tue Aug 25 17:00:04 2015 -0600
hp/dl165_g6_fam10/Kconfig: remove unused QRANK_DIMM_SUPPORT
AMD family 10 boards don't use QRANK_DIMM_SUPPORT.
Change-Id: Id7e1fba86e2ea1d4d5f5c2e123bd36ad802fd15e
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: http://review.coreboot.org/11344
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Reviewed-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com>
See http://review.coreboot.org/11344 for details.
-gerrit
the following patch was just integrated into master:
commit c0c115b6579de2f3ffbdd94b286d5059b1dfe132
Author: Martin Roth <martinroth(a)google.com>
Date: Fri Aug 21 14:37:02 2015 -0600
Google Kconfig: Add MAINBOARD_HAS_NATIVE_VGA_INIT in good places
Add 'select MAINBOARD_HAS_NATIVE_VGA_INIT' which is just used as a gate
symbol to display MAINBOARD_DO_NATIVE_VGA_INIT to the mainboards that
are already selecting MAINBOARD_DO_NATIVE_VGA_INIT.
Since MAINBOARD_HAS_NATIVE_VGA_INIT is not used in any code, this should
not have any other effects.
This fixes the warning:
warning: (BOARD_SPECIFIC_OPTIONS) selects MAINBOARD_DO_NATIVE_VGA_INIT
which has unmet direct dependencies (VENDOR_ASUS && BOARD_ASUS_KFSN4_DRE
|| MAINBOARD_HAS_NATIVE_VGA_INIT)
Change-Id: I8ceee69ebae90dc32f55df58c2e80fe25397f049
Signed-off-by: Martin Roth <martinroth(a)google.com>
Reviewed-on: http://review.coreboot.org/11301
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/11301 for details.
-gerrit