Merge with /home/sr/git/u-boot/denx
This commit is contained in:
Wolfgang Denk
commit
fc6c4a67ae
|
|
@ -2,10 +2,17 @@
|
|||
Changes since U-Boot 1.1.4:
|
||||
======================================================================
|
||||
|
||||
* AMCC bamboo (440EP) U-Boot image reduced to 384kbyte
|
||||
Please see doc/README.bamboo for details.
|
||||
Patch by Stefan Roese, 27 Jul 2006
|
||||
|
||||
* Fix CONFIG_CMDLINE_EDITING implementation
|
||||
Patch by Stefan Roese, 27 Jul 2006
|
||||
|
||||
* Fix preboot message on TQM5200 after switching to hush parser.
|
||||
|
||||
* MCC200: set default configuration to low_boot DDR,
|
||||
and support for configurable options high_boot and/or SDRAM.
|
||||
and support for configurable options high_boot and/or SDRAM.
|
||||
|
||||
* Add support for 256 MB SDRAM on CPU87
|
||||
Patch by Josef Wagner, 25 Nov 2005
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# (C) Copyright 2002
|
||||
# (C) Copyright 2002-2006
|
||||
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
#
|
||||
# See file CREDITS for list of people who contributed to this
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
# MA 02111-1307 USA
|
||||
#
|
||||
|
||||
TEXT_BASE = 0xFFF80000
|
||||
TEXT_BASE = 0xFFFA0000
|
||||
|
||||
PLATFORM_CPPFLAGS += -DCONFIG_440=1
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
|||
|
||||
#define MAX_DELAY_STOP_STR 32
|
||||
|
||||
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
|
||||
static int parse_line (char *, char *[]);
|
||||
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
|
||||
static int abortboot(int);
|
||||
|
|
@ -63,8 +62,11 @@ static int abortboot(int);
|
|||
|
||||
char console_buffer[CFG_CBSIZE]; /* console I/O buffer */
|
||||
|
||||
#ifndef CONFIG_CMDLINE_EDITING
|
||||
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
|
||||
static char erase_seq[] = "\b \b"; /* erase sequence */
|
||||
static char tab_seq[] = " "; /* used to expand TABs */
|
||||
#endif /* CONFIG_CMDLINE_EDITING */
|
||||
|
||||
#ifdef CONFIG_BOOT_RETRY_TIME
|
||||
static uint64_t endtime = 0; /* must be set, default is instant timeout */
|
||||
|
|
@ -641,6 +643,7 @@ static char* hist_next(void)
|
|||
return (ret);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_CMDLINE_EDITING
|
||||
static void cread_print_hist_list(void)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -659,6 +662,7 @@ static void cread_print_hist_list(void)
|
|||
i++;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_CMDLINE_EDITING */
|
||||
|
||||
#define BEGINNING_OF_LINE() { \
|
||||
while (num) { \
|
||||
|
|
@ -942,7 +946,8 @@ int readline (const char *const prompt)
|
|||
|
||||
puts (prompt);
|
||||
|
||||
return cread_line(p, &len);
|
||||
cread_line(p, &len);
|
||||
return len;
|
||||
#else
|
||||
char *p = console_buffer;
|
||||
int n = 0; /* buffer index */
|
||||
|
|
@ -1044,6 +1049,7 @@ int readline (const char *const prompt)
|
|||
|
||||
/****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_CMDLINE_EDITING
|
||||
static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
|
||||
{
|
||||
char *s;
|
||||
|
|
@ -1073,6 +1079,7 @@ static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
|
|||
(*np)--;
|
||||
return (p);
|
||||
}
|
||||
#endif /* CONFIG_CMDLINE_EDITING */
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
The configuration for the AMCC 440EP eval board "Bamboo" was changed
|
||||
to only use 384 kbytes of FLASH for the U-Boot image. This way the
|
||||
redundant environment can be saved in the remaining 2 sectors of the
|
||||
same flash chip.
|
||||
|
||||
Caution: With an upgrade from an earlier U-Boot version the current
|
||||
environment will be erased since the environment is now saved in
|
||||
different sectors. By using the following command the environment can
|
||||
be saved after upgrading the U-Boot image and *before* resetting the
|
||||
board:
|
||||
|
||||
setenv recover_env 'prot off FFF80000 FFF9FFFF;era FFF80000 FFF9FFFF;' \
|
||||
'cp.b FFF60000 FFF80000 20000'
|
||||
|
||||
2006-07-27, Stefan Roese <sr@denx.de>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* (C) Copyright 2005
|
||||
* (C) Copyright 2005-2006
|
||||
* Stefan Roese, DENX Software Engineering, sr@denx.de.
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
* Base addresses -- Note these are effective addresses where the
|
||||
* actual resources get mapped (not physical addresses)
|
||||
*----------------------------------------------------------------------*/
|
||||
#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */
|
||||
#define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Monitor */
|
||||
#define CFG_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc() */
|
||||
#define CFG_MONITOR_BASE (-CFG_MONITOR_LEN)
|
||||
#define CFG_SDRAM_BASE 0x00000000 /* _must_ be 0 */
|
||||
|
|
@ -257,8 +257,8 @@
|
|||
"kernel_addr=fff00000\0" \
|
||||
"ramdisk_addr=fff10000\0" \
|
||||
"load=tftp 100000 /tftpboot/bamboo/u-boot.bin\0" \
|
||||
"update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
|
||||
"cp.b 100000 fff80000 80000;" \
|
||||
"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \
|
||||
"cp.b 100000 fffa0000 60000;" \
|
||||
"setenv filesize;saveenv\0" \
|
||||
"upd=run load;run update\0" \
|
||||
""
|
||||
|
|
@ -358,6 +358,14 @@
|
|||
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
|
||||
#ifdef CONFIG_CMDLINE_EDITING
|
||||
#undef CONFIG_AUTO_COMPLETE
|
||||
#else
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* PCI stuff
|
||||
*-----------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue