Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp285012ybp; Tue, 8 Oct 2019 18:07:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1730wJ77Aj6hms27vHHey+lfFa6dLibASxtBZSNpQD33iPewUX4x7xE75u6w/I4ED2BnW X-Received: by 2002:a17:906:6b99:: with SMTP id l25mr484293ejr.233.1570583252785; Tue, 08 Oct 2019 18:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570583252; cv=none; d=google.com; s=arc-20160816; b=x/GUS3ebaO+ETam4rEloErAs8Rv0Svd+/vT7r+cNXNlnJug0sQNKb3CAeKzQEBkuSn AERuZ4RBcOtFNhO177T9mgJQTBD6TtK7ky9xG0hXwrdyt7ysXYeD21t+ob6kcVuWJ41s vw+UVJPRskcIc1izpFqkrsOHYz/TZj9GEC96J/vZLZPnJUUVLQnTY/skvlBQVsqCnN3e b2TPYOy3oDgOB4V5SNvYcSKJ04UtignmATu34jFSubflWDnGsqdQogF9L1CZvLkUQSC2 ThIgPvw/h8J/61OxV2bBxMDIkRbmHhOCZy/zJcKeGl9vHdwasMhFgbkSzMzayCIoGxW2 HLrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:wdcironportexception :ironport-sdr:ironport-sdr:ironport-sdr:dkim-signature; bh=c9XkwI+6IBYdxoLFumAvtmbvQ6+y7rbYy2RTeGrs+FY=; b=GU7Y4mVa9s/Z+UafndL4f72gKzD/qjYZSjR9bDJTSEi4/MRby6gqvHt6XvnXumsMZM kxoZCxmYrL8+mMf2kkHj7kJCQff8oZKhB5tptReoJ65lWuHbcDWYXAVPTsWCxfOo8Nmy LHuo0WH9q0ilL+VGdweJUQxdlri0Bh1SblE7Chg3rJtVWwdu5upLpPyKhePStTDys2r9 kXNyzJJGQCb+GbYTEjl+l+2Uxr0D4tOAdvdcADl4dFSJpSW/QEj9s91AKd+CA8J64rDP 6M2gKHswIQa76zxypMGIRdf8mzm1oBs3IUzjw4XrppJ9aryRfIeW2Y1fbehjdy1ntQ70 oYvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=gqX4rq+b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p39si452860eda.416.2019.10.08.18.07.04; Tue, 08 Oct 2019 18:07:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=gqX4rq+b; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730040AbfJIBHA (ORCPT + 99 others); Tue, 8 Oct 2019 21:07:00 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:50200 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729601AbfJIBHA (ORCPT ); Tue, 8 Oct 2019 21:07:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570583265; x=1602119265; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Drzoga2/qb62rG5gRYCswouIqBr/dzKl/+yVPPdGcgM=; b=gqX4rq+byIyj1ksBIeDBh08ZebXT+zg1G4E4L76I+9xaS9k8v4oRLhy6 y6YHoIfllPO6Aw1+1jHSemvoWWFk83QpwO2ZE1UYnW8qEJXfK8bR0PL91 O97a56JTEl0kzkC82f7MkKHv+PeAxlGOJ+mZKTEeWRNjlw91pP5Mt2PN5 6tC3YkVXhdm9WP7iagbIlk/BDsXLvmgIawta78nZ4SXYwqYQxrl7AQB0U n6shSusgiMxPG+gb/wG6fBmB2TFhVlejbxta59BISt/qNd9XfKll0KLTS EUAj2LlqKdLq556bQizbgIKjPWDLy1cibk5TCHTN6DJbSZzXryZWsbtT8 A==; IronPort-SDR: 3+RpQDAq64bceBLSfJd5B9q24cS+ftolY/chFzcWPY7vSB+KRg6fedks6BmXFqM+/0xsipKLUH IbDFdJAFSjGtZeH7W7PVqC/vfjWjZmRR1NXfndrwwHCXSWU22U+/6IVI+qOuwAfsyiX5wUZf44 N0WjHu744XQD45KvYxoyr0KiK4uCQ21h0ncEl5vR8aLeXuST6SZfChGYn1IMFQf2I02DtQgXg+ 5qPe1j5NjCktV9hEINujEFRNNGS86PTcTcWUXKFh7ETFpvyHoSPpkd+bsilr2h9H+hfDI6fP5N hcA= X-IronPort-AV: E=Sophos;i="5.67,273,1566835200"; d="scan'208";a="221061441" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 09 Oct 2019 09:07:44 +0800 IronPort-SDR: cLCQNGPHyGUGzBm9V1LBory8UsD0X1wmK818LvJjnm78kl0vV9sBomzclstRrwHsuBI9YUPC+i I6pRyN2Y4Tq1xA+n1y5Bk5jT7VFvOWKtdZPMgEqbzswCiUqL0490CRR/DyHLKknLuT2ObpK+f1 qbh8qha6tdFCzuRntg487lnWHuXSG0e6hS18SRRHcDHXfMBCk9ZBA2VJlwt8h91a7GshmUf6zS rZ7Honi4yCz40tHUIXFuhPFrmNIMU+l6T7lVqN0e5M18lHJsJZbSDGJxIq4QgG6tLBGnOA+rGD KQW3xLBOyQz/A+/Z/us5mLqs Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 18:02:59 -0700 IronPort-SDR: WGv8QSqeoPrRU4wj9q+DsbCGhW6kDwro69+hpsH/32hMiPv+tpqPC9K76rfmXhXKkaW8uM3d08 xkO7tt7ppZ8Sff79lVGqkdKX/if+MxfB0grUGXIYHkyd7Rlm5NeZuTy8JMnbpCS27qsFJS5/te 5Ku7OL1c/skrw1+qmMsoUgNM/y6vrPwriBmMOhvSb1UMlW1N6JHZiEn5bUAc8f60A2F0gmYJ0I 2VsOI9JxPfFUKgk4trI5/VjmpC7/bwXhlGF5oLc6IJyWzBekiTDR5jrC6Bfa8b09NdAt8DZlGO xKg= WDCIronportException: Internal Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip02.wdc.com with ESMTP; 08 Oct 2019 18:06:59 -0700 From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Albert Ou , Jonathan Corbet , Karsten Merker , linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, Mauro Carvalho Chehab , Palmer Dabbelt , Paul Walmsley Subject: [PATCH] RISC-V: Typo fixes in image header and documentation. Date: Tue, 8 Oct 2019 18:06:37 -0700 Message-Id: <20191009010637.9955-1-atish.patra@wdc.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are some typos in boot image header and riscv boot documentation. Fix the typos. Signed-off-by: Atish Patra --- Documentation/riscv/boot-image-header.rst | 4 ++-- arch/riscv/include/asm/image.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/riscv/boot-image-header.rst b/Documentation/riscv/boot-image-header.rst index 7b4d1d747585..8efb0596a33f 100644 --- a/Documentation/riscv/boot-image-header.rst +++ b/Documentation/riscv/boot-image-header.rst @@ -22,7 +22,7 @@ The following 64-byte header is present in decompressed Linux kernel image:: u64 res2 = 0; /* Reserved */ u64 magic = 0x5643534952; /* Magic number, little endian, "RISCV" */ u32 magic2 = 0x56534905; /* Magic number 2, little endian, "RSC\x05" */ - u32 res4; /* Reserved for PE COFF offset */ + u32 res3; /* Reserved for PE COFF offset */ This header format is compliant with PE/COFF header and largely inspired from ARM64 header. Thus, both ARM64 & RISC-V header can be combined into one common @@ -34,7 +34,7 @@ Notes - This header can also be reused to support EFI stub for RISC-V in future. EFI specification needs PE/COFF image header in the beginning of the kernel image in order to load it as an EFI application. In order to support EFI stub, - code0 should be replaced with "MZ" magic string and res5(at offset 0x3c) should + code0 should be replaced with "MZ" magic string and res3(at offset 0x3c) should point to the rest of the PE/COFF header. - version field indicate header version number diff --git a/arch/riscv/include/asm/image.h b/arch/riscv/include/asm/image.h index 344db5244547..4f8061a5ac4a 100644 --- a/arch/riscv/include/asm/image.h +++ b/arch/riscv/include/asm/image.h @@ -42,7 +42,7 @@ * @res2: reserved * @magic: Magic number (RISC-V specific; deprecated) * @magic2: Magic number 2 (to match the ARM64 'magic' field pos) - * @res4: reserved (will be used for PE COFF offset) + * @res3: reserved (will be used for PE COFF offset) * * The intention is for this header format to be shared between multiple * architectures to avoid a proliferation of image header formats. @@ -59,7 +59,7 @@ struct riscv_image_header { u64 res2; u64 magic; u32 magic2; - u32 res4; + u32 res3; }; #endif /* __ASSEMBLY__ */ #endif /* __ASM_IMAGE_H */ -- 2.21.0