January 2009 - U-Boot

[U-Boot] [PATCH 10/31] 8xx, mgsuvd: size and position of environment corrected
by Heiko Schocher 28 Jan '09

28 Jan '09

adapted the position and size of the environment sector to match the defines in mgcoge, kmeter1 and make them dependant of the MONITOR_LEN instead of an absolute address Signed-off-by: Thomas Herzmann <thomas.herzmann(a)keymile.com> Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/mgsuvd.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 05e770e..01f5bd3 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -126,13 +126,13 @@ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */ -#define CONFIG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET CONFIG_SYS_MONITOR_LEN +#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment */ #define CONFIG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */ /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_ENV_BUFFER_PRINT 1 /*----------------------------------------------------------------------- -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 3

[U-Boot] [PATCH 09/31] powerpc: mgcoge, mgsuvd: RxBuffer for serial input increased to 128 byte
by Heiko Schocher 28 Jan '09

28 Jan '09

powerpc: mgcoge, mgsuvd: RxBuffer for serial input increased to 128 byte The size of the serial RXBuffer is increased from 16 to 128 bytes to enable comfortable copy-and-paste of commands with the mouse Signed-off-by: Thomas Herzmann <thomas.herzmann(a)keymile.com> Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/mgcoge.h | 2 +- include/configs/mgsuvd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index f772627..07e0b8e 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -50,7 +50,7 @@ #undef CONFIG_CONS_ON_SCC /* It's not on SCC */ #undef CONFIG_CONS_NONE /* It's not on external UART */ #define CONFIG_CONS_INDEX 2 /* SMC2 is used for console */ -#define CONFIG_SYS_SMC_RXBUFLEN 16 +#define CONFIG_SYS_SMC_RXBUFLEN 128 /* * Select ethernet configuration diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index ee1da02..05e770e 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -45,7 +45,7 @@ #define CONFIG_SYS_SMC_UCODE_PATCH 1 /* Relocate SMC1 */ #define CONFIG_SYS_SMC_DPMEM_OFFSET 0x1fc0 #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#define CONFIG_SYS_SMC_RXBUFLEN 16 +#define CONFIG_SYS_SMC_RXBUFLEN 128 #define CONFIG_SYS_CPM_BOOTCOUNT_ADDR 0x1eb0 /* In case of SMC relocation, the * default value is not working */ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 3

[U-Boot] [PATCH 19/31] i2c, mpc83xx: add CONFIG_SYS_I2C_INIT_BOARD for fsl_i2c
by Heiko Schocher 28 Jan '09

28 Jan '09

This patch adds the possibility to call a board specific i2c bus reset routine for the fsl_i2c bus driver, and adds this option for the keymile kmeter1 board. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/common/common.c | 14 ++++++++++++++ drivers/i2c/fsl_i2c.c | 6 ++++++ include/configs/kmeter1.h | 1 + 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 17312b5..a282421 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -421,6 +421,7 @@ static int get_scl (void) #endif +#if !defined(CONFIG_KMETER1) static void writeStartSeq (void) { set_sda (1); @@ -471,6 +472,7 @@ static int i2c_make_abort (void) get_sda (); return ret; } +#endif /** * i2c_init_board - reset i2c bus. When the board is powercycled during a @@ -478,6 +480,17 @@ static int i2c_make_abort (void) */ void i2c_init_board(void) { +#if defined(CONFIG_KMETER1) + struct fsl_i2c *dev; + dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET); + uchar dummy; + + out_8 (&dev->cr, (I2C_CR_MSTA)); + out_8 (&dev->cr, (I2C_CR_MEN | I2C_CR_MSTA)); + dummy = in_8(&dev->dr); + out_8 (&dev->cr, (I2C_CR_MEN)); + +#else #if defined(CONFIG_HARD_I2C) volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c; @@ -497,6 +510,7 @@ void i2c_init_board(void) /* Set the PortPins back to use for I2C */ setports (0); #endif +#endif } #endif #endif diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 5242884..7ba5ab1 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -176,6 +176,12 @@ i2c_init(int speed, int slaveadd) struct fsl_i2c *dev; unsigned int temp; +#ifdef CONFIG_SYS_I2C_INIT_BOARD + /* call board specific i2c bus reset routine before accessing the */ + /* environment, which might be in a chip on that bus. For details */ + /* about this problem see doc/I2C_Edge_Conditions. */ + i2c_init_board(); +#endif dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET); writeb(0, &dev->cr); /* stop I2C controller */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 17ddcec..31e5cd6 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -316,6 +316,7 @@ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_MAX_I2C_BUS 2 +#define CONFIG_SYS_I2C_INIT_BOARD 1 #define CONFIG_I2C_MUX 1 /* EEprom support */ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 5

