UniCorn 2Gb + V4 as default for boradmodel

Author: WDrijver

arch/m68k-amiga/boot/rom_init.S

@@ -96,23 +96,34 @@ arosbootstrap_init:
 
 	/* set AttnFlags AFB_ADDR32 */
 	or.w	#0x2000,%a4@(2)
-	
+
 	#if VAMPIRECARDSERIES==4
 	//V4 version
 	move.l	#0x01800000,%a0		// Reserve 8MB for ApolloFloppy
-	move.l	#0x80000000,%a1		// UniCorn 2Gb
+	move.l	#0x40000000,%a1		// SA 1Gb
 	move.l	#0x00100000,%d0
 	jsr	__MemoryTest
 	#else
-	move.l	#0x08000000,%a0
-	move.l	#0x20000000,%a1
-	move.l	#0x00100000,%d0
-	jsr	__MemoryTest
 
-	move.l	#0x01000000,%a0
-	move.l	#0x08000000,%a1
-	move.l	#0x00100000,%d0
-	jsr	__MemoryTest
+		#if VAMPIRECARDSERIES==8
+		//V4 version
+		move.l	#0x01800000,%a0		// Reserve 8MB for ApolloFloppy
+		move.l	#0x80000000,%a1		// UniCorn 2Gb
+		move.l	#0x00100000,%d0
+		jsr	__MemoryTest
+
+		#else
+		move.l	#0x08000000,%a0
+		move.l	#0x20000000,%a1
+		move.l	#0x00100000,%d0
+		jsr	__MemoryTest
+
+		move.l	#0x01000000,%a0
+		move.l	#0x08000000,%a1
+		move.l	#0x00100000,%d0
+		jsr	__MemoryTest
+		#endif
+
 	#endif
 
 

arch/m68k-amiga/hidd/sagagfx/sagagfx_init.c

@@ -110,7 +110,8 @@ static int SAGAGfx_Init(LIBBASETYPEPTR LIBBASE)
 	case VREG_BOARD_V4_V500:
 	case VREG_BOARD_V4_V1200:
 	case VREG_BOARD_V4_V600:		
-	case VREG_BOARD_V4_UNI:				
+	case VREG_BOARD_V4_UNI:	
+    default:			
             // SAGA V4 METHODS
             xsd->SAGAGfx_GetPixFmt         = SAGAHW_V4_GetPixFmt;
             xsd->SAGAGfx_GetModeID         = SAGAHW_V4_GetModeID;
@@ -126,9 +127,9 @@ static int SAGAGfx_Init(LIBBASETYPEPTR LIBBASE)
             xsd->SAGAGfx_SetSpritePosition = SAGAHW_V4_SetSpritePosition;
             break;			
 
-	default:
-	    return(FALSE);	
- 	    break;
+	//default:
+	//    return(FALSE);	
+ 	//    break;
 	}
 
     /* Create a memory pool */