Changeset 2b3dd78 in mainline for boot/arch/ppc32


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ppc32/include/arch/arch.h

    ra0a9cc2 r2b3dd78  
    3838
    3939#ifndef __ASM__
    40         #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
     40#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
    4141#else
    42         #define PA2KA(addr)  ((addr) + 0x80000000)
     42#define PA2KA(addr)  ((addr) + 0x80000000)
    4343#endif
    4444
Note: See TracChangeset for help on using the changeset viewer.