summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2012-02-17 00:34:16 +0800
committerJustin Waters <justin.waters@timesys.com>2012-09-05 14:58:04 -0400
commit43b1074a9312993dc8d535014545a9ad631f373f (patch)
treeec845813d4feb4006ed3288e1e461152e5e192a9 /cpu
parent5ee91976298938d48ecde971f958fdecdc4b8c46 (diff)
ENGR00174625: Remove build warnings for mx6q
Remove build warnings for mx6q. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm_cortexa8/cpu.c4
-rw-r--r--cpu/arm_cortexa8/mx6/generic.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/cpu/arm_cortexa8/cpu.c b/cpu/arm_cortexa8/cpu.c
index a7a6fb7981..58cb529907 100644
--- a/cpu/arm_cortexa8/cpu.c
+++ b/cpu/arm_cortexa8/cpu.c
@@ -8,7 +8,7 @@
* (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
*
- * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -137,6 +137,8 @@ int cleanup_before_linux(void)
unsigned int i;
#ifdef CONFIG_CMD_IMX_DOWNLOAD_MODE
+ extern void clear_mfgmode_mem(void);
+
clear_mfgmode_mem();
#endif
diff --git a/cpu/arm_cortexa8/mx6/generic.c b/cpu/arm_cortexa8/mx6/generic.c
index 144924ac70..58e496665e 100644
--- a/cpu/arm_cortexa8/mx6/generic.c
+++ b/cpu/arm_cortexa8/mx6/generic.c
@@ -1066,6 +1066,8 @@ void set_usboh3_clk(void)
/*BOOT_CFG1[7..4] = 0x3 Boot from Serial ROM (I2C/SPI)*/
#define BOOT_MODE_SERIAL_ROM (0x00000030)
+extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
/* this function should call before enter linux, otherwise, you
* watchdog reset will enter mfg download mode again, clear this bit
* to prevent this behavior */
@@ -1082,7 +1084,7 @@ void clear_mfgmode_mem(void)
reg = writel(reg, SRC_BASE_ADDR + SRC_GPR10);
}
-void do_switch_mfgmode(void)
+int do_switch_mfgmode(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
u32 reg;
@@ -1104,6 +1106,8 @@ void do_switch_mfgmode(void)
* mode.
*/
do_reset(NULL, 0, 0, NULL);
+
+ return 0;
}
U_BOOT_CMD(