From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 377F4C05027 for ; Wed, 1 Feb 2023 08:27:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04AE985C11; Wed, 1 Feb 2023 09:27:20 +0100 (CET) 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.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="7Cjvfgfl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B3F9185C16; Wed, 1 Feb 2023 09:27:17 +0100 (CET) Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) (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 3DA7185C11 for ; Wed, 1 Feb 2023 09:27:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mkorpershoek@baylibre.com Received: by mail-wm1-x330.google.com with SMTP id q8so12023768wmo.5 for ; Wed, 01 Feb 2023 00:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=u6Erh6R7055wvXnLe5auM8PfZZ049XePhMwLJLQWU5s=; b=7CjvfgflEeMuzSc9lf4Lj9JwCYq1rL8sjkPwcS3PnswPmPb9lnnQViSpZmDPIYTbxW d7v//6PES6eBMKO63NK61epFBxUpjIA0tj7yme3FycnfUGDtxRC4m3hLl0csvinCBXjM +1p43SxDw1Zfd+Szsot/0Rnt2Zy0BN6xC9/FMj19eGaRkSlK5OPqDrvkfoanLLZgM6gs UNCLNoBfb4Hg7vxOUrcxSJuhx+RYA9ApwwIXsYvmpksz8n4kcdCJcBObi0C12K1PlPoD hZy0By/8p4phYEsKJaYISqdZXlnzYGTFWB3Bhrm88yDPySk0wVXd/GTA24/k/x+3zGjM UDMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u6Erh6R7055wvXnLe5auM8PfZZ049XePhMwLJLQWU5s=; b=lHjYDeLl07PprbQXldp4DKjJxV/T0IStRK3ToK1Qjc6CnZ9NYgALiwQqlhBjzDvOO/ ydidzhcgQMfNbxkPfWZOVGewyX0Qnaop+NOQ++XOsvbiaNlrvzocq8pqQSK7y7nDdQp/ IQJevHfCLhgERjFEuL5xGL3L2xYG7zOgkcLyNcQuSgwyiHm41jJNnyJEZOJMubVKT4BN DZbhNdrOPq9P94eeCFwOrhWEADZV0kItfg78NngdqWMlJI78YxeRt2vQ8TRsVWTUp0JL qU4XeCeDwZh1wlqxAtBRAyqxiyqb0rgSFZ+CVPQBKukCnEXtboo3Nof2O2w9gOQU/PUd JofQ== X-Gm-Message-State: AO0yUKWTjwNv+utakb38wEyKw0cIlV0LUZDqCvv0mvFX6Z3GTdzD5RMl BUveLLtHUIMEYkJCu6cyXsGjHw== X-Google-Smtp-Source: AK7set/5uQNtSc80AEr9rF1a0pDiYMTZ+VNdzFJ+XnaFgqor9vf1gMiBMYftFKJFtzOfmEY5Zadbcw== X-Received: by 2002:a05:600c:4f8f:b0:3cf:8b22:76b3 with SMTP id n15-20020a05600c4f8f00b003cf8b2276b3mr1258953wmq.0.1675240033653; Wed, 01 Feb 2023 00:27:13 -0800 (PST) Received: from localhost ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c2cd300b003cf71b1f66csm857206wmc.0.2023.02.01.00.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 00:27:12 -0800 (PST) From: Mattijs Korpershoek To: Safae Ouajih , sjg@chromium.org Cc: u-boot@lists.denx.de, sean.anderson@seco.com, r.stratiienko@gmail.com, glaroque@baylibre.com, khilman@baylibre.com Subject: Re: [PATCH v2 01/17] android: boot: rename andr_img_hdr -> andr_boot_img_hdr_v0 In-Reply-To: <20230126160506.1026643-2-souajih@baylibre.com> References: <20230126160506.1026643-1-souajih@baylibre.com> <20230126160506.1026643-2-souajih@baylibre.com> Date: Wed, 01 Feb 2023 09:27:11 +0100 Message-ID: <878rhhkcyo.fsf@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean On Thu, Jan 26, 2023 at 17:04, Safae Ouajih wrote: > Android introduced boot header version 3 or 4. > The header structure change with version 3 and 4 to support > the new updates such as: > - Introducing Vendor boot image: with a vendor ramdisk > - Bootconfig feature (v4) > > To maintain support for version v0, v1 and v2 while introducing > version 3 and 4, this struct name must change to refer to the header > structure before v3. > > Signed-off-by: Safae Ouajih Reviewed-by: Mattijs Korpershoek > --- > boot/image-android.c | 26 +++++++++++++------------- > boot/image-fdt.c | 2 +- > cmd/abootimg.c | 4 ++-- > drivers/fastboot/fb_mmc.c | 8 ++++---- > include/android_image.h | 4 ++-- > include/image.h | 18 +++++++++--------- > 6 files changed, 31 insertions(+), 31 deletions(-) > > diff --git a/boot/image-android.c b/boot/image-android.c > index 2628db3741..8c0a304cc0 100644 > --- a/boot/image-android.c > +++ b/boot/image-android.c > @@ -18,7 +18,7 @@ > > static char andr_tmp_str[ANDR_BOOT_ARGS_SIZE + 1]; > > -static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr) > +static ulong android_image_get_kernel_addr(const struct andr_boot_img_hdr_v0 *hdr) > { > /* > * All the Android tools that generate a boot.img use this > @@ -59,7 +59,7 @@ static ulong android_image_get_kernel_addr(const struct andr_img_hdr *hdr) > * Return: Zero, os start address and length on success, > * otherwise on failure. > */ > -int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, > +int android_image_get_kernel(const struct andr_boot_img_hdr_v0 *hdr, int verify, > ulong *os_data, ulong *os_len) > { > u32 kernel_addr = android_image_get_kernel_addr(hdr); > @@ -122,12 +122,12 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, > return 0; > } > > -int android_image_check_header(const struct andr_img_hdr *hdr) > +int android_image_check_header(const struct andr_boot_img_hdr_v0 *hdr) > { > return memcmp(ANDR_BOOT_MAGIC, hdr->magic, ANDR_BOOT_MAGIC_SIZE); > } > > -ulong android_image_get_end(const struct andr_img_hdr *hdr) > +ulong android_image_get_end(const struct andr_boot_img_hdr_v0 *hdr) > { > ulong end; > > @@ -150,12 +150,12 @@ ulong android_image_get_end(const struct andr_img_hdr *hdr) > return end; > } > > -ulong android_image_get_kload(const struct andr_img_hdr *hdr) > +ulong android_image_get_kload(const struct andr_boot_img_hdr_v0 *hdr) > { > return android_image_get_kernel_addr(hdr); > } > > -ulong android_image_get_kcomp(const struct andr_img_hdr *hdr) > +ulong android_image_get_kcomp(const struct andr_boot_img_hdr_v0 *hdr) > { > const void *p = (void *)((uintptr_t)hdr + hdr->page_size); > > @@ -167,7 +167,7 @@ ulong android_image_get_kcomp(const struct andr_img_hdr *hdr) > return image_decomp_type(p, sizeof(u32)); > } > > -int android_image_get_ramdisk(const struct andr_img_hdr *hdr, > +int android_image_get_ramdisk(const struct andr_boot_img_hdr_v0 *hdr, > ulong *rd_data, ulong *rd_len) > { > if (!hdr->ramdisk_size) { > @@ -186,7 +186,7 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr, > return 0; > } > > -int android_image_get_second(const struct andr_img_hdr *hdr, > +int android_image_get_second(const struct andr_boot_img_hdr_v0 *hdr, > ulong *second_data, ulong *second_len) > { > if (!hdr->second_size) { > @@ -226,7 +226,7 @@ int android_image_get_second(const struct andr_img_hdr *hdr, > */ > bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, u32 *size) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > ulong dtbo_img_addr; > bool ret = true; > > @@ -275,7 +275,7 @@ exit: > */ > static bool android_image_get_dtb_img_addr(ulong hdr_addr, ulong *addr) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > ulong dtb_img_addr; > bool ret = true; > > @@ -328,7 +328,7 @@ exit: > bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr, > u32 *size) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > bool res; > ulong dtb_img_addr; /* address of DTB part in boot image */ > u32 dtb_img_size; /* size of DTB payload in boot image */ > @@ -393,7 +393,7 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr, > * returns: > * no returned results > */ > -void android_print_contents(const struct andr_img_hdr *hdr) > +void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr) > { > const char * const p = IMAGE_INDENT_STRING; > /* os_version = ver << 11 | lvl */ > @@ -485,7 +485,7 @@ static bool android_image_print_dtb_info(const struct fdt_header *fdt, > */ > bool android_image_print_dtb_contents(ulong hdr_addr) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > bool res; > ulong dtb_img_addr; /* address of DTB part in boot image */ > u32 dtb_img_size; /* size of DTB payload in boot image */ > diff --git a/boot/image-fdt.c b/boot/image-fdt.c > index b830a0ab41..1181cb60f0 100644 > --- a/boot/image-fdt.c > +++ b/boot/image-fdt.c > @@ -529,7 +529,7 @@ int boot_get_fdt(int flag, int argc, char *const argv[], uint8_t arch, > } > #ifdef CONFIG_ANDROID_BOOT_IMAGE > } else if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) { > - struct andr_img_hdr *hdr = buf; > + struct andr_boot_img_hdr_v0 *hdr = buf; > ulong fdt_data, fdt_len; > u32 fdt_size, dtb_idx; > /* > diff --git a/cmd/abootimg.c b/cmd/abootimg.c > index f48a9dcb02..0262adb1e5 100644 > --- a/cmd/abootimg.c > +++ b/cmd/abootimg.c > @@ -18,7 +18,7 @@ static ulong _abootimg_addr = -1; > > static int abootimg_get_ver(int argc, char *const argv[]) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > int res = CMD_RET_SUCCESS; > > if (argc > 1) > @@ -65,7 +65,7 @@ static int abootimg_get_recovery_dtbo(int argc, char *const argv[]) > > static int abootimg_get_dtb_load_addr(int argc, char *const argv[]) > { > - const struct andr_img_hdr *hdr; > + const struct andr_boot_img_hdr_v0 *hdr; > int res = CMD_RET_SUCCESS; > > if (argc > 1) > diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c > index 033c510bc0..6d0112fdf4 100644 > --- a/drivers/fastboot/fb_mmc.c > +++ b/drivers/fastboot/fb_mmc.c > @@ -287,7 +287,7 @@ static void fb_mmc_boot_ops(struct blk_desc *dev_desc, void *buffer, > */ > static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, > struct disk_partition *info, > - struct andr_img_hdr *hdr, > + struct andr_boot_img_hdr_v0 *hdr, > char *response) > { > ulong sector_size; /* boot partition sector size */ > @@ -296,7 +296,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, > > /* Calculate boot image sectors count */ > sector_size = info->blksz; > - hdr_sectors = DIV_ROUND_UP(sizeof(struct andr_img_hdr), sector_size); > + hdr_sectors = DIV_ROUND_UP(sizeof(struct andr_boot_img_hdr_v0), sector_size); > if (hdr_sectors == 0) { > pr_err("invalid number of boot sectors: 0\n"); > fastboot_fail("invalid number of boot sectors: 0", response); > @@ -338,7 +338,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, > char *response) > { > uintptr_t hdr_addr; /* boot image header address */ > - struct andr_img_hdr *hdr; /* boot image header */ > + struct andr_boot_img_hdr_v0 *hdr; /* boot image header */ > lbaint_t hdr_sectors; /* boot image header sectors */ > u8 *ramdisk_buffer; > u32 ramdisk_sector_start; > @@ -361,7 +361,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, > > /* Put boot image header in fastboot buffer after downloaded zImage */ > hdr_addr = (uintptr_t)download_buffer + ALIGN(download_bytes, PAGE_SIZE); > - hdr = (struct andr_img_hdr *)hdr_addr; > + hdr = (struct andr_boot_img_hdr_v0 *)hdr_addr; > > /* Read boot image header */ > hdr_sectors = fb_mmc_get_boot_header(dev_desc, &info, hdr, response); > diff --git a/include/android_image.h b/include/android_image.h > index 54d25af068..2bdcab9122 100644 > --- a/include/android_image.h > +++ b/include/android_image.h > @@ -20,9 +20,9 @@ > #define ANDR_BOOT_ARGS_SIZE 512 > #define ANDR_BOOT_EXTRA_ARGS_SIZE 1024 > > -/* The bootloader expects the structure of andr_img_hdr with header > +/* The bootloader expects the structure of andr_boot_img_hdr_v0 with header > * version 0 to be as follows: */ > -struct andr_img_hdr { > +struct andr_boot_img_hdr_v0 { > /* Must be ANDR_BOOT_MAGIC. */ > char magic[ANDR_BOOT_MAGIC_SIZE]; > > diff --git a/include/image.h b/include/image.h > index 7717a4c13d..bcb24d92de 100644 > --- a/include/image.h > +++ b/include/image.h > @@ -1734,21 +1734,21 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo); > > struct cipher_algo *image_get_cipher_algo(const char *full_name); > > -struct andr_img_hdr; > -int android_image_check_header(const struct andr_img_hdr *hdr); > -int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify, > +struct andr_boot_img_hdr_v0; > +int android_image_check_header(const struct andr_boot_img_hdr_v0 *hdr); > +int android_image_get_kernel(const struct andr_boot_img_hdr_v0 *hdr, int verify, > ulong *os_data, ulong *os_len); > -int android_image_get_ramdisk(const struct andr_img_hdr *hdr, > +int android_image_get_ramdisk(const struct andr_boot_img_hdr_v0 *hdr, > ulong *rd_data, ulong *rd_len); > -int android_image_get_second(const struct andr_img_hdr *hdr, > +int android_image_get_second(const struct andr_boot_img_hdr_v0 *hdr, > ulong *second_data, ulong *second_len); > bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, u32 *size); > bool android_image_get_dtb_by_index(ulong hdr_addr, u32 index, ulong *addr, > u32 *size); > -ulong android_image_get_end(const struct andr_img_hdr *hdr); > -ulong android_image_get_kload(const struct andr_img_hdr *hdr); > -ulong android_image_get_kcomp(const struct andr_img_hdr *hdr); > -void android_print_contents(const struct andr_img_hdr *hdr); > +ulong android_image_get_end(const struct andr_boot_img_hdr_v0 *hdr); > +ulong android_image_get_kload(const struct andr_boot_img_hdr_v0 *hdr); > +ulong android_image_get_kcomp(const struct andr_boot_img_hdr_v0 *hdr); > +void android_print_contents(const struct andr_boot_img_hdr_v0 *hdr); > bool android_image_print_dtb_contents(ulong hdr_addr); > > /** > -- > 2.34.1