Changeset 20235a3 in mainline for boot/arch/arm32/include/arch.h


Ignore:
Timestamp:
2010-09-02T20:55:28Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0c39b96
Parents:
0c61955 (diff), 3249673 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/include/arch.h

    r0c61955 r20235a3  
    3636#define PTL0_ENTRY_SIZE  4
    3737
    38 #define BOOT_OFFSET  0xa00000
     38/*
     39 * Address where the boot stage image starts (beginning of usable physical
     40 * memory).
     41 */
     42#ifdef MACHINE_gta02
     43#define BOOT_BASE       0x30008000
     44#else
     45#define BOOT_BASE       0x00000000
     46#endif
     47
     48#define BOOT_OFFSET     (BOOT_BASE + 0xa00000)
    3949
    4050#ifndef __ASM__
Note: See TracChangeset for help on using the changeset viewer.