Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

arch/m68knommu/Kconfig

@@ -222,21 +222,17 @@ config UCDIMM
 	  Support for the Arcturus Networks uDsimm module.
 
 config DRAGEN2
-	bool "Dragen Engine II board support"
+	bool "DragenEngine II board support"
 	depends on M68VZ328
 	help
-	  Support for the Dragen Engine II board.
+	  Support for the DragenEngine II board.
 
-config HWADDR_FROMEEPROM
-	bool "  Read ETH address from EEPROM"
-	depends on DRAGEN2
+config DIRECT_IO_ACCESS
+	bool "  Allow user to access IO directly"
+	depends on (UCSIMM || UCDIMM || DRAGEN2)
 	help
-	  Use MAC address from EEPROM.
-
-config HWADDR_OFFSET
-	int "  Offset from start of EEPROM"
-	default "2"
-	depends on HWADDR_FROMEEPROM
+	  Disable the CPU internal registers protection in user mode,
+          to allow a user application to read/write them.
 
 config INIT_LCD
 	bool "  Initialize LCD"
@@ -246,7 +242,7 @@ config INIT_LCD
 
 config MEMORY_RESERVE
 	int "  Memory reservation (MiB)"
-	depends on (UCSIMM || UCDIMM || DRAGEN2)
+	depends on (UCSIMM || UCDIMM)
 	help
 	  Reserve certain memory regions on 68x328 based boards.
 

arch/m68knommu/platform/5307/MP3/crt0_ram.S

@@ -124,6 +124,8 @@ _start:
 	movec	%d0,%CACR
 	nop
 
+
+#ifdef CONFIG_ROMFS_FS
 	/*
 	 *	Move ROM filesystem above bss :-)
 	 */
@@ -145,6 +147,12 @@ _copy_romfs:
 	cmp.l	%a0, %a2			/* Check if at end */
 	bne	_copy_romfs
 
+#else /* CONFIG_ROMFS_FS */
+	lea.l	_ebss, %a1
+	move.l	%a1, _ramstart
+#endif /* CONFIG_ROMFS_FS */
+
+
 	/*
 	 *	Zero out the bss region.
 	 */

arch/m68knommu/platform/5307/NETtel/crt0_ram.S

@@ -147,6 +147,8 @@ _start:
 	movec	%d0,%CACR
 	nop
 
+
+#ifdef CONFIG_ROMFS_FS
 	/*
 	 *	Move ROM filesystem above bss :-)
 	 */
@@ -168,6 +170,12 @@ _copy_romfs:
 	cmp.l	%a0, %a2			/* Check if at end */
 	bne	_copy_romfs
 
+#else /* CONFIG_ROMFS_FS */
+	lea.l	_ebss, %a1
+	move.l	%a1, _ramstart
+#endif /* CONFIG_ROMFS_FS */
+
+
 	/*
 	 *	Zero out the bss region.
 	 */

arch/m68knommu/platform/68VZ328/de2/config.c

@@ -36,7 +36,7 @@
 #define TICKS_PER_JIFFY 41450
 
 static void
-dragen2_sched_init(void (*timer_routine) (int, void *, struct pt_regs *))
+dragen2_sched_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *))
 {
 	/* disable timer 1 */
 	TCTL = 0;
@@ -183,14 +183,20 @@ static void init_hardware(void)
 #endif
 }
 
-void config_BSP(char *command, int len)
+void config_BSP(char *command, int size)
 {
 	printk("68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
-	command[0] = '\0';			/* no specific boot option */
+
+#if defined(CONFIG_BOOTPARAM)
+	strncpy(command, CONFIG_BOOTPARAM_STRING, size);
+	command[size-1] = 0;
+#else
+	memset(command, 0, size);
+#endif
 
 	init_hardware();
 
-	mach_sched_init = dragen2_sched_init;
+	mach_sched_init = (void *)dragen2_sched_init;
 	mach_tick = dragen2_tick;
 	mach_gettimeoffset = dragen2_gettimeoffset;
 	mach_reset = dragen2_reset;

arch/m68knommu/vmlinux.lds.S

@@ -277,7 +277,9 @@ SECTIONS {
 		__con_initcall_start = .;
 		*(.con_initcall.init)
 		__con_initcall_end = .;
-		SECURITY_INIT
+		__security_initcall_start = .;
+		*(.security_initcall.init)
+		__security_initcall_end = .;
 		. = ALIGN(4);
 		__initramfs_start = .;
 		*(.init.ramfs)

drivers/serial/68328serial.c

@@ -1533,7 +1533,6 @@ void unregister_serial(int line)
 }
 	
 module_init(rs68328_init);
-/* DAVIDM module_exit(rs68328_fini); */
 
 
 

drivers/serial/mcfserial.c

@@ -1643,7 +1643,6 @@ mcfrs_init(void)
 }
 
 module_init(mcfrs_init);
-/* DAVIDM module_exit(mcfrs_fini); */
 
 /****************************************************************************/
 /*                          Serial Console                                  */