From patchwork Wed Jun 29 12:08:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Weisser X-Patchwork-Id: 102574 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 2937DB6F59 for ; Wed, 29 Jun 2011 22:08:25 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F2210280E3; Wed, 29 Jun 2011 14:08:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 58t2usDkQyXF; Wed, 29 Jun 2011 14:08:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F39CC280E7; Wed, 29 Jun 2011 14:08:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4F9E5280E7 for ; Wed, 29 Jun 2011 14:08:16 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tEKHr+fgH-uV for ; Wed, 29 Jun 2011 14:08:15 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-in-02.arcor-online.net (mail-in-02.arcor-online.net [151.189.21.42]) by theia.denx.de (Postfix) with ESMTPS id 65166280E3 for ; Wed, 29 Jun 2011 14:08:14 +0200 (CEST) Received: from mail-in-07-z2.arcor-online.net (mail-in-07-z2.arcor-online.net [151.189.8.19]) by mx.arcor.de (Postfix) with ESMTP id 6FFD63065D; Wed, 29 Jun 2011 14:08:13 +0200 (CEST) Received: from mail-in-15.arcor-online.net (mail-in-15.arcor-online.net [151.189.21.55]) by mail-in-07-z2.arcor-online.net (Postfix) with ESMTP id 5CFCCE197C; Wed, 29 Jun 2011 14:08:13 +0200 (CEST) Received: from localhost.localdomain (unknown [212.87.136.142]) (Authenticated sender: weisserm@arcor.de) by mail-in-15.arcor-online.net (Postfix) with ESMTPA id 89DF11AB9DA; Wed, 29 Jun 2011 14:08:12 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-15.arcor-online.net 89DF11AB9DA From: Matthias Weisser To: u-boot@lists.denx.de Date: Wed, 29 Jun 2011 14:08:07 +0200 Message-Id: <1309349287-3923-1-git-send-email-weisserm@arcor.de> X-Mailer: git-send-email 1.7.0.4 Subject: [U-Boot] [PATCH] arm: Update jadecpu board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- 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 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 */