From 5e1a2d3fca7a2add14023a905b8cfb4402c0d0ea Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Mon, 28 Jul 2014 16:08:34 -0700 Subject: [PATCH] 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 Change-Id: I1451d52382bc48cc126d40267e0f61712f4a6d4b 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 Reviewed-on: http://review.coreboot.org/8720 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- 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 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc index b66cd555fb..ace6e32c0a 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 b66cd555fb..59a165336e 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 dec8f64803..2630dc5327 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 e4520c1750..ddf6660a66 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 3c2b5da30f..9faba250d4 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