From patchwork Mon Mar 26 14:11:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 890985 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="etO9b9Ku"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 408x1K44lzz9s1B for ; Tue, 27 Mar 2018 01:12:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5534EC21F68; Mon, 26 Mar 2018 14:12:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C20DDC21F32; Mon, 26 Mar 2018 14:11:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 80B65C21E7E; Mon, 26 Mar 2018 14:11:49 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id F3029C21E26 for ; Mon, 26 Mar 2018 14:11:48 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id l16so15819744wmh.3 for ; Mon, 26 Mar 2018 07:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rzoIKHhhWd2qWMFKQ+oYI8u1CUjNVZwwjeZrLbeB7os=; b=etO9b9Kuyosd/YokslTFo1XKLUTxWqayBNsNMZB1OjpPaxQVjR0+qWWXX85ezq7w/z BdEVfB9Tb5oA/MKygcDoGjdRArSiAP+/504YaBh/jeDhCxiSdHEVW80etAnR60WBSiBd doFgIDwOy4SlZ9HhzQ0qgmaxXDrFgqcgeNPR0= 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:in-reply-to :references; bh=rzoIKHhhWd2qWMFKQ+oYI8u1CUjNVZwwjeZrLbeB7os=; b=cirAzAKbE4WLl2o6kmbH6HlvNHNz0h2Wp9ZQDBa4GDYOpdeLykS2e/MU7yV/AgwtQE wX78xbhIt0F3nTowQ/JKG/QI4jwK/TgfuvjKqPWOoIqCC3z1jZLYvkG9FaoRSf0++zUV zR8CURA9t5LmsuSyTfL3Dac4D3EZGW3jPqSQZ85s6deVCiLUJUpykPh4tLrdg3qDORQM d0JrpjCtpN+Z4jpv46WRQ67Qn7J7Cogd0FFF1+gs9ntTtgICFKVB0c8P2BgDHRja5fZZ mBE0/3fSmPh8VC7SlCX7Y7z6gBDIvMRzPfQlK/IHgKxE2/iv+z5lOtGXYVLrxn1exv3j ziIg== X-Gm-Message-State: AElRT7GcWNc9fwoHe0AVOsKTIWShNwodHLuSXNtJLRbX4SdPu5Yg5bha cKxgM5ox/6XAA1TQP5le/9dhGOCSeiM= X-Google-Smtp-Source: AG47ELsq4u2VRszYrb2heH2Eb21N2zaWsWnO00e/yUDPXh8i2CHvLtq06HNVnpzapAib+Lhp4F5maw== X-Received: by 10.80.247.4 with SMTP id g4mr15917189edn.121.1522073508370; Mon, 26 Mar 2018 07:11:48 -0700 (PDT) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a10sm10714045eda.71.2018.03.26.07.11.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 07:11:47 -0700 (PDT) From: Bryan O'Donoghue To: U-Boot@lists.denx.de, sbabic@denx.de Date: Mon, 26 Mar 2018 15:11:43 +0100 Message-Id: <1522073505-13066-2-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522073505-13066-1-git-send-email-bryan.odonoghue@linaro.org> References: <1522073505-13066-1-git-send-email-bryan.odonoghue@linaro.org> Cc: breno.lima@nxp.com, fabio.estevam@nxp.com, utkarsh.gupta@nxp.com Subject: [U-Boot] [PATCH v2 1/3] imximage: Encase majority of header in __ASSEMBLY__ declaration X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Subsequent patches will want to include imageimage.h but in doing so include it on an assembly compile path causing a range of compile errors. Fix the errors pre-emptively by encasing the majority of the declarations in imximage.h inside an ifdef __ASSEMBLY__ block. Signed-off-by: Bryan O'Donoghue Cc: Utkarsh Gupta Cc: Breno Lima Cc: Fabio Estevam --- include/imximage.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/imximage.h b/include/imximage.h index de1ea8f..553b852 100644 --- a/include/imximage.h +++ b/include/imximage.h @@ -56,6 +56,7 @@ #define DCD_CHECK_BITS_SET_PARAM 0x14 #define DCD_CHECK_BITS_CLR_PARAM 0x04 +#ifndef __ASSEMBLY__ enum imximage_cmd { CMD_INVALID, CMD_IMAGE_VERSION, @@ -197,4 +198,5 @@ typedef void (*set_dcd_rst_t)(struct imx_header *imxhdr, typedef void (*set_imx_hdr_t)(struct imx_header *imxhdr, uint32_t dcd_len, uint32_t entry_point, uint32_t flash_offset); +#endif /* __ASSEMBLY__ */ #endif /* _IMXIMAGE_H_ */