From patchwork Wed Sep 7 02:26:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1675077 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Wxlfm7Tz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMmQH4S7qz1yj1 for ; Wed, 7 Sep 2022 12:28:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0550084AA0; Wed, 7 Sep 2022 04:28:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Wxlfm7Tz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DDCFD84A56; Wed, 7 Sep 2022 04:28:02 +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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) (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 571F284A89 for ; Wed, 7 Sep 2022 04:27:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1225219ee46so32878124fac.2 for ; Tue, 06 Sep 2022 19:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=WZpvyx+nNmrhkFCdlsAw3prYrR2tGkiPlUlsMwp+jh0=; b=Wxlfm7TzIvymBB4wH9goocVPup3wEiLDDSMRvwi5rZkG9Ff06aN+8YGwcge3OoT7PT o9lzkr96bgHxJH+gxJGllYJIaOxqJdBHSe1gVsoE+sefvDv1TTukPIQuqY0PO8YIZeTR Gvk3A2DiFHHFA9HTNekBFyYbldJlrnauUM1HA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=WZpvyx+nNmrhkFCdlsAw3prYrR2tGkiPlUlsMwp+jh0=; b=w5Iy6jFQIPrGIUfnooSpy0JeHms1+4UtHMkOWZOGWbzNcjZO1xVrf5SHfW7kLwfQDS dmcE2AiLuYbHNEgkyT8KF5fMuSS38lkGOxPiwLStIMK8LQ4DbVnany/Ig4e5Gohr9dzE oGF7Bx2ULjBrBryS98r2fLuODdDMFz5KbeBGiQX9JhA+mwOK8oVhZC1iMgwl6E+km6SD rK0WClgBOfxVFErtzEk3FE++SJ29AesiybRD9u/i0oQ+kzPUmUFqKgYsjzZb//1aJNQB WhfaMQdGqqkeGEDXwD5GantTv4AP9Vnpx3RdRP6mmXNqpbPNX7woEHyVIF/G4FPY4vdu MJcA== X-Gm-Message-State: ACgBeo2/UpCm+pEMQP4IL6YxsRN4w83wY+7RGDFerNjXtfXa1sLjqBPE GThN1OjKzWlPyHa1a7psa/N5dFeDmqgj9w== X-Google-Smtp-Source: AA6agR7v3eChcIAtw2PEKDTon1UWsuJIc1JSrt9Jc7Mcmmw6W/7PchfwFYYmjnSosqoNklv6ssB1BA== X-Received: by 2002:a05:6808:1a06:b0:343:290e:813e with SMTP id bk6-20020a0568081a0600b00343290e813emr593566oib.256.1662517676578; Tue, 06 Sep 2022 19:27:56 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id b10-20020a05687051ca00b0011e73536301sm7605046oaj.52.2022.09.06.19.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 19:27:56 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Kishon Vijay Abraham I , Michal Simek , =?utf-8?q?Marek_Beh=C3=BAn?= , Tom Rini , Simon Glass , Alexandru Gagniuc , Andre Przywara , Heinrich Schuchardt , Jan Kiszka , Philippe Reynes , Sean Anderson Subject: [PATCH v2 03/45] treewide: Drop image_info_t typedef Date: Tue, 6 Sep 2022 20:26:51 -0600 Message-Id: <20220907022733.66423-4-sjg@chromium.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220907022733.66423-1-sjg@chromium.org> References: <20220907022733.66423-1-sjg@chromium.org> MIME-Version: 1.0 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 This is not needed and we should avoid typedefs. Use the struct instead. Signed-off-by: Simon Glass --- (no changes since v1) boot/bootm.c | 2 +- include/image.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index 73f7552fe4c..93bdbb0455c 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -399,7 +399,7 @@ static int handle_decomp_error(int comp_type, size_t uncomp_size, #ifndef USE_HOSTCC static int bootm_load_os(struct bootm_headers *images, int boot_progress) { - image_info_t os = images->os; + struct image_info os = images->os; ulong load = os.load; ulong load_end; ulong blob_start = os.start; diff --git a/include/image.h b/include/image.h index a725892cbed..e1a65cce7ba 100644 --- a/include/image.h +++ b/include/image.h @@ -278,13 +278,13 @@ typedef struct image_header { uint8_t ih_name[IH_NMLEN]; /* Image Name */ } image_header_t; -typedef struct image_info { +struct image_info { ulong start, end; /* start/end of blob */ ulong image_start, image_len; /* start of image within blob, len of image */ ulong load; /* load addr for the image */ uint8_t comp, type, os; /* compression, type of image, os type */ uint8_t arch; /* CPU architecture */ -} image_info_t; +}; /* * Legacy and FIT format headers used by do_bootm() and do_bootm_() @@ -324,7 +324,7 @@ struct bootm_headers { int fit_noffset_setup;/* x86 setup subimage node offset */ #ifndef USE_HOSTCC - image_info_t os; /* os image info */ + struct image_info os; /* os image info */ ulong ep; /* entry point of OS */ ulong rd_start, rd_end;/* ramdisk start/end */