projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configs: at91: sama5d2_icp: enable CONFIG_SPL_AT91_MCK_BYPASS and resync
[oweals/u-boot.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2824a6e159440c9475d76fdfcdf40915dfa03b80..d6a6ef19ab8fd38bad3be6fc1a076d85c1387948 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,9
+1,9
@@
# SPDX-License-Identifier: GPL-2.0+
VERSION = 2019
# SPDX-License-Identifier: GPL-2.0+
VERSION = 2019
-PATCHLEVEL = 0
4
+PATCHLEVEL = 0
7
SUBLEVEL =
SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION =
-rc1
NAME =
# *DOCUMENTATION*
NAME =
# *DOCUMENTATION*
@@
-1052,8
+1052,13
@@
MKIMAGEFLAGS_fit-dtb.blob = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
-a 0 -e 0 -E \
$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -d /dev/null
-a 0 -e 0 -E \
$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -d /dev/null
+ifneq ($(EXT_DTB),)
+u-boot-fit-dtb.bin: u-boot-nodtb.bin $(EXT_DTB)
+ $(call if_changed,cat)
+else
u-boot-fit-dtb.bin: u-boot-nodtb.bin $(FINAL_DTB_CONTAINER)
$(call if_changed,cat)
u-boot-fit-dtb.bin: u-boot-nodtb.bin $(FINAL_DTB_CONTAINER)
$(call if_changed,cat)
+endif
u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy)
u-boot.bin: u-boot-fit-dtb.bin FORCE
$(call if_changed,copy)
@@
-1972,6
+1977,13
@@
endif
$(build)=$(build-dir) $(@:.ko=.o)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(build)=$(build-dir) $(@:.ko=.o)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+quiet_cmd_genenv = GENENV $@
+cmd_genenv = $(OBJCOPY) --dump-section .rodata.default_environment=$@ env/common.o; \
+ sed --in-place -e 's/\x00/\x0A/g' $@
+
+u-boot-initial-env: u-boot.bin
+ $(call if_changed,genenv)
+
# Consistency checks
# ---------------------------------------------------------------------------
# Consistency checks
# ---------------------------------------------------------------------------