Blackfin: move ALL += u-boot.ldr to blackfin_config.mk

The way the ALL variable is used allows for config.mk's to add more targets themselves without having to clutter up the top level Makefile. Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Blackfin: move ALL += u-boot.ldr to blackfin_config.mk
The way the ALL variable is used allows for config.mk's to add more targets themselves without having to clutter up the top level Makefile. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike Frysinger
1 parent afac8b0717
Showing 2 changed files with 5 additions and 5 deletions Side-by-side Diff
Makefile
blackfin_config.mk
@@ -306,10 +306,8 @@
 #########################################################################
 #########################################################################
  
+# Always append ALL so that arch config.mk's can add custom ones
 ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
-ifeq ($(ARCH),blackfin)
-ALL += $(obj)u-boot.ldr
-endif
  
 all:		$(ALL)
  
@@ -36,6 +36,10 @@
 PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
 endif
  
+ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
+ALL += $(obj)u-boot.ldr
+endif
+
 SYM_PREFIX = _
  
 LDR_FLAGS-y :=
  
@@ -43,12 +47,10 @@
  
 LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE))
 LDR_FLAGS += --use-vmas
-ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
 LDR_FLAGS += --initcode $(obj)cpu/$(CPU)/initcode.o
 ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART)
 ifneq ($(ENV_IS_EMBEDDED_CUSTOM),ENV_IS_EMBEDDED_CUSTOM)
 LDR_FLAGS += --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o
-endif
 endif
 endif
 ifneq (,$(findstring s,$(MAKEFLAGS)))
...	...	@@ -306,10 +306,8 @@
306	306	#########################################################################
307	307	#########################################################################
308	308
	309	+# Always append ALL so that arch config.mk's can add custom ones
309	310	ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
310		-ifeq ($(ARCH),blackfin)
311		-ALL += $(obj)u-boot.ldr
312		-endif
313	311
314	312	all: $(ALL)
315	313
...	...	@@ -36,6 +36,10 @@
36	36	PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
37	37	endif
38	38
	39	+ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
	40	+ALL += $(obj)u-boot.ldr
	41	+endif
	42	+
39	43	SYM_PREFIX = _
40	44
41	45	LDR_FLAGS-y :=
42	46
...	...	@@ -43,12 +47,10 @@
43	47
44	48	LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE))
45	49	LDR_FLAGS += --use-vmas
46		-ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
47	50	LDR_FLAGS += --initcode $(obj)cpu/$(CPU)/initcode.o
48	51	ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART)
49	52	ifneq ($(ENV_IS_EMBEDDED_CUSTOM),ENV_IS_EMBEDDED_CUSTOM)
50	53	LDR_FLAGS += --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o
51		-endif
52	54	endif
53	55	endif
54	56	ifneq (,$(findstring s,$(MAKEFLAGS)))