summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-09-30 10:08:01 -0700
committerSimon Glass <sjg@chromium.org>2011-10-04 14:43:11 -0700
commite16e7f0ba3e81f07ba877479b91388160dd2aa46 (patch)
tree173a259c295d3412a3dba659caa43726021dd2d4 /lib
parent67e7baf4c43cf153c8ea64b896eab3a8ae0c5d97 (diff)
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 <clchiou@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/chromeos/Makefile2
1 files changed, 2 insertions, 0 deletions
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