[coreboot-gerrit] New patch to review for coreboot: 780326d Include board ID calculations only when necessary

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8720

-gerrit

commit 780326da20746ab13f962608428f4ba731294843
Author: Vadim Bendebury 
Date:   Mon Jul 28 16:08:34 2014 -0700

Include board ID calculations only when necessary

For the majority of Chrome OS boards there is no need to include board
    ID calculation in any stage but ramstage, where the ID should be
    available for inclusion into the coreboot table.

BUG=chrome-os-partner:30489
    TEST=build only, no other tests yet

Original-Change-Id: Ib9c06698a399d31e79a9b14143343ba2ad46d0fb
    Original-Signed-off-by: Vadim Bendebury 
    Original-Reviewed-on: https://chromium-review.googlesource.com/210117
    Original-Reviewed-by: Julius Werner 
    (cherry picked from commit 27dd40e85bfcd0a38f388bad4d79f5fbb77a7566)
    Signed-off-by: Marc Jones

Change-Id: I1451d52382bc48cc126d40267e0f61712f4a6d4b
---
 src/lib/Makefile.inc                         | 2 +-
 src/mainboard/google/nyan/Makefile.inc       | 1 +
 src/mainboard/google/nyan_big/Makefile.inc   | 2 +-
 src/mainboard/google/nyan_blaze/Makefile.inc | 2 +-
 src/mainboard/google/rush/Makefile.inc       | 4 ++--
 src/mainboard/google/rush_ryu/Makefile.inc   | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b3f3fbf..00a1ac9 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -81,7 +81,7 @@ ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c
 ramstage-y += memrange.c
 ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
 ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
-ramstage--${CONFIG_TERTIARY_BOARD_ID} += tristate_gpios.c
+ramstage-$(CONFIG_TERTIARY_BOARD_ID) += tristate_gpios.c

romstage-y += cbmem_common.c dynamic_cbmem.c
 ramstage-y += cbmem_common.c dynamic_cbmem.c
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc
index b66cd55..ace6e32 100644
--- a/src/mainboard/google/nyan/Makefile.inc
+++ b/src/mainboard/google/nyan/Makefile.inc
@@ -37,5 +37,6 @@ romstage-y += romstage.c
 romstage-y += sdram_configs.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c

+ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc
index b66cd55..59a1653 100644
--- a/src/mainboard/google/nyan_big/Makefile.inc
+++ b/src/mainboard/google/nyan_big/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:

subdirs-y += bct

-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -37,5 +36,6 @@ romstage-y += romstage.c
 romstage-y += sdram_configs.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c

+ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc
index dec8f64..2630dc5 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:

subdirs-y += bct

-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -40,5 +39,6 @@ romstage-y += romstage.c
 romstage-y += sdram_configs.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c

+ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/rush/Makefile.inc b/src/mainboard/google/rush/Makefile.inc
index e4520c1..ddf6660 100644
--- a/src/mainboard/google/rush/Makefile.inc
+++ b/src/mainboard/google/rush/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:

subdirs-y += bct

-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -38,6 +37,7 @@ romstage-y += sdram_configs.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 romstage-y += ec_dummy.c

+ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
-ramstage-y += ec_dummy.c
\ No newline at end of file
+ramstage-y += ec_dummy.c
diff --git a/src/mainboard/google/rush_ryu/Makefile.inc b/src/mainboard/google/rush_ryu/Makefile.inc
index 3c2b5da..9faba25 100644
--- a/src/mainboard/google/rush_ryu/Makefile.inc
+++ b/src/mainboard/google/rush_ryu/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:

subdirs-y += bct

-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -36,4 +35,5 @@ romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c

+ramstage-y += boardid.c
 ramstage-y += mainboard.c