patch-2.4.20 linux-2.4.20/arch/m68k/kernel/setup.c
Next file: linux-2.4.20/arch/m68k/kernel/traps.c
Previous file: linux-2.4.20/arch/m68k/kernel/head.S
Back to the patch index
Back to the overall index
- Lines: 62
- Date:
Thu Nov 28 15:53:09 2002
- Orig file:
linux-2.4.19/arch/m68k/kernel/setup.c
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/arch/m68k/kernel/setup.c linux-2.4.20/arch/m68k/kernel/setup.c
@@ -34,6 +34,7 @@
#endif
#ifdef CONFIG_ATARI
#include <asm/atarihw.h>
+#include <asm/atari_stram.h>
#endif
#ifdef CONFIG_SUN3X
#include <asm/dvma.h>
@@ -71,11 +72,12 @@
void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;
/* machine dependent keyboard functions */
+#ifdef CONFIG_VT
int (*mach_keyb_init) (void) __initdata = NULL;
int (*mach_kbdrate) (struct kbd_repeat *) = NULL;
void (*mach_kbd_leds) (unsigned int) = NULL;
int (*mach_kbd_translate)(unsigned char scancode, unsigned char *keycode, char raw_mode) = NULL;
-unsigned int SYSRQ_KEY;
+#endif
/* machine dependent irq functions */
void (*mach_init_IRQ) (void) __initdata = NULL;
void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
@@ -104,6 +106,7 @@
#endif
#ifdef CONFIG_MAGIC_SYSRQ
+unsigned int SYSRQ_KEY;
int mach_sysrq_key = -1;
int mach_sysrq_shift_state = 0;
int mach_sysrq_shift_mask = 0;
@@ -218,8 +221,20 @@
int i;
char *p, *q;
- /* The bootinfo is located right after the kernel bss */
- m68k_parse_bootinfo((const struct bi_record *)&_end);
+ if (!MACH_IS_HP300) {
+ /* The bootinfo is located right after the kernel bss */
+ m68k_parse_bootinfo((const struct bi_record *)&_end);
+ } else {
+ /* FIXME HP300 doesn't use bootinfo yet */
+ extern unsigned long hp300_phys_ram_base;
+ unsigned long hp300_mem_size = 0xffffffff-hp300_phys_ram_base;
+ m68k_cputype = CPU_68030;
+ m68k_fputype = FPU_68882;
+ m68k_memory[0].addr = hp300_phys_ram_base;
+ /* 0.5M fudge factor */
+ m68k_memory[0].size = hp300_mem_size-512*1024;
+ m68k_num_memory++;
+ }
if (CPU_IS_040)
m68k_is040or060 = 4;
@@ -372,7 +387,7 @@
#ifdef CONFIG_ATARI
if (MACH_IS_ATARI)
- atari_stram_reserve_pages(availmem);
+ atari_stram_reserve_pages((void *)availmem);
#endif
#ifdef CONFIG_SUN3X
if (MACH_IS_SUN3X) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)