[U-Boot] [PATCH 12/31] 82xx, mgcoge: corrected wrong flash sizes
by Heiko Schocher 28 Jan '09

28 Jan '09

flash size of mgcoge corrected boot to 4M (was 32) cfg to 32M (was 64) Signed-off-by: Thomas Herzmann <thomas.herzmann(a)keymile.com> Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/mgcoge.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index a754f0b..f307382 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -99,14 +99,14 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_FLASH_BASE 0xFE000000 -#define CONFIG_SYS_FLASH_SIZE 32 +#define CONFIG_SYS_FLASH_SIZE 4 #define CONFIG_SYS_FLASH_CFI #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max num of flash banks */ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* max num of sects on one chip */ #define CONFIG_SYS_FLASH_BASE_1 0x50000000 -#define CONFIG_SYS_FLASH_SIZE_1 64 +#define CONFIG_SYS_FLASH_SIZE_1 32 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_BASE_1 } -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 2

[U-Boot] [PATCH 04/31] powerpc: 82xx serial: add configurable SMC Rx buffer len
by Heiko Schocher 28 Jan '09

28 Jan '09

This patch adds the configuration option CONFIG_SYS_SMC_RXBUFLEN. With this option it is possible to allow the receive buffer for the SMC on 82xx to be greater then 1. In case CONFIG_SYS_SMC_RXBUFLEN == 1 or it is not defined this driver works as the old version. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- cpu/mpc8260/serial_smc.c | 94 +++++++++++++++++++++++++++++++--------------- include/configs/mgcoge.h | 1 + 2 files changed, 64 insertions(+), 31 deletions(-) diff --git a/cpu/mpc8260/serial_smc.c b/cpu/mpc8260/serial_smc.c index a6efa66..6825e2e 100644 --- a/cpu/mpc8260/serial_smc.c +++ b/cpu/mpc8260/serial_smc.c @@ -64,6 +64,18 @@ DECLARE_GLOBAL_DATA_PTR; #endif +typedef volatile struct serialbuffer { + cbd_t rxbd; /* Rx BD */ + cbd_t txbd; /* Tx BD */ +#ifdef CONFIG_SYS_SMC_RXBUFLEN + uint rxindex; /* index for next character to read */ + volatile uchar rxbuf[CONFIG_SYS_SMC_RXBUFLEN];/* rx buffers */ +#else + volatile uchar rxbuf[1]; /* rx buffers */ +#endif + volatile uchar txbuf; /* tx buffers */ +} serialbuffer_t; + /* map rs_table index to baud rate generator index */ static unsigned char brg_map[] = { 6, /* BRG7 for SMC1 */ @@ -79,9 +91,9 @@ int serial_init (void) volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile smc_t *sp; volatile smc_uart_t *up; - volatile cbd_t *tbdf, *rbdf; volatile cpm8260_t *cp = &(im->im_cpm); uint dpaddr; + volatile serialbuffer_t *rtx; /* initialize pointers to SMC */ @@ -99,17 +111,21 @@ int serial_init (void) * damm: allocating space after the two buffers for rx/tx data */ - dpaddr = m8260_cpm_dpalloc((2 * sizeof (cbd_t)) + 2, 16); + /* allocate + * size of struct serialbuffer with bd rx/tx, buffer rx/tx and rx index + */ + dpaddr = m8260_cpm_dpalloc((sizeof(serialbuffer_t)), 16); + + rtx = (serialbuffer_t *)&im->im_dprambase[dpaddr]; /* Set the physical address of the host memory buffers in * the buffer descriptors. */ - rbdf = (cbd_t *)&im->im_dprambase[dpaddr]; - rbdf->cbd_bufaddr = (uint) (rbdf+2); - rbdf->cbd_sc = 0; - tbdf = rbdf + 1; - tbdf->cbd_bufaddr = ((uint) (rbdf+2)) + 1; - tbdf->cbd_sc = 0; + rtx->rxbd.cbd_bufaddr = (uint) &rtx->rxbuf; + rtx->rxbd.cbd_sc = 0; + + rtx->txbd.cbd_bufaddr = (uint) &rtx->txbuf; + rtx->txbd.cbd_sc = 0; /* Set up the uart parameters in the parameter ram. */ @@ -142,13 +158,21 @@ int serial_init (void) /* Make the first buffer the only buffer. */ - tbdf->cbd_sc |= BD_SC_WRAP; - rbdf->cbd_sc |= BD_SC_EMPTY | BD_SC_WRAP; + rtx->txbd.cbd_sc |= BD_SC_WRAP; + rtx->rxbd.cbd_sc |= BD_SC_EMPTY | BD_SC_WRAP; +#ifdef CONFIG_SYS_SMC_RXBUFLEN + /* multi-character receive. + */ + up->smc_mrblr = CONFIG_SYS_SMC_RXBUFLEN; + up->smc_maxidl = 10; + rtx->rxindex = 0; +#else /* Single character receive. */ up->smc_mrblr = 1; up->smc_maxidl = 0; +#endif /* Initialize Tx/Rx parameters. */ @@ -183,27 +207,24 @@ serial_setbrg (void) void serial_putc(const char c) { - volatile cbd_t *tbdf; - volatile char *buf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile serialbuffer_t *rtx; if (c == '\n') serial_putc ('\r'); up = (smc_uart_t *)&(im->im_dprambase[PROFF_SMC]); - tbdf = (cbd_t *)&im->im_dprambase[up->smc_tbase]; + rtx = (serialbuffer_t *)&im->im_dprambase[up->smc_rbase]; /* Wait for last character to go. */ - buf = (char *)tbdf->cbd_bufaddr; - while (tbdf->cbd_sc & BD_SC_READY) + while (rtx->txbd.cbd_sc & BD_SC_READY & BD_SC_READY) ; - - *buf = c; - tbdf->cbd_datlen = 1; - tbdf->cbd_sc |= BD_SC_READY; + rtx->txbuf = c; + rtx->txbd.cbd_datlen = 1; + rtx->txbd.cbd_sc |= BD_SC_READY; } void @@ -217,39 +238,50 @@ serial_puts (const char *s) int serial_getc(void) { - volatile cbd_t *rbdf; - volatile unsigned char *buf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; - unsigned char c; + volatile serialbuffer_t *rtx; + unsigned char c; up = (smc_uart_t *)&(im->im_dprambase[PROFF_SMC]); - rbdf = (cbd_t *)&im->im_dprambase[up->smc_rbase]; + rtx = (serialbuffer_t *)&im->im_dprambase[up->smc_rbase]; /* Wait for character to show up. */ - buf = (unsigned char *)rbdf->cbd_bufaddr; - while (rbdf->cbd_sc & BD_SC_EMPTY) + while (rtx->rxbd.cbd_sc & BD_SC_EMPTY) ; - c = *buf; - rbdf->cbd_sc |= BD_SC_EMPTY; +#ifdef CONFIG_SYS_SMC_RXBUFLEN + /* the characters are read one by one, + * use the rxindex to know the next char to deliver + */ + c = *(unsigned char *) (rtx->rxbd.cbd_bufaddr+rtx->rxindex); + rtx->rxindex++; + + /* check if all char are readout, then make prepare for next receive */ + if (rtx->rxindex >= rtx->rxbd.cbd_datlen) { + rtx->rxindex = 0; + rtx->rxbd.cbd_sc |= BD_SC_EMPTY; + } +#else + c = *(unsigned char *) (rtx->rxbd.cbd_bufaddr); + rtx->rxbd.cbd_sc |= BD_SC_EMPTY; +#endif return(c); } int serial_tstc() { - volatile cbd_t *rbdf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; + volatile serialbuffer_t *rtx; up = (smc_uart_t *)&(im->im_dprambase[PROFF_SMC]); + rtx = (serialbuffer_t *)&im->im_dprambase[up->smc_rbase]; - rbdf = (cbd_t *)&im->im_dprambase[up->smc_rbase]; - - return(!(rbdf->cbd_sc & BD_SC_EMPTY)); + return !(rtx->rxbd.cbd_sc & BD_SC_EMPTY); } #endif /* CONFIG_CONS_ON_SMC */ diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 9416a03..ddb06aa 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -49,6 +49,7 @@ #undef CONFIG_CONS_ON_SCC /* It's not on SCC */ #undef CONFIG_CONS_NONE /* It's not on external UART */ #define CONFIG_CONS_INDEX 2 /* SMC2 is used for console */ +#define CONFIG_SYS_SMC_RXBUFLEN 16 /* * Select ethernet configuration -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 3

