examples: move api/ and standalone/ entry to examples/Makefile

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

examples: move api/ and standalone/ entry to examples/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini
1 parent 433b2f1e5a
Showing 4 changed files with 10 additions and 12 deletions Side-by-side Diff
Makefile
examples/Makefile
examples/api/Makefile
examples/standalone/Makefile
@@ -570,11 +570,8 @@
  
 .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)
+ifndef CONFIG_SANDBOX
+
+ifdef FTRACE
+subdir-ccflags-y += -finstrument-functions -DFTRACE
+endif
+
+subdir-y += standalone
+subdir-$(CONFIG_API) += api
+endif
@@ -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
@@ -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
...	...	@@ -570,11 +570,8 @@
570	570
571	571	.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
572	572
573		-SUBDIR_EXAMPLES-y := examples/standalone
574		-SUBDIR_EXAMPLES-$(CONFIG_API) += examples/api
575		-ifndef CONFIG_SANDBOX
	573	+SUBDIR_EXAMPLES-y := examples
576	574	SUBDIRS += $(SUBDIR_EXAMPLES-y)
577		-endif
578	575
579	576	#########################################################################
580	577	# U-Boot objects....order is important (i.e. start must be first)
	1	+ifndef CONFIG_SANDBOX
	2	+
	3	+ifdef FTRACE
	4	+subdir-ccflags-y += -finstrument-functions -DFTRACE
	5	+endif
	6	+
	7	+subdir-y += standalone
	8	+subdir-$(CONFIG_API) += api
	9	+endif
...	...	@@ -4,10 +4,6 @@
4	4	# SPDX-License-Identifier: GPL-2.0+
5	5	#
6	6
7		-ifdef FTRACE
8		-ccflags-y += -finstrument-functions -DFTRACE
9		-endif
10		-
11	7	ifeq ($(ARCH),powerpc)
12	8	LOAD_ADDR = 0x40000
13	9	endif
...	...	@@ -5,10 +5,6 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-ifdef FTRACE
9		-ccflags-y += -finstrument-functions -DFTRACE
10		-endif
11		-
12	8	extra-y := hello_world
13	9	extra-$(CONFIG_SMC91111) += smc91111_eeprom
14	10	extra-$(CONFIG_SMC911X) += smc911x_eeprom