Changeset 587

Timestamp:

Dec 5, 2013, 3:55:07 PM (11 years ago)

Author:

bouyer

Message:

Add back version string print

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (1 diff)
• src/reset.S (modified) (1 diff)

trunk/softs/tsar_boot/Makefile

@@ -82 +82 @@
 all: $(TARGET)
 
-# $(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) version version.sh
-#       $(ECHO) "[version.sh]"
-#       ./version.sh > $(BUILD_DIR)/version.c
-#       $(ECHO) "[   CC    ]     $(BUILD_DIR)/version.c"
-#       $(CC) $(DEFS) $(CFLAGS) $(INCLUDE) -c -o $@ $(BUILD_DIR)/version.c
-#       $(DU) -D $@ > $@.txt
+ $(BUILD_DIR)/version.o: $(BUILD_DIR) $(OBJS) version version.sh
+        $(ECHO) "[version.sh]"
+        ./version.sh > $(BUILD_DIR)/version.c
+        $(ECHO) "[   CC    ]     $(BUILD_DIR)/version.c"
+        $(CC) $(DEFS) $(CFLAGS) $(INCLUDE) -c -o $@ $(BUILD_DIR)/version.c
+        $(DU) -D $@ > $@.txt
 
-$(TARGET): $(BUILD_DIR) $(OBJS) $(PLATFORM_DIR)/ldscript $(BUILD_DIR)/platform.ld
+$(TARGET): $(BUILD_DIR) $(BUILD_DIR)/version.o $(OBJS) $(PLATFORM_DIR)/ldscript $(BUILD_DIR)/platform.ld
         $(ECHO) "[   LD    ]     $@"
-        $(LD) -o $@ -T $(PLATFORM_DIR)/ldscript $(OBJS) 
+        $(LD) -o $@ -T $(PLATFORM_DIR)/ldscript $(OBJS) $(BUILD_DIR)/version.o
         $(DU) -D $@ > $@.txt
 

trunk/softs/tsar_boot/src/reset.S

@@ -158 +158 @@
     /* Processor 0 displays version for this reset code */
 
-#   la      a0,     versionstr
-#   la      k0,     reset_puts
-#   jalr    k0
-#   nop
+    la      a0,     versionstr
+    la      k0,     reset_puts
+    jalr    k0
+    nop