diff options
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | board/atc/atc.c | 32 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | cpu/mpc85xx/start.S | 6 |
4 files changed, 28 insertions, 19 deletions
@@ -2,6 +2,13 @@ Changes for U-Boot 1.0.0: ====================================================================== +* Patch by Xiao Xianghua, 23 Oct 2003: + small patch for mpc85xx + +* Fix small problem in MPC5200 I2C driver + +* Fix FCC3 support on ATC board + * Correct header printing for multi-image files in do_bootm() * Make CONFIG_SILENT_CONSOLE work with CONFIG_AUTOBOOT_KEYED diff --git a/board/atc/atc.c b/board/atc/atc.c index 42abcda..9aa942f 100644 --- a/board/atc/atc.c +++ b/board/atc/atc.c @@ -92,20 +92,20 @@ const iop_conf_t iop_conf_tab[4][32] = { /* PB20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[1] */ /* PB19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[2] */ /* PB18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[3] */ - /* PB17 */ { 0, 0, 0, 0, 0, 0 }, /* PB17 */ - /* PB16 */ { 0, 0, 0, 0, 0, 0 }, /* PB16 */ - /* PB15 */ { 0, 0, 0, 0, 0, 0 }, /* PB15 */ - /* PB14 */ { 0, 0, 0, 0, 0, 0 }, /* PB14 */ - /* PB13 */ { 0, 0, 0, 0, 0, 0 }, /* PB13 */ - /* PB12 */ { 0, 0, 0, 0, 0, 0 }, /* PB12 */ - /* PB11 */ { 0, 0, 0, 0, 0, 0 }, /* PB11 */ - /* PB10 */ { 0, 0, 0, 0, 0, 0 }, /* PB10 */ - /* PB9 */ { 0, 0, 0, 0, 0, 0 }, /* PB9 */ - /* PB8 */ { 0, 0, 0, 0, 0, 0 }, /* PB8 */ - /* PB7 */ { 0, 0, 0, 0, 0, 0 }, /* PB7 */ - /* PB6 */ { 0, 0, 0, 0, 0, 0 }, /* PB6 */ - /* PB5 */ { 0, 0, 0, 0, 0, 0 }, /* PB5 */ - /* PB4 */ { 0, 0, 0, 0, 0, 0 }, /* PB4 */ + /* PB17 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_DV */ + /* PB16 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_ER */ + /* PB15 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TX_ER */ + /* PB14 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TX_EN */ + /* PB13 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII COL */ + /* PB12 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII CRS */ + /* PB11 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */ + /* PB10 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */ + /* PB9 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */ + /* PB8 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */ + /* PB7 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */ + /* PB6 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */ + /* PB5 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */ + /* PB4 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */ /* PB3 */ { 0, 0, 0, 0, 0, 0 }, /* PB3 */ /* PB2 */ { 0, 0, 0, 0, 0, 0 }, /* PB2 */ /* PB1 */ { 0, 0, 0, 0, 0, 0 }, /* PB1 */ @@ -128,8 +128,8 @@ const iop_conf_t iop_conf_tab[4][32] = { /* PC20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 MII TX_CLK */ /* PC19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_CLK */ /* PC18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII TX_CLK */ - /* PC17 */ { 0, 0, 0, 0, 0, 0 }, /* PC17 */ - /* PC16 */ { 0, 0, 0, 0, 0, 0 }, /* PC16 */ + /* PC17 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_CLK */ + /* PC16 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII TX_CLK */ #if 0 /* PC15 */ { 0, 0, 0, 0, 0, 0 }, /* PC15 */ #else diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 07cda56..852eefd 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -205,7 +205,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) SHOW_BOOT_PROGRESS (3); /* for multi-file images we need the data part, too */ - print_image_hdr (addr); + print_image_hdr ((image_header_t *)addr); data = addr + sizeof(image_header_t); len = ntohl(hdr->ih_size); diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index 468923c..b2baf02 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -362,10 +362,12 @@ _start: isync #if defined(CONFIG_ADDR_STREAMING) - li r0,0x2000 + li r0,0x3000 +#else + li r0,0x1000 +#endif mtspr HID1,r0 isync -#endif /* Enable Branch Prediction */ #if defined(CONFIG_BTB) |