Changeset 960f8476 in mainline for boot/arch/mips32

Timestamp:

2008-05-30T14:22:58Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

afb1e35

Parents:

136edca

Message:

finish unifying pack script

Location:

boot/arch/mips32/loader

Files:

• Makefile (modified) (2 diffs)
• _link.ld.in.binary (moved) (moved from boot/arch/mips32/loader/_link.ld.in ) (2 diffs)
• _link.ld.in.ecoff (added)

boot/arch/mips32/loader/Makefile

@@ -34 +34 @@
 
 ifeq ($(IMAGE),binary)
-        BFD = binary
+        LD_IN = binary
 endif
 ifeq ($(IMAGE),ecoff)
-        BFD = ecoff-littlemips
+        LD_IN = ecoff
 endif
 BFD_NAME = elf32-tradlittlemips
@@ -109 +109 @@
 
 clean:
-        -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
+        -rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
-        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
+        ../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
+
+_link.ld.in: _link.ld.in.$(LD_IN)
+        cp $< $@
 
 %.o: %.S

boot/arch/mips32/loader/_link.ld.in.binary

@@ +1 @@
+OUTPUT_FORMAT("binary") 
+ENTRY(start) 
+ 
+SECTIONS {
         .boot 0xbfc00000: AT (0) {
                 *(BOOTSTRAP);
@@ -13 +17 @@
                 *(COMMON);              /* global variables */
                 *(.reginfo);
+[[COMPONENTS]]
+        }
+}