From patchwork Fri Feb 14 17:38:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1238245 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=konsulko.com 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 48K0wV4cxJzB3wF for ; Sat, 15 Feb 2020 04:38:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 261638125E; Fri, 14 Feb 2020 18:38:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 430158127F; Fri, 14 Feb 2020 18:38:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SUBJ_OBFU_PUNCT_FEW, SUBJ_OBFU_PUNCT_MANY, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qv1-f68.google.com (mail-qv1-f68.google.com [209.85.219.68]) (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 648128124F for ; Fri, 14 Feb 2020 18:38:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f68.google.com with SMTP id p2so4636022qvo.10 for ; Fri, 14 Feb 2020 09:38:25 -0800 (PST) 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; bh=Tlo6GGXmBenZFK/2wr7AvtKM2KtYk9kBBO9YANwjhTw=; b=B+DVvDgkzdjiARpGBUSKcYvCWiAZbXD/MGQwU7cp+q7/M6lyRftYwyBWycfnr530CV W7lFC3Ap3xUOVkqKcYjnCkIPgefwLRbRyRfLKkYNdbi+RjYS8+UsPzZJyGAd9aJn+otd US2aYRWu++rs3Gq1VMHQuUzVEzqIXgzKLzdPxkZ37GaTTYgnWAt6v7xaDJ2ErEBUQ8ev bLJqjZ93zr6taU6RTOrXVkNH8V/vgxTM5UcEZ5rsXz/ko91JNHhhWMh+CEt3Efi/cF4p x+oWwVqccJXJ2k6AsT6CBiQlHR+C+/ElWEVAtj2ddarnD8zt7SRi1eNneR412VZWBkQC isSg== X-Gm-Message-State: APjAAAXfBn+Tj9+BALS0WRIVtzZ5SI/lkNSlf5IziFTpwLsAk9qXlip2 YQ+qLy9xpST8hgFJ+epIXb+/Qdo= X-Google-Smtp-Source: APXvYqxgGyqHjxs2l49sf6ZDv9hxxOyIVjqNTI5irC4jdDPzICC9Yr8yNTdn4z8b+nigcosx35j2qA== X-Received: by 2002:ad4:4d50:: with SMTP id m16mr3187175qvm.186.1581701903612; Fri, 14 Feb 2020 09:38:23 -0800 (PST) Received: from bill-the-cat.local (2606-a000-1401-86dd-dc18-c24e-b540-bef6.inf6.spectrum.com. [2606:a000:1401:86dd:dc18:c24e:b540:bef6]) by smtp.gmail.com with ESMTPSA id h14sm3631421qke.99.2020.02.14.09.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2020 09:38:22 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Eugeniu Rosca , Sam Protsenko Subject: [PATCH] image.h: Change android_image_get_dtb* to use uint and not u32 Date: Fri, 14 Feb 2020 12:38:19 -0500 Message-Id: <20200214173819.9277-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.1 at phobos.denx.de X-Virus-Status: Clean The image.h header can be used fairly widely in U-Boot builds. We cannot use u32 here as it may be used in cases where we don't have that typedef available and don't want to expose it either. Use uint instead here. Cc: Eugeniu Rosca Cc: Sam Protsenko Signed-off-by: Tom Rini Reviewed-by: Eugeniu Rosca --- include/image.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/image.h b/include/image.h index b316d167d8d7..1dc3b48d8689 100644 --- a/include/image.h +++ b/include/image.h @@ -1425,9 +1425,9 @@ int android_image_get_ramdisk(const struct andr_img_hdr *hdr, ulong *rd_data, ulong *rd_len); int android_image_get_second(const struct andr_img_hdr *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); +bool android_image_get_dtbo(ulong hdr_addr, ulong *addr, uint *size); +bool android_image_get_dtb_by_index(ulong hdr_addr, uint index, ulong *addr, + uint *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);