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/11461
-gerrit
commit 788ea1e17b3c1980fd2d3339f7d0a2e3229072b8
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Sat Aug 29 17:48:01 2015 -0700
drivers/intel/fsp_1_1: Remove useless #ifndef/#error pairs
The #error messages only say that "CONFIG_* must be defined", which
conveys no more information that the compiler or assembler failing
when it encounters an undefined CONFIG_* symbol.
Change-Id: I6058474d4cd454cfc20290650425d379f388abd9
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/drivers/intel/fsp1_1/cache_as_ram.inc | 18 ------------------
src/drivers/intel/fsp1_1/fsp_util.c | 4 ----
2 files changed, 22 deletions(-)
diff --git a/src/drivers/intel/fsp1_1/cache_as_ram.inc b/src/drivers/intel/fsp1_1/cache_as_ram.inc
index f56d841..6af30ce 100644
--- a/src/drivers/intel/fsp1_1/cache_as_ram.inc
+++ b/src/drivers/intel/fsp1_1/cache_as_ram.inc
@@ -33,24 +33,6 @@
#include <cpu/x86/post_code.h>
#include <cbmem.h>
-#ifndef CONFIG_FSP_LOC
-# error "CONFIG_FSP_LOC must be set."
-#endif
-
-#ifndef CONFIG_POST_IO
-# error "CONFIG_POST_IO must be set."
-#endif
-
-#if IS_ENABLED(CONFIG_POST_IO)
-# ifndef CONFIG_POST_IO_PORT
-# error "CONFIG_POST_IO_PORT must be set."
-# endif
-#endif
-
-#ifndef CONFIG_CPU_MICROCODE_CBFS_LOC
-# error "CONFIG_CPU_MICROCODE_CBFS_LOC must be set."
-#endif
-
#define LHLT_DELAY 0x50000 /* I/O delay between post codes on failure */
/*
diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c
index 51ddc67..e5624b3 100644
--- a/src/drivers/intel/fsp1_1/fsp_util.c
+++ b/src/drivers/intel/fsp1_1/fsp_util.c
@@ -38,10 +38,6 @@ FSP_INFO_HEADER *find_fsp(void)
} fsp_ptr;
u32 *image_id;
-#ifndef CONFIG_FSP_LOC
-#error "CONFIG_FSP_LOC must be set."
-#endif
-
for (;;) {
/* Get the FSP binary base address in CBFS */
fsp_ptr.u8 = (u8 *)CONFIG_FSP_LOC;
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 f98cc525e51a50c5741a552c1e8506b096795344
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 39e612d..613461b 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 && !MAINBOARD_DO_NATIVE_VGA_INIT && EXPERT
+ depends on PCI && !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 && EXPERT
+ depends on PCI
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 fada85e655879efc3774fc602987b078bc20fb41
Author: robbie zhang <robbie.zhang(a)intel.com>
Date: Tue Aug 25 16:13:53 2015 -0700
intel/kunimitsu: port the change from glados for correctly reading lid
switch and SPI write protect for fill_lb_gpios() to coreboot table.
BUG=chrome-os-partner:43707
BRANCH=none
TEST=build and boot on kunimits
Signed-off-by: robbie zhang <robbie.zhang(a)intel.com>
Change-Id: I82cd3f74d0ac26e369ee4274b2c65f4f93c1fd3b
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Original-Commit-Id: 804a8a60951321e1b5b1d7ddacb97ddbe0cd7680
Original-Change-Id: I31ed6c0e48089b84ef9d52753484253a091d5aa5
Original-Reviewed-on: https://chromium-review.googlesource.com/295580
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Original-Commit-Queue: Wenkai Du <wenkai.du(a)intel.com>
Original-Tested-by: Wenkai Du <wenkai.du(a)intel.com>
Reviewed-on: http://review.coreboot.org/11436
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/11436 for details.
-gerrit
the following patch was just integrated into master:
commit 302aeb7a4ee10897d42298726b85e2d0bb26e788
Author: Martin Roth <martinroth(a)chromium.org>
Date: Tue Aug 25 11:26:33 2015 -0600
google/glados: Remove unnecessary check for mainboard_ec_init()
mainboard_ec_init() wasn't getting run due to an invalid
Kconfig symbol. This check isn't required as the Kconfig
option for the EC is forced to be enabled, and the function
should always be run.
BRANCH=none
BUG=none
TEST=Rebuilt glados mainboard.
Change-Id: I2c4a33d80533a19b02b83b3aaa6a3386e927f1c7
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Original-Commit-Id: edd8c7a0666208b35ee81f57ec2626390958dfb7
Original-Change-Id: I2a92fd28347455c09ecf2119788ca9b6a97a11de
Original-Signed-off-by: Martin Roth <martinroth(a)chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/295143
Original-Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-on: http://review.coreboot.org/11435
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/11435 for details.
-gerrit
the following patch was just integrated into master:
commit c8dd59df9138dc2b4770865c76025bbdf76304ad
Author: robbie zhang <robbie.zhang(a)intel.com>
Date: Mon Aug 24 16:41:09 2015 -0700
intel/kunimitsu: port the change from glados for enabling reading
recovery mode.
BUG=chrome-os-partner:43683
BRANCH=none
TEST=build and boot on kunimits and successfully enter recovery mode
by pressing “Esc + refresh + Power” keys.
Change-Id: Id25b9f2195f1caaa8b46967b4b5d4abdab48d6cc
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Original-Commit-Id: 96b1c295448b412a5662afc729fdd37294d3cb61
Original-Change-Id: I9f650b28b0a86b631ffdfe6de5d58d18e48a0a22
Original-Signed-off-by: robbie zhang <robbie.zhang(a)intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/295138
Original-Tested-by: Wenkai Du <wenkai.du(a)intel.com>
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Reviewed-on: http://review.coreboot.org/11434
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
See http://review.coreboot.org/11434 for details.
-gerrit