[U-Boot] [PATCH 02/31] environment, netconsole: reducing packages when printing environment variables
by Heiko Schocher 28 Jan '09

28 Jan '09

Actual, do_printenv () uses putc () to print the Environment- variables. If using netconsole, this will result in a lot of packages with single characters in it. With the new config option CONFIG_ENV_BUFFER_PRINT do_printenv () uses now puts () to print a complete Environmentvariable, so the number of packages when using netconsole are reduced. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- common/cmd_nvedit.c | 8 ++++++++ include/configs/mgcoge.h | 1 + include/configs/mgsuvd.h | 1 + 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 85025da..8f6310a 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -89,8 +89,12 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (i=0; env_get_char(i) != '\0'; i=nxt+1) { for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) ; +#if defined(CONFIG_ENV_BUFFER_PRINT) + puts ((char *)( env_get_addr(nxt) + 1)); +#else for (k=i; k<nxt; ++k) putc(env_get_char(k)); +#endif putc ('\n'); if (ctrlc()) { @@ -118,11 +122,15 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (k < 0) { continue; } +#if defined(CONFIG_ENV_BUFFER_PRINT) + printf ("%s=%s\n", name, (char *)( env_get_addr(k))); +#else puts (name); putc ('='); while (k < nxt) putc(env_get_char(k++)); putc ('\n'); +#endif break; } if (k < 0) { diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 233bee0..9416a03 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -139,6 +139,7 @@ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #endif /* CONFIG_ENV_IS_IN_FLASH */ +#define CONFIG_ENV_BUFFER_PRINT 1 /* enable I2C and select the hardware/software driver */ #undef CONFIG_HARD_I2C /* I2C with hardware support */ diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 8f82751..698f0e7 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -143,6 +143,7 @@ /* Address and size of Redundant Environment Sector */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) +#define CONFIG_ENV_BUFFER_PRINT 1 /*----------------------------------------------------------------------- * Cache Configuration -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

