244 Commits

Author SHA1 Message Date
Ian Campbell
227c7e031f Add copyright headers to various files.
I'd like to package sunxi-tools for Debian and therefore it is important for
the licensing information to be complete/accurate. I believe the intention was
for everything here to be GPL2+ by default, since that is the license on every
file which has one and COPYING contains GPL2.

Early on the license applied to this repo was GPLv3 however this was changed to
GPL2+ by Alejandro in 79ea14d4e050 at which point he had been the only
contributor.

This patch adds the standard GPL2+ stanza used already in sunxi-tools.git or
the MIT license stanza when requested by the copyright holder to various files
which were missing one as follows:

adb-devprobe.sh
fel-gpio
    According to git all of these were written by Henrik. Copyright years
    according to git. Henrik requested that these be put under an MIT license,
    so that is what has been done.

boot_head.lds
fel-pio.lds
fel-sdboot.lds
jtag-loop.lds
    According to git all of these were written by Henrik. Copyright years
    according to git. According to Henrik "These linker scripts are all GPLv2+
    as the C / ASM sources they refer to".

include/endian_compat.h
    The content of this file was originally added to fel.c (commit
    c71ff92c02d3), which had a GPL2+ stanza at the time, by Eric Molitor and later
    those lines were moved by Alejandro (commit bcde0fc72170) into this file.
    I originally added GPL2+ from fel.c and added Eric's copyright with the
    correct year according to git but Eric said "Ack but also would prefer
    MIT/Dual :)", so it has now been changed to MIT.

include/types.h:
    Henrik originally added some of these lines to bootinfo.c, along with a
    GPL2+ stanza, in the original version (commit c26e5ff80af6). Later on
    Alejandro moved them into this file (commit 329a13ed75e5) and added more.
    I've copied the stanza from bootinfo.c and added both copyrights with the
    years according to git. Authors:
      Henrik, who says "OK".
      Alejandro Mery

Makefile:
    GPL2+ with copyrights and years according to git. Authors are:
      Alejandro Mery
      Henrik Nordstrom, who says "Yes"
      Pat Wood, who says "Fine with me"

usb-boot:
    Henrik is the primary author, added MIT license on Henrik's request with
    his copyright and years according to git. Authors are:
      Henrik Nordstrom, who says "Yes, that too should be MIT"
      Alejandro Mery (typo fix)
      Michal Suchanek (typo fix)

Everyone affected by the above is CCd.

This probably seems pretty obvious to most people, sorry for being so pedantic
about it. It will save hassel when it comes to getting it into Debian though.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Cc: Henrik Nordstrom <henrik@henriknordstrom.net>
Cc: Eric Molitor <eric@molitor.org>
Cc: Alejandro Mery <amery@geeks.cl>
Cc: Pat Wood <Pat.Wood@efi.com>
Cc: Michal Suchanek <hramrach@gmail.com>
---
v2: Gathered feedback from the authors
 - Pat said "Fine with me"
 - Henrik asked that adb-devprobe.sh, fel-gpio and usb-boot be MIT, acked
   *.lds, types.h and Makefile
 - Explicitly listed authors of Makefile and usb-boot
 - Michal Suchanek make a typo fix to usb-boot but wasn't CCd, sorry.
 - Reworded commit message due to some bits now being MIT on request of the
   author.
2014-07-01 08:04:19 +01:00
Chen-Yu Tsai
346bbff6eb fel: Add A23 SoC ID
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
2014-04-26 20:59:49 +02:00
Henrik Nordström
271130b31c Merge pull request #22 from jsonn/patch-1
Support build of fel.c on NetBSD
2014-01-31 12:37:42 -08:00
Joerg Sonnenberger
fa4159c630 Support build of fel.c on NetBSD
_BSD_SOURCE doesn't work on NetBSD, so explicitly request the full native namespace.
2014-01-31 21:36:18 +01:00
Michal Suchanek
a03129b185 Fix bogus usage message in pio tool.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
2014-01-29 18:39:20 +01:00
Michal Suchanek
b00fbc985f Fix usb-boot usage message.
When - is specified usb-boot interprets it as kernel so the usage
message is clearly bogus.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
2014-01-29 08:13:08 +01:00
Emilio López
ea2a4169cc fexc: uboot: update code output
The U-Boot code has changed slightly, so adjust the tool to output
proper, working code.

