diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2011-08-09 14:36:25 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:24 -0700 |
| commit | 60531d5f97cb4993541029e7f537b66940f2ab08 (patch) | |
| tree | a954472f5bb986ea2191f2a621e168f153228cbd /Makefile | |
| parent | 354afc513dc44fc27e4fffd6d34d931a9f5eb45c (diff) | |
Fix non-ChromeOS builds.
Recent changes broke the build for seaboard. It turns out that
the build stops when attempting to compile the files in the
ChromeOS specific libraries which are not even used in
non-ChromeOS targets.
The fix is to exclude these libraries from non-ChromeOS builds.
BUG=chrome-os-partner:5369
TEST=manual
. run the following commands while in chroot in the u-boot/files
directory:
emerge-tegra2_kaen chromeos-u-boot
emerge-x86-alex chromeos-u-boot
make -j16 ARCH=arm CROSS_COMPILE=armv7a-cros-linux-gnueabi- O=/tmp/sb distclean
make -j16 ARCH=arm CROSS_COMPILE=armv7a-cros-linux-gnueabi- O=/tmp/sb seaboard_config
make -j16 ARCH=arm CROSS_COMPILE=armv7a-cros-linux-gnueabi- O=/tmp/sb all
. observe all of the commands succeed.
Change-Id: I6a96105e9d403f57d3058818c24b36fadf013ec6
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/5598
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Gabe Black (Do Not Use) <gabeblack@google.com>
Reviewed-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -214,9 +214,13 @@ LIBS = lib/libgeneric.o LIBS += lib/lzma/liblzma.o LIBS += lib/lzo/liblzo.o LIBS += lib/zlib/libz.o + +ifdef VBOOT LIBS += lib/chromeos/libchromeos.a LIBS += lib/vbexport/libvbexport.a LIBS += lib/vboot/libvboot.a +endif + LIBS += board/$(VENDOR)/chromeos/libchromeos_board.a LIBS += board/$(VENDOR)/vbexport/libvbexport_board.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ |