From patchwork Thu Apr 12 05:02:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 897467 X-Patchwork-Delegate: bmeng.cn@gmail.com 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rq++jMpy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40M7y039YKz9s1B for ; Thu, 12 Apr 2018 15:00:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0F1BEC21D74; Thu, 12 Apr 2018 04:58:58 +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=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 63047C21D9A; Thu, 12 Apr 2018 04:58:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 80A67C21C51; Thu, 12 Apr 2018 04:57:47 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 16519C21DB3 for ; Thu, 12 Apr 2018 04:57:42 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id y66so2610338pfi.7 for ; Wed, 11 Apr 2018 21:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ppcv1tl8J2Tsz0opL9AydQ2DuXVvouHi4WdzPirIhkg=; b=rq++jMpyu5Y59csVYuDmeWLKsg69QmRa0I8VBrxvLbGEuQPa6v1D8YMeqzfr4xXygU 7g5IOFVD8xxw4bCVG9yZ3DZ85fT3zC04eCdiPPrPOa1oZPOUs3VJTl/m5HJiJ1dyLntX O+YLA1lPOQH2hwW1KQGPPkwYmo/eNhnuyBRKZ0LRaofDi3rRr1Js7Gs7qwlQrV0z/9At 5yjj8Njj3bBy2kwI8Pvwajt30p4NHDVE/p5m9vy9lv/nPSsVe8RPFQe4/up4QrAUQs8S MDs3o6d/v4TTsL7Rp75uGUskywfu+vjiNPSlKViEl6Nd5qN3WaUy6sHS9f6+Aoxuil0F CGqQ== 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=ppcv1tl8J2Tsz0opL9AydQ2DuXVvouHi4WdzPirIhkg=; b=m/dMmQQDFUhDoPOCE/m7VFjP4fFa2O5NPkzFkXk1MwKABfgbN8tgmzROJnVlFvWw8k 5K2IR2LSC9VP5kDtX+lL38bT01T5JONPXVHfFjjIwZ2Mti/zDvvj/IYchBmBFxjmE0LV kQ3Q9WRmWiBg7n5eO0qQUTrkhhebOOiBEpqMn9+8gapesZceZZXF/G4PpkNfILODlXlO c+RQvbajuMfGkNmlnvCI2IQXFQ5yKBLUaXMRJuTE7Yc/Xb4PFyL7I6EWi5hEfTC7Nq5s 70wPDUhhacb7Sl+lFz4jF0C7P+b5Bt7UlRjE1N11D1W8JrbVBe1/FvELRxxyDg6a6YXv ZUGQ== X-Gm-Message-State: ALQs6tCCADzZPRBAzxA2WXDzXQpCM0ieGZJYtx+XV1FlQ3JPigSOrFyy nzp5o6ItNmgu1S5u4Ntv6lY= X-Google-Smtp-Source: AIpwx4/XINB8IDfGKefwSv+LOuwbsHjjjlMoqG6z12B7CvSlgKRVVGbFhs0CgXVQ+Z8bRmiLwDcwwA== X-Received: by 10.99.146.87 with SMTP id s23mr30022pgn.64.1523509060817; Wed, 11 Apr 2018 21:57:40 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id s17sm6573715pfk.105.2018.04.11.21.57.39 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Apr 2018 21:57:39 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Wed, 11 Apr 2018 22:02:09 -0700 Message-Id: <1523509343-18123-5-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1523509343-18123-1-git-send-email-bmeng.cn@gmail.com> References: <1523509343-18123-1-git-send-email-bmeng.cn@gmail.com> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 04/18] vxworks: x86: Rename e820info to e820_info 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" This changes 'struct e820info' to 'struct e820_info' to conform with the coding style. Signed-off-by: Bin Meng Reviewed-by: Christian Gmeiner --- Changes in v2: None cmd/elf.c | 6 +++--- include/vxworks.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/elf.c b/cmd/elf.c index 4638d79..0717feb 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -209,7 +209,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int ptr = 0; #ifdef CONFIG_X86 ulong base; - struct e820info *info; + struct e820_info *info; struct e820entry *data; #endif @@ -340,9 +340,9 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) */ base = env_get_hex("vx_phys_mem_base", VXWORKS_PHYS_MEM_BASE); data = (struct e820entry *)(base + E820_DATA_OFFSET); - info = (struct e820info *)(base + E820_INFO_OFFSET); + info = (struct e820_info *)(base + E820_INFO_OFFSET); - memset(info, 0, sizeof(struct e820info)); + memset(info, 0, sizeof(struct e820_info)); info->sign = E820_SIGNATURE; info->entries = install_e820_map(E820MAX, data); info->addr = (info->entries - 1) * sizeof(struct e820entry) + diff --git a/include/vxworks.h b/include/vxworks.h index d912076..4a83a34 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -32,7 +32,7 @@ /* E820 info signatiure "SMAP" - System MAP */ #define E820_SIGNATURE 0x534d4150 -struct e820info { +struct e820_info { u32 sign; /* "SMAP" signature */ u32 x0; /* don't care, used by VxWorks */ u32 x1; /* don't care, used by VxWorks */