Changeset 646b996 in mainline for boot


Ignore:
Timestamp:
2009-07-30T15:58:54Z (16 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

Location:
boot/arch/arm32/loader
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.