← Back to branch summary

~vojtech-horky/helenos/logging

« back to all changes in this revision

Viewing changes to boot/arch/arm32/include/arch.h

  • Committer: Vojtech Horky
  • Date: 2012-11-23 09:13:00 UTC
  • mfrom: (1537.1.179 HelenOS.mainline)
  • Revision ID: vojtechhorky@users.sourceforge.net-20121123091300-z5zb5nu4qf7pn795
Merge mainline changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
boot/arch/arm32/include/arch.h
41
41
 */
42
42
#ifdef MACHINE_gta02
43
43
#define BOOT_BASE       0x30008000
 
44
#elif defined MACHINE_beagleboardxm
 
45
#define BOOT_BASE       0x80000000
44
46
#else
45
47
#define BOOT_BASE       0x00000000
46
48
#endif
47
49
 
48
50
#define BOOT_OFFSET     (BOOT_BASE + 0xa00000)
49
51
 
 
52
#ifdef MACHINE_beagleboardxm
 
53
        #define PA_OFFSET 0
 
54
#else
 
55
        #define PA_OFFSET 0x80000000
 
56
#endif
 
57
 
50
58
#ifndef __ASM__
51
 
        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
 
59
        #define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
52
60
#else
53
 
        #define PA2KA(addr)  ((addr) + 0x80000000)
 
61
        #define PA2KA(addr)  ((addr) + PA_OFFSET)
54
62
#endif
 
63
 
55
64
 
56
65
#endif
57
66