BPI/sunxi-tools
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fel: Add the ability to pass uEnv-style data via FEL (#60)

Browse Source 
* 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: Bernhard Nortmann <bernhard.nortmann@web.de>
This commit is contained in:
NiteHawk 2016-10-24 12:18:46 +02:00 committed by GitHub
parent 6392ecf630
commit a8eadb9be8
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fel.c
View File

@ -1352,16 +1352,22 @@ bool have_sunxi_spl(libusb_device_handle *usb, uint32_t spl_addr)
* (see "boot_file_head" in ${U-BOOT}/arch/arm/include/asm/arch-sunxi/spl.h),
* providing the boot script address (DRAM location of boot.scr).
*/
void pass_fel_information(libusb_device_handle *usb, uint32_t script_address)
void pass_fel_information(libusb_device_handle *usb,
uint32_t script_address, uint32_t uEnv_length)
{
soc_sram_info *sram_info = aw_fel_get_sram_info(usb);
/* write something _only_ if we have a suitable SPL header */
if (have_sunxi_spl(usb, sram_info->spl_addr)) {
pr_info("Passing boot info via sunxi SPL: script address = 0x%08X\n",
script_address);
aw_fel_write(usb, &script_address,
sram_info->spl_addr + 0x18, sizeof(script_address));
pr_info("Passing boot info via sunxi SPL: "
"script address = 0x%08X, uEnv length = %u\n",
script_address, uEnv_length);
uint32_t transfer[] = {
htole32(script_address),
htole32(uEnv_length)
};
aw_fel_write(usb, transfer,
sram_info->spl_addr + 0x18, sizeof(transfer));
}
}
@ -1455,6 +1461,14 @@ void aw_rmr_request(libusb_device_handle *usb, uint32_t entry_point, bool aarch6
pr_info(" done.\n");
}
/* check buffer for magic "#=uEnv", indicating uEnv.txt compatible format */
static bool is_uEnv(void *buffer, size_t size)
{
if (size <= 6)
return false; /* insufficient size */
return memcmp(buffer, "#=uEnv", 6) == 0;
}
/* private helper function, gets used for "write*" and "multi*" transfers */
static unsigned int file_upload(libusb_device_handle *handle, size_t count,
size_t argc, char **argv, progress_cb_t progress)
@ -1482,7 +1496,9 @@ static unsigned int file_upload(libusb_device_handle *handle, size_t count,
/* If we transferred a script, try to inform U-Boot about its address. */
if (get_image_type(buf, size) == IH_TYPE_SCRIPT)
pass_fel_information(handle, offset);
pass_fel_information(handle, offset, 0);
if (is_uEnv(buf, size)) /* uEnv-style data */
pass_fel_information(handle, offset, size);
}
free(buf);
}