Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 836 → Rev 833

/kernel/trunk/arch/ppc32/src/mm/frame.c
33,9 → 33,5
 
void frame_arch_init(void)
{
/* First page is exception vector,
* second is 'implementation specific', evade it too
*/
zone_create(0, SIZE2FRAMES(config.memory_size), 2, 0);
frame_mark_unavailable(0, 2);
zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
}
/kernel/trunk/arch/mips32/src/mm/frame.c
42,10 → 42,6
if (arc_enabled())
arc_frame_init();
else {
zone_create(0, ADDR2PFN(config.memory_size), 1, 0);
/*
* Blacklist interrupt vektor
*/
frame_mark_unavailable(0, 1);
zone_create(1, (config.memory_size >> FRAME_WIDTH)-1,1,0);
}
}
/kernel/trunk/arch/mips32/src/console.c
31,7 → 31,6
#include <arch/drivers/arc.h>
#include <arch/drivers/serial.h>
#include <arch/drivers/msim.h>
#include <fb/fb.h>
 
void console_init(void)
{
41,7 → 40,4
serial_console();
} else
msim_console();
#ifdef CONFIG_FB
fb_init(0xb2000000, 640, 480);
#endif
}
/kernel/trunk/generic/include/fb/fb.h
File deleted
/kernel/trunk/generic/src/fb/fb.c
File deleted
/kernel/trunk/contrib/conf/gxemul.sh
1,4 → 1,4
#!/bin/sh
# Uspace addresses outside of normal memory (kernel has std. 8 or 16MB)
# we place the pages at 24M
gxemul -E testmips -X 0x81800000:init kernel.bin
gxemul -E testmips 0x81800000:init kernel.bin
/kernel/trunk/Makefile
132,16 → 132,9
generic/src/synch/mutex.c \
generic/src/synch/semaphore.c \
generic/src/synch/waitq.c \
generic/src/smp/ipi.c
generic/src/smp/ipi.c \
generic/src/fb/font-8x16.c
 
## Framebuffer
ifeq ($(CONFIG_FB),y)
GENERIC_SOURCES += \
generic/src/fb/font-8x16.c \
generic/src/fb/fb.c
DEFS += -DCONFIG_FB
endif
 
## Test sources
#
 
/kernel/trunk/kernel.config
44,9 → 44,6
@ "indy" SGI Indy
! [ARCH=mips32] MIPS_MACHINE (choice)
 
# Framebuffer support
! [ARCH=mips32&MIPS_MACHINE=lgxemul] CONFIG_FB (y/n)
 
# Support for SMP
! [ARCH=ia32|ARCH=amd64] CONFIG_SMP (y/n)