From: Tom Rini <trini@ti.com>
Date: Mon, 27 Oct 2014 13:08:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-imx
X-Git-Tag: KARO-TXA5-2015-06-26~441
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0ce4af99c07acebf4fce9a91f1099d2460629293;hp=-c

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

0ce4af99c07acebf4fce9a91f1099d2460629293
diff --combined arch/arm/cpu/armv7/mx6/soc.c
index a202b0318e,6dc26003b6..dd5aaa286a
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@@ -9,7 -9,6 +9,7 @@@
  
  #include <common.h>
  #include <asm/armv7.h>
 +#include <asm/bootm.h>
  #include <asm/pl310.h>
  #include <asm/errno.h>
  #include <asm/io.h>
@@@ -21,6 -20,7 +21,7 @@@
  #include <stdbool.h>
  #include <asm/arch/mxc_hdmi.h>
  #include <asm/arch/crm_regs.h>
+ #include <asm/bootm.h>
  
  enum ldo_reg {
  	LDO_ARM,
diff --combined arch/arm/lib/bootm.c
index 0d19c8ae23,4949d573af..cdb1975105
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@@ -15,7 -15,6 +15,7 @@@
  #include <common.h>
  #include <command.h>
  #include <image.h>
 +#include <vxworks.h>
  #include <u-boot/zlib.h>
  #include <asm/byteorder.h>
  #include <libfdt.h>
@@@ -23,6 -22,8 +23,8 @@@
  #include <asm/bootm.h>
  #include <asm/secure.h>
  #include <linux/compiler.h>
+ #include <bootm.h>
+ #include <vxworks.h>
  
  #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
  #include <asm/armv7.h>
@@@ -300,7 -301,8 +302,8 @@@ static void boot_jump_linux(bootm_heade
   * DIFFERENCE: Instead of calling prep and go at the end
   * they are called if subcommand is equal 0.
   */
- int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+ int do_bootm_linux(int flag, int argc, char * const argv[],
+ 		   bootm_headers_t *images)
  {
  	/* No need for those on ARM */
  	if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)