summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-10-10 20:23:57 +0000
committerwdenk <wdenk>2004-10-10 20:23:57 +0000
commitcf33678e51e02143ed67850b3f13646fd51fb489 (patch)
tree68d8c425710d63d266395181eb592ec61ba3c734 /board
parent08b6aa61545d74afd4a9646adb469cf1320f4d8f (diff)
* Patch by Jon Loeliger, 24 Aug 2004:
- Fix PCI window on MPC85xx; remove unneeded PCI initialization from board_early_init_f() - Provide SW workaround for PCI initialization on 85xx CDS - Convert MPC85xxADS to use common CFI flash driver * Cleanup: avoid compiler warnings * Add CMC PU2 board to MAKEALL script
Diffstat (limited to 'board')
-rw-r--r--board/mpc8540ads/Makefile2
-rw-r--r--board/mpc8540ads/mpc8540ads.c7
-rw-r--r--board/mpc8560ads/Makefile2
-rw-r--r--board/mpc8560ads/mpc8560ads.c7
4 files changed, 2 insertions, 16 deletions
diff --git a/board/mpc8540ads/Makefile b/board/mpc8540ads/Makefile
index d150df831c5..5d8ea34946b 100644
--- a/board/mpc8540ads/Makefile
+++ b/board/mpc8540ads/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = lib$(BOARD).a
-OBJS := $(BOARD).o flash.o
+OBJS := $(BOARD).o
SOBJS := init.o
#SOBJS :=
diff --git a/board/mpc8540ads/mpc8540ads.c b/board/mpc8540ads/mpc8540ads.c
index c97e8ba15e1..01b03866e8b 100644
--- a/board/mpc8540ads/mpc8540ads.c
+++ b/board/mpc8540ads/mpc8540ads.c
@@ -44,13 +44,6 @@ long int fixed_sdram(void);
int board_early_init_f (void)
{
-#if defined(CONFIG_PCI)
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- volatile ccsr_pcix_t *pci = &immr->im_pcix;
-
- pci->peer &= 0xffffffdf; /* disable master abort */
-#endif
-
return 0;
}
diff --git a/board/mpc8560ads/Makefile b/board/mpc8560ads/Makefile
index d150df831c5..5d8ea34946b 100644
--- a/board/mpc8560ads/Makefile
+++ b/board/mpc8560ads/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = lib$(BOARD).a
-OBJS := $(BOARD).o flash.o
+OBJS := $(BOARD).o
SOBJS := init.o
#SOBJS :=
diff --git a/board/mpc8560ads/mpc8560ads.c b/board/mpc8560ads/mpc8560ads.c
index ed7139d87eb..1990e54769c 100644
--- a/board/mpc8560ads/mpc8560ads.c
+++ b/board/mpc8560ads/mpc8560ads.c
@@ -214,13 +214,6 @@ typedef struct bcsr_ {
int board_early_init_f (void)
{
-#if defined(CONFIG_PCI)
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- volatile ccsr_pcix_t *pci = &immr->im_pcix;
-
- pci->peer &= 0xffffffdf; /* disable master abort */
-#endif
-
return 0;
}