patch for Milo-1.3.68 - fixes problems with 21066 based systems

Ka'plaagh 29-Feb-1996 1205 +0000 (rusling@rdgeng.enet.dec.com)
Thu, 29 Feb 96 13:03:12 MET

All,
oops, I goofed. The milo-1.3.68 sources do not correctly
build for 21066 based systems. The following patch can be applied
to fix this, but the 1.3.69 sources will be out later with this
fix in them. The images in /test-images all work fine.

Dave

--------------
--- ./milo-1.3.68/Makefile Tue Feb 27 18:30:03 1996
+++ ./milo-1.3.69/Makefile Thu Feb 29 11:54:48 1996
@@ -179,7 +179,7 @@
.c.s:
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -S -o $*.s $<
.s.o:
- $(AS) $(ASFLAGS) -o $*.o $<
+ $(AS) -o $*.o $<
.c.o:
$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $*.o $<
.S.s:
@@ -301,13 +301,17 @@
# milo (a relocatable image that can be loaded by _anything_!
# ----------------------------------------------------------------------------

+micropal.i: micropal.S
+ $(CPP) $(DEFINES) $(INCLUDES) $< > micropal.i
+
+micropal.o: micropal.i
+ $(AS) $(ASFLAGS) -o micropal.o micropal.i
+
milo.compressed.s: tools/data milo.compressed
tools/data -v milo.compressed milo.compressed.s

milo.compressed.o: milo.compressed.s

-micropal.o: micropal.S
-
micropal.nh: micropal.o
tools/cstrip -va micropal.o micropal.nh

@@ -445,13 +449,6 @@
$(NM) fmu | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | sort > fmu.map
quickstrip fmu fmu

-micropal.i: micropal.S
- $(CPP) $(DEFINES) $(INCLUDES) $< > micropal.i
-
-micropal.o: micropal.i
- $(AS) $(ASFLAGS) -o micropal.o micropal.i
-
-
# ----------------------------------------------------------------------------
# The tools that we need to build the miniloader.
# ----------------------------------------------------------------------------
@@ -474,7 +471,7 @@
clean:
rm -f $(ALL) *.nh *.map *.lis *.exe *.o flash_image.s *.gz \
mboot bootm *~ milo.exe milo.full* milo.compressed* \
- *.stripped
+ *.stripped *.i
ifndef MINI_DIGITAL_BIOSEMU
$(MAKE) -C x86 DEFINES="" X86LIB=$(X86LIB) clean
endif
--- ./milo-1.3.68/micropal.S Tue Feb 27 18:40:43 1996
+++ ./milo-1.3.69/micropal.S Thu Feb 29 11:54:21 1996
@@ -137,6 +137,10 @@
#define DEBUG_APECS
#endif /* DC21064 */

+#ifdef DC21066
+#define DEBUG_21066
+#endif
+
#endif /* DEBUG */

#ifdef DC21164
@@ -165,7 +169,15 @@
#define WaitDelay 0x400
#endif /* DEBUG_APECS */

-#if defined (DEBUG_ALCOR) || defined (DEBUG_APECS)
+#ifdef DEBUG_21066
+#define LEDPORT 0x80
+#define IO_SHIFT 5
+#define PCI_SPARSE 0x1C
+#define BASE_SHIFT 28
+#define WaitDelay 0x400
+#endif /* DEBUG_APECS */
+
+#if defined (DEBUG_ALCOR) || defined (DEBUG_APECS) || defined(DEBUG_21066)
#define LEDWRITE(value, reg1, reg2) \
lda reg1, PCI_SPARSE($31); \
sll reg1, (BASE_SHIFT-IO_SHIFT), reg1; \
@@ -501,7 +513,7 @@
STALL
STALL

-#ifdef DC21064
+#if defined(DC21064) || defined(DC21066)
mtpr $31, flushIc /* Flush the I-cache */
mtpr $31, xtbZap /* Flush the TBs */
#endif /* DC21064 */
@@ -541,7 +553,7 @@
#endif


-#ifdef DC21064
+#if defined(DC21064) || defined(DC21066)
/*
** DC21064 PALcode entry point for DTB miss flow
*/