From e16e7f0ba3e81f07ba877479b91388160dd2aa46 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 30 Sep 2011 10:08:01 -0700 Subject: CHROMIUM: Guard lib/chromeos/fdt_decode correctly This file needs to depend on both CONFIG_CHROMEOS and CONFIG_OF_CONTROL. BUG=chromium-os:19353 TEST=build with CONFIG_OF_CONTROL, but without CONFIG_CHROMEOS; see that it now succeeds Change-Id: I94b2616b6bcb10619b00c5fe93adf2e36d459fb0 Reviewed-on: http://gerrit.chromium.org/gerrit/8682 Reviewed-by: Che-Liang Chiou Tested-by: Simon Glass --- lib/chromeos/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/chromeos/Makefile b/lib/chromeos/Makefile index 6fe3bdc2e8..e7017c1c71 100644 --- a/lib/chromeos/Makefile +++ b/lib/chromeos/Makefile @@ -14,7 +14,9 @@ LIB = $(obj)libchromeos.a COBJS-$(CONFIG_CHROMEOS) += boot_kernel.o COBJS-$(CONFIG_CHROMEOS) += crossystem_data.o +ifeq ($(CONFIG_CHROMEOS),y) COBJS-$(CONFIG_OF_CONTROL) += fdt_decode.o +endif COBJS-$(CONFIG_CHROMEOS) += firmware_storage_spi.o COBJS-$(CONFIG_CHROMEOS) += fmap.o COBJS-$(CONFIG_CHROMEOS) += gbb.o -- cgit v1.2.3