From patchwork Fri Oct 16 17:52:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabien Parent X-Patchwork-Id: 1383486 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=ZvGVJBx/; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCYf31rlNz9sTm for ; Sat, 17 Oct 2020 04:52:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1077C823F3; Fri, 16 Oct 2020 19:52:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="ZvGVJBx/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 279C282413; Fri, 16 Oct 2020 19:52:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 823A7823E0 for ; Fri, 16 Oct 2020 19:52:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=fparent@baylibre.com Received: by mail-wr1-x444.google.com with SMTP id i1so3923755wro.1 for ; Fri, 16 Oct 2020 10:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IelH3+5Q2nbr0EtJ8RPcgrIqcRyXRJ5pvL6GoO2gQpw=; b=ZvGVJBx/MFJfiU781psxAO0R2kOGoVTUpQ4m620ws0o04d7eSKz59lOa5eHN59OQMP quc0i1Tecmqb5KiNTrXdWbgYFO8N3fMHJAgRxY7yXR3DuvsEGmnCrs20agSkXMBGNJFQ KPXZWtcI5GMmOFP5A/6RHSapuNCleGlfr+ZmFLysCeB2/m0coXKPzDEMeiu5KQtH2MZh XcrExnjJfkBSs3LsBgT9nwBT/B+B0ignketvjvz2fiU6AmQCzJAnlSM7PYGCze7Pt8Df UzlbSqhhBtxnCEE6D6H7bECxcAMk/3J9LtfYBt9//gh2+YivK9M3IHqUBtnpRYwx9obU G01w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IelH3+5Q2nbr0EtJ8RPcgrIqcRyXRJ5pvL6GoO2gQpw=; b=lW9M5E1D02z2N2LvqFfZgUZesOnwYdDtpr3tqj0lfvKb7dCp2MtjH4fZ3lbNMDRpTB anki5gNbVUH13GA864+JGenOYXhVsqeRvi2072uX2YeCb8P2vya/SOnzU7M+GNJl5pnp 1Jj+WNYhKCbBl1sUt4i4OCGaF6Em/oBsj9plElG1HBwmmkAy4EZqUy2ZjRB+YEK/TLWx BV/j+dD4YE3BvJo71pS1/krOu7VZrnHfIklvKx5esQflYVywbHxbSGgmF8JdSz2x1Nlh rPtzndz+zXNWXwzw5cD7ufN8H/oNy0P8d6A2s2zg+eaPo0kMUKHHXNljSBpeu2fu5tGs nRUw== X-Gm-Message-State: AOAM5308k2r7HeoAmCrq6Hzu9TcC57Dueoqzc3yVFvB/t9a5gnTXTaFj MpdUBYtjsIofuSk9bqIRs0E6UL/HQYYcqw== X-Google-Smtp-Source: ABdhPJwgAn0mqkoWHgLV61RokDuxlBt2D8W2fAH/oebvRtD0lvh3Z9yr8RERhXCHiKoVKVFMJcWaGw== X-Received: by 2002:a5d:6a0a:: with SMTP id m10mr5393713wru.189.1602870760710; Fri, 16 Oct 2020 10:52:40 -0700 (PDT) Received: from localhost.localdomain (211.163.185.81.rev.sfr.net. [81.185.163.211]) by smtp.gmail.com with ESMTPSA id z11sm4250319wrh.70.2020.10.16.10.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 10:52:39 -0700 (PDT) From: Fabien Parent To: u-boot@lists.denx.de, GSS_MTK_Uboot_upstream@mediatek.com Cc: weijie.gao@mediatek.com, ryder.lee@mediatek.com, Fabien Parent Subject: [PATCH] tools: mtk_image: add support for booting ARM64 images Date: Fri, 16 Oct 2020 19:52:37 +0200 Message-Id: <20201016175237.3308437-1-fparent@baylibre.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean mkimage is only able to package aarch32 binaries. Add support for AArch64 images. One can create a ARM64 image using the following command line: mkimage -T mtk_image -a 0x201000 -e 0x201000 -n "media=emmc;arm64=1" -d bl2.bin bl2.img Signed-off-by: Fabien Parent --- tools/mtk_image.c | 28 ++++++++++++++++++++++++---- tools/mtk_image.h | 6 +++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/mtk_image.c b/tools/mtk_image.c index 2ca519483d33..bde1e5da4bec 100644 --- a/tools/mtk_image.c +++ b/tools/mtk_image.c @@ -246,6 +246,7 @@ static const struct brom_img_type { /* Image type selected by user */ static enum brlyt_img_type hdr_media; static int use_lk_hdr; +static bool is_arm64_image; /* LK image name */ static char lk_name[32] = "U-Boot"; @@ -276,6 +277,7 @@ static int mtk_brom_parse_imagename(const char *imagename) static const char *media = ""; static const char *nandinfo = ""; static const char *lk = ""; + static const char *arm64_param = ""; key = buf; while (key) { @@ -323,6 +325,9 @@ static int mtk_brom_parse_imagename(const char *imagename) if (!strcmp(key, "lkname")) snprintf(lk_name, sizeof(lk_name), "%s", val); + + if (!strcmp(key, "arm64")) + arm64_param = val; } if (next) @@ -354,6 +359,9 @@ static int mtk_brom_parse_imagename(const char *imagename) } } + if (arm64_param && arm64_param[0] == '1') + is_arm64_image = true; + free(buf); if (hdr_media == BRLYT_TYPE_INVALID) { @@ -458,6 +466,9 @@ static int mtk_image_verify_gen_header(const uint8_t *ptr, int print) le32_to_cpu(gfh->file_info.load_addr) + le32_to_cpu(gfh->file_info.jump_offset)); + if (print) + printf("Architecture: %s\n", is_arm64_image ? "ARM64" : "ARM"); + return 0; } @@ -523,6 +534,9 @@ static int mtk_image_verify_nand_header(const uint8_t *ptr, int print) le32_to_cpu(gfh->file_info.load_addr) + le32_to_cpu(gfh->file_info.jump_offset)); + if (print) + printf("Architecture: %s\n", is_arm64_image ? "ARM64" : "ARM"); + return 0; } @@ -581,6 +595,8 @@ static void put_ghf_common_header(struct gfh_common_header *gfh, int size, static void put_ghf_header(struct gfh_header *gfh, int file_size, int dev_hdr_size, int load_addr, int flash_type) { + uint32_t cfg_bits; + memset(gfh, 0, sizeof(struct gfh_header)); /* GFH_FILE_INFO header */ @@ -608,11 +624,15 @@ static void put_ghf_header(struct gfh_header *gfh, int file_size, /* GFH_BROM_CFG header */ put_ghf_common_header(&gfh->brom_cfg.gfh, sizeof(gfh->brom_cfg), GFH_TYPE_BROM_CFG, 3); - gfh->brom_cfg.cfg_bits = cpu_to_le32( - GFH_BROM_CFG_USBDL_AUTO_DETECT_DIS | - GFH_BROM_CFG_USBDL_BY_KCOL0_TIMEOUT_EN | - GFH_BROM_CFG_USBDL_BY_FLAG_TIMEOUT_EN); + cfg_bits = GFH_BROM_CFG_USBDL_AUTO_DETECT_DIS | + GFH_BROM_CFG_USBDL_BY_KCOL0_TIMEOUT_EN | + GFH_BROM_CFG_USBDL_BY_FLAG_TIMEOUT_EN; gfh->brom_cfg.usbdl_by_kcol0_timeout_ms = cpu_to_le32(5000); + if (is_arm64_image) { + gfh->brom_cfg.jump_bl_arm64 = GFH_BROM_CFG_JUMP_BL_ARM64; + cfg_bits |= GFH_BROM_CFG_JUMP_BL_ARM64_EN; + } + gfh->brom_cfg.cfg_bits = cpu_to_le32(cfg_bits); /* GFH_BL_SEC_KEY header */ put_ghf_common_header(&gfh->bl_sec_key.gfh, sizeof(gfh->bl_sec_key), diff --git a/tools/mtk_image.h b/tools/mtk_image.h index 4e78b3d0ff0b..7dda71ce88a5 100644 --- a/tools/mtk_image.h +++ b/tools/mtk_image.h @@ -136,7 +136,9 @@ struct gfh_brom_cfg { struct gfh_common_header gfh; uint32_t cfg_bits; uint32_t usbdl_by_auto_detect_timeout_ms; - uint8_t unused[0x48]; + uint8_t unused[0x45]; + uint8_t jump_bl_arm64; + uint8_t unused2[2]; uint32_t usbdl_by_kcol0_timeout_ms; uint32_t usbdl_by_flag_timeout_ms; uint32_t pad; @@ -146,6 +148,8 @@ struct gfh_brom_cfg { #define GFH_BROM_CFG_USBDL_AUTO_DETECT_DIS 0x10 #define GFH_BROM_CFG_USBDL_BY_KCOL0_TIMEOUT_EN 0x80 #define GFH_BROM_CFG_USBDL_BY_FLAG_TIMEOUT_EN 0x100 +#define GFH_BROM_CFG_JUMP_BL_ARM64_EN 0x1000 +#define GFH_BROM_CFG_JUMP_BL_ARM64 0x64 struct gfh_bl_sec_key { struct gfh_common_header gfh;