3 5

[U-Boot] [PATCH 26/31] powerpc: mgcoge, mgsuvd, kmeter1: dont print errormsg if second IVM Block lacks..
by Heiko Schocher 28 Jan '09

28 Jan '09

The second IVM inventory block for the keymile boards is optional only, so dont print an error message, if this block dont exists. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/common/common.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index a282421..1904482 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -204,8 +204,9 @@ static int ivm_check_crc (unsigned char *buf, int block) crceeprom = (buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN - 1] + \ buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN - 2] * 256); if (crc != crceeprom) { - printf ("Error CRC Block: %d EEprom: calculated: %lx EEprom: %lx\n", - block, crc, crceeprom); + if (block == 0) + printf ("Error CRC Block: %d EEprom: calculated: \ + %lx EEprom: %lx\n", block, crc, crceeprom); return -1; } return 0; @@ -288,7 +289,7 @@ int ivm_analyze_eeprom (unsigned char *buf, int len) GET_STRING("IVM_CustomerProductID", IVM_POS_CUSTOMER_PROD_ID, 32) if (ivm_check_crc (&buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2], 2) != 0) - return -2; + return 0; ivm_analyze_block2 (&buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2], CONFIG_SYS_IVM_EEPROM_PAGE_LEN); return 0; -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 16/31] dtt: call dtt_init () conditional in init_sequence
by Heiko Schocher 28 Jan '09

28 Jan '09

If CONFIG_SYS_DTT_BOARD_INIT is defined, dtt_init () is not called in the init_sequence. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/dtt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/dtt.h b/include/dtt.h index 399b64a..1c8eda7 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -36,7 +36,9 @@ defined(CONFIG_DTT_LM75) || \ defined(CONFIG_DTT_LM81) +#ifndef CONFIG_SYS_DTT_BOARD_INIT #define CONFIG_DTT /* We have a DTT */ +#endif #ifndef CONFIG_DTT_ADM1021 #define DTT_COMMERCIAL_MAX_TEMP 70 /* 0 - +70 C */ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 08/31] powerpc, keymile boards: added cmdline feature
by Heiko Schocher 28 Jan '09

28 Jan '09

added the cmdline features: - auto-completion - history - editing within the cmdline Signed-off-by: Thomas Herzmann <thomas.herzmann(a)keymile.com> Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/keymile-common.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 28cdf76..2864e8e 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -72,6 +72,8 @@ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ +#define CONFIG_COMMAND_HISTORY 1 +#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ /* should go away, if kmeter I2C support is enabled */ #if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 29/31] 8xx, kmsupx4: add bootcount support
by Heiko Schocher 28 Jan '09

28 Jan '09

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/keymile-common.h | 2 +- include/configs/km8xx.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 20f7bab..3736cd8 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -27,7 +27,7 @@ /* Do boardspecific init for all boards */ #define CONFIG_BOARD_EARLY_INIT_R 1 -#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) || defined(CONFIG_KMSUPX4) #define CONFIG_BOOTCOUNT_LIMIT #endif diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h index 0ab75b4..237eb6a 100644 --- a/include/configs/km8xx.h +++ b/include/configs/km8xx.h @@ -54,10 +54,8 @@ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ #define CONFIG_SYS_SMC_RXBUFLEN 128 -#if defined(CONFIG_MGSUVD) #define CONFIG_SYS_CPM_BOOTCOUNT_ADDR 0x1eb0 /* In case of SMC relocation, the - * default value is not working */ -#endif + * default value is not working */ #define CONFIG_PREBOOT "echo;" \ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0