With support added for Armada 38x, include the bubt command in ClearFog defconfig.

Signed-off-by: Joel Johnson mrjoel@lixil.net

---

v2 changes: - none

--- configs/clearfog_defconfig | 1 + 1 file changed, 1 insertion(+)

diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index c938448c30..0d7e19e731 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -35,6 +35,7 @@ CONFIG_SPL_CMD_TLV_EEPROM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MVEBU_BUBT=y CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y

When a mismatch is found trying to write an image for one boot method to a different boot device, print an error message including the image header marked target boot device type.

Signed-off-by: Joel Johnson mrjoel@lixil.net

---

v2 changes: - newly added in v2 series

--- cmd/mvebu/bubt.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 78061a6a2d..5e2877788a 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -678,6 +678,17 @@ static int a38x_check_boot_mode(const struct bubt_dev *dst) if (a38x_boot_modes[mode].id == hdr->blockid) return 0;

+ for (int i = 0; i < A38X_BOOT_MODE_MAX; i++) { + if (a38x_boot_modes[i].id == hdr->blockid) { + printf("Error: image meant to be booted from " + " "%s", not "%s"!\n", + a38x_boot_modes[i].name, dst->name); + return -ENOEXEC; + } + } + + printf("Error: unknown boot device in image header: 0x%x\n", + hdr->blockid); return -ENOEXEC; }

@@ -747,10 +758,8 @@ static int bubt_verify(const struct bubt_dev *dst)

#if defined(CONFIG_ARMADA_38X) err = a38x_check_boot_mode(dst); - if (err) { - puts("Error: image not built for destination device!\n"); + if (err) return err; - } #endif

return 0;

I just wanted to ping on this review (http://patchwork.ozlabs.org/project/uboot/list/?series=155850). I haven't seen any review feedback, so would like to check if it's agreeably in a state ready for merging in the next merge window or if there are issues.

Thanks! Joel

On 2020-01-29 07:50, Joel Johnson wrote:

Add support for Armada 38x devices in bubt flashing utility. This is based on (and streamlined from) the support in the SolidRun master-a38x vendor fork branch.

Signed-off-by: Joel Johnson mrjoel@lixil.net

---

v2 changes

• none

---

cmd/mvebu/bubt.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 2041a7a29a..d399fb6da4 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -85,7 +85,29 @@ struct mvebu_image_info { u32 encrypt_start_offset; u32 encrypt_size; }; -#endif /* CONFIG_ARMADA_XXX */ +#elif defined(CONFIG_ARMADA_38X) /* A38X */

+/* Structure of the main header, version 1 (Armada 370/38x/XP) */ +struct a38x_main_hdr_v1 {

• u8 blockid; /* 0x0 */
• u8 flags; /* 0x1 */
• u16 reserved2; /* 0x2-0x3 */
• u32 blocksize; /* 0x4-0x7 */
• u8 version; /* 0x8 */
• u8 headersz_msb; /* 0x9 */
• u16 headersz_lsb; /* 0xA-0xB */
• u32 srcaddr; /* 0xC-0xF */
• u32 destaddr; /* 0x10-0x13 */
• u32 execaddr; /* 0x14-0x17 */
• u8 options; /* 0x18 */
• u8 nandblocksize; /* 0x19 */
• u8 nandbadblklocation; /* 0x1A */
• u8 reserved4; /* 0x1B */
• u16 reserved5; /* 0x1C-0x1D */
• u8 ext; /* 0x1E */
• u8 checksum; /* 0x1F */

+}; +#endif

struct bubt_dev { char name[8]; @@ -621,7 +643,52 @@ static int check_image_header(void)

return 0; } +#elif defined(CONFIG_ARMADA_38X) +static size_t a38x_header_size(const struct a38x_main_hdr_v1 *h) +{

• if (h->version == 1)

• return (h->headersz_msb << 16) | le16_to_cpu(h->headersz_lsb);
  

• printf("Error: Invalid A38x image (header version 0x%x unknown)!\n",

•       h->version);
  

• return 0;

+}

+static uint8_t image_checksum8(const void *start, size_t len) +{

• u8 csum = 0;
• const u8 *p = start;
• while (len) {

• csum += *p;
  

• ++p;
  

• --len;
  

• }
• return csum;

+}

+static int check_image_header(void) +{

• u8 checksum;
• const struct a38x_main_hdr_v1 *hdr =

• (struct a38x_main_hdr_v1 *)get_load_addr();
  

• const size_t image_size = a38x_header_size(hdr);
• if (!image_size)

• return -ENOEXEC;
  

• checksum = image_checksum8(hdr, image_size);
• checksum -= hdr->checksum;
• if (checksum != hdr->checksum) {

• printf("Error: Bad A38x image checksum. 0x%x != 0x%x\n",
  

•        checksum, hdr->checksum);
  

• return -ENOEXEC;
  

• }
• printf("Image checksum...OK!\n");
• return 0;

+} #else /* Not ARMADA? */ static int check_image_header(void) {