Angel Pons submitted this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  Michael Niewöhner: Looks good to me, approved

mb/lippert: Put files under variants/

This isn't reproducible for some reason, but it is relatively simple.

Change-Id: I507229be71ac2c589c7ecd81495d38ce363d26a7
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43275
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/lippert/frontrunner-af/Kconfig
M src/mainboard/lippert/frontrunner-af/Makefile.inc
R src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/BiosCallOuts.c
R src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/OemCustomize.c
R src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/bootblock.c
R src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/devicetree.cb
R src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/mainboard.c
R src/mainboard/lippert/frontrunner-af/variants/toucan-af/BiosCallOuts.c
R src/mainboard/lippert/frontrunner-af/variants/toucan-af/OemCustomize.c
R src/mainboard/lippert/frontrunner-af/variants/toucan-af/bootblock.c
R src/mainboard/lippert/frontrunner-af/variants/toucan-af/devicetree.cb
R src/mainboard/lippert/frontrunner-af/variants/toucan-af/mainboard.c
12 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 5b21140..55157ed 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -32,8 +32,7 @@
 
 config DEVICETREE
 	string
-	default "devicetree-fr.cb" if BOARD_LIPPERT_FRONTRUNNER_AF
-	default "devicetree-tc.cb" if BOARD_LIPPERT_TOUCAN_AF
+	default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lippert/frontrunner-af/Makefile.inc b/src/mainboard/lippert/frontrunner-af/Makefile.inc
index c09a8ed..b05b4e8 100644
--- a/src/mainboard/lippert/frontrunner-af/Makefile.inc
+++ b/src/mainboard/lippert/frontrunner-af/Makefile.inc
@@ -7,31 +7,16 @@
 pci$(stripped_ahcibios_id).rom-type := optionrom
 endif
 
-ifeq ($(CONFIG_BOARD_LIPPERT_FRONTRUNNER_AF),y)
-bootblock-y += bootblock-fr.c
-else ifeq ($(CONFIG_BOARD_LIPPERT_TOUCAN_AF),y)
-bootblock-y += bootblock-tc.c
-endif
+bootblock-y += variants/$(VARIANT_DIR)/bootblock.c
 
 romstage-y += buildOpts.c
-ifeq ($(CONFIG_BOARD_LIPPERT_FRONTRUNNER_AF),y)
-romstage-y += BiosCallOuts-fr.c
-romstage-y += OemCustomize-fr.c
-else ifeq ($(CONFIG_BOARD_LIPPERT_TOUCAN_AF),y)
-romstage-y += BiosCallOuts-tc.c
-romstage-y += OemCustomize-tc.c
-endif
+romstage-y += variants/$(VARIANT_DIR)/BiosCallOuts.c
+romstage-y += variants/$(VARIANT_DIR)/OemCustomize.c
 
 ramstage-y += buildOpts.c
-ifeq ($(CONFIG_BOARD_LIPPERT_FRONTRUNNER_AF),y)
-ramstage-y += BiosCallOuts-fr.c
-ramstage-y += OemCustomize-fr.c
-ramstage-y += mainboard-fr.c
-else ifeq ($(CONFIG_BOARD_LIPPERT_TOUCAN_AF),y)
-ramstage-y += BiosCallOuts-tc.c
-ramstage-y += OemCustomize-tc.c
-ramstage-y += mainboard-tc.c
-endif
+ramstage-y += variants/$(VARIANT_DIR)/BiosCallOuts.c
+ramstage-y += variants/$(VARIANT_DIR)/OemCustomize.c
+ramstage-y += variants/$(VARIANT_DIR)/mainboard.c
 
 # Minimal SEMA watchdog support
 romstage-y += sema.c
diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts-fr.c b/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/BiosCallOuts.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/BiosCallOuts-fr.c
rename to src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/BiosCallOuts.c
diff --git a/src/mainboard/lippert/frontrunner-af/OemCustomize-fr.c b/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/OemCustomize.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/OemCustomize-fr.c
rename to src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/OemCustomize.c
diff --git a/src/mainboard/lippert/frontrunner-af/bootblock-fr.c b/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/bootblock.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/bootblock-fr.c
rename to src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/bootblock.c
diff --git a/src/mainboard/lippert/frontrunner-af/devicetree-fr.cb b/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/devicetree.cb
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/devicetree-fr.cb
rename to src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/devicetree.cb
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard-fr.c b/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/mainboard.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/mainboard-fr.c
rename to src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/mainboard.c
diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts-tc.c b/src/mainboard/lippert/frontrunner-af/variants/toucan-af/BiosCallOuts.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/BiosCallOuts-tc.c
rename to src/mainboard/lippert/frontrunner-af/variants/toucan-af/BiosCallOuts.c
diff --git a/src/mainboard/lippert/frontrunner-af/OemCustomize-tc.c b/src/mainboard/lippert/frontrunner-af/variants/toucan-af/OemCustomize.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/OemCustomize-tc.c
rename to src/mainboard/lippert/frontrunner-af/variants/toucan-af/OemCustomize.c
diff --git a/src/mainboard/lippert/frontrunner-af/bootblock-tc.c b/src/mainboard/lippert/frontrunner-af/variants/toucan-af/bootblock.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/bootblock-tc.c
rename to src/mainboard/lippert/frontrunner-af/variants/toucan-af/bootblock.c
diff --git a/src/mainboard/lippert/frontrunner-af/devicetree-tc.cb b/src/mainboard/lippert/frontrunner-af/variants/toucan-af/devicetree.cb
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/devicetree-tc.cb
rename to src/mainboard/lippert/frontrunner-af/variants/toucan-af/devicetree.cb
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard-tc.c b/src/mainboard/lippert/frontrunner-af/variants/toucan-af/mainboard.c
similarity index 100%
rename from src/mainboard/lippert/frontrunner-af/mainboard-tc.c
rename to src/mainboard/lippert/frontrunner-af/variants/toucan-af/mainboard.c

To view, visit change 43275. To unsubscribe, or for help writing mail filters, visit settings.