From: Tom Rini <trini@konsulko.com>
Date: Thu, 22 Oct 2015 00:47:40 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2016.01-rc1~298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=858dbdf8412cefb6dbc4eed63dc3de9744578455;hp=-c;p=platform%2Fkernel%2Fu-boot.git

Merge git://git.denx.de/u-boot-x86
---

858dbdf8412cefb6dbc4eed63dc3de9744578455
diff --combined Makefile
index 0f6a60c,737227d..d4c35ba
--- a/Makefile
+++ b/Makefile
@@@ -901,7 -901,7 +901,7 @@@ MKIMAGEFLAGS_u-boot.kwb = -n $(srctree)
  	-T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
  
  MKIMAGEFLAGS_u-boot-spl.kwb = -n $(srctree)/$(CONFIG_SYS_KWD_CONFIG:"%"=%) \
 -	-T kwbimage -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE)
 +	-T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE)
  
  MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
  		-R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
@@@ -909,18 -909,8 +909,18 @@@
  u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
  	$(call if_changed,mkimage)
  
 -u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
 +# If the kwboot xmodem protocol is used, to boot U-Boot on the MVEBU
 +# SoC's, the SPL U-Boot returns to the BootROM after it completes
 +# the SDRAM setup. The BootROM expects no U-Boot header in the main
 +# U-Boot image. So we need to combine SPL and u-boot.bin instead of
 +# u-boot.img in this case.
 +ifdef CONFIG_MVEBU_BOOTROM_UARTBOOT
 +u-boot-spl.kwb: u-boot-dtb.bin spl/u-boot-spl.bin FORCE
 +	$(call if_changed,mkimage)
 +else
 +u-boot-spl.kwb: u-boot-dtb.img spl/u-boot-spl.bin FORCE
  	$(call if_changed,mkimage)
 +endif
  
  MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img)
  
@@@ -1288,6 -1278,7 +1288,7 @@@ define filechk_timestamp.
  			LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_DATE "%b %d %C%y"'; \
  			LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TIME "%T"'; \
  			LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TZ "%z"'; \
+ 			LC_ALL=C $${DATE} -u -d "$${SOURCE_DATE}" +'#define U_BOOT_DMI_DATE "%m/%d/%Y"'; \
  		else \
  			return 42; \
  		fi; \
@@@ -1295,6 -1286,7 +1296,7 @@@
  		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"'; \
+ 		LC_ALL=C date +'#define U_BOOT_DMI_DATE "%m/%d/%Y"'; \
  	fi)
  endef
  
diff --combined common/malloc_simple.c
index 9bf1fed,dd1119f..479a1e4
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@@ -19,10 -19,13 +19,13 @@@ void *malloc_simple(size_t bytes
  	void *ptr;
  
  	new_ptr = gd->malloc_ptr + bytes;
+ 	debug("%s: size=%zx, ptr=%lx, limit=%lx\n", __func__, bytes, new_ptr,
+ 	      gd->malloc_limit);
  	if (new_ptr > gd->malloc_limit)
  		return NULL;
  	ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
  	gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+ 
  	return ptr;
  }
  
@@@ -37,10 -40,11 +40,11 @@@ void *memalign_simple(size_t align, siz
  		return NULL;
  	ptr = map_sysmem(addr, bytes);
  	gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+ 
  	return ptr;
  }
  
 -#ifdef CONFIG_SYS_MALLOC_SIMPLE
 +#if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
  void *calloc(size_t nmemb, size_t elem_size)
  {
  	size_t size = nmemb * elem_size;