Changeset 646b996 in mainline
- Timestamp:
- 2009-07-30T15:58:54Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 30885b9
- Parents:
- 76093ae
- Files:
-
- 2 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r76093ae r646b996 57 57 58 58 % Machine type 59 @ "testarm" G xemul Testarm59 @ "testarm" GXEmul Testarm 60 60 @ "integratorcp" Integratorcp 61 61 ! [PLATFORM=arm32] MACHINE (choice) -
boot/arch/arm32/loader/Makefile
r76093ae r646b996 41 41 TARGET = arm-linux-gnu 42 42 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin 43 44 ifeq ($(MACHINE), testarm)45 DMACHINE = MACHINE_GXEMUL_TESTARM46 endif47 48 ifeq ($(MACHINE), integratorcp)49 DMACHINE = MACHINE_ICP50 endif51 52 43 53 44 ifeq ($(COMPILER),gcc_native) … … 103 94 $(USPACEDIR)/srv/fs/fat/fat \ 104 95 $(USPACEDIR)/srv/bd/file_bd/file_bd 105 ifeq ($(MACHINE), 96 ifeq ($(MACHINE),testarm) 106 97 RD_SRVS += \ 107 98 $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd … … 161 152 162 153 %.o: %.c 163 $(CC) -D$(DMACHINE)$(DEFS) $(CFLAGS) -c $< -o $@154 $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -
boot/arch/arm32/loader/print/print.c
r76093ae r646b996 41 41 42 42 /** Address where characters to be printed are expected. */ 43 #ifdef MACHINE_ GXEMUL_TESTARM44 #define PUTC_ADDRESS0x1000000043 #ifdef MACHINE_testarm 44 #define PUTC_ADDRESS 0x10000000 45 45 #endif 46 #ifdef MACHINE_ICP 47 #define PUTC_ADDRESS 0x16000000 46 47 #ifdef MACHINE_integratorcp 48 #define PUTC_ADDRESS 0x16000000 48 49 #endif 49 50 -
kernel/Makefile
r76093ae r646b996 344 344 -rm -f kernel.bin kernel.raw kernel.map kernel.map.pre kernel.objdump kernel.disasm generic/src/debug/real_map.bin Makefile.depend* generic/include/arch generic/include/genarch arch/$(KARCH)/_link.ld 345 345 find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \; 346 ifeq ($(PLATFORM),arm32)347 rm -f arch/$(KARCH)/include/machine.h348 endif349 346 for arch in arch/* ; do \ 350 347 [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null ; \ … … 354 351 ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch 355 352 ln -sfn ../../genarch/include/ generic/include/genarch 356 ifeq ($(PLATFORM),arm32)357 ln -sfn mach/$(MACHINE)/$(MACHINE).h arch/$(KARCH)/include/machine.h358 endif359 353 360 354 depend: archlinks -
kernel/arch/arm32/Makefile.inc
r76093ae r646b996 61 61 arch/$(KARCH)/src/mm/page.c \ 62 62 arch/$(KARCH)/src/mm/tlb.c \ 63 arch/$(KARCH)/src/mm/page_fault.c 64 ifeq ($(MACHINE), testarm) 65 ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c 66 else ifeq ($(MACHINE), integratorcp) 67 ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c 63 arch/$(KARCH)/src/mm/page_fault.c 64 65 ifeq ($(MACHINE),testarm) 66 ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c 68 67 endif 69 ifeq ($(CONFIG_PL050), y) 68 69 ifeq ($(MACHINE),integratorcp) 70 ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c 71 endif 72 73 ifeq ($(CONFIG_PL050),y) 70 74 ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c 71 75 endif -
kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
r76093ae r646b996 36 36 */ 37 37 38 #ifndef KERN_arm32_ ICP_H_39 #define KERN_arm32_ ICP_H_38 #ifndef KERN_arm32_MACHINE_H_ 39 #define KERN_arm32_MACHINE_H_ 40 40 41 41 #include <arch/machine_func.h> -
kernel/arch/arm32/include/mach/testarm/testarm.h
r76093ae r646b996 37 37 */ 38 38 39 #ifndef KERN_arm32_ GXEMUL_H_40 #define KERN_arm32_ GXEMUL_H_39 #ifndef KERN_arm32_MACHINE_H_ 40 #define KERN_arm32_MACHINE_H_ 41 41 42 42 #include <arch/machine_func.h> -
kernel/arch/arm32/src/arm32.c
r76093ae r646b996 41 41 #include <console/console.h> 42 42 #include <ddi/irq.h> 43 #include <arch/machine.h>44 43 #include <print.h> 45 44 #include <config.h> … … 50 49 #include <string.h> 51 50 51 #ifdef MACHINE_testarm 52 #include <arch/mach/testarm/testarm.h> 53 #endif 54 55 #ifdef MACHINE_integratorcp 56 #include <arch/mach/integratorcp/integratorcp.h> 57 #endif 58 59 52 60 /** Performs arm32-specific initialization before main_bsp() is called. */ 53 61 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) -
kernel/arch/arm32/src/exception.c
r76093ae r646b996 40 40 #include <arch/mm/page_fault.h> 41 41 #include <arch/barrier.h> 42 #include <arch/machine.h>43 42 #include <print.h> 44 43 #include <syscall/syscall.h> 44 45 #ifdef MACHINE_testarm 46 #include <arch/mach/testarm/testarm.h> 47 #endif 48 49 #ifdef MACHINE_integratorcp 50 #include <arch/mach/integratorcp/integratorcp.h> 51 #endif 45 52 46 53 /** Offset used in calculation of exception handler's relative address. -
kernel/arch/arm32/src/interrupt.c
r76093ae r646b996 36 36 #include <arch/asm.h> 37 37 #include <arch/regutils.h> 38 #include <arch/machine.h>39 38 #include <ddi/irq.h> 40 39 #include <ddi/device.h> 41 40 #include <interrupt.h> 41 42 #ifdef MACHINE_testarm 43 #include <arch/mach/testarm/testarm.h> 44 #endif 45 46 #ifdef MACHINE_integratorcp 47 #include <arch/mach/integratorcp/integratorcp.h> 48 #endif 42 49 43 50 /** Initial size of a table holding interrupt handlers. */ … … 97 104 irq_init(IRQ_COUNT, IRQ_COUNT); 98 105 machine_timer_irq_start(); 99 100 106 } 101 107 -
kernel/arch/arm32/src/mm/frame.c
r76093ae r646b996 36 36 #include <mm/frame.h> 37 37 #include <arch/mm/frame.h> 38 #include <arch/machine.h>39 38 #include <config.h> 39 40 #ifdef MACHINE_testarm 41 #include <arch/mach/testarm/testarm.h> 42 #endif 43 44 #ifdef MACHINE_integratorcp 45 #include <arch/mach/integratorcp/integratorcp.h> 46 #endif 40 47 41 48 /** Address of the last frame in the memory. */
Note:
See TracChangeset
for help on using the changeset viewer.