diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-03 13:29:06 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-08 16:26:58 +0200 |
commit | 5c4b8483d2de976cb3957cc9ea23086041ed9625 (patch) | |
tree | 9c180b27b1c49639ce5f0545f28890e7c0b07a70 /src/mainboard | |
parent | ab7280970a96eb5a604a37ffd913355a1f40fb88 (diff) | |
download | coreboot-staging-5c4b8483d2de976cb3957cc9ea23086041ed9625.zip coreboot-staging-5c4b8483d2de976cb3957cc9ea23086041ed9625.tar.gz |
ChromeOS boards: Always build code for bootmode straps
Leave it under BOOTMODE_STRAPS to control whether these have
any functional meaning on the build.
Change-Id: Ieb59aa7ab4b1e8da6a1002e7a8e5462eb7988d35
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5643
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/google/bolt/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/butterfly/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/falco/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/link/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/parrot/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/peppy/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/rambi/Makefile.inc | 6 | ||||
-rw-r--r-- | src/mainboard/google/slippy/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/google/stout/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/intel/baskingridge/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/intel/emeraldlake2/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/intel/wtm2/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/samsung/lumpy/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/samsung/lumpy/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/samsung/stumpy/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/samsung/stumpy/romstage.c | 2 |
16 files changed, 29 insertions, 33 deletions
diff --git a/src/mainboard/google/bolt/Makefile.inc b/src/mainboard/google/bolt/Makefile.inc index 4e71be7..e30d0ae 100644 --- a/src/mainboard/google/bolt/Makefile.inc +++ b/src/mainboard/google/bolt/Makefile.inc @@ -19,8 +19,8 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc index 5b4e74c..f735e9c 100644 --- a/src/mainboard/google/butterfly/Makefile.inc +++ b/src/mainboard/google/butterfly/Makefile.inc @@ -19,7 +19,7 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc index 3269d2d..b9a1e04 100644 --- a/src/mainboard/google/falco/Makefile.inc +++ b/src/mainboard/google/falco/Makefile.inc @@ -19,8 +19,8 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc index ba9a5aa..b8899e3 100644 --- a/src/mainboard/google/link/Makefile.inc +++ b/src/mainboard/google/link/Makefile.inc @@ -19,8 +19,8 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += i915.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += i915io.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc index 5ad5454..2275bec 100644 --- a/src/mainboard/google/parrot/Makefile.inc +++ b/src/mainboard/google/parrot/Makefile.inc @@ -19,5 +19,5 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc index 7f8cae3..21c4c96 100644 --- a/src/mainboard/google/peppy/Makefile.inc +++ b/src/mainboard/google/peppy/Makefile.inc @@ -19,8 +19,8 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc index 1b15ad7..572baaa 100644 --- a/src/mainboard/google/rambi/Makefile.inc +++ b/src/mainboard/google/rambi/Makefile.inc @@ -19,9 +19,9 @@ subdirs-y += spd -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += gpio.c +romstage-y += chromeos.c +ramstage-y += chromeos.c +ramstage-y += gpio.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-y += irqroute.c diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc index 7a62022..9e3c310 100644 --- a/src/mainboard/google/slippy/Makefile.inc +++ b/src/mainboard/google/slippy/Makefile.inc @@ -19,8 +19,8 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += gma.c i915io.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc index 2ebf74b..4dae171 100644 --- a/src/mainboard/google/stout/Makefile.inc +++ b/src/mainboard/google/stout/Makefile.inc @@ -19,8 +19,8 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc index 80385d6..b215ad7 100644 --- a/src/mainboard/intel/baskingridge/Makefile.inc +++ b/src/mainboard/intel/baskingridge/Makefile.inc @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.inc index c595a62..a1f72e1 100644 --- a/src/mainboard/intel/emeraldlake2/Makefile.inc +++ b/src/mainboard/intel/emeraldlake2/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c diff --git a/src/mainboard/intel/wtm2/Makefile.inc b/src/mainboard/intel/wtm2/Makefile.inc index a4afb7e..e519bb2 100644 --- a/src/mainboard/intel/wtm2/Makefile.inc +++ b/src/mainboard/intel/wtm2/Makefile.inc @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += i915.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += graphics.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc index 4c6d647..a6be0c2 100644 --- a/src/mainboard/samsung/lumpy/Makefile.inc +++ b/src/mainboard/samsung/lumpy/Makefile.inc @@ -19,8 +19,8 @@ ramstage-y += ec.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c SPD_BIN = $(obj)/spd.bin diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c index c864209..ef5a836 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -202,9 +202,7 @@ void main(unsigned long bist) console_init(); -#if CONFIG_CHROMEOS init_bootmode_straps(); -#endif /* Halt if there was a built in self test failure */ report_bist_failure(bist); diff --git a/src/mainboard/samsung/stumpy/Makefile.inc b/src/mainboard/samsung/stumpy/Makefile.inc index c595a62..a1f72e1 100644 --- a/src/mainboard/samsung/stumpy/Makefile.inc +++ b/src/mainboard/samsung/stumpy/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += chromeos.c +ramstage-y += chromeos.c diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c index 4ce6e41..8d2a3e4 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/romstage.c @@ -239,9 +239,7 @@ void main(unsigned long bist) CONFIG_TTYS0_BASE); console_init(); -#if CONFIG_CHROMEOS init_bootmode_straps(); -#endif /* Halt if there was a built in self test failure */ report_bist_failure(bist); |