Dave Frodin (dave.frodin(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8252
-gerrit
commit 797551cce7258e75c838f7df3fd16098f1d68e49
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Wed Jan 21 07:26:26 2015 -0700
southbridge/amd/pi: Clean up whitespace in Kconfig
Change-Id: I4dbccc7d132a14a71107f24124814d30d93d6ece
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
---
src/southbridge/amd/pi/hudson/Kconfig | 42 +++++++++++++++++------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index a924ace..c0ca85a 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -61,13 +61,13 @@ config HUDSON_IMC_FWM
bool "Add IMC firmware"
depends on !HUDSON_DISABLE_IMC
default y
- help
+ help
Add Hudson 2/3/4 IMC Firmware to support the onboard fan control
config HUDSON_GEC_FWM
bool
default n
- help
+ help
Add Hudson 2/3/4 GEC Firmware to support the onboard gigabit Ethernet MAC.
Must be connected to a Broadcom B50610 or B50610M PHY on the motherboard.
@@ -76,17 +76,17 @@ config HUDSON_PSP
default y if CPU_AMD_PI_00730F01
config HUDSON_XHCI_FWM_FILE
- string "XHCI firmware path and filename"
- default "3rdparty/southbridge/amd/avalon/xhci.bin" if SOUTHBRIDGE_AMD_PI_AVALON
+ string "XHCI firmware path and filename"
+ default "3rdparty/southbridge/amd/avalon/xhci.bin" if SOUTHBRIDGE_AMD_PI_AVALON
depends on HUDSON_XHCI_FWM
config HUDSON_IMC_FWM_FILE
- string "IMC firmware path and filename"
- default "3rdparty/southbridge/amd/avalon/imc.bin" if SOUTHBRIDGE_AMD_PI_AVALON
+ string "IMC firmware path and filename"
+ default "3rdparty/southbridge/amd/avalon/imc.bin" if SOUTHBRIDGE_AMD_PI_AVALON
depends on HUDSON_IMC_FWM
config HUDSON_GEC_FWM_FILE
- string "GEC firmware path and filename"
+ string "GEC firmware path and filename"
depends on HUDSON_GEC_FWM
config HUDSON_FWM
@@ -97,12 +97,12 @@ config HUDSON_FWM
if HUDSON_FWM
config HUDSON_FWM_POSITION
- hex "Hudson Firmware ROM Position"
- default 0xFFF20000 if BOARD_ROMSIZE_KB_1024
- default 0xFFE20000 if BOARD_ROMSIZE_KB_2048
- default 0xFFC20000 if BOARD_ROMSIZE_KB_4096
- default 0xFF820000 if BOARD_ROMSIZE_KB_8192
- default 0xFF020000 if BOARD_ROMSIZE_KB_16384
+ hex "Hudson Firmware ROM Position"
+ default 0xFFF20000 if BOARD_ROMSIZE_KB_1024
+ default 0xFFE20000 if BOARD_ROMSIZE_KB_2048
+ default 0xFFC20000 if BOARD_ROMSIZE_KB_4096
+ default 0xFF820000 if BOARD_ROMSIZE_KB_8192
+ default 0xFF020000 if BOARD_ROMSIZE_KB_16384
help
Hudson requires the firmware MUST be located at
a specific address (ROM start address + 0x20000), otherwise
@@ -118,14 +118,14 @@ config HUDSON_FWM_POSITION
endif # HUDSON_FWM
config AMD_PUBKEY_FILE
- depends on HUDSON_PSP
- string "AMD public Key"
- default "3rdparty/southbridge/amd/avalon/PSP/AmdPubKey.bin" if CPU_AMD_PI_00730F01
+ depends on HUDSON_PSP
+ string "AMD public Key"
+ default "3rdparty/southbridge/amd/avalon/PSP/AmdPubKey.bin" if CPU_AMD_PI_00730F01
config HUDSON_SATA_MODE
- int "SATA Mode"
- default 0
- range 0 6
+ int "SATA Mode"
+ default 0
+ range 0 6
help
Select the mode in which SATA should be driven. NATIVE AHCI, or RAID.
The default is NATIVE.
@@ -181,8 +181,8 @@ if HUDSON_SATA_MODE = 1
config RAID_ROM_ID
string "RAID device PCI IDs"
default "1022,7802"
- help
- 1022,7802 for SATA NON-RAID5 module, 1022,7803 for SATA RAID5 mode
+ help
+ 1022,7802 for SATA NON-RAID5 module, 1022,7803 for SATA RAID5 mode
config RAID_ROM_FILE
string "RAID ROM path and filename"
Dave Frodin (dave.frodin(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8253
-gerrit
commit 9f25a61c53071b3fef9d401f8d945caf29de6143
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Wed Jan 21 07:56:38 2015 -0700
southbridge/amd/pi: Rework the SATA config menu
This change creates a config variable for each of the
Hudson SATA modes to allow easier decoding of the
various mode. These changes will be needed later when
a hudson/bolton based board is added.
Change-Id: I0d6374bd5f3befeaf4cc6cc0d069112a7e71da15
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
---
src/southbridge/amd/pi/hudson/Kconfig | 91 +++++++++++++++++++++--------------
1 file changed, 54 insertions(+), 37 deletions(-)
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index 9d1010f..a7d666d 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -128,49 +128,66 @@ config AMD_PUBKEY_FILE
string "AMD public Key"
default "3rdparty/southbridge/amd/avalon/PSP/AmdPubKey.bin" if CPU_AMD_PI_00730F01
-config HUDSON_SATA_MODE
- int "SATA Mode"
- default 0
- range 0 6
+choice
+ prompt "SATA Mode"
+ default HUDSON_SATA_IDE
help
Select the mode in which SATA should be driven. NATIVE AHCI, or RAID.
The default is NATIVE.
- 0: NATIVE mode does not require a ROM.
- 1: RAID mode must have the two ROM files.
- 2: AHCI may work with or without AHCI ROM. It depends on the payload support.
- For example, seabios does not require the AHCI ROM.
- 3: LEGACY IDE
- 4: IDE to AHCI
- 5: AHCI7804: ROM Required, and AMD driver required in the OS.
- 6: IDE to AHCI7804: ROM Required, and AMD driver required in the OS.
-
-comment "NATIVE"
- depends on HUDSON_SATA_MODE = 0
-comment "RAID"
- depends on HUDSON_SATA_MODE = 1
+config HUDSON_SATA_IDE
+ bool "NATIVE"
+ help
+ NATIVE is the default mode and does not require a ROM.
-comment "AHCI"
- depends on HUDSON_SATA_MODE = 2
+config HUDSON_SATA_RAID
+ bool "RAID"
+ help
+ Hudson RAID mode must have the two required ROM files.
-comment "LEGACY IDE"
- depends on HUDSON_SATA_MODE = 3
+config HUDSON_SATA_AHCI
+ bool "AHCI"
+ help
+ AHCI may work with or without AHCI ROM. It depends on the payload support.
+ For example, seabios does not require the AHCI ROM.
-comment "IDE to AHCI"
- depends on HUDSON_SATA_MODE = 4
+config HUDSON_SATA_LEGACY_IDE
+ bool "LEGACY IDE"
+ help
+ TODO
-comment "AHCI7804"
- depends on HUDSON_SATA_MODE = 5
+config HUDSON_SATA_IDE2AHCI
+ bool "IDE to AHCI"
+ help
+ TODO
-comment "IDE to AHCI7804"
- depends on HUDSON_SATA_MODE = 6
+config HUDSON_SATA_AHCI7804
+ bool "AHCI7804"
+ help
+ AHCI ROM Required, and AMD driver required in the OS.
-if HUDSON_SATA_MODE = 2 || HUDSON_SATA_MODE = 5
+config HUDSON_SATA_IDE2AHCI7804
+ bool "IDE to AHCI7804"
+ help
+ AHCI ROM Required, and AMD driver required in the OS.
+endchoice
+config HUDSON_SATA_MODE
+ int
+ depends on (HUDSON_SATA_IDE || HUDSON_SATA_RAID || HUDSON_SATA_AHCI)
+ default "0" if HUDSON_SATA_IDE
+ default "1" if HUDSON_SATA_RAID
+ default "2" if HUDSON_SATA_AHCI
+ default "3" if HUDSON_SATA_LEGACY_IDE
+ default "4" if HUDSON_SATA_IDE2AHCI
+ default "5" if HUDSON_SATA_AHCI7804
+ default "6" if HUDSON_SATA_IDE2AHCI7804
+
+if HUDSON_SATA_AHCI || HUDSON_SATA_AHCI7804
config AHCI_ROM_ID
- string "AHCI device PCI IDs"
- default "1022,7801" if HUDSON_SATA_MODE = 2
- default "1022,7804" if HUDSON_SATA_MODE = 5
+ string "AHCI device PCI IDs"
+ default "1022,7801" if HUDSON_SATA_AHCI
+ default "1022,7804" if HUDSON_SATA_AHCI7804
config HUDSON_AHCI_ROM
bool "Add a AHCI ROM"
@@ -179,11 +196,9 @@ config AHCI_ROM_FILE
string "AHCI ROM path and filename"
depends on HUDSON_AHCI_ROM
default "src/southbridge/amd/pi/hudson/ahci.bin"
+endif # HUDSON_SATA_AHCI || HUDSON_SATA_AHCI7804
-endif
-
-if HUDSON_SATA_MODE = 1
-
+if HUDSON_SATA_RAID
config RAID_ROM_ID
string "RAID device PCI IDs"
default "1022,7802"
@@ -192,21 +207,23 @@ config RAID_ROM_ID
config RAID_ROM_FILE
string "RAID ROM path and filename"
+ depends on HUDSON_SATA_RAID
default "src/southbridge/amd/pi/hudson/raid.bin"
config RAID_MISC_ROM_FILE
string "RAID Misc ROM path and filename"
default "src/southbridge/amd/pi/hudson/misc.bin"
+ depends on HUDSON_SATA_RAID
config RAID_MISC_ROM_POSITION
hex "RAID Misc ROM Position"
default 0xFFF00000
+ depends on HUDSON_SATA_RAID
help
The RAID ROM requires that the MISC ROM is located between the range
0xFFF0_0000 to 0xFFF0_FFFF. Also, it must 1K bytes aligned.
The CONFIG_ROM_SIZE must be larger than 0x100000.
-
-endif
+endif # HUDSON_SATA_RAID
config HUDSON_LEGACY_FREE
bool "System is legacy free"
Dave Frodin (dave.frodin(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8250
-gerrit
commit cf283ab44881812308c5404069d80188b716472c
Author: Dave Frodin <dave.frodin(a)se-eng.com>
Date: Tue Jan 20 18:17:25 2015 -0700
northbridge/amd/pi: Correct the path to an #include
Change-Id: Ibf0bd494b2022272cb2d5c4ddb1bdf82ea70ca50
Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com>
---
src/northbridge/amd/pi/00730F01/dimmSpd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/northbridge/amd/pi/00730F01/dimmSpd.c b/src/northbridge/amd/pi/00730F01/dimmSpd.c
index 45a1b50..eaf961c 100644
--- a/src/northbridge/amd/pi/00730F01/dimmSpd.c
+++ b/src/northbridge/amd/pi/00730F01/dimmSpd.c
@@ -26,7 +26,7 @@
#include "amdlib.h"
#include "chip.h"
-#include "northbridge/amd/agesa/dimmSpd.h"
+#include "northbridge/amd/pi/dimmSpd.h"
#define DIMENSION(array)(sizeof (array)/ sizeof (array [0]))