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 E2000C0015E for ; Fri, 14 Jul 2023 00:38:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2C8F286C1D; Fri, 14 Jul 2023 02:37:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="n629Yxs9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6055B86C16; Fri, 14 Jul 2023 02:37:48 +0200 (CEST) Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) (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 8596B86C39 for ; Fri, 14 Jul 2023 02:37:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb34.google.com with SMTP id 3f1490d57ef6-cb4de3bd997so1389383276.1 for ; Thu, 13 Jul 2023 17:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689295059; x=1691887059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=g90AqGDgIpsWaHPlYnUAQ3d4j0kofX9fD2+vHWQWCzQ=; b=n629Yxs9EM6ViiuziGQEUpgK80yCugU8U4bdULNXnMAKT0tSEN945HwkbNTNC2RFqk USpOI04XHxF+FtDOVZD5V/Tv/OgA9/fOFLzWykIdc5kmYZ4algi0YZNcKejH75BGNd/l rr6ajQ5qYsasVNVECWFm64F79L+l32+vMmQgU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689295059; x=1691887059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g90AqGDgIpsWaHPlYnUAQ3d4j0kofX9fD2+vHWQWCzQ=; b=J865Yxy7eYNt8pedzhdFfWC9tBfYg1H3zY95+tJMCWtfy8dUi2n3PhNGko369U0vaU 6MchHXj5vrrqUDlxwYCnndHONm0NudNX8CDb+KUE2Shg8ZRGmbHY2b9W4FrW16YEgSdH papaYS6sdCrAGuEi9+anAiWhSTic34dyNudJVcj1MoIkYnXp0wADivlUqS5opFfSGlUx xNqT4+eQHLV3mwWYUAIDQg6wq0xcNbuiD3OrLuIgO6Dvce4mTDLunGwI2nnWtxftI1OA fyCCSjv4GVUDKYbBUMRk5bp+QjI1WGUTh76tm21Tr8gUbkeAPI7Y+2/6UUNiEZogBuB3 VWew== X-Gm-Message-State: ABy/qLZtlLNpvgYMbQyMDQvr2qNsVQwJMw6iccXIZFYEwd71gJJBgTuQ MovKJLomldc01s5WRSSuz7pURQxhu4EtRIhYX/PMYw== X-Google-Smtp-Source: APBJJlHRj51eUqFwCvmFTPfvRsecA/2ueicjAf4mVD+2BCbanMNf3l783yNPYz2gqhD28iruExpTmg== X-Received: by 2002:a25:aea6:0:b0:c1b:6de8:5395 with SMTP id b38-20020a25aea6000000b00c1b6de85395mr1449724ybj.16.1689295059112; Thu, 13 Jul 2023 17:37:39 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-cb70-e592-de93-e6d2.res6.spectrum.com. [2603:6081:7b00:6400:cb70:e592:de93:e6d2]) by smtp.gmail.com with ESMTPSA id y7-20020a0dd607000000b005616d72f435sm2036552ywd.116.2023.07.13.17.37.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jul 2023 17:37:38 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 3/5] spl: Correct spl_board_boot_device function prototype Date: Thu, 13 Jul 2023 20:37:34 -0400 Message-Id: <20230714003736.3512509-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714003736.3512509-1-trini@konsulko.com> References: <20230714003736.3512509-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean With gcc-13.1 we get a warning about enum vs int here, so correct the declaration to match the implementation. Signed-off-by: Tom Rini --- include/spl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/spl.h b/include/spl.h index 658d36481dee..92bcaa90a4af 100644 --- a/include/spl.h +++ b/include/spl.h @@ -31,6 +31,7 @@ struct legacy_img_hdr; struct blk_desc; struct legacy_img_hdr; struct spl_boot_device; +enum boot_device; /* * u_boot_first_phase() - check if this is the first U-Boot phase @@ -525,7 +526,7 @@ void spl_board_prepare_for_linux(void); void spl_board_prepare_for_optee(void *fdt); void spl_board_prepare_for_boot(void); int spl_board_ubi_load_image(u32 boot_device); -int spl_board_boot_device(u32 boot_device); +int spl_board_boot_device(enum boot_device boot_dev_spl); /** * spl_board_loader_name() - Return a name for the loader -- 2.34.1