From patchwork Fri Apr 1 07:16:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 89234 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 B6BAFB6F7D for ; Fri, 1 Apr 2011 18:27:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C73782815A; Fri, 1 Apr 2011 09:25:32 +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 CiKn2EFHpZ9O; Fri, 1 Apr 2011 09:25:32 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A648B2810E; Fri, 1 Apr 2011 09:23:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D5D7628099 for ; Fri, 1 Apr 2011 09:23:27 +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 HxMvv1FoMPJL for ; Fri, 1 Apr 2011 09:23:27 +0200 (CEST) X-policyd-weight: IN_SBL_XBL_SPAMHAUS=4.35 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from pollux.denx.de (p4FF073FC.dip.t-dialin.net [79.240.115.252]) by theia.denx.de (Postfix) with ESMTP id 09C99280A2 for ; Fri, 1 Apr 2011 09:23:10 +0200 (CEST) Received: by pollux.denx.de (Postfix, from userid 515) id 728EF180156D4; Fri, 1 Apr 2011 09:16:37 +0200 (CEST) From: Heiko Schocher To: u-boot@lists.denx.de Date: Fri, 1 Apr 2011 09:16:16 +0200 Message-Id: <1301642195-15280-5-git-send-email-hs@denx.de> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1301642195-15280-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> <1301642195-15280-1-git-send-email-hs@denx.de> In-Reply-To: <1299591018-8944-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> Cc: Valentin Longchamp , Kim Phillips , Holger Brunck , Heiko Schocher Subject: [U-Boot] [PATCH v4 04/23] ppc, arm: adapt keymile header 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 From: Holger Brunck - adapt copyright string - change bootdelay to 2 seconds - set max number of command args to 32 - set I/O buffer size to 512 Signed-off-by: Holger Brunck Signed-off-by: Heiko Schocher cc: Kim Phillips cc: Wolfgang Denk cc: Valentin Longchamp Signed-off-by: Kim Phillips --- Changes for v2: - new patch in v2, first patch in v1 was split up - fix checkpatch.pl errors and warnings Changes for v3: - rebased only include/configs/keymile-common.h | 13 ++++--------- include/configs/kmeter1.h | 4 ++-- include/configs/mgcoge.h | 7 +++---- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index b934620..6f37f53 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -27,8 +27,6 @@ /* Do boardspecific init for all boards */ #define CONFIG_BOARD_EARLY_INIT_R -#define CONFIG_BOOTCOUNT_LIMIT - /* * By default kwbimage.cfg from board specific folder is used * If for some board, different configuration file need to be used, @@ -56,16 +54,15 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 -#define CONFIG_JFFS2_CMDLINE #define CONFIG_CMD_MTDPARTS +#define CONFIG_CMD_SETEXPR #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ /* @@ -78,10 +75,10 @@ #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ #endif #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) -#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE @@ -139,8 +136,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -#define CONFIG_ENV_SIZE 0x04000 /* Size of Environment */ - #define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) /* UBI Support for all Keymile boards */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index f288cb0..15042b9 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -8,7 +8,7 @@ * Copyright (C) 2007 MontaVista Software, Inc. * Anton Vorontsov * - * (C) Copyright 2008 + * (C) Copyright 2008-2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * * This program is free software; you can redistribute it and/or @@ -171,7 +171,7 @@ #undef CONFIG_SYS_RAMBOOT #endif -#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve for Mon */ +#define CONFIG_SYS_MONITOR_LEN (768 * 1024) /* Reserve for Mon */ /* * Initial RAM Base Address Setup diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 3a987ad..662d885 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 + * (C) Copyright 2007-2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * * See file CREDITS for list of people who contributed to this @@ -78,8 +78,7 @@ #define CONFIG_8260_CLKIN 66000000 /* in Hz */ #endif -#define BOOTFLASH_START FE000000 -#define CONFIG_PRAM 512 /* protected RAM [KBytes] */ +#define BOOTFLASH_START 0xFE000000 #define MTDIDS_DEFAULT "nor0=boot,nor1=app" #define MTDPARTS_DEFAULT \ @@ -128,7 +127,7 @@ #define CONFIG_SYS_RAMBOOT #endif -#define CONFIG_SYS_MONITOR_LEN (384 << 10) +#define CONFIG_SYS_MONITOR_LEN (768 << 10) #define CONFIG_ENV_IS_IN_FLASH