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

diff --combined arch/arm/cpu/armv7/mx6/soc.c
index a202b0318e0659e02551027c6de9e6fa9e56b095,6dc26003b692cbab444a1136f7f85d3eef3aca76..dd5aaa286a68d708fda6814e6d107adba4d70231
--- 1/arch/arm/cpu/armv7/mx6/soc.c
--- 2/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 0d19c8ae2366caee800920d36dce8d79f984b6c2,4949d573af8c310f8348beae48caa5ea0f580bf9..cdb19751058815b19e274ba32c7293690c5ce99f
--- 1/arch/arm/lib/bootm.c
--- 2/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)