[coreboot-gerrit] New patch to review for coreboot: a658e54 AMD: Kconfig cleanup
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Tue Jun 11 17:00:49 CEST 2013
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3433
-gerrit
commit a658e5465976c24d102137c84d757eeba35e5e54
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Jun 11 16:30:48 2013 +0300
AMD: Kconfig cleanup
Change-Id: I21182eae1d389790c330f27e6a830d91c3ee4eb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/northbridge/amd/agesa/family12/Kconfig | 10 +++-------
src/northbridge/amd/amdfam10/Kconfig | 4 ++--
src/northbridge/amd/cimx/rd890/Kconfig | 5 ++++-
src/northbridge/amd/gx2/Kconfig | 5 +++--
src/southbridge/amd/agesa/hudson/Kconfig | 11 ++++-------
src/southbridge/amd/sb800/Kconfig | 10 ++++++----
6 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/northbridge/amd/agesa/family12/Kconfig b/src/northbridge/amd/agesa/family12/Kconfig
index c5387e6..d51fbdd 100755
--- a/src/northbridge/amd/agesa/family12/Kconfig
+++ b/src/northbridge/amd/agesa/family12/Kconfig
@@ -24,40 +24,35 @@ config NORTHBRIDGE_AMD_AGESA_FAMILY12
select MMCONF_SUPPORT
select NORTHBRIDGE_AMD_AGESA_FAMILY12_ROOT_COMPLEX
+if NORTHBRIDGE_AMD_AGESA_FAMILY12
+
config HT3_SUPPORT
bool
default y
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config HW_MEM_HOLE_SIZEK
hex
default 0x100000
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config HW_MEM_HOLE_SIZE_AUTO_INC
bool
default n
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config MMCONF_BASE_ADDRESS
hex
default 0xe0000000
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config MMCONF_BUS_NUMBER
int
default 256
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config DIMM_DDR3
bool
default n
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
config DIMM_REGISTERED
bool
default n
- depends on NORTHBRIDGE_AMD_AGESA_FAMILY12
if !DIMM_REGISTERED
config DIMM_SUPPORT
@@ -73,3 +68,4 @@ if DIMM_DDR3
endif
endif
+endif # NORTHBRIDGE_AMD_AGESA_FAMILY_12
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index 000dd11..b61be28 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -110,14 +110,14 @@ if DIMM_DDR3
default 0x0005
endif
endif
-endif
config SVI_HIGH_FREQ
bool
default n
- depends on NORTHBRIDGE_AMD_AMDFAM10
help
Select this for boards with a Voltage Regulator able to operate
at 3.4 MHz in SVI mode. Ignored unless the AMD CPU is rev C3.
+endif # NORTHBRIDGE_AMD_AMDFAM10
+
source src/northbridge/amd/amdfam10/root_complex/Kconfig
diff --git a/src/northbridge/amd/cimx/rd890/Kconfig b/src/northbridge/amd/cimx/rd890/Kconfig
index 6731b60..9642416 100644
--- a/src/northbridge/amd/cimx/rd890/Kconfig
+++ b/src/northbridge/amd/cimx/rd890/Kconfig
@@ -22,12 +22,15 @@ config NORTHBRIDGE_AMD_CIMX_RD890
default n
select AMD_NB_CIMX
+if NORTHBRIDGE_AMD_CIMX_RD890
+
config REDIRECT_NBCIMX_TRACE_TO_SERIAL
bool "Redirect AMD Northbridge CIMX Trace to serial console"
default n
- depends on NORTHBRIDGE_AMD_CIMX_RD890
help
This Option allows you to redirect the AMD Northbridge CIMX
Trace debug information to the serial console.
Warning: Only enable this option when debuging or tracing AMD CIMX code.
+
+endif # NORTHBRIDGE_AMD_CIMX_RD890
diff --git a/src/northbridge/amd/gx2/Kconfig b/src/northbridge/amd/gx2/Kconfig
index 9ea5440..dc347c4 100644
--- a/src/northbridge/amd/gx2/Kconfig
+++ b/src/northbridge/amd/gx2/Kconfig
@@ -21,10 +21,11 @@ config NORTHBRIDGE_AMD_GX2
bool
select GEODE_VSA
+if NORTHBRIDGE_AMD_GX2
+
choice
prompt "Framebuffer size"
default GX2_VIDEO_MB_8MB
- depends on NORTHBRIDGE_AMD_GX2
config GX2_VIDEO_MB_4MB
bool "4MB"
@@ -55,7 +56,6 @@ config VIDEO_MB
default 128 if GX2_VIDEO_MB_128MB
default 256 if GX2_VIDEO_MB_256MB
default -1 if GX2_VIDEO_MB_CMOS
- depends on NORTHBRIDGE_AMD_GX2
# The GX2_PROCESSOR_MHZ options let you chose the correct GX2 processor
# speed in the mainboard's Kconfig file.
@@ -73,3 +73,4 @@ config GX2_PROCESSOR_MHZ
default 366 if GX2_PROCESSOR_MHZ_366
default 400 if GX2_PROCESSOR_MHZ_400
+endif # NORTHBRIDGE_AMD_GX2
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 3e58563..7aa3405 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -22,26 +22,23 @@ config SOUTHBRIDGE_AMD_AGESA_HUDSON
select IOAPIC
select HAVE_USBDEBUG
+if SOUTHBRIDGE_AMD_AGESA_HUDSON
+
config BOOTBLOCK_SOUTHBRIDGE_INIT
string
default "southbridge/amd/agesa/hudson/bootblock.c"
- depends on SOUTHBRIDGE_AMD_AGESA_HUDSON
config SOUTHBRIDGE_AMD_HUDSON_SKIP_ISA_DMA_INIT
bool
default n
- depends on SOUTHBRIDGE_AMD_AGESA_HUDSON
config EHCI_BAR
hex
- default 0xfef00000 if SOUTHBRIDGE_AMD_AGESA_HUDSON
+ default 0xfef00000
config EHCI_DEBUG_OFFSET
hex
- default 0xe0 if SOUTHBRIDGE_AMD_AGESA_HUDSON
-
-
-if SOUTHBRIDGE_AMD_AGESA_HUDSON
+ default 0xe0
config HUDSON_XHCI_FWM
bool "Add xhci firmware"
diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig
index 4d0e7f6..4708f1f 100644
--- a/src/southbridge/amd/sb800/Kconfig
+++ b/src/southbridge/amd/sb800/Kconfig
@@ -23,20 +23,22 @@ config SOUTHBRIDGE_AMD_SB800
select HAVE_USBDEBUG
select HAVE_HARD_RESET
+if SOUTHBRIDGE_AMD_SB800
+
config BOOTBLOCK_SOUTHBRIDGE_INIT
string
default "southbridge/amd/sb800/bootblock.c"
- depends on SOUTHBRIDGE_AMD_SB800
config SOUTHBRIDGE_AMD_SB800_SKIP_ISA_DMA_INIT
bool
default n
- depends on SOUTHBRIDGE_AMD_SB800
config EHCI_BAR
hex
- default 0xfef00000 if SOUTHBRIDGE_AMD_SB800
+ default 0xfef00000
config EHCI_DEBUG_OFFSET
hex
- default 0xe0 if SOUTHBRIDGE_AMD_SB800
+ default 0xe0
+
+endif # SOUTHBRIDGE_AMD_SB800
More information about the coreboot-gerrit
mailing list