Changeset 646b996 in mainline


Ignore:
Timestamp:
2009-07-30T15:58:54Z (15 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
30885b9
Parents:
76093ae
Message:

cleanup some of the dirty hacks introduced into the arm32 port
add default configurations for the two supported arm32 variants

Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r76093ae r646b996  
    5757
    5858% Machine type
    59 @ "testarm" Gxemul Testarm
     59@ "testarm" GXEmul Testarm
    6060@ "integratorcp" Integratorcp
    6161! [PLATFORM=arm32] MACHINE (choice)

  • boot/arch/arm32/loader/Makefile

    r76093ae r646b996  
    4141TARGET = arm-linux-gnu
    4242TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
    43 
    44 ifeq ($(MACHINE), testarm)
    45         DMACHINE = MACHINE_GXEMUL_TESTARM
    46 endif
    47 
    48 ifeq ($(MACHINE), integratorcp)
    49         DMACHINE = MACHINE_ICP
    50 endif
    51 
    5243
    5344ifeq ($(COMPILER),gcc_native)
    … …  
    10394        $(USPACEDIR)/srv/fs/fat/fat \
    10495        $(USPACEDIR)/srv/bd/file_bd/file_bd
    105 ifeq ($(MACHINE), testarm)
     96ifeq ($(MACHINE),testarm)
    10697        RD_SRVS += \
    10798                $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
    … …  
    161152
    162153%.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  
    4141
    4242/** Address where characters to be printed are expected. */
    43 #ifdef MACHINE_GXEMUL_TESTARM
    44 #define PUTC_ADDRESS    0x10000000
     43#ifdef MACHINE_testarm
     44        #define PUTC_ADDRESS  0x10000000
    4545#endif
    46 #ifdef MACHINE_ICP
    47 #define  PUTC_ADDRESS    0x16000000
     46
     47#ifdef MACHINE_integratorcp
     48        #define PUTC_ADDRESS  0x16000000
    4849#endif
    4950

  • kernel/Makefile

    r76093ae r646b996  
    344344        -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
    345345        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    346 ifeq ($(PLATFORM),arm32)
    347         rm -f arch/$(KARCH)/include/machine.h
    348 endif
    349346        for arch in arch/* ; do \
    350347            [ -e $$arch/_link.ld ] && rm $$arch/_link.ld 2>/dev/null ; \
    … …  
    354351        ln -sfn ../../arch/$(KARCH)/include/ generic/include/arch
    355352        ln -sfn ../../genarch/include/ generic/include/genarch
    356 ifeq ($(PLATFORM),arm32)
    357         ln -sfn mach/$(MACHINE)/$(MACHINE).h arch/$(KARCH)/include/machine.h
    358 endif
    359353
    360354depend: archlinks

  • kernel/arch/arm32/Makefile.inc

    r76093ae r646b996  
    6161        arch/$(KARCH)/src/mm/page.c \
    6262        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
     65ifeq ($(MACHINE),testarm)
     66        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
    6867endif
    69 ifeq ($(CONFIG_PL050), y)
     68
     69ifeq ($(MACHINE),integratorcp)
     70        ARCH_SOURCES += arch/$(KARCH)/src/mach/integratorcp/integratorcp.c
     71endif
     72
     73ifeq ($(CONFIG_PL050),y)
    7074        ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
    7175endif

  • kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

    r76093ae r646b996  
    3636 */
    3737
    38 #ifndef KERN_arm32_ICP_H_
    39 #define KERN_arm32_ICP_H_
     38#ifndef KERN_arm32_MACHINE_H_
     39#define KERN_arm32_MACHINE_H_
    4040
    4141#include <arch/machine_func.h>

  • kernel/arch/arm32/include/mach/testarm/testarm.h

    r76093ae r646b996  
    3737 */
    3838
    39 #ifndef KERN_arm32_GXEMUL_H_
    40 #define KERN_arm32_GXEMUL_H_
     39#ifndef KERN_arm32_MACHINE_H_
     40#define KERN_arm32_MACHINE_H_
    4141
    4242#include <arch/machine_func.h>

  • kernel/arch/arm32/src/arm32.c

    r76093ae r646b996  
    4141#include <console/console.h>
    4242#include <ddi/irq.h>
    43 #include <arch/machine.h>
    4443#include <print.h>
    4544#include <config.h>
    … …  
    5049#include <string.h>
    5150
     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
    5260/** Performs arm32-specific initialization before main_bsp() is called. */
    5361void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)

  • kernel/arch/arm32/src/exception.c

    r76093ae r646b996  
    4040#include <arch/mm/page_fault.h>
    4141#include <arch/barrier.h>
    42 #include <arch/machine.h>
    4342#include <print.h>
    4443#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
    4552
    4653/** Offset used in calculation of exception handler's relative address.

  • kernel/arch/arm32/src/interrupt.c

    r76093ae r646b996  
    3636#include <arch/asm.h>
    3737#include <arch/regutils.h>
    38 #include <arch/machine.h>
    3938#include <ddi/irq.h>
    4039#include <ddi/device.h>
    4140#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
    4249
    4350/** Initial size of a table holding interrupt handlers. */
    … …  
    97104        irq_init(IRQ_COUNT, IRQ_COUNT);
    98105        machine_timer_irq_start();
    99        
    100106}
    101107

  • kernel/arch/arm32/src/mm/frame.c

    r76093ae r646b996  
    3636#include <mm/frame.h>
    3737#include <arch/mm/frame.h>
    38 #include <arch/machine.h>
    3938#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
    4047
    4148/** Address of the last frame in the memory. */
Note: See TracChangeset for help on using the changeset viewer.