Complete source for GPL'd firmware
cover Complete source for GPL'd firmware
Some of the source code for firmware licenced under the GPL is not included in the linux-firmware repository or has incomplete or inaccurate build instructions. This series adds the missing pieces. With the appropriate tools installed, these makefiles produce identical binaries to those already in the repository.
Ben.
Ben Hutchings (4):
dsp56k: Add makefile for building from source
dvb-ttpci: Add source code and makefile
keyspan_pda: Fix parse error with as31 version 2.3.1
keyspan_pda: Add makefile for building from source
WHENCE | 10 +++- av7110/Boot.S | 109 ++++++++++++++++++++++++++++++++++++++++++++ av7110/Makefile | 11 ++++ dsp56k/Makefile | 6 ++ dsp56k/concat-bootstrap.pl | 33 +++++++++++++ keyspan_pda/Makefile | 12 +++++ keyspan_pda/keyspan_pda.S | 7 ++- 7 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 av7110/Boot.S create mode 100644 av7110/Makefile create mode 100644 dsp56k/Makefile create mode 100644 dsp56k/concat-bootstrap.pl create mode 100644 keyspan_pda/Makefile
Signature · 1 line
1.7.7.3
PATCH 1/4 dsp56k: Add makefile for building from source
Some small amount of postprocessing is required after assembling bootstrap.asm with a56. Add a script and makefile for this.
--- WHENCE | 4 +++- dsp56k/Makefile | 6 ++++++ dsp56k/concat-bootstrap.pl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 dsp56k/Makefile create mode 100644 dsp56k/concat-bootstrap.pl
WHENCE +3 -1
@@ -372,10 +372,12 @@ Driver: dsp56k - Atari DSP56k support File: dsp56k/bootstrap.bin Source: dsp56k/bootstrap.asm +Source: dsp56k/Makefile +Source: dsp56k/concat-bootstrap.pl Licence: GPLv2 or later -DSP56001 assembler, possibly buildable with a56 from +DSP56001 assembler, buildable with a56 from http://www.zdomain.com/a56.html --------------------------------------------------------------------------
dsp56k/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +bootstrap.bin: bootstrap.asm concat-bootstrap.pl + a56 bootstrap.asm >/dev/null + perl concat-bootstrap.pl <a56.out >bootstrap.bin + +clean: + rm -f a56.out bootstrap.bin
dsp56k/concat-bootstrap.pl new file +33 -0
@@ -0,0 +1,33 @@ +# Postprocessor for dsp56k bootstrap code. +# +# Copyright Ben Hutchings 2011. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +use strict; +use warnings; + +my @memory; +my %symbol; + +# Reconstruct memory image and symbol table +while (<>) { + if (/^P ([0-9A-F]{4}) ([0-9A-F]{6})\n/) { + $memory[hex($1)] = hex($2); + } elsif (/^I ([0-9A-F]{6}) (\w+)\n/) { + $symbol{$2} = hex($1); + } else { + print STDERR "W: did not recognise line $.\n"; + } +} + +# Concatenate first and second stage. Second stage is assembled +# between 'upload' and 'upload_end', but initially loaded at +# 'real' (end of the first stage). +for (0 .. ($symbol{real} - 1), $symbol{upload} .. ($symbol{upload_end} - 1)) { + my $word = $memory[$_] || 0; + print pack('CCC', $word / 65536, ($word / 256) % 256, $word % 256); +}
Signature · 1 line
1.7.7.3
PATCH 2/4 dvb-ttpci: Add source code and makefile
In reply to Ben HutchingsDownstream commercial distributors need to distribute the source code as well as the binary.
--- WHENCE | 4 ++- av7110/Boot.S | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ av7110/Makefile | 11 ++++++ 3 files changed, 123 insertions(+), 1 deletions(-) create mode 100644 av7110/Boot.S create mode 100644 av7110/Makefile
WHENCE +3 -1
@@ -1094,10 +1094,12 @@ Licence: Redistributable. See LICENCE.phanfw for details. Driver: dvb-ttpci -- AV7110 cards File: av7110/bootcode.bin +Source: av7110/Boot.S +Source: av7110/Makefile Licence: GPLv2 or later -ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S +ARM assembly source code from http://www.linuxtv.org/downloads/firmware/Boot.S --------------------------------------------------------------------------
av7110/Boot.S new file +109 -0
109 lines not on this page · raw message
av7110/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +CC = arm-linux-gnueabi-gcc +LD = arm-linux-gnueabi-ld +OBJCOPY = arm-linux-gnueabi-objcopy + +bootcode.bin: Boot.S + $(CC) -mbig-endian -c Boot.S + $(LD) -Ttext 0x2c000000 -EB -o Boot Boot.o + $(OBJCOPY) -Obinary Boot bootcode.bin + +clean: + rm -f Boot.o Boot bootcode.bin
Signature · 1 line
1.7.7.3
PATCH 3/4 keyspan_pda: Fix parse error with as31 version 2.3.1
In reply to Ben Hutchingskeyspan_pda.S has an out-of-range decimal constant that looks like it was really meant to be a binary constant. Comparing with the binary, it appears that as31 used to treat this as 0, so change the source to use 0 and add a comment on this.
--- keyspan_pda/keyspan_pda.S | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
keyspan_pda/keyspan_pda.S +6 -1
@@ -285,7 +285,12 @@ clear_rx_ring_loop: mov dptr,OUTC movx @dptr, a ;; setup the serial port. 9600 8N1. - mov a,#01010011 ; mode 1, enable rx, clear int + ;; Original source had: + ;;mov a,#01010011 ; mode 1, enable rx, clear int + ;; This was presumably meant to be a binary constant, but it's + ;; really decimal and out of 8-bit range. as31 used to treat + ;; it as 0 and that seems to have worked, so carry on with 0. + mov a,#0 mov SCON, a ;; using timer2, in 16-bit baud-rate-generator mode ;; (xtal 12MHz, internal fosc 24MHz)
Signature · 1 line
1.7.7.3
PATCH 4/4 keyspan_pda: Add makefile for building from source
In reply to Ben HutchingsThe commands given in the source aren't quite right, and don't cover use of ihex2fw.
--- WHENCE | 2 ++ keyspan_pda/Makefile | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 keyspan_pda/Makefile
WHENCE +2 -0
@@ -173,6 +173,8 @@ Source: keyspan_pda/keyspan_pda.S File: keyspan_pda/xircom_pgs.fw Source: keyspan_pda/xircom_pgs.S +Source: keyspan_pda/Makefile + Licence: GPLv2+ Compiled from original 8051 source into Intel HEX, used in our binary ihex form.
keyspan_pda/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +CC = gcc +IHEX2FW = ihex2fw + +all: keyspan_pda.fw xircom_pgs.fw + +%.fw: %.S + $(CC) -x assembler-with-cpp -P -E -o $*.asm $< + as31 -l $*.asm + $(IHEX2FW) $*.hex $@ + +clean: + rm -f *.asm *.fw *.hex *.lst *.obj
Signature · 1 line
1.7.7.3
Quoted 5 lines · Ben Hutchings
Some of the source code for firmware licenced under the GPL is not included in the linux-firmware repository or has incomplete or inaccurate build instructions. This series adds the missing pieces. With the appropriate tools installed, these makefiles produce identical binaries to those already in the repository.
For the avoidance of doubt, I'm about to push these changes to linux-firmware.git myself.
Ben.
Quoted 22 lines
Ben.
Ben Hutchings (4):
dsp56k: Add makefile for building from source
dvb-ttpci: Add source code and makefile
keyspan_pda: Fix parse error with as31 version 2.3.1
keyspan_pda: Add makefile for building from sourceWHENCE | 10 +++- av7110/Boot.S | 109 ++++++++++++++++++++++++++++++++++++++++++++ av7110/Makefile | 11 ++++ dsp56k/Makefile | 6 ++ dsp56k/concat-bootstrap.pl | 33 +++++++++++++ keyspan_pda/Makefile | 12 +++++ keyspan_pda/keyspan_pda.S | 7 ++- 7 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 av7110/Boot.S create mode 100644 av7110/Makefile create mode 100644 dsp56k/Makefile create mode 100644 dsp56k/concat-bootstrap.pl create mode 100644 keyspan_pda/Makefile
Signature · 2 lines
Ben Hutchings Computers are not intelligent. They only think they are.