Changeset 98e4507 in mainline for boot


Ignore:
Timestamp:
2011-05-20T01:13:40Z (15 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5c460cc
Parents:
a0bb65af (diff), 326bf65 (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.

Location:
boot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    ra0bb65af r98e4507  
    4040        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    4141        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
    42         -Werror-implicit-function-declaration -Wwrite-strings \
     42        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
    4343        -pipe
    4444

  • boot/arch/ppc32/src/asm.S

    ra0bb65af r98e4507  
    243243        clear_end:
    244244       
    245 #ifdef CONFIG_BAT
    246        
    247245        # create BAT identity mapping
    248246       
    … …  
    288286       
    289287        no_bat:
    290        
    291 #endif
    292288       
    293289        # flush TLB
Note: See TracChangeset for help on using the changeset viewer.