Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

diff --combined Makefile
index 394ed096f053740e398e4c86aa6f3107170aafdf,a95d0e33866d2480768e8242724d20c0675d0a01..605003e3553f4a7851890bc709f87227a1f8d2cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -10,10 -10,9 +10,10 @@@ NAME 
  # Comments in this file are targeted only to the developer, do not
  # expect to learn how to build the kernel reading this file.
  
 -# Do not use make's built-in rules and variables
 -# (this increases performance and avoids hard-to-debug behaviour);
 -MAKEFLAGS += -rR
 +# o Do not use make's built-in rules and variables
 +#   (this increases performance and avoids hard-to-debug behaviour);
 +# o Look for make include files relative to root of kernel src
 +MAKEFLAGS += -rR --include-dir=$(CURDIR)
  
  # Avoid funny character set dependencies
  unexport LC_ALL
@@@ -320,9 -319,12 +320,9 @@@ endi
  export KBUILD_MODULES KBUILD_BUILTIN
  export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
  
 -# Look for make include files relative to root of kernel src
 -MAKEFLAGS += --include-dir=$(srctree)
 -
  # We need some generic definitions (do not try to remake the file).
 -$(srctree)/scripts/Kbuild.include: ;
 -include $(srctree)/scripts/Kbuild.include
 +scripts/Kbuild.include: ;
 +include scripts/Kbuild.include
  
  # Make variables (CC, etc...)
  
@@@ -435,7 -437,7 +435,7 @@@ endi
  ifeq ($(KBUILD_EXTMOD),)
          ifneq ($(filter config %config,$(MAKECMDGOALS)),)
                  config-targets := 1
 -                ifneq ($(filter-out config %config,$(MAKECMDGOALS)),)
 +                ifneq ($(words $(MAKECMDGOALS)),1)
                          mixed-targets := 1
                  endif
          endif
@@@ -516,8 -518,8 +516,8 @@@ ifneq ($(wildcard include/config/auto.c
  autoconf_is_old := $(shell find . -path ./$(KCONFIG_CONFIG) -newer \
                                                include/config/auto.conf)
  ifeq ($(autoconf_is_old),)
 -include $(srctree)/config.mk
 -include $(srctree)/arch/$(ARCH)/Makefile
 +include config.mk
 +include arch/$(ARCH)/Makefile
  endif
  endif
  endif
@@@ -593,7 -595,7 +593,7 @@@ endi
  
  export CONFIG_SYS_TEXT_BASE
  
 -include $(srctree)/scripts/Makefile.extrawarn
 +include scripts/Makefile.extrawarn
  
  # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
  KBUILD_CPPFLAGS += $(KCPPFLAGS)
@@@ -736,8 -738,12 +736,12 @@@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-
  ifeq ($(CONFIG_SPL_FSL_PBL),y)
  ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
  else
+ ifneq ($(CONFIG_SECURE_BOOT), y)
+ # For Secure Boot The Image needs to be signed and Header must also
+ # be included. So The image has to be built explicitly
  ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl
  endif
+ endif
  ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin
  ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
  ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
@@@ -1230,10 -1236,9 +1234,10 @@@ define filechk_version.
  endef
  
  define filechk_timestamp.h
 -      (LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \
 -      LC_ALL=C date +'#define U_BOOT_TIME "%T"'; \
 -      LC_ALL=C date +'#define U_BOOT_TZ "%z"')
 +      (SOURCE_DATE="$${SOURCE_DATE_EPOCH:+@$$SOURCE_DATE_EPOCH}"; \
 +      LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_DATE "%b %d %C%y"'; \
 +      LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TIME "%T"'; \
 +      LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TZ "%z"' )
  endef
  
  $(version_h): include/config/uboot.release FORCE
@@@ -1242,6 -1247,12 +1246,6 @@@
  $(timestamp_h): $(srctree)/Makefile FORCE
        $(call filechk,timestamp.h)
  
 -# ---------------------------------------------------------------------------
 -
 -PHONY += depend dep
 -depend dep:
 -      @echo '*** Warning: make $@ is unnecessary now.'
 -
  # ---------------------------------------------------------------------------
  quiet_cmd_cpp_lds = LDS     $@
  cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
@@@ -1542,6 -1553,11 +1546,6 @@@ ifneq ($(cmd_files),
    include $(cmd_files)
  endif
  
 -# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=dir
 -# Usage:
 -# $(Q)$(MAKE) $(clean)=dir
 -clean := -f $(srctree)/scripts/Makefile.clean obj
 -
  endif # skip-makefile
  
  PHONY += FORCE