Signed-off-by: Emilio López <emilio@elopez.com.ar>
2014-01-28 17:56:25 -03:00
Olliver Schinagl
7984d602c1 Rename fel-boot.lds to fel-sdboot.lds
This rename goes with the previous rename of fel-boot -> fel-sdboot

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2014-01-20 12:18:19 +01:00
Patrick Wood
ed6f7969d8 nand-part: fixed error in -f usage message
Signed-off-by: Patrick Wood <patrickhwood@gmail.com>
2013-09-19 02:24:25 +02:00
Patrick Wood
356b3149bf nand-part: updated usage message
Signed-off-by: Patrick Wood <patrickhwood@gmail.com>
2013-09-19 02:24:25 +02:00
Patrick Wood
c84cc29acb nand-part: added/updated open source copyright headers
Signed-off-by: Patrick Wood <patrickhwood@gmail.com>
2013-09-19 02:24:25 +02:00
Patrick Wood
5d0ee5037b nand-part: create one nand-part program to handle both A10 and A20
Build one nand-part program to handle both A10 and A20 mbr header formats.
Changed -f option to take an "a10" or "a20" argument to specify which mbr
format to force.

Signed-off-by: Patrick Wood <patrickhwood@gmail.com>
2013-09-19 02:24:25 +02:00
Henrik Nordstrom
c0f39a2417 fel: Improve error messages a bit on file I/O errors 2013-09-06 22:22:51 +02:00
Henrik Nordstrom
b398456630 usb-boot: Check number of arguments before eating them 2013-07-27 22:02:26 +02:00
Henrik Nordstrom
e5736fd09a usb-boot: ramboot script without uimage header 2013-07-27 01:59:20 +02:00
Henrik Nordstrom
1b3efe41c8 usb-boot: Improve messages somewhat explainign that it wants u-boot SPL FEL 2013-07-27 01:51:17 +02:00
Henrik Nordstrom
6f5049ffa7 usb-boot: Remove prebuilt fel boot binaries
They were all built with no version information so it's not trivial
to tell which sources they are built from.

