summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Weisser <weisserm@arcor.de>2011-06-29 02:08:07 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-07-04 10:55:26 +0200
commita91916ff8e938a7299512e5e510f2a73ad1b676f (patch)
tree5d54aa215d392d7a17cc2bf5c578e07a6483185e
parent0aeb01d512772a88e0cbe2fa8654daf1b0136189 (diff)
downloadu-boot-imx-a91916ff8e938a7299512e5e510f2a73ad1b676f.zip
u-boot-imx-a91916ff8e938a7299512e5e510f2a73ad1b676f.tar.gz
u-boot-imx-a91916ff8e938a7299512e5e510f2a73ad1b676f.tar.bz2
arm: Update jadecpu board
Enable dcache and arch memset/memcpy for speed reasons Remove of config.mk and some environment overwrites Some generic cleanup Signed-off-by: Matthias Weisser <weisserm@arcor.de>
-rw-r--r--board/syteco/jadecpu/config.mk1
-rw-r--r--board/syteco/jadecpu/jadecpu.c5
-rw-r--r--include/configs/jadecpu.h24
3 files changed, 16 insertions, 14 deletions
diff --git a/board/syteco/jadecpu/config.mk b/board/syteco/jadecpu/config.mk
deleted file mode 100644
index 617603d..0000000
--- a/board/syteco/jadecpu/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0x10000000
diff --git a/board/syteco/jadecpu/jadecpu.c b/board/syteco/jadecpu/jadecpu.c
index 69476f8..a7b6e70 100644
--- a/board/syteco/jadecpu/jadecpu.c
+++ b/board/syteco/jadecpu/jadecpu.c
@@ -44,6 +44,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + PHYS_SDRAM_SIZE - 0x10000;
icache_enable();
+ dcache_enable();
return 0;
}
@@ -125,9 +126,6 @@ int board_late_init(void)
setenv("preboot", "run gs_slow_boot");
} else if ((in_word & 0xC0) != 0) {
setenv("stdout", "vga");
- setenv("gs_bootcmd", "mw.l 0x40000000 0 1024; usb start;"
- "fatls usb 0; fatload usb 0 0x40000000 mcq5resq.bin;"
- "bootelf 0x40000000; bootelf 0x10080000");
setenv("preboot", "run gs_slow_boot");
} else {
setenv("stdin", "serial");
@@ -136,7 +134,6 @@ int board_late_init(void)
if (getenv("gs_devel")) {
setenv("preboot", "run gs_slow_boot");
} else {
- setenv("gs_bootcmd", "bootelf 0x10080000");
setenv("preboot", "run gs_fast_boot");
}
}
diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index c119392..0375732 100644
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -29,17 +29,21 @@
#define CONFIG_MB86R0x
#define CONFIG_MB86R0x_IOCLK get_bus_freq(0)
#define CONFIG_SYS_HZ 1000
+#define CONFIG_SYS_TEXT_BASE 0x10000000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
+#define CONFIG_USE_ARCH_MEMCPY
+#define CONFIG_USE_ARCH_MEMSET
+
/*
* Environment settings
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"gs_fast_boot=setenv bootdelay 5\0" \
"gs_slow_boot=setenv bootdelay 10\0" \
- "bootcmd=mw.l 0x40000000 0 1024; usb start;" \
+ "bootcmd=dcache off; mw.l 0x40000000 0 1024; usb start;" \
"fatls usb 0; fatload usb 0 0x40000000 jadecpu-init.bin;" \
"bootelf 0x40000000\0" \
""
@@ -122,13 +126,14 @@
#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_XIMG
-#define CONFIG_CMD_BMP 1
-#define CONFIG_CMD_CAN 1
-#define CONFIG_CMD_DHCP 1
-#define CONFIG_CMD_ELF 1
-#define CONFIG_CMD_FAT 1
-#define CONFIG_CMD_PING 1
-#define CONFIG_CMD_USB 1
+#define CONFIG_CMD_BMP
+#define CONFIG_CMD_CAN
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_CACHE
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
@@ -196,7 +201,8 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_SYS_MALLOC_LEN (0x400000 - 0x8000)
+#define CONFIG_SYS_MALLOC_LEN (10 << 20)
+#define CONFIG_SYS_MEM_TOP_HIDE (4 << 20)
#define CONFIG_STACKSIZE (32*1024) /* regular stack */