Changeset 5d9e36b in mainline


Ignore:
Timestamp:
2012-12-30T13:32:58Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bfb57fb
Parents:
949869d
Message:

arm32: Rename PROCESSOR macro to PROCESSOR_ARCH

We'll need PROCESSOR macro for MPU specific bits

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r949869d r5d9e36b  
    8686! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
    8787
    88 % CPU type
     88% CPU arch
    8989@ "armv4" ARMv4
    90 ! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR (choice)
     90! [PLATFORM=arm32&(MACHINE=gta02)] PROCESSOR_ARCH (choice)
    9191
    9292% CPU type
    9393@ "armv5" ARMv5
    94 ! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
     94! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR_ARCH (choice)
    9595
    9696% CPU type
    9797@ "armv7_a" ARMv7-A
    98 ! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR (choice)
     98! [PLATFORM=arm32&MACHINE=beagleboardxm] PROCESSOR_ARCH (choice)
    9999
    100100% RAM disk format
    … …  
    348348## armv7 made fpu hardware compulsory
    349349% FPU support
    350 ! [PLATFORM=arm32&PROCESSOR=armv7_a] CONFIG_FPU (y)
     350! [PLATFORM=arm32&PROCESSOR_ARCH=armv7_a] CONFIG_FPU (y)
    351351
    352352% FPU support

  • boot/arch/arm32/Makefile.inc

    r949869d r5d9e36b  
    4949BITS = 32
    5050ENDIANESS = LE
    51 EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR)) -mno-unaligned-access
     51EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
    5252
    5353ifeq ($(MACHINE), gta02)

  • boot/arch/arm32/src/mm.c

    r949869d r5d9e36b  
    107107                "mcr p15, 0, r0, c3, c0, 0\n"
    108108               
    109 #ifdef PROCESSOR_armv7_a
     109#ifdef PROCESSOR_ARCH_armv7_a
    110110                /* Read Auxiliary control register */
    111111                "mrc p15, 0, r0, c1, c0, 1\n"
    … …  
    119119                "mrc p15, 0, r0, c1, c0, 0\n"
    120120               
    121 #ifdef PROCESSOR_armv7_a
     121#ifdef PROCESSOR_ARCH_armv7_a
    122122                /* Mask to enable paging, I-cache D-cache and branch predict
    123123                 * See kernel/arch/arm32/include/regutils.h for bit values.*/

  • kernel/arch/arm32/Makefile.inc

    r949869d r5d9e36b  
    3333ATSIGN = %
    3434
    35 GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR)) -mno-unaligned-access
     35GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
    3636
    3737ifeq ($(CONFIG_FPU),y)

  • kernel/arch/arm32/include/asm.h

    r949869d r5d9e36b  
    5353NO_TRACE static inline void cpu_sleep(void)
    5454{
    55 #ifdef PROCESSOR_armv7_a
     55#ifdef PROCESSOR_ARCH_armv7_a
    5656        asm volatile ( "wfe" :: );
    5757#elif defined(MACHINE_gta02) | defined(MACHINE_integratorcp)

  • kernel/arch/arm32/include/mm/page.h

    r949869d r5d9e36b  
    129129        set_pt_level1_present((pte_t *) (ptl3), (size_t) (i))
    130130
    131 #if defined(PROCESSOR_armv6) | defined(PROCESSOR_armv7_a)
     131#if defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_ARCH_armv7_a)
    132132#include "page_armv6.h"
    133 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
     133#elif defined(PROCESSOR_ARCH_armv4) | defined(PROCESSOR_ARCH_armv5)
    134134#include "page_armv4.h"
    135135#else

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

    r949869d r5d9e36b  
    9898void cpu_arch_init(void)
    9999{
    100 #if defined(PROCESSOR_armv7_a) | defined(PROCESSOR_armv6)
     100#if defined(PROCESSOR_ARCH_armv7_a) | defined(PROCESSOR_ARCH_armv6)
    101101        uint32_t control_reg = 0;
    102102        asm volatile (

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

    r949869d r5d9e36b  
    174174}
    175175
    176 #if defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
     176#if defined(PROCESSOR_ARCH_armv4) | defined(PROCESSOR_ARCH_armv5)
    177177/** Decides whether read or write into memory is requested.
    178178 *
    … …  
    281281        }
    282282
    283 #if defined(PROCESSOR_armv6) | defined(PROCESSOR_armv7_a)
     283#if defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_ARCH_armv7_a)
    284284        const pf_access_t access =
    285285            fsr.data.wr ? PF_ACCESS_WRITE : PF_ACCESS_READ;
    286 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
     286#elif defined(PROCESSOR_ARCH_armv4) | defined(PROCESSOR_ARCH_armv5)
    287287        const pf_access_t access = get_memory_access_type(istate->pc, badvaddr);
    288288#else

  • uspace/lib/c/arch/arm32/Makefile.common

    r949869d r5d9e36b  
    2828#
    2929
    30 GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR))
     30GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH))
    3131
    3232ifeq ($(CONFIG_FPU),y)
Note: See TracChangeset for help on using the changeset viewer.