GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-28 09:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Patch by Xiao Xianghua, 23 Oct 2003:

Browse source 
small patch for mpc85xx

* Fix small problem in MPC5200 I2C driver

* Fix FCC3 support on ATC board
This commit is contained in:
wdenk 2003-10-26 22:52:58 +00:00
parent 8cb8143ef7
commit a57a496f4d
4 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG
View file

@ -2,6 +2,13 @@
Changes for U-Boot 1.0.0: 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() * Correct header printing for multi-image files in do_bootm()
* Make CONFIG_SILENT_CONSOLE work with CONFIG_AUTOBOOT_KEYED * Make CONFIG_SILENT_CONSOLE work with CONFIG_AUTOBOOT_KEYED

32
board/atc/atc.c
View file

@ -92,20 +92,20 @@ const iop_conf_t iop_conf_tab[4][32] = {
/* PB20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[1] */ /* PB20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[1] */
/* PB19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[2] */ /* PB19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[2] */
/* PB18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[3] */ /* PB18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[3] */
/* PB17 */ { 0, 0, 0, 0, 0, 0 }, /* PB17 */ /* PB17 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_DV */
/* PB16 */ { 0, 0, 0, 0, 0, 0 }, /* PB16 */ /* PB16 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_ER */
/* PB15 */ { 0, 0, 0, 0, 0, 0 }, /* PB15 */ /* PB15 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TX_ER */
/* PB14 */ { 0, 0, 0, 0, 0, 0 }, /* PB14 */ /* PB14 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TX_EN */
/* PB13 */ { 0, 0, 0, 0, 0, 0 }, /* PB13 */ /* PB13 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII COL */
/* PB12 */ { 0, 0, 0, 0, 0, 0 }, /* PB12 */ /* PB12 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII CRS */
/* PB11 */ { 0, 0, 0, 0, 0, 0 }, /* PB11 */ /* PB11 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */
/* PB10 */ { 0, 0, 0, 0, 0, 0 }, /* PB10 */ /* PB10 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */
/* PB9 */ { 0, 0, 0, 0, 0, 0 }, /* PB9 */ /* PB9 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */
/* PB8 */ { 0, 0, 0, 0, 0, 0 }, /* PB8 */ /* PB8 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RxD */
/* PB7 */ { 0, 0, 0, 0, 0, 0 }, /* PB7 */ /* PB7 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */
/* PB6 */ { 0, 0, 0, 0, 0, 0 }, /* PB6 */ /* PB6 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */
/* PB5 */ { 0, 0, 0, 0, 0, 0 }, /* PB5 */ /* PB5 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */
/* PB4 */ { 0, 0, 0, 0, 0, 0 }, /* PB4 */ /* PB4 */ { 1, 1, 0, 1, 0, 0 }, /* FCC3 MII TxD */
/* PB3 */ { 0, 0, 0, 0, 0, 0 }, /* PB3 */ /* PB3 */ { 0, 0, 0, 0, 0, 0 }, /* PB3 */
/* PB2 */ { 0, 0, 0, 0, 0, 0 }, /* PB2 */ /* PB2 */ { 0, 0, 0, 0, 0, 0 }, /* PB2 */
/* PB1 */ { 0, 0, 0, 0, 0, 0 }, /* PB1 */ /* 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 */ /* PC20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 MII TX_CLK */
/* PC19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_CLK */ /* PC19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_CLK */
/* PC18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII TX_CLK */ /* PC18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII TX_CLK */
/* PC17 */ { 0, 0, 0, 0, 0, 0 }, /* PC17 */ /* PC17 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII RX_CLK */
/* PC16 */ { 0, 0, 0, 0, 0, 0 }, /* PC16 */ /* PC16 */ { 1, 1, 0, 0, 0, 0 }, /* FCC3 MII TX_CLK */
#if 0 #if 0
/* PC15 */ { 0, 0, 0, 0, 0, 0 }, /* PC15 */ /* PC15 */ { 0, 0, 0, 0, 0, 0 }, /* PC15 */
#else #else

2
common/cmd_bootm.c
View file

@ -205,7 +205,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
SHOW_BOOT_PROGRESS (3); SHOW_BOOT_PROGRESS (3);
/* for multi-file images we need the data part, too */ /* 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); data = addr + sizeof(image_header_t);
len = ntohl(hdr->ih_size); len = ntohl(hdr->ih_size);

6
cpu/mpc85xx/start.S
View file

@ -362,10 +362,12 @@ _start:
isync isync
#if defined(CONFIG_ADDR_STREAMING) #if defined(CONFIG_ADDR_STREAMING)
li r0,0x2000 li r0,0x3000
#else
li r0,0x1000
#endif
mtspr HID1,r0 mtspr HID1,r0
isync isync
#endif
/* Enable Branch Prediction */ /* Enable Branch Prediction */
#if defined(CONFIG_BTB) #if defined(CONFIG_BTB)