From: Holger Brunck Date: Mon, 14 Mar 2011 14:49:05 +0000 (+0100) Subject: ppc, arm: adapt keymile header X-Git-Tag: v2011.06-rc1~115 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f41ee960d25ce9959767da262e5bb7631f5a3188;p=u-boot ppc, arm: adapt keymile header - 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 Acked-by: Kim Phillips cc: Kim Phillips cc: Wolfgang Denk cc: Valentin Longchamp --- diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index b9346204d0..6f37f53fff 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 a615db0eb5..564910a721 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 d0b7c651a2..a28d14bcf3 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