diff options
| author | Tom Rini <[email protected]> | 2022-01-30 17:12:34 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-30 17:12:34 -0500 |
| commit | e267665a7420bddbfd5833573fdfc9d0930ff515 (patch) | |
| tree | dd92172de357d0843012dcdc5a1a363ad31bffb9 /tools | |
| parent | c7d042f315d89ab2f0122920829f18a8f8897a05 (diff) | |
| parent | 50d5c6428fc280c095b0edd1a612b3661b5db77d (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
a bit delayed, the first batch of the sunxi pull request for this cycle.
This is mostly collecting some patches that were lying around for a
while, plus some recent fixes. Nothing too exciting at this point, but
of course they should be merged nevertheless.
There is the much bigger F1C100s SoC support coming up, which I hope to
be able to send in the next few days, along with the removal of sunxi's
lowlevel_init usage.
Compile tested for all 159 sunxi boards, plus briefly tested on BananaPi
M1, OrangePi Zero, Pine64 and Pine-H64.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sunxi_egon.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/sunxi_egon.c b/tools/sunxi_egon.c index a5299eb6a11..d1398c07fb0 100644 --- a/tools/sunxi_egon.c +++ b/tools/sunxi_egon.c @@ -10,9 +10,10 @@ /* * NAND requires 8K padding. SD/eMMC gets away with 512 bytes, - * but let's use the larger padding to cover both. + * but let's use the larger padding by default to cover both. */ #define PAD_SIZE 8192 +#define PAD_SIZE_MIN 512 static int egon_check_params(struct image_tool_params *params) { @@ -114,10 +115,12 @@ static int egon_check_image_type(uint8_t type) static int egon_vrec_header(struct image_tool_params *params, struct image_type_params *tparams) { + int pad_size = ALIGN(params->bl_len ?: PAD_SIZE, PAD_SIZE_MIN); + tparams->hdr = calloc(sizeof(struct boot_file_head), 1); - /* Return padding to 8K blocks. */ - return ALIGN(params->file_size, PAD_SIZE) - params->file_size; + /* Return padding to complete blocks. */ + return ALIGN(params->file_size, pad_size) - params->file_size; } U_BOOT_IMAGE_TYPE( |