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/11379
-gerrit
commit 3fb4c8c36123ee89000c96353899d98cba1200e1
Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Date: Wed Aug 26 23:04:34 2015 -0700
packardbell/ms2290/mainboard.c: Do not guard int15 includes
Do not guard the inclusion of "drivers/intel/gma/int15.h"
and "arch/interrupt.h" with configs that control option rom execution.
These headers already have the proper guards. The
install_intel_vga_int15_handler() is unconditionally called, even when
the header that declares it is guarded out.
Change-Id: Ia273437486f5802aa2b53212f2a1b5704c9485fa
Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
---
src/mainboard/packardbell/ms2290/mainboard.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 5a4882f..bddc8a8 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -34,10 +34,8 @@
#include <pc80/mc146818rtc.h>
#include <arch/x86/include/arch/acpigen.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
#include <drivers/intel/gma/int15.h>
#include <arch/interrupt.h>
-#endif
#include <pc80/keyboard.h>
#include <cpu/x86/lapic.h>
#include <device/pci.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 e7d8bd1d91cb6577b9fca63f2e234b30c781198d
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 | 4 ++--
src/northbridge/amd/amdfam10/Kconfig | 2 +-
src/northbridge/amd/amdht/h3finit.c | 4 ++--
5 files changed, 5 insertions(+), 17 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..3bee877 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.
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;
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 e159e8b8521fd0307a81b2a668167995cdf8a4b7
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 | 4 ++--
src/northbridge/amd/amdfam10/Kconfig | 2 +-
src/northbridge/amd/amdht/h3finit.c | 4 ++--
5 files changed, 5 insertions(+), 17 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..3bee877 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.
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;
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11378
-gerrit
commit 166fe38f8083e2974f2564f6e9906303a1c8d1f7
Author: zbao <fishbaozi(a)gmail.com>
Date: Wed Aug 26 22:29:07 2015 -0400
AMD Bettong: Add usb device into devicetree.
Change-Id: Ieeca06c68fe8c8eef6be4fab43193b898aebf013
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
src/include/device/pci_ids.h | 1 +
src/mainboard/amd/bettong/devicetree.cb | 4 +---
src/southbridge/amd/pi/hudson/usb.c | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 5ba183b..dcb8a42 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -434,6 +434,7 @@
#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI 0x7901
#define PCI_DEVICE_ID_AMD_CZ_USB_0 0x7907
#define PCI_DEVICE_ID_AMD_CZ_USB_1 0x7908
+#define PCI_DEVICE_ID_AMD_CZ_USB3_0 0x7914
#define PCI_VENDOR_ID_VLSI 0x1004
#define PCI_DEVICE_ID_VLSI_82C592 0x0005
diff --git a/src/mainboard/amd/bettong/devicetree.cb b/src/mainboard/amd/bettong/devicetree.cb
index 90b0324..41a5655 100644
--- a/src/mainboard/amd/bettong/devicetree.cb
+++ b/src/mainboard/amd/bettong/devicetree.cb
@@ -44,11 +44,9 @@ chip northbridge/amd/pi/00660F01/root_complex
chip southbridge/amd/pi/hudson # it is under NB/SB Link, but on the same pci bus
device pci 9.0 on end # HDA
device pci 9.2 on end # HDA
+ device pci 10.0 on end # USB
device pci 11.0 on end # SATA
device pci 12.0 on end # USB
-# device pci 12.2 on end # USB
- device pci 13.0 on end # USB
-# device pci 13.2 on end # USB
device pci 14.0 on # SM
chip drivers/generic/generic #dimm 0-0-0
device i2c 50 on end
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index f686521..ef8f675 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -49,6 +49,7 @@ static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_ATI_SB900_USB_20_5,
PCI_DEVICE_ID_AMD_CZ_USB_0,
PCI_DEVICE_ID_AMD_CZ_USB_1,
+ PCI_DEVICE_ID_AMD_CZ_USB3_0,
0
};
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11377
-gerrit
commit dfcf1a2b793a56eee1eeef158ea0d062fbe140b0
Author: zbao <fishbaozi(a)gmail.com>
Date: Wed Aug 26 03:37:40 2015 -0400
AMD Bettong: Set the USB3 port as unremoveable.
Without this change, if one USB3 device is attached when
the board is power up, the USB3 port can not be used.
Change-Id: I98628975000c7d56b1540c2b321d580ace1ef70e
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
src/mainboard/amd/bettong/BiosCallOuts.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c
index 0311baa..ad8dc40 100644
--- a/src/mainboard/amd/bettong/BiosCallOuts.c
+++ b/src/mainboard/amd/bettong/BiosCallOuts.c
@@ -87,6 +87,7 @@ AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
FchParams_env->Usb.Xhci0Enable = FALSE;
#endif
FchParams_env->Usb.Xhci1Enable = FALSE;
+ FchParams_env->Usb.USB30PortInit = 8; /* 8: If USB3 port is unremoveable. */
/* sata configuration */
}
Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11376
-gerrit
commit 0eeb5d91ba492400ec46925b0a6ff49b5185ab9f
Author: zbao <fishbaozi(a)gmail.com>
Date: Mon Aug 24 00:24:51 2015 -0400
AMD Bettong: Lower the TOM to give more MMIO space
Change-Id: Idf28faa26a7ea5e94495af5ff027309df444766e
Signed-off-by: Zheng Bao <zheng.bao(a)amd.com>
Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com>
---
src/northbridge/amd/pi/agesawrapper.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c
index 255b31d..9bdf340 100644
--- a/src/northbridge/amd/pi/agesawrapper.c
+++ b/src/northbridge/amd/pi/agesawrapper.c
@@ -140,6 +140,7 @@ AGESA_STATUS agesawrapper_amdinitpost(void)
// the compiler to flag the error if CONFIG_GFXUMA is not set.
PostParams->MemConfig.UmaMode = CONFIG_GFXUMA ? UMA_AUTO : UMA_NONE;
PostParams->MemConfig.UmaSize = 0;
+ PostParams->MemConfig.BottomIo = (UINT16)(0xD0000000 >> 24);
status = AmdInitPost (PostParams);
printk(
BIOS_SPEW,