summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-07-05 18:02:15 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-07-05 18:02:15 +0200
commit3b4bad17b38d730d48b4eee23f3374536642517f (patch)
tree521e6c753a4e512500fdd7ff203b6bfdafa51bdf
parent88599b8edad047c7887aeb407907ee800ebb5b1b (diff)
downloadbarebox-3b4bad17b38d730d48b4eee23f3374536642517f.tar.gz
barebox-3b4bad17b38d730d48b4eee23f3374536642517f.tar.xz
svn_rev_664
-rw-r--r--arch/arm/cpu/start-arm920t.S1
-rw-r--r--arch/arm/mach-imx/clocksource.c1
-rw-r--r--board/scb9328/lowlevel_init.S1
-rw-r--r--commands/mem.c18
-rw-r--r--commands/rm.c5
5 files changed, 16 insertions, 10 deletions
diff --git a/arch/arm/cpu/start-arm920t.S b/arch/arm/cpu/start-arm920t.S
index 596f0b4672..1cf239113a 100644
--- a/arch/arm/cpu/start-arm920t.S
+++ b/arch/arm/cpu/start-arm920t.S
@@ -26,7 +26,6 @@
#include <config.h>
-#include <version.h>
/*
diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index 2630d03254..d2434d1c1a 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -32,7 +32,6 @@
#include <common.h>
#include <init.h>
#include <clock.h>
-#include <arm920t.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
diff --git a/board/scb9328/lowlevel_init.S b/board/scb9328/lowlevel_init.S
index 5523be3483..5f318cda52 100644
--- a/board/scb9328/lowlevel_init.S
+++ b/board/scb9328/lowlevel_init.S
@@ -19,7 +19,6 @@
*/
#include <config.h>
-#include <version.h>
#include <asm/arch/imx-regs.h>
#define CFG_GPR_A_VAL 0x00800000
diff --git a/commands/mem.c b/commands/mem.c
index e0f83608d3..180ee4d4c9 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -296,6 +296,7 @@ U_BOOT_CMD_START(mw)
U_BOOT_CMD_HELP(cmd_mw_help)
U_BOOT_CMD_END
+#if 0
int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
ulong addr1, addr2, count, ngood;
@@ -364,6 +365,16 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
ngood == 1 ? "" : "s");
return rcode;
}
+
+U_BOOT_CMD_START(cmp)
+ .maxargs = 4,
+ .cmd = do_mem_cmp,
+ .usage = "memory compare",
+ U_BOOT_CMD_HELP("write me\n")
+U_BOOT_CMD_END
+
+#endif
+
#if 0
int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
@@ -550,13 +561,6 @@ static int mem_init(void)
device_initcall(mem_init);
-U_BOOT_CMD_START(cmp)
- .maxargs = 4,
- .cmd = do_mem_cmp,
- .usage = "memory compare",
- U_BOOT_CMD_HELP("write me\n")
-U_BOOT_CMD_END
-
#ifndef CONFIG_CRC32_VERIFY
U_BOOT_CMD_START(crc32)
diff --git a/commands/rm.c b/commands/rm.c
index 7199580485..b586520083 100644
--- a/commands/rm.c
+++ b/commands/rm.c
@@ -1,3 +1,8 @@
+#include <common.h>
+#include <command.h>
+#include <fs.h>
+#include <errno.h>
+
static int do_rm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
int i = 1;