- 25 Oct, 2016 2 commits
-
-
Bernhard Nortmann authored
This commit renames the function pointer of type progress_cb_t for file_upload(). That might help to avoid potential confusion with other routines that use a boolean "progress" parameter to indicate whether progress information is desired (at all). Signed-off-by:Bernhard Nortmann <bernhard.nortmann@web.de>
-
howientc authored
Until now, the function would always pass `true` as the "progress" parameter to aw_write_buffer(). This has the potential drawback of limiting the maximum USB transfer size. By selectively passing `false` instead (with no progress function active), we hint that aw_write_buffer() and subsequent routines don't have to care about callbacks; so that usb_bulk_send() is free to select a transfer size of AW_USB_MAX_BULK_SEND. Reviewed-by:
-
- 24 Oct, 2016 1 commit
-
-
NiteHawk authored
* fel: Add the ability to pass uEnv-style data via FEL The corresponding format is recognized by having the environment data (= text) start with a special "#=uEnv" marker. Upon transfer of such a file, sunxi-fel will detect this condition, and set a field in the SPL header accordingly - which in turn also requests U-Boot to auto-import it (i.e. merge with the default environment). (Note that this requires a U-Boot version that knows about the new meaning of this field, namely v2016.09 or later. Older U-Boot versions will fail to import the uEnv-style data.) Signed-off-by:
-
- 22 Oct, 2016 1 commit
-
-
Bernhard Nortmann authored
-
- 27 May, 2016 1 commit
-
-
Bernhard Nortmann authored
This commit adds a new "reset64 <addr>" command "rmr32" that could be helpful with new 64-bit SoCs. It takes an entry point (address) parameter, stores it via RVBAR and then issues a RMR write to request a warm boot into AArch64 mode. For now, this is useful with the boot process of A64, where we might wish to transfer control to a 64-bit binary (for ATF or U-Boot). See e.g. http://linux-sunxi.org/Pine64#Boot_sequence Signed-off-by:
-
- 11 May, 2016 1 commit
-
-
Siarhei Siamashka authored
The SCTLR bits are somewhat different because the V bit is set to 0 on A64 (Low exception vectors, base address 0x00000000) and the UNK bit (Reads of this bit return an UNKNOWN value) is also not the same as on the other SoCs. So the SCTLR check can be relaxed. Changes in v2: - Because the SRAM A and SRAM C reside back-to-back in the address space, it is possible to use 40 KiB of SRAM by the SPL for its code+data+stack. So the FEL backup storage is moved from 0x18000 to 0x1A000 to support this. Signed-off-by:Siarhei Siamashka <siarhei.siamashka@gmail.com>
-
- 08 May, 2016 4 commits
-
-
Siarhei Siamashka authored
This allows the SRAM section A2 to be exclusively used by the OpenRISC core. There are no substantial differences between H3 and A10/A13/A20. It just has 64 KiB of SRAM starting at the address 0x0 instead of 48 KiB. Signed-off-by: -
Siarhei Siamashka authored
This allows the SRAM section A2 to be exclusively used by the OpenRISC core. Regarding the potential U-Boot SPL size. The SRAM section A1 only has 32 KiB. But at least the stack can be set at the end of the SRAM section B. Or runtime UCL or LZO decompression can be used to unpack the SPL code to 0x24000-0x2FFFF and have 48 KiB of available space there. Signed-off-by:
-
Siarhei Siamashka authored
That would be a more appropriate name. And A31 is going to implement this in a different way and give the SRAM back to OpenRISC. Signed-off-by:
-
Siarhei Siamashka authored
Previously the backup area was allocated at the address 0x8000. This is not very good because it means that the U-Boot SPL can only safely use memory at addresses 0x0000-0x7FFF (32 KiB). But if we move the backup area to the end of the SRAM A4, this can allow U-Boot SPL to use memory 0x0000-0x9FFF (40 KiB). The BROM can't load such large SPLs from the SD card. But the SPL still can move its stack up to the 40 KiB boundary or do UCL or LZO decompression at runtime to squeeze more code into it. This patch makes the sunxi-fel tool compatible with 40 KiB SPLs, even though the current U-Boot releases do not use them yet. Signed-off-by:
-
- 06 May, 2016 1 commit
-
-
Bernhard Nortmann authored
- Convert C++ style comments for a uniform coding style. - Some small formatting adjustments. - Change "sid" command to print ':' separators instead of spaces. Apart from "sid" output, no functional changes involved. Signed-off-by:
-
- 05 May, 2016 3 commits
-
-
Bernhard Nortmann authored
This patch makes use of the new aw_fel_readl_n() function to output the first four 32-bit values (SID key) from an SoC-specific address. The corresponding e-fuses may not necessarily start at the SID "base" address, e.g. on H3/A83T they are at <base+0x200>. Note: SoC support is currently incomplete. In particular, reading the SID on A31(s) is unsupported. Accessing it there is complicated by the fact that Allwinner moved this information from the SoC into the PMIC/AXP221. Signed-off-by: -
Bernhard Nortmann authored
Signed-off-by:
-
Siarhei Siamashka authored
Doing certain operations may need uploading and executing code on the device. For example, such operations right now are reading/writing ARM CP15 coprocessor registers. Uploading the code to the device is naturally overwriting some part of SRAM as a side effect. Right now it is not a problem, because the CP15 coprocessor registers are only accessed as part of uploading and executing U-Boot SPL. They are nicely timed not to cause problems and the temporary scratch area gets overwritten by the SPL code anyway. But if we decide to provide access to such operations via command line interface, then any side effects may potentially cause problems for the users. Consider the following scenario: sunxi-fel clear 0x2000 0x100 \ advanced-command-which-uploads-and-executes-code \ hexdump 0x2000 0x100 The user may rightfully expect that clearing a buffer in SRAM to zero and then reading it back should show all zero bytes. But inserting advanced commands in the middle may cause data corruption. In order to resolve this problem, just move the scratch area away from the 0x2000-0x5BFF addresses range. These particular addresses are already known to the users as a safe place for their bare metal expariments in FEL mode. The "sunxi-fel spl" command is a special case though and it is expected to overwrite data in this area too. A possible alternative would be to just backup & restore data in the scratch area. But this has some disadvantages: 1. Extra code in the sunxi-fel tool and extra roundtrips over USB to do the backup/restore job. 2. If we allow the OpenRISC core to use the 0x2000-0x5C00 range in SRAM A1, then this becomes unsafe and racy (we can't really backup & restore data without causing a temporarily glitch for the currently running code on the OpenRISC core). To sum it up. With this patch we make it so that now the 0x2000-0x5BFF range is freely available for the users of the sunxi-fel tool. The 0x1000-0x1FFF range is off limits (the upper part of it is used by the FEL IRQ handler, the lower part of it is reserved for internal use by the sunxi-fel tool). The 0x0000-0x0FFF addresses range is reserved for passing data from the SPL to the main U-Boot binary (via the SPL header) and is also off limits. Signed-off-by:
-
- 04 May, 2016 2 commits
-
-
Bernhard Nortmann authored
This is done by explicitly setting at least one member field (preferably the one that gets tested for validity later), instead of just using "{ 0 }". Signed-off-by: -
Bernhard Nortmann authored
Signed-off-by:
-
- 03 May, 2016 1 commit
-
-
Bernhard Nortmann authored
For Linux, this requires additional #defines, see https://gist.github.com/panzi/6856583#gistcomment-1656524 Placing those #defines into portable_endian.h would mean we depend on the specific order of #includes (whatever pulls in endian.h first, including other system includes). Avoid this by using symbols provided "globally" via the Makefile. Also nuke the _NETBSD_SOURCE definition in fel.c Signed-off-by:
-
- 20 Apr, 2016 8 commits
-
-
Bernhard Nortmann authored
Our previous include file only supplied a very limited set of wrapper redefinitions for platforms that define __APPLE__ (i.e. Mac OS). In particular, some needed big endian conversions were missing, causing "symbol(s) not found" errors when linking. Instead of patching the existing file, let's do away with it completely and replace it by something more sophisticated. The portable_endian.h used is in the public domain, and was taken from https://gist.github.com/panzi/6856583 Signed-off-by:
-
Bernhard Nortmann authored
Commit 472ac475 introduced a possible regression by relying on the availability of libusb_strerror(). There are libusb versions out there _not_ offering this function, which breaks compilation. Introducing a separate helper function allows us to work around this, refactor existing code and have more streamlined error reporting - avoiding the message string retrieval where needed. The usb_error() function can also optionally abort execution with a given exit code. Signed-off-by:
-
Bernhard Nortmann authored
Signed-off-by: -
Bernhard Nortmann authored
Signed-off-by: -
Bernhard Nortmann authored
Signed-off-by: -
Bernhard Nortmann authored
instead of memset() and strcpy() to clear / assign member fields. Signed-off-by: -
Bernhard Nortmann authored
Signed-off-by: -
Bernhard Nortmann authored
Gracefully shut down the FEL utility, instead of continuing execution. This avoids a possible "ERROR: Allwinner USB FEL device not found!" when doing a plain `./sunxi-fel` without any arguments (and no suitable USB device connected). Signed-off-by:
-
- 21 Mar, 2016 2 commits
-
-
Jens Kuske authored
The A80 has the V bit in SCTLR set to 0 because of the BROM being at 0x00000000 now, so the SCTLR check has to be relaxed. Signed-off-by:
Jens Kuske <jenskuske@gmail.com> Reviewed-by:
-
Jens Kuske authored
This workaround is necessary for A80, which sometimes fails at reading DACR. Signed-off-by:
-
- 20 Mar, 2016 2 commits
-
-
Bernhard Nortmann authored
See https://github.com/linux-sunxi/sunxi-tools/issues/37 The patch was originally inspired by https://github.com/NextThingCo/sunxi-tools/commit/16386a7 and https://github.com/NextThingCo/sunxi-tools/commit/47bafaf It introduces a "--dev" (-d) option to specify the desired FEL device. This is useful if multiple target devices are connected to the same host. Signed-off-by:
-
Lourens Rozema authored
Closes #24. See https://groups.google.com/forum/#!topic/linux-sunxi/sEJ1eTBoCvw Tested-by:
-
- 17 Dec, 2015 3 commits
-
-
Bernhard Nortmann authored
The aw_fel_process_spl_and_uboot() was missing a free() for the file buffer. This patch also adds a proper libusb cleanup/shutdown. Signed-off-by:
-
Bernhard Nortmann authored
This patch forces relevant options to be placed at the beginning of the command line, but also makes sure that their specific order does not matter. Currently this applies to "-p" (--progress) and "-v" (--verbose). Signed-off-by:
-
Bernhard Nortmann authored
Commit d99d59c0 introduces a bug when the "spl" command is used with a file that contains a U-Boot binary. "spl" will now try to execute it, while it's not supposed to. (The command should only start the SPL.) This patch brings back the `uboot_autostart` flag, which is meant to remain `false` for the "spl" command, and gets set by "uboot" only. Signed-off-by:
-
- 16 Dec, 2015 4 commits
-
-
Bernhard Nortmann authored
This patch adds an "echo-gauge" command that is intended for use with sunxi-fel's output piped into the dialog utility. "echo-gauge" will output its string argument in a way that updates (i.e. overwrites) the prompt text that dialog displays, so it's possible to change that inbetween file transfers from sunxi-fel. Example: sunxi-fel uboot ${UBOOT} \ echo-gauge "Uploading kernel (1/2)" \ write-with-gauge 0x42000000 ${KERNEL} \ write 0x43100000 ${SCRIPT} \ echo-gauge "Uploading rootfs (2/2)" \ write-with-gauge 0x44000000 ${ROOTFS} \ | dialog --gauge "" 6 70 Signed-off-by: -
Bernhard Nortmann authored
This patch adds some additional commands, and implements corresponding progress callbacks that produce output for the 'dialog' utility: http://invisible-island.net/dialog/dialog.html The simple "*-with-gauge" just emits percentage numbers, line by line, while "*-with-xgauge" outputs extended information to update the dialog prompt. Both are meant for directly piping the output: sunxi-fel write-with-gauge <...> | dialog --gauge "FEL upload" 6 70 Signed-off-by:
-
Bernhard Nortmann authored
The two new commands both imply that a (simple) progress bar display is requested. "multi[write]" allows to upload a group of files with a single command, resulting in their transfer showing a common, 'overall' progress status. Signed-off-by:
-
Bernhard Nortmann authored
This patch moves some code out of the "write" handler, with the intention to reuse it later for similar commands. At the same time, it also discards the previous transfer rate output when using "-v", as that has become redundant with the 'progress bar' display available by "-p". Signed-off-by:
-
- 07 Dec, 2015 4 commits
-
-
Bernhard Nortmann authored
Add "--progress" option and a progress bar display for FEL transfers. This picks up on a suggestion from Alexander Kaplan and the discussion at https://groups.google.com/forum/#!topic/linux-sunxi/lz0oQBwjex0 Signed-off-by:
-
Bernhard Nortmann authored
This patch adds a boolean parameter "progress" to several functions. When set (true), it will cause usb_bulk_send() to notify the progress framework, using progress_update() to convey the current transfer status. The feature gets enabled for the "write" command, and is forced inactive in most other places, e.g. aw_fel_write_uboot_image(). Also, we specifically want the internal use of aw_fel_write() to never use it. Signed-off-by:
-
Bernhard Nortmann authored
This patch introduces a new function aw_write_buffer() to allow a better distinction between FEL write operations. aw_fel_write() is meant for "privileged" internal use, while aw_write_buffer() now represents the preferred entry point for user code like the "write", "fill" or "clear" commands. There is some deliberate code duplication here that makes sense when combined with the next patch, where the aw_usb_write() call will differ. We want aw_fel_write() to enforce no progress update/callback, while aw_write_buffer() will (optionally) support it. Signed-off-by:
-
Bernhard Nortmann authored
This patch adds two new source files that will deal with code related to progress callbacks and display. I have decided to keep this separate, as there will be many smaller routines involved, which otherwise would bloat fel.c unnecessarily. For starters, let's also move the gettime() function there. Signed-off-by:
-
