Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3514 → Rev 3515

/branches/arm/kernel/arch/arm32/include/machine.h
43,7 → 43,12
#include <console/console.h>
#include <arch/types.h>
#include <arch/exception.h>
#ifdef MACHINE_GXEMUL_TESTARM
#include <arch/drivers/gxemul.h>
#endif
#ifdef MACHINE_QEMU_ICP
#include <arch/drivers/qemu.h>
#endif
 
 
/** Initializes console.
116,7 → 121,20
#define machine_get_fb_address gxemul_get_fb_address
#endif
 
#ifdef MACHINE_QEMU_ICP
#define machine_console_init(devno) qemu_icp_console_init(devno)
#define machine_grab_console qemu_icp_grab_console
#define machine_release_console qemu_icp_release_console
#define machine_hw_map_init qemu_icp_hw_map_init
#define machine_timer_irq_start qemu_icp_timer_irq_start
#define machine_cpu_halt qemu_icp_cpu_halt
#define machine_get_memory_size qemu_icp_get_memory_size
#define machine_debug_putc(ch) qemu_icp_debug_putc(ch)
#define machine_irq_exception(exc_no, istate) \
qemu_icp_irq_exception(exc_no, istate)
#define machine_get_fb_address qemu_icp_get_fb_address
#endif
#endif
 
/** @}
*/
/branches/arm/kernel/arch/arm32/Makefile.inc
41,9 → 41,11
 
KERNEL_LOAD_ADDRESS = 0x80200000
 
# ifeq ($(MACHINE), gxemul_testarm)
ifeq ($(MACHINE), gxemul_testarm)
DMACHINE = MACHINE_GXEMUL_TESTARM
# endif
else ifeq ($(MACHINE), qemu_icp)
DMACHINE = MACHINE_QEMU_ICP
endif
 
ATSIGN = %
 
94,7 → 96,9
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/mm/page_fault.c
 
# ifeq ($(MACHINE), gxemul_testarm)
ifeq ($(MACHINE), gxemul_testarm)
ARCH_SOURCES += arch/$(ARCH)/src/drivers/gxemul.c
# endif
else ifeq ($(MACHINE), qemu_icp)
ARCH_SOURCES += arch/$(ARCH)/src/drivers/qemu.c
endif