Change in coreboot[master]: mb/lippert: Put files under variants/

[Angel Pons (Code Review)]

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

Change subject: mb/lippert: Put files under variants/
......................................................................

mb/lippert: Put files under variants/

This isn't reproducible for some reason.

Change-Id: I507229be71ac2c589c7ecd81495d38ce363d26a7
Signed-off-by: Angel Pons 
---
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, 8 insertions(+), 23 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/43275/1

diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index b77d23c..7362c75 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -32,8 +32,8 @@

config DEVICETREE
    string
-	default "devicetree-fr.cb" if BOARD_LIPPERT_FRONTRUNNER_AF
-	default "devicetree-tc.cb" if BOARD_LIPPERT_TOUCAN_AF
+	default "variants/frontrunner-af/devicetree.cb" if BOARD_LIPPERT_FRONTRUNNER_AF
+	default "variants/toucan-af/devicetree.cb"      if BOARD_LIPPERT_TOUCAN_AF

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

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/43275

to look at the new patch set (#2).

Change subject: mb/lippert: Put files under variants/
......................................................................

mb/lippert: Put files under variants/

This isn't reproducible for some reason.

Change-Id: I507229be71ac2c589c7ecd81495d38ce363d26a7
Signed-off-by: Angel Pons 
---
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, 8 insertions(+), 23 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/43275/2

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/43275

to look at the new patch set (#3).

Change subject: mb/lippert: Put files under variants/
......................................................................

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 
---
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(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/43275/3

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43275 )

Change subject: mb/lippert: Put files under variants/
......................................................................

Patch Set 4: Code-Review+2

is there any benefit in doing this in a separate commit while you're moving/renaming those files anyways in the parent?

[Angel Pons (Code Review)]

Angel Pons has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/43275 )

Change subject: mb/lippert: Put files under variants/
......................................................................

Abandoned

[Angel Pons (Code Review)]

Angel Pons has restored this change. ( https://review.coreboot.org/c/coreboot/+/43275 )

Change subject: mb/lippert: Put files under variants/
......................................................................

Restored

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43275 )

Change subject: mb/lippert: Put files under variants/
......................................................................

Patch Set 6:

I've done some research on the differing binaries "problem". The ramstage and romstage binaries differ in linking order. The reason for that is linking in alphabetically sorted order, where the paths ".../variants/..." get sorted to the end, so the call becomse `i386-elf-ld.bfd ... buildOpts.o sema.o BiosCallOuts.o OemCustomize.o ...` instead of `i386-elf-ld.bfd ... BiosCallOuts-fr.o OemCustomize-fr.o buildOpts.o sema.o  ...` now, resulting in a differently-ordered binary.

TL;DR +2

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43275 )

Change subject: mb/lippert: Put files under variants/
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43275
Reviewed-by: Michael Niewöhner
Tested-by: build bot (Jenkins) 
---
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(-)

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

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