From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 14 Jan 2022 17:54:23 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n8PqJ-002DHC-8H for lore@lore.pengutronix.de; Fri, 14 Jan 2022 17:54:23 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n8PqH-0004QU-9T for lore@pengutronix.de; Fri, 14 Jan 2022 17:54:22 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mwOPXC+BsPne3/SkBM7wiOEEuKyU9K7SeMi3vKFAlrw=; b=0yOQD5V6vKgoKQ JUBfkNm+UHYd9udvq6JmVUBFEtsHAZWRPUM+z6AneyU5lVE/WMVXfrv4Xis845na6SkdxHsuwvtor XW1LXA05uqo3bZ8Pi0YAJ2hp/O3E3tmb2zGfOqRUtyHZt4U+Yv1eTyo3+fTTRXwgUIPv4WPeA655K PfPcxQEAbM3koVPiNGCXn2F6Fq2vykHmgrIuw0TaaKu1zKx9Un0QgI2EihXrGZKWs0BcAF/y5dSTt gXgQiyvxY+RjCO/rOiuER3UHPSADG5F1Wb1qjY/8z0E+OXoAzRvaeGndhBWt5+bTrF4J6pgWGB9vq QAAJyJHiOxsxTEEqCduQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8Poy-009qXQ-5J; Fri, 14 Jan 2022 16:53:00 +0000 Received: from smtpout140.security-mail.net ([85.31.212.143] helo=fx403.security-mail.net) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8PoR-009qGr-0f for barebox@lists.infradead.org; Fri, 14 Jan 2022 16:52:32 +0000 Received: from localhost (localhost [127.0.0.1]) by fx403.security-mail.net (Postfix) with ESMTP id C75521C74B3 for ; Fri, 14 Jan 2022 17:52:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kalray.eu; s=sec-sig-email; t=1642179144; bh=WDjP8fVyMnTvEvcgcgLKktTKr/SLI0f68LRBSG2jEmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xxbr8UMfTCZlwhhR6mgFFBxUgOML2xmqff+00WqTFEIIeKzdwz+XyGVY9A9SrD7s1 dfaZRJPRNkTaBgBa9GnYJM4WHUIJ/FOtR8QDW1rScPuC+sH6a/Sbf0PfSbQAT3KYXa He6lYEnsnGXhKebezTIgEnuR+HbvHoJsAI1iVE1E= Received: from fx403 (localhost [127.0.0.1]) by fx403.security-mail.net (Postfix) with ESMTP id 75FB41C74AB; Fri, 14 Jan 2022 17:52:24 +0100 (CET) X-Virus-Scanned: E-securemail Secumail-id: <428d.61e1aa47.ea08d.0> Received: from zimbra2.kalray.eu (unknown [217.181.231.53]) by fx403.security-mail.net (Postfix) with ESMTPS id EAE8E1C7497; Fri, 14 Jan 2022 17:52:23 +0100 (CET) Received: from zimbra2.kalray.eu (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTPS id C717927E03AE; Fri, 14 Jan 2022 17:52:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id AEFBB27E03F8; Fri, 14 Jan 2022 17:52:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 zimbra2.kalray.eu AEFBB27E03F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalray.eu; s=32AE1B44-9502-11E5-BA35-3734643DEF29; t=1642179143; bh=45VKSFCOp43NeCQA9hc080V48LA1/9OxpDOE6/TzrP0=; h=From:To:Date:Message-Id; b=Z/DLr+mEYGSOPM1Vj0oWDXiMTmbivrrc5JymqIWMD175OAHnqMCwRd/7h+7HAGE8g g1/P5E+6JupLWV45ZSlI63dvmK63HT5ipm6e8aSzn5iXjcGV2+A+tIFqd2Br35E4y8 4So4sspPTpe7FgRMXwdVenX2bvwYI7E0d26g+uHQ= Received: from zimbra2.kalray.eu ([127.0.0.1]) by localhost (zimbra2.kalray.eu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HCa7bA5vQBXr; Fri, 14 Jan 2022 17:52:23 +0100 (CET) Received: from tellis.lin.mbt.kalray.eu (unknown [192.168.36.206]) by zimbra2.kalray.eu (Postfix) with ESMTPSA id 9984F27E03AE; Fri, 14 Jan 2022 17:52:23 +0100 (CET) From: Jules Maselbas To: barebox@lists.infradead.org Cc: Clement Leger , Louis Morhet , Luc Michel , Yann Sionneau , Jules Maselbas Date: Fri, 14 Jan 2022 17:52:01 +0100 Message-Id: <20220114165208.9980-3-jmaselbas@kalray.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220114165208.9980-1-jmaselbas@kalray.eu> References: <20220114165208.9980-1-jmaselbas@kalray.eu> X-Virus-Scanned: by Secumail X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220114_085227_423947_BEFD740A X-CRM114-Status: GOOD ( 10.15 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 02/13] kvx: Move LINUX_BOOT_PARAM_MAGIC in asm/common.h X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Declare both defines FSBL_PARAM_MAGIC and LINUX_BOOT_PARAM_MAGIC in the same header file, as they both have a very similar uses and value. Signed-off-by: Jules Maselbas --- arch/kvx/include/asm/bootm.h | 11 ----------- arch/kvx/include/asm/common.h | 3 ++- arch/kvx/lib/bootm.c | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 arch/kvx/include/asm/bootm.h diff --git a/arch/kvx/include/asm/bootm.h b/arch/kvx/include/asm/bootm.h deleted file mode 100644 index 7ad7e2e878..0000000000 --- a/arch/kvx/include/asm/bootm.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2019 Kalray Inc. - */ - -#ifndef _ASM_KVX_BOOTM_H -#define _ASM_KVX_BOOTM_H - -#define LINUX_BOOT_PARAM_MAGIC 0x31564752414E494CULL - -#endif /* _ASM_KVX_BOOTM_H */ diff --git a/arch/kvx/include/asm/common.h b/arch/kvx/include/asm/common.h index a7e301e53a..754953962b 100644 --- a/arch/kvx/include/asm/common.h +++ b/arch/kvx/include/asm/common.h @@ -12,7 +12,8 @@ * Magic value passed in r0 to indicate valid parameters from FSBL when booting * If $r0 contains this value, then $r1 contains dtb pointer. */ -#define FSBL_PARAM_MAGIC 0x31564752414C414BULL +#define FSBL_PARAM_MAGIC 0x31564752414C414BULL /* KALARGV1 */ +#define LINUX_BOOT_PARAM_MAGIC 0x31564752414E494CULL /* LINARGV1 */ extern char _exception_start; extern char __end; diff --git a/arch/kvx/lib/bootm.c b/arch/kvx/lib/bootm.c index 4d17e1846d..3e9772c458 100644 --- a/arch/kvx/lib/bootm.c +++ b/arch/kvx/lib/bootm.c @@ -17,7 +17,6 @@ #include #include -#include typedef void __noreturn (*boot_func_entry)(unsigned long, void *); -- 2.17.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox