projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcnet: align rx buffers for cache invalidation
[oweals/u-boot.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index f18f3eb4f528c62a61732e7c93d3fb8fcadb5332..c91c10ed3a33089a94fe06e6d2ebee05753111c0 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-8,7
+8,7
@@
VERSION = 2014
PATCHLEVEL = 04
SUBLEVEL =
VERSION = 2014
PATCHLEVEL = 04
SUBLEVEL =
-EXTRAVERSION =
-rc2
+EXTRAVERSION =
NAME =
# *DOCUMENTATION*
NAME =
# *DOCUMENTATION*
@@
-124,7
+124,8
@@
ifneq ($(KBUILD_OUTPUT),)
# Invoke a second make in the output directory, passing relevant variables
# check that the output directory actually exists
saved-output := $(KBUILD_OUTPUT)
# Invoke a second make in the output directory, passing relevant variables
# check that the output directory actually exists
saved-output := $(KBUILD_OUTPUT)
-KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
+KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \
+ && /bin/pwd)
$(if $(KBUILD_OUTPUT),, \
$(error output directory "$(saved-output)" does not exist))
$(if $(KBUILD_OUTPUT),, \
$(error output directory "$(saved-output)" does not exist))
@@
-165,13
+166,7
@@
VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
export srctree objtree VPATH
export srctree objtree VPATH
-OBJTREE := $(objtree)
-SPLTREE := $(OBJTREE)/spl
-TPLTREE := $(OBJTREE)/tpl
-SRCTREE := $(srctree)
-export SRCTREE OBJTREE SPLTREE TPLTREE
-
-MKCONFIG := $(SRCTREE)/mkconfig
+MKCONFIG := $(srctree)/mkconfig
export MKCONFIG
# Make sure CDPATH settings don't interfere
export MKCONFIG
# Make sure CDPATH settings don't interfere
@@
-414,7
+409,7
@@
timestamp_h := include/generated/timestamp_autogenerated.h
no-dot-config-targets := clean clobber mrproper distclean \
help %docs check% coccicheck \
no-dot-config-targets := clean clobber mrproper distclean \
help %docs check% coccicheck \
- ubootversion backup
+ ubootversion backup
tools-only
config-targets := 0
mixed-targets := 0
config-targets := 0
mixed-targets := 0
@@
-734,7
+729,7
@@
endif
quiet_cmd_objcopy = OBJCOPY $@
cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
quiet_cmd_objcopy = OBJCOPY $@
cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
-quiet_cmd_mkimage =
UIMAGE
$@
+quiet_cmd_mkimage =
MKIMAGE
$@
cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
$(if $(KBUILD_VERBOSE:1=), >/dev/null)
cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \
$(if $(KBUILD_VERBOSE:1=), >/dev/null)
@@
-755,6
+750,9
@@
dtbs dts/dt.dtb: checkdtc u-boot
u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
$(call if_changed,cat)
u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
$(call if_changed,cat)
+%.imx: %.bin
+ $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+
quiet_cmd_copy = COPY $@
cmd_copy = cp $< $@
quiet_cmd_copy = COPY $@
cmd_copy = cp $< $@
@@
-808,9
+806,6
@@
MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
$(call if_changed,mkimage)
u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
$(call if_changed,mkimage)
-u-boot.imx: u-boot.bin
- $(Q)$(MAKE) $(build)=arch/arm/imx-common $@
-
u-boot.sha1: u-boot.bin
tools/ubsha1 u-boot.bin
u-boot.sha1: u-boot.bin
tools/ubsha1 u-boot.bin
@@
-854,6
+849,8
@@
OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_MAX_SIZE)
u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
$(call if_changed,pad_cat)
u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
$(call if_changed,pad_cat)
+u-boot-signed.sb: u-boot.bin spl/u-boot-spl.bin
+ $(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs u-boot-signed.sb
u-boot.sb: u-boot.bin spl/u-boot-spl.bin
$(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs u-boot.sb
u-boot.sb: u-boot.bin spl/u-boot-spl.bin
$(Q)$(MAKE) $(build)=arch/arm/cpu/arm926ejs/mxs u-boot.sb
@@
-1056,11
+1053,11
@@
depend dep:
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
-cmd_cpp_lds = $(CPP)
$(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__
\
- -x assembler-with-cpp -P -o $@ $<
+cmd_cpp_lds = $(CPP)
-Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi
\
+ -
D__ASSEMBLY__ -
x assembler-with-cpp -P -o $@ $<
u-boot.lds: $(LDSCRIPT) prepare FORCE
u-boot.lds: $(LDSCRIPT) prepare FORCE
- $(call if_changed,cpp_lds)
+ $(call if_changed
_dep
,cpp_lds)
PHONY += nand_spl
nand_spl: prepare
PHONY += nand_spl
nand_spl: prepare
@@
-1133,6
+1130,9
@@
checkarmreloc: u-boot
env: scripts_basic
$(Q)$(MAKE) $(build)=tools/$@
env: scripts_basic
$(Q)$(MAKE) $(build)=tools/$@
+tools-only: scripts_basic $(version_h) $(timestamp_h)
+ $(Q)$(MAKE) $(build)=tools
+
tools-all: export HOST_TOOLS_ALL=y
tools-all: env tools ;
tools-all: export HOST_TOOLS_ALL=y
tools-all: env tools ;
@@
-1178,7
+1178,7
@@
MRPROPER_FILES += .config .config.old \
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
-clean-dirs := $(foreach f,$(u-boot-alldirs),$(if $(wildcard $f/Makefile),$f))
+clean-dirs := $(foreach f,$(u-boot-alldirs),$(if $(wildcard $
(srctree)/$
f/Makefile),$f))
clean-dirs := $(addprefix _clean_, $(clean-dirs) doc/DocBook)
clean-dirs := $(addprefix _clean_, $(clean-dirs) doc/DocBook)
@@
-1234,7
+1234,7
@@
distclean: mrproper
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
@find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
- -o -name '.*.rej' \
+ -o -name '.*.rej'
-o -name '*.pyc'
\
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f