diff mbox

[U-Boot] arm: Update jadecpu board

Message ID 1309349287-3923-1-git-send-email-weisserm@arcor.de
State Accepted
Commit a91916ff8e938a7299512e5e510f2a73ad1b676f
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Matthias Weisser June 29, 2011, 12:08 p.m. UTC 
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>
---
 board/syteco/jadecpu/config.mk |    1 -
 board/syteco/jadecpu/jadecpu.c |    5 +----
 include/configs/jadecpu.h      |   24 +++++++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 board/syteco/jadecpu/config.mk

Comments

Albert ARIBAUD June 29, 2011, 5:56 p.m. UTC | #1 
Le 29/06/2011 14:08, Matthias Weisser a écrit :
> 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>

Hi Matthias,

I assume this has been tested?

Amicalement,
Matthias Weisser June 29, 2011, 6:22 p.m. UTC | #2 
Am 29.06.2011 19:56, schrieb Albert ARIBAUD:
> Le 29/06/2011 14:08, Matthias Weisser a écrit :
>> 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>
> 
> Hi Matthias,
> 
> I assume this has been tested?

Sure. Build and runtime tested.


Matthias
Albert ARIBAUD June 29, 2011, 6:34 p.m. UTC | #3 
Hi Matthias,

Le 29/06/2011 14:08, Matthias Weisser a écrit :
> 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>
> ---
>   board/syteco/jadecpu/config.mk |    1 -
>   board/syteco/jadecpu/jadecpu.c |    5 +----
>   include/configs/jadecpu.h      |   24 +++++++++++++++---------
>   3 files changed, 16 insertions(+), 14 deletions(-)
>   delete mode 100644 board/syteco/jadecpu/config.mk

Applied to u-boot-arm/master, thanks.

Amicalement,
diff mbox

Patch

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 */