summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-01-09 17:12:27 +0000
committerwdenk <wdenk>2005-01-09 17:12:27 +0000
commita1191902cab72b9f7127365fac39a1e1d5c9abda (patch)
tree2baffb8ff9c965e0bdaaa4f047a4a3b21aff27a3 /board
parent15c7a8efd2f7275e5b3249aac305f2598a998645 (diff)
downloadu-boot-imx-a1191902cab72b9f7127365fac39a1e1d5c9abda.zip
u-boot-imx-a1191902cab72b9f7127365fac39a1e1d5c9abda.tar.gz
u-boot-imx-a1191902cab72b9f7127365fac39a1e1d5c9abda.tar.bz2
* Patch by Jon Loeliger, 02 Sep 2004:
Reset monitor size back to 256 so environment can be written to flash on MPC85xx ADS and CDS releases. * Patch by Paolo Broggini, 02 Sep 2004: Make BSS clearing on ARM systems more robust * Patch by Yue Hu and Joe, 01 Sep 2004: - add PCI support for ixp425; - add EEPRO100 suppor tfor ixdp425 board. * Fix problem with protected sector detection in driver/cfi_flash.c
Diffstat (limited to 'board')
-rw-r--r--board/ixdp425/ixdp425.c8
-rw-r--r--board/xilinx/xilinx_iic/iic_adapter.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c
index 09e5fdf..e56f477 100644
--- a/board/ixdp425/ixdp425.c
+++ b/board/ixdp425/ixdp425.c
@@ -40,7 +40,7 @@
int
/**********************************************************/
-board_late_init (void)
+board_post_init (void)
/**********************************************************/
{
return (0);
@@ -74,3 +74,9 @@ dram_init (void)
return (0);
}
+extern struct pci_controller hose;
+void pci_init_board(void)
+{
+ pci_ixp_init(&hose);
+ return ;
+}
diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c
index 0b7de7b..5ad4a0c 100644
--- a/board/xilinx/xilinx_iic/iic_adapter.c
+++ b/board/xilinx/xilinx_iic/iic_adapter.c
@@ -329,7 +329,7 @@ convert_env(void)
if (s != NULL) {
sprintf(temp, "%c%c.%c%c.%c%c.%c%c.%c%c.%c%c",
s[0], s[1], s[ 2], s[ 3],
- s[4], s[5], s[ 6], s[ 7],
+ s[4], s[5], s[ 6], s[ 7],
s[8], s[9], s[10], s[11] );
setenv("ethaddr", temp);
setenv("E", NULL);