summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2015-08-10 15:17:59 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-11 22:41:16 +0000
commit263b66204ceb84b9d89a4a06254fb8c281bbbf02 (patch)
tree5dda7a3ebf9e30a47fadab23ade74fbdffce4a20 /Makefile.rules
parentccb0c139310671c659fc457cf61c4193a9d64fb1 (diff)
downloadchrome-ec-263b66204ceb84b9d89a4a06254fb8c281bbbf02.tar.gz
Allow for private board configurations
The public sources look for board configurations in directories named board/$BOARD/ Sometimes it's necessary to keep sensitive projects out of the public view for a bit. This CL allows board configurations to also appear in directories named private*/board/$BOARD/ BUG=none BRANCH=none TEST=manual First, ebuilds and "make buildall" seem to work just as before. Second, I copied 24 of the existing boards (those without board-specific #ifdefs in the code) into a private*/board/ directory, renamed them to something unique, and ran "make buildall" again. Both public and private boards compiled and passed their tests. Change-Id: I977c23cb8e73e40677c8f329abca8bbc51fd53df Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/292428 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 36927aa657..5682f47ec9 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -14,7 +14,7 @@ host-srcs := $(foreach u,$(host-util-bin),$(sort $($(u)-objs:%.o=util/%.c) util/
# Don't do a build test on the following boards:
skip_boards = OWNERS host it8380dev
-boards := $(filter-out $(skip_boards),$(subst board/,,$(wildcard board/*)))
+boards := $(filter-out $(skip_boards),$(notdir $(wildcard board/* private*/board/*)))
# Create output directories if necessary
_common_dir_create := $(foreach d,$(common_dirs),$(shell [ -d $(out)/$(d) ] || \
@@ -317,7 +317,7 @@ xrefs: $(call targ_if_prog,etags,$(out)/TAGS) \
flash: $(out)/ec.bin
openocd -c "set BOARD $(BOARD)"\
-c "set BUILD_DIR $(out)"\
- -f board/$(BOARD)/openocd-flash.cfg
+ -f $(BDIR)/openocd-flash.cfg
.PHONY: flash_ec
flash_ec: $(out)/ec.bin
@@ -325,7 +325,7 @@ flash_ec: $(out)/ec.bin
.PHONY: flash_dfu
flash_dfu: $(out)/ec.bin
- sudo ./board/$(BOARD)/dfu $(out)/ec.bin
+ sudo ./$(BDIR)/dfu $(out)/ec.bin
.PHONY: clean
clean: