Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 3916 → Rev 3917

/trunk/kernel/arch/arm32/_link.ld.in
6,10 → 6,11
*
*/
 
#define KERNEL_LOAD_ADDRESS 0x80200000
 
OUTPUT_ARCH(arm)
ENTRY(kernel_image_start)
 
 
SECTIONS {
. = KERNEL_LOAD_ADDRESS;
.text : {
48,5 → 49,4
*(.comment);
*(.note);
}
 
}
/trunk/kernel/arch/arm32/include/machine.h
102,7 → 102,7
extern uintptr_t machine_get_fb_address(void);
 
 
#ifdef MACHINE_GXEMUL_TESTARM
#ifdef MACHINE_gxemul
#define machine_console_init(devno) gxemul_console_init(devno)
#define machine_grab_console gxemul_grab_console
#define machine_release_console gxemul_release_console
/trunk/kernel/arch/arm32/Makefile.inc
35,14 → 35,11
TARGET = arm-linux-gnu
TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm
 
KERNEL_LOAD_ADDRESS = 0x80200000
DMACHINE = MACHINE_GXEMUL_TESTARM
 
ATSIGN = %
 
GCC_CFLAGS += -fno-zero-initialized-in-bss
 
DEFS += -D__32_BITS__ -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS) -D$(DMACHINE)
DEFS += -D__32_BITS__
 
ARCH_SOURCES = \
arch/$(KARCH)/src/start.S \
/trunk/HelenOS.config
48,6 → 48,10
! [PLATFORM=mips32] MACHINE (choice)
 
% Machine type
@ "gxemul" GXEmul
! [PLATFORM=arm32] MACHINE (choice)
 
% Machine type
@ "i460GX" i460GX chipset machine
@ "ski" Ski ia64 simulator
! [PLATFORM=ia64] MACHINE (choice)