It is very easy to rebuild u-boot which gives these. Not really a need
to have them prebuilt here.
2013-07-27 01:27:10 +02:00
Pat Wood
c20d395d59 set MBR_MAGIC to "softw411" and MBR_VERSION to 0x200 in nand-part-a20.h
A20 boot1 checks the MBR magic string but not the version, but let's
check it anyway (can always force now with the -f option if the version
isn't 0x200 on the system)
2013-07-23 14:51:35 -04:00
Pat Wood
3413153e6e check that starting offset of partition 1 is beyond MBR area 2013-07-23 01:44:23 -04:00
Pat Wood
762d32a929 print out correct number of partitions 2013-07-23 01:19:20 -04:00
Pat Wood
653ae97b0c display partition numbers starting at "1" instead of "0"; corresponds to
command usage and partition numbering in linux nand driver
2013-07-23 01:01:37 -04:00
Pat Wood
606c0688d3 added backwards compatibility with older version of nand-part: if the starting
offset of partition 1 isn't specified, switch to old argument syntax that retains
partition 1 values
2013-07-23 00:58:20 -04:00
Pat Wood
dd94a2f117 build both A10 and A20 nand-part executables
allow setting of partition 1 size/offset
if -f option is used, force writing of MBR header, even if CRC or
header magic/version are incorrect (for recovery only)
2013-07-23 00:42:19 -04:00
Pat Wood
1dfa8cf006 Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools
Conflicts:
	nand-part.c
2013-06-27 23:07:42 -04:00
Michal Suchanek
c66667ff52 nand-part: Reject wrong partition version.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
2013-06-24 23:06:14 +02:00
Michal Suchanek
f1eca9d438 nand-part: Add mbr parsing diagnostics.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
2013-06-24 23:06:14 +02:00
Henrik Nordstrom
ee4e95e7b1 Teach fel about A20 SoC ID (for fel ver) 2013-06-23 15:04:56 +02:00
Henrik Nordstrom
fff571988e usb-boot: Support speficying the fel boot image by full path 2013-06-10 01:35:05 +02:00
Henrik Nordstrom
d31d4a4ec2 fel: More verbose error output if USB device not found 2013-06-10 01:33:59 +02:00
Henrik Nordstrom
0be7b52c53 felboot have been fully merged into sunxi u-boot 2013-06-10 01:33:59 +02:00
Alejandro Mery
3fb12ad20b usb-boot: fix small typo
Signed-off-by: Alejandro Mery <amery@geeks.cl>
2013-05-27 19:56:18 +02:00
Bartosz J
68a4f6f231 fexc: accept negative values in .fex files
closes #16
2013-05-25 19:49:11 +00:00
Henrik Nordstrom
c749f83060 felboot: Reduce to only a linkerscript + stubs to compensate for general SPL config
The stubs is only needed because we are using objects from a full
SPL build. Even these will go away when felboot is integrated in
u-boot, reducing it to only a link script and config changes.
2013-05-24 00:30:24 +02:00
Henrik Nordstrom
fa8e86bb2a felboot: Update documentation slightly 2013-05-24 00:25:11 +02:00
Henrik Nordstrom
498ffab9d1 felboot: Use u-boot serial driver 2013-05-24 00:16:14 +02:00
Henrik Nordstrom
c8493720d9 felboot: Move closer to u-boot build structure, reducing source size even further 2013-05-24 00:08:24 +02:00
Henrik Nordstrom
7c05609384 felboot: Simplify Makefile a bit to more closely match u-boot 2013-05-23 22:46:20 +02:00
Henrik Nordstrom
98b3125dfc felboot: Use sunxi_board_init directly from u-boot
as expected there was no problem to use sunxi_board_init directly
from u-boot. Failure on A13 was a timing issue in the host side
script (need to wait for DRAM init to finish before trying next
fel operation)
2013-05-23 21:19:17 +02:00
Henrik Nordstrom
3ba3dde4ee felboot: Show u-boot version banner 2013-05-23 21:18:02 +02:00
Henrik Nordstrom
e42ec9b7ad usb-boot: Fix for failure just after DRAM initialization.
just need to wait a little for the DRAM initialization to finish. Can't
use fel until we know it's finished or things breaks down.
2013-05-23 21:12:58 +02:00
Henrik Nordstrom
6004127d01 usb-boot: Handle variable arguments 2013-05-23 21:12:53 +02:00
Henrik Nordstrom
05cdc60eb1 usb-boot: Rework ram boot to use a boot.scr @0x41000000 to indicate RAM boot 2013-05-21 23:19:19 +02:00
Henrik Nordstrom
bacc658e59 Rename eoma68 to eoma68-a10 2013-05-19 21:33:30 +02:00
Henrik Nordstrom
9d30ca8e86 fel: Detach (and reattach on exit) the awusb kernel driver if loaded 2013-05-19 11:55:17 +02:00
Henrik Nordstrom
6829404a44 felboot: Correct merge conflict 2013-05-18 00:34:20 +02:00
Henrik Nordstrom
99c3501bed Revert "felboot: Reuse sunxi_board_init() directly from u-boot tree"
For some reason cubieboard no longer works with this. a13-olinuxino do
work however. Needs further analysis.

This reverts commit de093ee7eff417e188b3c60c1dc1d574c9a546ac.

Conflicts:
	felboot/main.c
2013-05-18 00:04:25 +02:00
Henrik Nordstrom
d34a13fccf felboot: Even closer to u-boot 2013-05-17 23:59:34 +02:00
Henrik Nordstrom
c4ae8f2e73 felboot: Reduce _start to just a call to s_init. 2013-05-17 23:02:04 +02:00
Henrik Nordstrom
789512036b felboot: Use u-boot common.h instead of system stdio.h 2013-05-17 22:06:03 +02:00
Henrik Nordstrom
4c5e0845e1 felboot: Correct line output 2013-05-17 17:07:55 +02:00