Merge with /home/hs/U-Boot/u-boot-dev
This commit is contained in:
commit
807522fc9a
13
CHANGELOG
13
CHANGELOG
|
@ -1,6 +1,19 @@
|
||||||
======================================================================
|
======================================================================
|
||||||
Changes since U-Boot 1.1.4:
|
Changes since U-Boot 1.1.4:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
* Fix dbau1x00 Board
|
||||||
|
- Fix dbau1x00 boards broken by dbau1550 patch
|
||||||
|
PLL:s were not set for boards other than 1550.
|
||||||
|
Flash CFI caused card to hang due to undefined CFG_FLASH_BANKS_LIST.
|
||||||
|
Default boot is now bootp for cards other than 1550.
|
||||||
|
Patch by Thomas Lange Aug 10 2005
|
||||||
|
|
||||||
|
* Fixes common/cmd_flash.c:
|
||||||
|
|
||||||
|
- fix some compiler/parser error, if using m68k tool chain
|
||||||
|
- optical fix for protect on/off all messages, if using more
|
||||||
|
then one bank
|
||||||
|
Patch by Jens Scharsig, 28 July 2005
|
||||||
|
|
||||||
* Fix Quad UART mapping on MCC200 board due to new HW revision
|
* Fix Quad UART mapping on MCC200 board due to new HW revision
|
||||||
|
|
||||||
|
|
|
@ -185,6 +185,8 @@ tlbloop:
|
||||||
bne t0, t2, tlbloop
|
bne t0, t2, tlbloop
|
||||||
nop
|
nop
|
||||||
|
|
||||||
|
#endif /* CONFIG_DBAU1550 */
|
||||||
|
|
||||||
/* First setup pll:s to make serial work ok */
|
/* First setup pll:s to make serial work ok */
|
||||||
/* We have a 12 MHz crystal */
|
/* We have a 12 MHz crystal */
|
||||||
li t0, SYS_CPUPLL
|
li t0, SYS_CPUPLL
|
||||||
|
@ -205,6 +207,7 @@ tlbloop:
|
||||||
sw t1, 0(t0) /* aux pll */
|
sw t1, 0(t0) /* aux pll */
|
||||||
sync
|
sync
|
||||||
|
|
||||||
|
#ifdef CONFIG_DBAU1550
|
||||||
/* Static memory controller */
|
/* Static memory controller */
|
||||||
/* RCE0 - can not change while fetching, do so from icache */
|
/* RCE0 - can not change while fetching, do so from icache */
|
||||||
move t2, ra /* Store return address */
|
move t2, ra /* Store return address */
|
||||||
|
@ -237,7 +240,7 @@ noCacheJump:
|
||||||
sw t1, 0(t0)
|
sw t1, 0(t0)
|
||||||
#else /* CONFIG_DBAU1550 */
|
#else /* CONFIG_DBAU1550 */
|
||||||
li t0, MEM_STTIME0
|
li t0, MEM_STTIME0
|
||||||
li t1, 0x00014C0F
|
li t1, 0x040181D7
|
||||||
sw t1, 0(t0)
|
sw t1, 0(t0)
|
||||||
|
|
||||||
/* RCE0 AMD 29LV640M MirrorBit Flash */
|
/* RCE0 AMD 29LV640M MirrorBit Flash */
|
||||||
|
|
|
@ -125,13 +125,16 @@ abbrev_spec (char *str, flash_info_t ** pinfo, int *psf, int *psl)
|
||||||
static int
|
static int
|
||||||
addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
|
addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
|
||||||
{
|
{
|
||||||
char len_used = 0; /* indicates if the "start +length" form used */
|
|
||||||
char *ep;
|
char *ep;
|
||||||
|
char len_used; /* indicates if the "start +length" form used */
|
||||||
|
char found;
|
||||||
|
ulong bank;
|
||||||
|
|
||||||
*addr_first = simple_strtoul(arg1, &ep, 16);
|
*addr_first = simple_strtoul(arg1, &ep, 16);
|
||||||
if (ep == arg1 || *ep != '\0')
|
if (ep == arg1 || *ep != '\0')
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
len_used = 0;
|
||||||
if (arg2 && *arg2 == '+'){
|
if (arg2 && *arg2 == '+'){
|
||||||
len_used = 1;
|
len_used = 1;
|
||||||
++arg2;
|
++arg2;
|
||||||
|
@ -142,9 +145,6 @@ addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (len_used){
|
if (len_used){
|
||||||
char found = 0;
|
|
||||||
ulong bank;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* *addr_last has the length, compute correct *addr_last
|
* *addr_last has the length, compute correct *addr_last
|
||||||
* XXX watch out for the integer overflow! Right now it is
|
* XXX watch out for the integer overflow! Right now it is
|
||||||
|
@ -159,6 +159,7 @@ addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* find the end addr of the sector where the *addr_last is */
|
/* find the end addr of the sector where the *addr_last is */
|
||||||
|
found = 0;
|
||||||
for (bank = 0; bank < CFG_MAX_FLASH_BANKS && !found; ++bank){
|
for (bank = 0; bank < CFG_MAX_FLASH_BANKS && !found; ++bank){
|
||||||
int i;
|
int i;
|
||||||
flash_info_t *info = &flash_info[bank];
|
flash_info_t *info = &flash_info[bank];
|
||||||
|
@ -506,12 +507,10 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
||||||
info->protect[i] = p;
|
info->protect[i] = p;
|
||||||
#endif /* CFG_FLASH_PROTECTION */
|
#endif /* CFG_FLASH_PROTECTION */
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(CFG_FLASH_PROTECTION)
|
#if defined(CFG_FLASH_PROTECTION)
|
||||||
if (!rcode) puts (" done\n");
|
if (!rcode) puts (" done\n");
|
||||||
#endif /* CFG_FLASH_PROTECTION */
|
#endif /* CFG_FLASH_PROTECTION */
|
||||||
|
}
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,8 +81,7 @@
|
||||||
CFG_CMD_MII | CFG_CMD_RUN | CFG_CMD_BDI | CFG_CMD_BEDBUG | \
|
CFG_CMD_MII | CFG_CMD_RUN | CFG_CMD_BDI | CFG_CMD_BEDBUG | \
|
||||||
CFG_CMD_NFS | CFG_CMD_ELF | CFG_CMD_PCMCIA | CFG_CMD_I2C))
|
CFG_CMD_NFS | CFG_CMD_ELF | CFG_CMD_PCMCIA | CFG_CMD_I2C))
|
||||||
#else /* CONFIG_DBAU1550 */
|
#else /* CONFIG_DBAU1550 */
|
||||||
/* Boot from Compact flash partition 2 as default */
|
#define CONFIG_BOOTCOMMAND "bootp;bootm"
|
||||||
#define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;bootm"
|
|
||||||
|
|
||||||
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP | CFG_CMD_ELF) & \
|
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP | CFG_CMD_ELF) & \
|
||||||
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \
|
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \
|
||||||
|
@ -133,8 +132,6 @@
|
||||||
#define PHYS_FLASH_1 0xb8000000 /* Flash Bank #1 */
|
#define PHYS_FLASH_1 0xb8000000 /* Flash Bank #1 */
|
||||||
#define PHYS_FLASH_2 0xbc000000 /* Flash Bank #2 */
|
#define PHYS_FLASH_2 0xbc000000 /* Flash Bank #2 */
|
||||||
|
|
||||||
#define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
|
|
||||||
|
|
||||||
#else /* CONFIG_DBAU1550 */
|
#else /* CONFIG_DBAU1550 */
|
||||||
|
|
||||||
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
|
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
|
||||||
|
@ -145,6 +142,8 @@
|
||||||
|
|
||||||
#endif /* CONFIG_DBAU1550 */
|
#endif /* CONFIG_DBAU1550 */
|
||||||
|
|
||||||
|
#define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
|
||||||
|
|
||||||
#define CFG_FLASH_CFI 1
|
#define CFG_FLASH_CFI 1
|
||||||
#define CFG_FLASH_CFI_DRIVER 1
|
#define CFG_FLASH_CFI_DRIVER 1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue