Re: [PATCH linux-firmware 1/2] usbdux: Assume as31 is already installed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

thanks!

Here is a patch for the README. There is no debian package. My web page is still the only place where it resides and nobody has ever made a DEBIAN package out of it. For the 5+ people using 8051 assembler that's probably not really needed.

/Bernd

Ben Hutchings wrote:
Don't try to build the as31 assembler in a subdirectory.  A suitable
version may be installed separately; for example it is packaged in
Debian.  Update the README accordingly.

Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
 usbdux/Makefile_dux |   18 ++++++++----------
 usbdux/README.dux   |   12 +++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/usbdux/Makefile_dux b/usbdux/Makefile_dux
index 1dc0939..a61118e 100644
--- a/usbdux/Makefile_dux
+++ b/usbdux/Makefile_dux
@@ -3,20 +3,18 @@
 # no warranty
 #
-all: as31 usbduxfast_firmware.bin usbdux_firmware.bin usbduxsigma_firmware.bin
+AS31 := as31
-as31:
-	make -C as31-2.1
+all: usbduxfast_firmware.bin usbdux_firmware.bin usbduxsigma_firmware.bin
-usbduxfast_firmware.bin: fx2-include.asm usbduxfast_firmware.asm as31
-	as31-2.1/as31 -Fbin usbduxfast_firmware.asm
+usbduxfast_firmware.bin: fx2-include.asm usbduxfast_firmware.asm
+	$(AS31) -Fbin usbduxfast_firmware.asm
-usbdux_firmware.bin: fx2-include.asm usbdux_firmware.asm as31
-	as31-2.1/as31 -Fbin usbdux_firmware.asm
+usbdux_firmware.bin: fx2-include.asm usbdux_firmware.asm
+	$(AS31) -Fbin usbdux_firmware.asm
-usbduxsigma_firmware.bin: fx2-include.asm usbduxsigma_firmware.asm as31
-	as31-2.1/as31 -Fbin usbduxsigma_firmware.asm
+usbduxsigma_firmware.bin: fx2-include.asm usbduxsigma_firmware.asm
+	$(AS31) -Fbin usbduxsigma_firmware.asm
clean:
 	rm -f *.bin *~ *.lst *.bin
-	make -C as31-2.1 clean
diff --git a/usbdux/README.dux b/usbdux/README.dux
index b3c8c05..791f14d 100644
--- a/usbdux/README.dux
+++ b/usbdux/README.dux
@@ -1,15 +1,13 @@
 To compile the firmware for the USBDUX,USBDUXfast and USBDUXsigma
 -----------------------------------------------------------------
-Download the as31 from:
-http://www.berndporr.me.uk/as31/
-
-(this is a patched version of as31 which supports an
-include directive).
+You need a version of as31 that supports the include directive.  If
+your distribution doesn't provide this, it may be downloaded from:
-Install it in this directory.
+http://www.berndporr.me.uk/as31/
-Then run "make -f Makefile_dux".
+Then run "make -f Makefile_dux".  If as31 is not installed in your
+path, set the AS31 make variable accordingly.
Feedback:
 BerndPorr@xxxxxxx

--
www:    http://www.berndporr.me.uk/
        http://www.linux-usb-daq.co.uk/
	http://www.imdb.com/name/nm3293421/
Mobile: +44 (0)7840 340069
Work:   +44 (0)141 330 5237
        University of Glasgow
        School of Engineering
        72 Oakfield Avenue (Rankine Building for deliveries)
        Glasgow, G12 8LT
>From 5da10affde52caa56b037b15f9aa02a3b03dbe7b Mon Sep 17 00:00:00 2001
From: Bernd Porr <berndporr@xxxxxxx>
Date: Sun, 19 Feb 2012 10:13:09 +0000
Subject: [PATCH 1/1] changes the instructions how to compile and install the
 as31


Signed-off-by: Bernd Porr <berndporr@xxxxxxx>
---
 usbdux/README.dux |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/usbdux/README.dux b/usbdux/README.dux
index b3c8c05..60b5f9e 100644
--- a/usbdux/README.dux
+++ b/usbdux/README.dux
@@ -7,7 +7,7 @@ http://www.berndporr.me.uk/as31/
 (this is a patched version of as31 which supports an
 include directive).
 
-Install it in this directory.
+Compile and install it as described in the README of the as31.
 
 Then run "make -f Makefile_dux".
 
-- 
1.7.9

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux