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>
This commit is contained in:
Kyösti Mälkki 2014-05-03 13:29:06 +03:00
parent ab7280970a
commit 5c4b8483d2
17 changed files with 30 additions and 34 deletions

View File

@ -144,7 +144,6 @@ static void lb_framebuffer(struct lb_header *header)
#endif #endif
} }
#if CONFIG_CHROMEOS
void fill_lb_gpio(struct lb_gpio *gpio, int num, void fill_lb_gpio(struct lb_gpio *gpio, int num,
int polarity, const char *name, int value) int polarity, const char *name, int value)
{ {
@ -156,6 +155,7 @@ void fill_lb_gpio(struct lb_gpio *gpio, int num,
strncpy((char *)gpio->name, name, GPIO_MAX_NAME_LENGTH); strncpy((char *)gpio->name, name, GPIO_MAX_NAME_LENGTH);
} }
#if CONFIG_CHROMEOS
static void lb_gpios(struct lb_header *header) static void lb_gpios(struct lb_header *header)
{ {
struct lb_gpios *gpios; struct lb_gpios *gpios;

View File

@ -19,8 +19,8 @@
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c

View File

@ -19,7 +19,7 @@
ramstage-y += ec.c ramstage-y += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

View File

@ -19,8 +19,8 @@
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c

View File

@ -19,8 +19,8 @@
ramstage-y += ec.c ramstage-y += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += i915.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) += i915io.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c

View File

@ -19,5 +19,5 @@
ramstage-y += ec.c ramstage-y += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c

View File

@ -19,8 +19,8 @@
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c

View File

@ -19,9 +19,9 @@
subdirs-y += spd subdirs-y += spd
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += gpio.c ramstage-y += gpio.c
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += irqroute.c ramstage-y += irqroute.c

View File

@ -19,8 +19,8 @@
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += gma.c i915io.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += gma.c i915io.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c

View File

@ -19,8 +19,8 @@
ramstage-y += ec.c ramstage-y += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c

View File

@ -17,7 +17,7 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c

View File

@ -17,5 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c

View File

@ -17,8 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += i915.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) += graphics.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += intel_dp.c

View File

@ -19,8 +19,8 @@
ramstage-y += ec.c ramstage-y += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c
SPD_BIN = $(obj)/spd.bin SPD_BIN = $(obj)/spd.bin

View File

@ -202,9 +202,7 @@ void main(unsigned long bist)
console_init(); console_init();
#if CONFIG_CHROMEOS
init_bootmode_straps(); init_bootmode_straps();
#endif
/* Halt if there was a built in self test failure */ /* Halt if there was a built in self test failure */
report_bist_failure(bist); report_bist_failure(bist);

View File

@ -17,5 +17,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
romstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-y += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += chromeos.c

View File

@ -239,9 +239,7 @@ void main(unsigned long bist)
CONFIG_TTYS0_BASE); CONFIG_TTYS0_BASE);
console_init(); console_init();
#if CONFIG_CHROMEOS
init_bootmode_straps(); init_bootmode_straps();
#endif
/* Halt if there was a built in self test failure */ /* Halt if there was a built in self test failure */
report_bist_failure(bist); report_bist_failure(bist);