From patchwork Tue Feb 13 02:32:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 128192 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3799904ljc; Mon, 12 Feb 2018 18:32:53 -0800 (PST) X-Google-Smtp-Source: AH8x226gklZ9yqGmqoEGm3zzWwdGckmwQSCQRjyh+YQVRT5sU8wfLSuqK9uCf886ZZEr2pl5UauM X-Received: by 10.80.159.169 with SMTP id c38mr15630edf.277.1518489173721; Mon, 12 Feb 2018 18:32:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518489173; cv=none; d=google.com; s=arc-20160816; b=bOPwfAWhiIuMFCmBQmVzReEXq08jQALKzjnUHWO31OSQ3JSS7BNpfRFKicz+csIu/g XK0mBJOEAGBKEm1ZWHwPB3iqIM7qMd9Qgz4ITpFjrr3Ur3bK1mkNdlsKLDNbGHwaBT2l 3PwXiwm7Fl5LLM8fLv+Sd8B981QiFJnx+mKmElLampujzep+l6t8fec9kP1Y4YCdqbhG J9I+zegZgUNSwWKRv6M2xC8dg8UiNplD37ugzCrX0nyLw5CSCtkkO25srQWCeRixwVl5 pBhZhTmYKNgajRiTNlNwKFVsgxXJ0+z1c/tkbWYw6vKmN+xEZh1A8lV7HmSLpKQ6HWFM cPhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-filter:arc-authentication-results; bh=vlmU5YCilssjEinhjz/SHLEvB+h1n7GneMzdfu8uXc0=; b=eIqwZ+xXvFI8WUyKyEKEbKFpFc1IP7r287+/GipZIgFE52DhkmVoicCv4V+AuolZtN EKsiuuUNlDreromLwgAF5/mTTEftY+WBKpEo6v1wwbWaVarz8GSvqbAOnBHvu4Ah3C+/ N7XsmGFUOrljNvmL2/CRH45cYlLOLcdIUxsfvjaeJYWUoT9wN0LlCjL36mk0XDANcnhJ VvDdA7s4LlesYjWU85KF3W48rTBFOaEP0vrcVATX9OGpTApkGRyNqQgWm8zQkB5h0j/j bKA4FyE4rXOVWfoqAg51LDafHMfTmhzKDpaWvsjqYTTV4DfZQIVjOVkYqL4Bq9/viHFg P0GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=HHwweAje; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id g88si1357707ede.488.2018.02.12.18.32.52; Mon, 12 Feb 2018 18:32:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=HHwweAje; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 99C7AC21F50; Tue, 13 Feb 2018 02:32:52 +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_DNSWL_BLOCKED, 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 3F881C21EAE; Tue, 13 Feb 2018 02:32:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C81FCC21E76; Tue, 13 Feb 2018 02:32:47 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id B1E76C21D65 for ; Tue, 13 Feb 2018 02:32:46 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w1D2WJ6p026253; Tue, 13 Feb 2018 11:32:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w1D2WJ6p026253 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1518489139; bh=AI/+ioNcsmrEbswWirfFEUJLSfPF7mIyeR7J7xZ25Y8=; h=From:To:Cc:Subject:Date:From; b=HHwweAje2yHAnNu1OSLGvxbYEk/akq3HHWaqv9tZcB8/Uj0kHr4OlKsFSwgrSG9D0 pCYkszY/S/zUmqsczO0YFywqB/SGhe6KrPEFANKb0mEnbv9BKzbZq8vLHrrYmjmSeY TdtOsKbUwhs3864/aZUzQJ717VsI1oPKkLORCzokn/v7G6nrZgE0Tyy4e/2a0mbjZY zvLq32sfS7yvncbwWXaxNo4oofm4RgRt0shkdFMPVfk9CNyD1jlOG1MDhuYJBXYr+r GsLETumNIUGcbCHpK9p3GvY3l2ihHciJZhpg+URvV/DnPoJ4aRk5ZuTD77rBxfNbSK 2Ku3wc1bc4z8A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 13 Feb 2018 11:32:15 +0900 Message-Id: <1518489135-17702-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH] ARM: image: indent with tab instead of 4 spaces 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" Commit 6808ef9ac2a6 ("move booti_setup to arch/arm/lig/image.c") not only moved the code, but also replaced a tab with 4 spaces to break the Linux coding style. Restore tab indentation. Signed-off-by: Masahiro Yamada Reviewed-by: Bin Chen --- arch/arm/lib/image.c | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c index f72cf63..92bfb8f 100644 --- a/arch/arm/lib/image.c +++ b/arch/arm/lib/image.c @@ -15,63 +15,63 @@ DECLARE_GLOBAL_DATA_PTR; /* See Documentation/arm64/booting.txt in the Linux kernel */ struct Image_header { - uint32_t code0; /* Executable code */ - uint32_t code1; /* Executable code */ - uint64_t text_offset; /* Image load offset, LE */ - uint64_t image_size; /* Effective Image size, LE */ - uint64_t flags; /* Kernel flags, LE */ - uint64_t res2; /* reserved */ - uint64_t res3; /* reserved */ - uint64_t res4; /* reserved */ - uint32_t magic; /* Magic number */ - uint32_t res5; + uint32_t code0; /* Executable code */ + uint32_t code1; /* Executable code */ + uint64_t text_offset; /* Image load offset, LE */ + uint64_t image_size; /* Effective Image size, LE */ + uint64_t flags; /* Kernel flags, LE */ + uint64_t res2; /* reserved */ + uint64_t res3; /* reserved */ + uint64_t res4; /* reserved */ + uint32_t magic; /* Magic number */ + uint32_t res5; }; int booti_setup(ulong image, ulong *relocated_addr, ulong *size) { - struct Image_header *ih; - uint64_t dst; - uint64_t image_size, text_offset; + struct Image_header *ih; + uint64_t dst; + uint64_t image_size, text_offset; - *relocated_addr = image; + *relocated_addr = image; - ih = (struct Image_header *)map_sysmem(image, 0); + ih = (struct Image_header *)map_sysmem(image, 0); - if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { - puts("Bad Linux ARM64 Image magic!\n"); - return 1; - } + if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { + puts("Bad Linux ARM64 Image magic!\n"); + return 1; + } - /* - * Prior to Linux commit a2c1d73b94ed, the text_offset field - * is of unknown endianness. In these cases, the image_size - * field is zero, and we can assume a fixed value of 0x80000. - */ - if (ih->image_size == 0) { - puts("Image lacks image_size field, assuming 16MiB\n"); - image_size = 16 << 20; - text_offset = 0x80000; - } else { - image_size = le64_to_cpu(ih->image_size); - text_offset = le64_to_cpu(ih->text_offset); - } + /* + * Prior to Linux commit a2c1d73b94ed, the text_offset field + * is of unknown endianness. In these cases, the image_size + * field is zero, and we can assume a fixed value of 0x80000. + */ + if (ih->image_size == 0) { + puts("Image lacks image_size field, assuming 16MiB\n"); + image_size = 16 << 20; + text_offset = 0x80000; + } else { + image_size = le64_to_cpu(ih->image_size); + text_offset = le64_to_cpu(ih->text_offset); + } - *size = image_size; + *size = image_size; - /* - * If bit 3 of the flags field is set, the 2MB aligned base of the - * kernel image can be anywhere in physical memory, so respect - * images->ep. Otherwise, relocate the image to the base of RAM - * since memory below it is not accessible via the linear mapping. - */ - if (le64_to_cpu(ih->flags) & BIT(3)) - dst = image - text_offset; - else - dst = gd->bd->bi_dram[0].start; + /* + * If bit 3 of the flags field is set, the 2MB aligned base of the + * kernel image can be anywhere in physical memory, so respect + * images->ep. Otherwise, relocate the image to the base of RAM + * since memory below it is not accessible via the linear mapping. + */ + if (le64_to_cpu(ih->flags) & BIT(3)) + dst = image - text_offset; + else + dst = gd->bd->bi_dram[0].start; - *relocated_addr = ALIGN(dst, SZ_2M) + text_offset; + *relocated_addr = ALIGN(dst, SZ_2M) + text_offset; - unmap_sysmem(ih); + unmap_sysmem(ih); - return 0; + return 0; }