[coreboot-gerrit] Change in coreboot[master]: Drop 'NON_AGESA' from Kconfig names
Adurb Akhbar (Code Review)
gerrit at coreboot.org
Sun Mar 19 20:47:14 CET 2017
Adurb Akhbar has uploaded a new change for review. ( https://review.coreboot.org/18916 )
Change subject: Drop 'NON_AGESA' from Kconfig names
......................................................................
Drop 'NON_AGESA' from Kconfig names
Since AGESA support was removed, this naming is redundant.
Change-Id: Iec13d59d804994578c2b98780e10740187b0eba1
Signed-off-by: Adurb Akhbar <aakhbar at mail.com>
---
M src/cpu/amd/Makefile.inc
M src/cpu/amd/family_10h-family_15h/Kconfig
M src/cpu/amd/socket_C32/Kconfig
M src/cpu/amd/socket_FM2/Kconfig
M src/cpu/amd/socket_G34/Kconfig
M src/mainboard/asus/kcma-d8/Kconfig
M src/mainboard/asus/kgpe-d16/Kconfig
M src/mainboard/supermicro/h8scm_fam10/Kconfig
M src/northbridge/amd/amdfam10/northbridge.c
M util/board_status/to-wiki/towiki.sh
10 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/18916/1
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index 3cb0e56..afbbdf2 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -7,9 +7,9 @@
subdirs-$(CONFIG_CPU_AMD_SOCKET_AM2R2) += socket_AM2r2
subdirs-$(CONFIG_CPU_AMD_SOCKET_AM3) += socket_AM3
subdirs-$(CONFIG_CPU_AMD_SOCKET_ASB2) += socket_ASB2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_C32_NON_AGESA) += socket_C32
-subdirs-$(CONFIG_CPU_AMD_SOCKET_FM2_NON_AGESA) += socket_FM2
-subdirs-$(CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA) += socket_G34
+subdirs-$(CONFIG_CPU_AMD_SOCKET_C32) += socket_C32
+subdirs-$(CONFIG_CPU_AMD_SOCKET_FM2) += socket_FM2
+subdirs-$(CONFIG_CPU_AMD_SOCKET_G34) += socket_G34
subdirs-$(CONFIG_CPU_AMD_GEODE_GX2) += geode_gx2
subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
subdirs-$(CONFIG_CPU_AMD_SOCKET_S1G1) += socket_S1G1
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index 8e90247..c648ef2 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -17,9 +17,9 @@
config USE_LARGE_DCACHE
bool
- default y if CPU_AMD_SOCKET_G34_NON_AGESA
- default y if CPU_AMD_SOCKET_FM2_NON_AGESA
- default y if CPU_AMD_SOCKET_C32_NON_AGESA
+ default y if CPU_AMD_SOCKET_G34
+ default y if CPU_AMD_SOCKET_FM2
+ default y if CPU_AMD_SOCKET_C32
default n
config NUM_IPI_STARTS
diff --git a/src/cpu/amd/socket_C32/Kconfig b/src/cpu/amd/socket_C32/Kconfig
index 65d1cbb..89e5fc4 100644
--- a/src/cpu/amd/socket_C32/Kconfig
+++ b/src/cpu/amd/socket_C32/Kconfig
@@ -1,10 +1,10 @@
-config CPU_AMD_SOCKET_C32_NON_AGESA
+config CPU_AMD_SOCKET_C32
bool
select CPU_AMD_MODEL_10XXX
select PCI_IO_CFG_EXT
select X86_AMD_FIXED_MTRRS
-if CPU_AMD_SOCKET_C32_NON_AGESA
+if CPU_AMD_SOCKET_C32
config CPU_SOCKET_TYPE
hex
diff --git a/src/cpu/amd/socket_FM2/Kconfig b/src/cpu/amd/socket_FM2/Kconfig
index a87694a..4c1f8c4 100644
--- a/src/cpu/amd/socket_FM2/Kconfig
+++ b/src/cpu/amd/socket_FM2/Kconfig
@@ -1,10 +1,10 @@
-config CPU_AMD_SOCKET_FM2_NON_AGESA
+config CPU_AMD_SOCKET_FM2
bool
select CPU_AMD_MODEL_10XXX
select PCI_IO_CFG_EXT
select X86_AMD_FIXED_MTRRS
-if CPU_AMD_SOCKET_FM2_NON_AGESA
+if CPU_AMD_SOCKET_FM2
config CPU_SOCKET_TYPE
hex
diff --git a/src/cpu/amd/socket_G34/Kconfig b/src/cpu/amd/socket_G34/Kconfig
index abc9726..b064e79 100644
--- a/src/cpu/amd/socket_G34/Kconfig
+++ b/src/cpu/amd/socket_G34/Kconfig
@@ -1,10 +1,10 @@
-config CPU_AMD_SOCKET_G34_NON_AGESA
+config CPU_AMD_SOCKET_G34
bool
select CPU_AMD_MODEL_10XXX
select PCI_IO_CFG_EXT
select X86_AMD_FIXED_MTRRS
-if CPU_AMD_SOCKET_G34_NON_AGESA
+if CPU_AMD_SOCKET_G34
config CPU_SOCKET_TYPE
hex
diff --git a/src/mainboard/asus/kcma-d8/Kconfig b/src/mainboard/asus/kcma-d8/Kconfig
index 6d2e13f..21a2aad 100644
--- a/src/mainboard/asus/kcma-d8/Kconfig
+++ b/src/mainboard/asus/kcma-d8/Kconfig
@@ -2,7 +2,7 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
- select CPU_AMD_SOCKET_C32_NON_AGESA
+ select CPU_AMD_SOCKET_C32
select DIMM_DDR3
select DIMM_REGISTERED
# select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/asus/kgpe-d16/Kconfig b/src/mainboard/asus/kgpe-d16/Kconfig
index 8e7a105..34a00b7 100644
--- a/src/mainboard/asus/kgpe-d16/Kconfig
+++ b/src/mainboard/asus/kgpe-d16/Kconfig
@@ -2,7 +2,7 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
- select CPU_AMD_SOCKET_G34_NON_AGESA
+ select CPU_AMD_SOCKET_G34
select DIMM_DDR3
select DIMM_REGISTERED
# select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 0673390..12a4eda 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -2,7 +2,7 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
- select CPU_AMD_SOCKET_C32_NON_AGESA
+ select CPU_AMD_SOCKET_C32
select DIMM_DDR3
select DIMM_REGISTERED
select NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index c23f04f..640e58b 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -320,7 +320,7 @@
{
struct bus *link;
-#if CONFIG_CPU_AMD_SOCKET_G34_NON_AGESA
+#if CONFIG_CPU_AMD_SOCKET_G34
if (is_fam15h()) {
uint8_t current_link_number = 0;
diff --git a/util/board_status/to-wiki/towiki.sh b/util/board_status/to-wiki/towiki.sh
index 7589c07..ec3892a 100755
--- a/util/board_status/to-wiki/towiki.sh
+++ b/util/board_status/to-wiki/towiki.sh
@@ -243,10 +243,10 @@
AMD_SOCKET_S1G1)
cpu_nice="AMD Turion™ / X2 Sempron™";
socket_nice="Socket S1G1";;
- AMD_SOCKET_G34|AMD_SOCKET_G34_NON_AGESA)
+ AMD_SOCKET_G34|AMD_SOCKET_G34)
cpu_nice="AMD Opteron™ Magny-Cours/Interlagos";
socket_nice="Socket G34";;
- AMD_SOCKET_C32|AMD_SOCKET_C32_NON_AGESA)
+ AMD_SOCKET_C32|AMD_SOCKET_C32)
cpu_nice="AMD Opteron™ Magny-Cours/Interlagos";
socket_nice="Socket C32";;
AMD_SOCKET_AM2)
--
To view, visit https://review.coreboot.org/18916
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec13d59d804994578c2b98780e10740187b0eba1
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Adurb Akhbar
More information about the coreboot-gerrit
mailing list