summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-07-26 16:55:33 +0800
committerSimon Glass <sjg@chromium.org>2011-08-29 10:59:13 -0700
commitdf4a451bb25ade57adcd5895b4fbfbec01c32371 (patch)
treefde584711208ee6190c0695e4d83bee5fd39e336 /lib
parent34b7b623417dc1ba47f9d18a2e59e05787f6839c (diff)
CHROMIUM: reorganize config headers
The headers are merged and split into the board-independent header chromeos.h and a board-dependent header, e.g., chromeos_tegra2_twostop.h. The board-independent header defines/enables all features that a verified boot firmware must have, and is included by a board-dependent header. Moreover, the CONFIG_CHROMEOS_* flags are reduced into a single flag CONFIG_CHROMEOS. BUG=none TEST=make chromeos_tegra2_twostop_config && make Change-Id: I2ec9092ed898c640175095e86cfcb100efbefb3a Reviewed-on: http://gerrit.chromium.org/gerrit/4731 Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/chromeos/Makefile2
-rw-r--r--lib/vbexport/Makefile14
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/chromeos/Makefile b/lib/chromeos/Makefile
index 5ea27547406..6305673cc7e 100644
--- a/lib/chromeos/Makefile
+++ b/lib/chromeos/Makefile
@@ -21,7 +21,7 @@ COBJS-$(CONFIG_CHROMEOS) += memory_wipe.o
# TODO(sjg): This MMC code is not needed as yet, and needs slight changes
# to build now
-#COBJS-$(CONFIG_CHROMEOS_TWOSTOP) += firmware_storage_twostop.o
+#COBJS-$(CONFIG_CHROMEOS) += firmware_storage_twostop.o
COBJS := $(COBJS-y)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/lib/vbexport/Makefile b/lib/vbexport/Makefile
index 378e043ad24..64e633a46ba 100644
--- a/lib/vbexport/Makefile
+++ b/lib/vbexport/Makefile
@@ -12,13 +12,13 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libvbexport.a
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += boot_device.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += display.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += keyboard.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += load_firmware.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += misc.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += tlcl_stub.o
-COBJS-$(CONFIG_CHROMEOS_VBEXPORT) += utility.o
+COBJS-$(CONFIG_CHROMEOS) += boot_device.o
+COBJS-$(CONFIG_CHROMEOS) += display.o
+COBJS-$(CONFIG_CHROMEOS) += keyboard.o
+COBJS-$(CONFIG_CHROMEOS) += load_firmware.o
+COBJS-$(CONFIG_CHROMEOS) += misc.o
+COBJS-$(CONFIG_CHROMEOS) += tlcl_stub.o
+COBJS-$(CONFIG_CHROMEOS) += utility.o
COBJS := $(COBJS-y)
OBJS := $(addprefix $(obj),$(COBJS))