From db43fd2f8a2ff3156e774e7e5aebada718c5c2e5 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 22 Jan 2015 18:23:11 -0800 Subject: [PATCH] mips: Temporarily work around build error caused by mismatch Our headers are a mess and not in any way as arch-independent as their pathname makes it sound. CL:242404 made this blow up, but it's really just surprising that this didn't happen earlier already. This patch is just a quick fix to make MIPS ChromeOS boards buildable again while we deal with the real issue of aligning the interfaces. BRANCH=none BUG=chromium:451270,chromium:451388 TEST=Booted Jerry, built Falco and Urara. Change-Id: I509c842d3393bd810e89ebdf0dc745275c120c1d Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/242504 Reviewed-by: David Hendricks (cherry picked from commit c919c72ddc9d2e1e18858c0bf49c0ce79f2bc506) Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/243127 --- src/vendorcode/google/chromeos/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 14333e1a15..be05003d79 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -45,7 +45,7 @@ ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/chromeos.c),) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c romstage-srcs += src/mainboard/$(MAINBOARDDIR)/chromeos.c endif -ifneq ($(CONFIG_ARCH_X86),y) +ifeq ($(CONFIG_ARCH_X86)$(CONFIG_ARCH_MIPS),) bootblock-y += watchdog.c ramstage-y += watchdog.c endif