build scripts: wrs_build_gateware: use self-compiled RT CPU from rt/ or...

build scripts: wrs_build_gateware: use self-compiled RT CPU from rt/ or pre-compiled binary from binaries/. Updated download info for gateware

build/download-info

@@ -127,6 +127,6 @@ uClibc-0.9.32.tar.bz2            cfcb6c25d8ebe12817499d8749ee8ae1 \
 zlib-1.2.5.tar.bz2               be1e89810e66150f5b0327984d8625a0 \
    http://kent.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.5.tar.bz2
 
-wrs3-gw.tar.gz                   339414ba4d26ee4d50ddb36284377860 \
-   http://www.ohwr.org/attachments/download/1371/wrs3-gw.tar.gz
+wrs3-gw.tar.gz                   28a7ac3ec004d3e441c232fa125d820a \
+   http://www.ohwr.org/attachments/download/1474/wrs3-gw.tar.gz
 

build/scripts/wrs_build_gateware

@@ -15,9 +15,17 @@ mkdir -p ${WRS_OUTPUT_DIR}/images/wr/lib/firmware
 
 echo "$WRS_HW_DIR"
 
+if [ -f "${WRS_BASE_DIR}/../rt/rt_cpu.bin" ]; then
+	echo "Using self-compiled RT firmware"
+	cp ${WRS_BASE_DIR}/../rt/rt_cpu.bin ${WRS_OUTPUT_DIR}/images/wr/lib/firmware/rt_cpu.bin
+else
+	echo "Using pre-compiled (binaries/) RT firmware"
+	cp ${WRS_BASE_DIR}/../binaries/rt_cpu.bin ${WRS_OUTPUT_DIR}/images/wr/lib/firmware/rt_cpu.bin
+fi
+
 if [ "$WRS_HW_DIR" != "" ]; then
 	cp ${WRS_HW_DIR}/syn/scb_8ports/scb_top_synthesis.bin ${WRS_OUTPUT_DIR}/images/wr/lib/firmware/8ports_mb.bin
-	cp ${WRS_HW_DIR}/rt/rt_cpu.bin ${WRS_OUTPUT_DIR}/images/wr/lib/firmware/rt_cpu.bin
+	cp ${WRS_HW_DIR}/syn/scb_18ports/scb_top_synthesis.bin ${WRS_OUTPUT_DIR}/images/wr/lib/firmware/18ports_mb.bin
 else
 	tarname=wrs3-gw.tar.gz
 	wrs_download $tarname

rt/Makefile

@@ -26,6 +26,7 @@ all: 		$(OBJS)
 				$(CC) $(CFLAGS) -c revision.c
 				${CC} -o $(OUTPUT).elf $(OBJS) revision.o $(LDFLAGS) 
 				${OBJCOPY} -O binary $(OUTPUT).elf $(OUTPUT).bin
+				cp	$(OUTPUT).bin ../binaries
 
 clean:	
 				rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin $(OUTPUT).ram