summaryrefslogtreecommitdiff
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-27 09:08:42 -0400
committerTom Rini <trini@ti.com>2014-10-27 09:08:42 -0400
commit0ce4af99c07acebf4fce9a91f1099d2460629293 (patch)
treed87d969bfc91662e7a90b3c4fcce35acf4a3cdaf /arch/arm/lib
parent5aa7bece1045c28806ce919099616ebe8fa63325 (diff)
parent3f97af5302ee15530411232b464d255eb2ff2ffb (diff)
downloadu-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.zip
u-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.tar.gz
u-boot-imx-0ce4af99c07acebf4fce9a91f1099d2460629293.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/bootm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 0d19c8a..cdb1975 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -23,6 +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 +302,8 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
* 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)