diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-04 08:24:36 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-19 16:07:51 (GMT) |
| commit | cbce795e5ef2175b1fd3ec580281ef8ce397afd7 (patch) | |
| tree | f88776cf0b30a8f9286e99d469faae66773e5789 | |
| parent | 433b2f1e5a837426b3269a83a81bc572c3beaf75 (diff) | |
| download | u-boot-cbce795e5ef2175b1fd3ec580281ef8ce397afd7.tar.xz | |
examples: move api/ and standalone/ entry to examples/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | examples/Makefile | 9 | ||||
| -rw-r--r-- | examples/api/Makefile | 4 | ||||
| -rw-r--r-- | examples/standalone/Makefile | 4 |
4 files changed, 10 insertions, 12 deletions
@@ -570,11 +570,8 @@ SUBDIRS = $(SUBDIR_TOOLS) .PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE) -SUBDIR_EXAMPLES-y := examples/standalone -SUBDIR_EXAMPLES-$(CONFIG_API) += examples/api -ifndef CONFIG_SANDBOX +SUBDIR_EXAMPLES-y := examples SUBDIRS += $(SUBDIR_EXAMPLES-y) -endif ######################################################################### # U-Boot objects....order is important (i.e. start must be first) diff --git a/examples/Makefile b/examples/Makefile new file mode 100644 index 0000000..18d008e --- /dev/null +++ b/examples/Makefile @@ -0,0 +1,9 @@ +ifndef CONFIG_SANDBOX + +ifdef FTRACE +subdir-ccflags-y += -finstrument-functions -DFTRACE +endif + +subdir-y += standalone +subdir-$(CONFIG_API) += api +endif diff --git a/examples/api/Makefile b/examples/api/Makefile index 8b79886..09475f8 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -4,10 +4,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef FTRACE -ccflags-y += -finstrument-functions -DFTRACE -endif - ifeq ($(ARCH),powerpc) LOAD_ADDR = 0x40000 endif diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 90e173b..47c9d54 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -5,10 +5,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifdef FTRACE -ccflags-y += -finstrument-functions -DFTRACE -endif - extra-y := hello_world extra-$(CONFIG_SMC91111) += smc91111_eeprom extra-$(CONFIG_SMC911X) += smc911x_eeprom |