#endif
#include <u-boot/sha1.h>
#include <u-boot/sha256.h>
+#include <u-boot/sha512.h>
#if defined(CONFIG_ARMADA_8K)
#define MAIN_HDR_MAGIC 0xB105B002
#define IMAGE_VERSION_3_6_0 0x030600
#define IMAGE_VERSION_3_5_0 0x030500
+struct tim_boot_flash_sign {
+ unsigned int id;
+ const char *name;
+};
+
+struct tim_boot_flash_sign tim_boot_flash_signs[] = {
+ { 0x454d4d08, "mmc" },
+ { 0x454d4d0b, "mmc" },
+ { 0x5350490a, "spi" },
+ { 0x5350491a, "nand" },
+ { 0x55415223, "uart" },
+ { 0x53415432, "sata" },
+ {},
+};
+
struct common_tim_data {
u32 version;
u32 identifier;
u32 encrypt_start_offset;
u32 encrypt_size;
};
-#endif
+#elif defined(CONFIG_ARMADA_32BIT)
-/* Structure of the main header, version 1 (Armada 370/38x/XP) */
+/* Structure of the main header, version 1 (Armada 370/XP/375/38x/39x) */
struct a38x_main_hdr_v1 {
u8 blockid; /* 0x0 */
u8 flags; /* 0x1 */
- u16 reserved2; /* 0x2-0x3 */
+ u16 nandpagesize; /* 0x2-0x3 */
u32 blocksize; /* 0x4-0x7 */
u8 version; /* 0x8 */
u8 headersz_msb; /* 0x9 */
{},
};
+#endif
+
struct bubt_dev {
char name[8];
size_t (*read)(const char *file_name);
addr_str = env_get("loadaddr");
if (addr_str)
- addr = simple_strtoul(addr_str, NULL, 16);
+ addr = hextoul(addr_str, NULL);
else
addr = CONFIG_SYS_LOAD_ADDR;
u32 erase_bytes;
/* Probe the SPI bus to get the flash device */
- flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
- CONFIG_ENV_SPI_CS,
+ flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
+ CONFIG_SF_DEFAULT_CS,
CONFIG_SF_DEFAULT_SPEED,
CONFIG_SF_DEFAULT_MODE);
if (!flash) {
#ifdef CONFIG_CMD_NET
static size_t tftp_read_file(const char *file_name)
{
+ int ret;
+
/*
* update global variable image_load_addr before tftp file from network
*/
image_load_addr = get_load_addr();
- return net_loop(TFTPGET);
+ ret = net_loop(TFTPGET);
+ return ret > 0 ? ret : 0;
}
static int is_tftp_active(void)
int image_num;
u8 hash_160_output[SHA1_SUM_LEN];
u8 hash_256_output[SHA256_SUM_LEN];
+ u8 hash_512_output[SHA512_SUM_LEN];
sha1_context hash1_text;
sha256_context hash256_text;
+ sha512_context hash512_text;
u8 *hash_output;
u32 hash_algorithm_id;
u32 image_size_to_hash;
sha256_finish(&hash256_text, hash_256_output);
hash_output = hash_256_output;
break;
+ case SHA512_SUM_LEN:
+ sha512_starts(&hash512_text);
+ sha512_update(&hash512_text, buff, image_size_to_hash);
+ sha512_finish(&hash512_text, hash_512_output);
+ hash_output = hash_512_output;
+ break;
default:
printf("Error: Unsupported hash_algorithm_id = %d\n",
hash_algorithm_id);
return 0;
}
-#elif defined(CONFIG_ARMADA_38X)
+#elif defined(CONFIG_ARMADA_32BIT)
static size_t a38x_header_size(const struct a38x_main_hdr_v1 *h)
{
if (h->version == 1)
static int bubt_check_boot_mode(const struct bubt_dev *dst)
{
- if (IS_ENABLED(CONFIG_ARMADA_38X)) {
- int mode;
- const struct a38x_main_hdr_v1 *hdr =
- (struct a38x_main_hdr_v1 *)get_load_addr();
-
- for (mode = 0; mode < ARRAY_SIZE(a38x_boot_modes); mode++) {
- if (strcmp(a38x_boot_modes[mode].name, dst->name) == 0)
- break;
- }
-
- if (a38x_boot_modes[mode].id == hdr->blockid)
- return 0;
+#if defined(CONFIG_ARMADA_3700) || defined(CONFIG_ARMADA_32BIT)
+ int mode;
+#if defined(CONFIG_ARMADA_3700)
+ const struct tim_boot_flash_sign *boot_modes = tim_boot_flash_signs;
+ const struct common_tim_data *hdr =
+ (struct common_tim_data *)get_load_addr();
+ u32 id = hdr->boot_flash_sign;
+#elif defined(CONFIG_ARMADA_32BIT)
+ const struct a38x_boot_mode *boot_modes = a38x_boot_modes;
+ const struct a38x_main_hdr_v1 *hdr =
+ (struct a38x_main_hdr_v1 *)get_load_addr();
+ u32 id = hdr->blockid;
+#endif
- for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) {
- if (a38x_boot_modes[i].id == hdr->blockid) {
- printf("Error: A38x image meant to be booted from "
- "\"%s\", not \"%s\"!\n",
- a38x_boot_modes[i].name, dst->name);
- return -ENOEXEC;
- }
- }
+ for (mode = 0; boot_modes[mode].name; mode++) {
+ if (boot_modes[mode].id == id)
+ break;
+ }
- printf("Error: unknown boot device in A38x image header: "
- "0x%x\n", hdr->blockid);
+ if (!boot_modes[mode].name) {
+ printf("Error: unknown boot device in image header: 0x%x\n", id);
return -ENOEXEC;
- } else {
- return 0;
}
+
+ if (strcmp(boot_modes[mode].name, dst->name) == 0)
+ return 0;
+
+ printf("Error: image meant to be booted from \"%s\", not \"%s\"!\n",
+ boot_modes[mode].name, dst->name);
+ return -ENOEXEC;
+#else
+ return 0;
+#endif
}
static int bubt_verify(const struct bubt_dev *dst)
#define DEFAULT_BUBT_DST "nand"
#elif defined(CONFIG_MVEBU_MMC_BOOT)
#define DEFAULT_BUBT_DST "mmc"
-else
+#else
#define DEFAULT_BUBT_DST "error"
#endif
#endif /* DEFAULT_BUBT_DST */
bubt, 4, 0, do_bubt_cmd,
"Burn a u-boot image to flash",
"[file-name] [destination [source]]\n"
- "\t-file-name The image file name to burn. Default = flash-image.bin\n"
- "\t-destination Flash to burn to [spi, nand, mmc]. Default = active boot device\n"
- "\t-source The source to load image from [tftp, usb, mmc]. Default = tftp\n"
+ "\t-file-name The image file name to burn. Default = " CONFIG_MVEBU_UBOOT_DFLT_NAME "\n"
+ "\t-destination Flash to burn to [spi, nand, mmc]. Default = " DEFAULT_BUBT_DST "\n"
+ "\t-source The source to load image from [tftp, usb, mmc]. Default = " DEFAULT_BUBT_SRC "\n"
"Examples:\n"
"\tbubt - Burn flash-image.bin from tftp to active boot device\n"
"\tbubt flash-image-new.bin nand - Burn flash-image-new.bin from tftp to NAND flash\n"
projects / platform / kernel / u-boot.git / blobdiff