Changeset 58775d30 in mainline for boot


Ignore:
Timestamp:
2015-03-16T16:07:21Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2003739
Parents:
6069061 (diff), 795e2bf (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:

Mainline changes

Location:
boot
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    r6069061 r58775d30  
    3434OPTIMIZATION = 3
    3535
    36 DEFS = -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
     36DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
    3737
    3838GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \

  • boot/Makefile.common

    r6069061 r58775d30  
    193193        $(USPACE_PATH)/app/mkmfs/mkmfs \
    194194        $(USPACE_PATH)/app/nic/nic \
     195        $(USPACE_PATH)/app/rcutest/rcutest \
     196        $(USPACE_PATH)/app/rcubench/rcubench \
    195197        $(USPACE_PATH)/app/sbi/sbi \
    196198        $(USPACE_PATH)/app/sportdmp/sportdmp \

  • boot/arch/ppc32/_link.ld.in

    r6069061 r58775d30  
    22
    33SECTIONS {
    4         . = 0x02000000;
     4        . = 0x08000000;
    55        .text : {
    66                *(BOOTSTRAP);

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

    r6069061 r58775d30  
    3535#define BOOT_OFFSET  0x8000
    3636
    37 #define LOADER_ADDRESS  0x02000000
     37#define LOADER_ADDRESS  0x08000000
    3838
    3939#ifndef __ASM__
Note: See TracChangeset for help on using the changeset viewer.