provide CPU and Manufacturer as well, and moved around the makefile somewhat

so that "make -k" still can output a rockbox-info.txt file even if the build
(partly) fails


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13219 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 13 insertions, 3 deletions

diff --git a/tools/configure b/tools/configure
index dbb008e44d..1842be71ab 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1526,6 +1526,8 @@ sed > Makefile \
  -e "s,@MEMORY@,${memory},g" \
  -e "s,@TARGET_ID@,${target_id},g" \
  -e "s,@TARGET@,${target},g" \
+ -e "s,@CPU@,${t_cpu},g" \
+ -e "s,@MANUFACTURER@,${t_manufacturer},g" \
  -e "s,@ARCHOS@,${archos},g" \
  -e "s,@LANGUAGE@,${language},g" \
  -e "s,@PWD@,${pwd},g" \
@@ -1596,6 +1598,8 @@ export ARCHOSROM=@ARCHOSROM@
 export FLASHFILE=@FLASHFILE@
 export TARGET_ID=@TARGET_ID@
 export TARGET=@TARGET@
+export CPU=@CPU@
+export MANUFACTURER=@MANUFACTURER@
 export OBJDIR=@PWD@
 export BUILDDIR=@PWD@
 export LANGUAGE=@LANGUAGE@
@@ -1638,14 +1642,18 @@ export MANUALDEV=@MANUALDEV@
 # Do not print "Entering directory ..."
 MAKEFLAGS += --no-print-directory
 
-.PHONY: all clean tags zip tools manual
+.PHONY: all clean tags zip tools manual bin build info
 
-all: tools
+all: build info
+
+info:
+        \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
+
+build: tools
         @SIMUL1@
         @SIMUL2@
         \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
         \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
-        \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
 
 bin: tools
         @SIMUL1@
diff --git a/tools/mkinfo.pl b/tools/mkinfo.pl
index dadb6b81d3..bc6421ffe5 100755
--- a/tools/mkinfo.pl
+++ b/tools/mkinfo.pl
@@ -41,6 +41,8 @@ printf O ("Target: %s\n", $ENV{'ARCHOS'});
 printf O ("Target id: %d\n", $ENV{'TARGET_ID'});
 printf O ("Target define: %s\n", $ENV{'TARGET'});
 printf O ("Memory: %d\n", $ENV{'MEMORYSIZE'});
+printf O ("CPU: %s\n", $ENV{'CPU'});
+printf O ("Manufacturer: %s\n", $ENV{'MANUFACTURER'});
 
 # Variables identifying Rockbox and bootloader properties. Possibly changing
 # every software upgrade.