diff options
| author | wdenk <wdenk> | 2004-05-12 22:54:36 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-05-12 22:54:36 +0000 |
| commit | 02b11f8e096fde3fc891190c413014a63cdc37b3 (patch) | |
| tree | a54ae384e4818c20966cd8710bc9d2fa27b3faf9 /board/kup/kup4k | |
| parent | 6c1362cf637ccaa89806edf70f000009672c509e (diff) | |
| download | u-boot-midas-02b11f8e096fde3fc891190c413014a63cdc37b3.tar.gz u-boot-midas-02b11f8e096fde3fc891190c413014a63cdc37b3.tar.bz2 u-boot-midas-02b11f8e096fde3fc891190c413014a63cdc37b3.zip | |
Patch by Klaus Heydeck, 12 May 2004:
Using external watchdog for KUP4 boards in mpc8xx/cpu.c;
load_sernum_ethaddr() for KUP4 boards in lib_ppc/board.c;
various changes to KUP4 board specific files
Diffstat (limited to 'board/kup/kup4k')
| -rw-r--r-- | board/kup/kup4k/Makefile | 2 | ||||
| -rw-r--r-- | board/kup/kup4k/kup4k.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/board/kup/kup4k/Makefile b/board/kup/kup4k/Makefile index 573204491e..62d289b436 100644 --- a/board/kup/kup4k/Makefile +++ b/board/kup/kup4k/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a -OBJS = $(BOARD).o ../common/flash.o ../common/kup.o +OBJS = $(BOARD).o ../common/flash.o ../common/kup.o ../common/load_sernum_ethaddr.o $(LIB): .depend $(OBJS) $(AR) crv $@ $(OBJS) diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c index 8bed3d5ad5..c352c8b671 100644 --- a/board/kup/kup4k/kup4k.c +++ b/board/kup/kup4k/kup4k.c @@ -129,11 +129,11 @@ int checkboard (void) */ immap->im_memctl.memc_or4 = 0xFFFF8926; immap->im_memctl.memc_br4 = 0x90000401; - + __asm__ ("eieio"); latch=(uchar *)0x90000200; rev = (*latch & 0xF8) >> 3; mod=(*latch & 0x03); - printf ("Board: KUP4K Rev %d.%d SN: %s\n",rev,mod,getenv("ethaddr")); + printf ("Board: KUP4K Rev %d.%d\n",rev,mod); return (0); } @@ -346,6 +346,7 @@ void lcd_logo (bd_t * bd) */ memctl->memc_or5 = 0xFFC007F0; /* 4 MB 17 WS or externel TA */ memctl->memc_br5 = 0x80080801; /* Start at 0x80080000 */ + __asm__ ("eieio"); fb_info.VmemAddr = (unsigned char *) (S1D_PHYSICAL_VMEM_ADDR); fb_info.RegAddr = (unsigned char *) (S1D_PHYSICAL_REG_ADDR); |