WebSVN – HelenOS – Path Comparison – / – /trunk/boot/arch/ Rev 3022 and /trunk/boot/arch/ Rev 3023

Ignore whitespace Rev 3022 → Rev 3023

/trunk/boot/arch/ppc32/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /trunk/boot/arch/ppc32/loader/_link.ld.in
 ,0 → 1,13
+    .boot 0x10000000: AT (0) {
+        *(BOOTSTRAP);
+        *(REALMODE);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */

 /trunk/boot/arch/ppc32/loader/main.c
 ,10 → 96,10
 {
     version_print();
-    init_components();
+    component_t components[COMPONENTS];
+    init_components(components);
     unsigned int i;
     for (i = 0; i < COMPONENTS; i++)
         check_align(components[i].start, components[i].name);

 /trunk/boot/arch/ppc32/loader/Makefile
 ,6 → 32,9
 ## Toolchain configuration
 #
+BFD = elf32-powerpc
+BFD_NAME = elf32-powerpc
+BFD_ARCH = powerpc:common
 TARGET = ppc-linux-gnu
 TOOLCHAIN_DIR = /usr/local/ppc/bin
 ,6 → 75,7
 SOURCES = \
     main.c \
     ofwarch.c \
+    _components.c \
     ../../../genarch/ofw.c \
     ../../../generic/printf.c \
     asm.S \
 ,10 → 112,10
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

/trunk/boot/arch/ppc64/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /trunk/boot/arch/ppc64/loader/_link.ld.in
 ,0 → 1,15
+    .boot 0x0000000010000000: AT (0) {
+        *(BOOTSTRAP);
+        *(REALMODE);
+        *(.text);
+        *(.toc);
+        *(.opd);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */

 /trunk/boot/arch/ppc64/loader/main.c
 ,8 → 96,9
 {
     version_print();
-    init_components();
+    component_t components[COMPONENTS];
+    init_components(components);
     unsigned int i;
     for (i = 0; i < COMPONENTS; i++)

 /trunk/boot/arch/ppc64/loader/Makefile
 ,6 → 32,9
 ## Toolchain configuration
 #
+BFD = elf64-powerpc
+BFD_NAME = elf64-powerpc
+BFD_ARCH = powerpc:common64
 TARGET = ppc64-linux-gnu
 TOOLCHAIN_DIR = /usr/local/ppc64/bin
 ,6 → 75,7
 SOURCES = \
     main.c \
     ofwarch.c \
+    _components.c \
     ../../../genarch/ofw.c \
     ../../../generic/printf.c \
     asm.S \
 ,10 → 112,10
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@

/trunk/boot/arch/mips32/loader/pack
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /trunk/boot/arch/mips32/loader/_link.ld.in
 ,0 → 1,14
+    .boot 0xbfc00000: AT (0) {
+        *(BOOTSTRAP);
+        *(.text);
+        *(.rodata);
+        *(.rodata.*);
+        *(.data);       /* initialized data */
+        *(.sdata);
+        *(.sdata2);
+        *(.sbss);
+        *(.scommon);
+        *(.bss);        /* uninitialized static variables */
+        *(COMMON);      /* global variables */
+        *(.reginfo);

 /trunk/boot/arch/mips32/loader/main.c
 ,9 → 59,10
     version_print();
     component_t components[COMPONENTS];
-    bootinfo_t bootinfo;
     init_components(components);
+    bootinfo_t bootinfo;
     printf("\nMemory statistics\n");
     printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
     printf(" %L: boot info structure\n", &bootinfo);

 /trunk/boot/arch/mips32/loader/Makefile
 ,6 → 32,14
 ## Toolchain configuration
 #
+ifeq ($(IMAGE),binary)
+    BFD = binary
+endif
+ifeq ($(IMAGE),ecoff)
+    BFD = ecoff-littlemips
+endif
+BFD_NAME = elf32-tradlittlemips
+BFD_ARCH = mips
 TARGET = mipsel-linux-gnu
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
 ,6 → 80,7
 SOURCES = \
     main.c \
     msim.c \
+    _components.c \
     ../../../generic/printf.c \
     asm.S \
     boot.S
 ,10 → 116,10
     -makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 clean:
-    -rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+    -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
-_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-    ./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
+    ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
 %.o: %.S
     $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@