Changeset e1a27be in mainline for boot/arch/arm32/include/main.h


Ignore:
Timestamp:
2012-12-29T10:48:35Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
17cc8f4f
Parents:
8f88beb (diff), c928bb7 (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/main.h

    r8f88beb re1a27be  
    6363
    6464
    65 /** GXemul testarm serial console output register */
    66 #define TESTARM_SCONS_ADDR      0x10000000
    67 
    6865/** IntegratorCP serial console output register */
    6966#define ICP_SCONS_ADDR          0x16000000
Note: See TracChangeset for help on using the changeset viewer.