[coreboot-gerrit] Change in coreboot[master]: mb/supermicro/x11ssh: simplify variant mechanism

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35443 )

Change subject: mb/supermicro/x11ssh: simplify variant mechanism
......................................................................

mb/supermicro/x11ssh: simplify variant mechanism

The concept of a "baseboard" does not really make sense for retrofit
coreboot ports. Also, correct the naming of some symbols and values.

Change-Id: If64debe0dda6b32886f5288a6fe918b47c9dcd34
Signed-off-by: Angel Pons 
---
M src/mainboard/supermicro/x11ssh/Kconfig
M src/mainboard/supermicro/x11ssh/Kconfig.name
2 files changed, 7 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/35443/1

diff --git a/src/mainboard/supermicro/x11ssh/Kconfig b/src/mainboard/supermicro/x11ssh/Kconfig
index 4f18a80..4c21986 100644
--- a/src/mainboard/supermicro/x11ssh/Kconfig
+++ b/src/mainboard/supermicro/x11ssh/Kconfig
@@ -1,4 +1,6 @@
-config BOARD_SUPERMICRO_BASEBOARD_X11SSH
+if BOARD_SUPERMICRO_X11SSH_TF
+
+config BOARD_SPECIFIC_OPTIONS
    def_bool n
    select BOARD_ROMSIZE_KB_16384
    select HAVE_ACPI_RESUME
@@ -12,8 +14,6 @@
    select GENERATE_SMBIOS_TABLES
    select IPMI_KCS

-if BOARD_SUPERMICRO_BASEBOARD_X11SSH
-
 config VBOOT
    select VBOOT_NO_BOARD_SUPPORT
    select GBB_FLAG_DISABLE_LID_SHUTDOWN
@@ -46,7 +46,7 @@

config VARIANT_DIR
    string
-	default "tf" if BOARD_SUPERMICRO_X11SSH_PLUS_TF
+	default "tf" if BOARD_SUPERMICRO_X11SSH_TF

config DEVICETREE
    string
@@ -54,7 +54,7 @@

config MAINBOARD_PART_NUMBER
    string
-	default "X11SSH-TF" if BOARD_SUPERMICRO_X11SSH_PLUS_TF
+	default "X11SSH-TF" if BOARD_SUPERMICRO_X11SSH_TF

config MAX_CPUS
    int
diff --git a/src/mainboard/supermicro/x11ssh/Kconfig.name b/src/mainboard/supermicro/x11ssh/Kconfig.name
index a9b351b..fe3bf71 100644
--- a/src/mainboard/supermicro/x11ssh/Kconfig.name
+++ b/src/mainboard/supermicro/x11ssh/Kconfig.name
@@ -1,3 +1,2 @@
-config BOARD_SUPERMICRO_X11SSH_PLUS_TF
-	bool "X11SSH+-TF"
-	select BOARD_SUPERMICRO_BASEBOARD_X11SSH
+config BOARD_SUPERMICRO_X11SSH_TF
+	bool "X11SSH-TF"