From patchwork Fri Jun 13 11:11:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 31874 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 053DF2054B for ; Fri, 13 Jun 2014 11:13:40 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id w10sf8300527pde.1 for ; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=BktwkZ8z3BbMyDVtp7f2qTg99KBPTYuVOPHX2qM2Htk=; b=QDPGufqG0/4vZz0GgCSROFXvazAAAHkDzqcmK6UGf7+WUA8mrlD9wcbAufY23A2YBb VlVTMy8YmK3tWNc27/EpvVIt49EtBv0GoZ2bGlkajzfVCX3LhKBhqWCujLeeSxbvsxRe rKJ0zPQ/5kVln2X9vuJrN/6S/P2asOiQEcq3xa2jHNDBDv18My9Rn8KMBcz3b6JTndZC i1iU7sgkIWwBAZBmeSnHuP5RCAZjRyzOeAuxQ67gJFhT+IQxV5vbwOT30BOGNgzGxeA6 fLG44JShYAyjVLPDrrWaSh8OIW4ki+vf9OQbZS9gD6C1p78yQ/SVdUgfjDLnwHXFmJxh dsHg== X-Gm-Message-State: ALoCoQkIy3Adskad7Zng+thJBr4N8BBEWVAAVmD1WwEnsYbFLaJcnvc7VflJpxAbb/3Fp2chdtZb X-Received: by 10.66.138.17 with SMTP id qm17mr240508pab.34.1402658019622; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.74 with SMTP id w68ls3408364qgw.53.gmail; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-Received: by 10.58.211.229 with SMTP id nf5mr1243483vec.19.1402658019502; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id ig3si1291633vdb.34.2014.06.13.04.13.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Jun 2014 04:13:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so2126841vcb.31 for ; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-Received: by 10.58.112.65 with SMTP id io1mr161056veb.61.1402658019390; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp478361vcb; Fri, 13 Jun 2014 04:13:39 -0700 (PDT) X-Received: by 10.140.49.171 with SMTP id q40mr2299640qga.7.1402658018857; Fri, 13 Jun 2014 04:13:38 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id u89si1415640qge.77.2014.06.13.04.13.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jun 2014 04:13:38 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WvPPD-0003Of-8P; Fri, 13 Jun 2014 11:12:23 +0000 Received: from mail-wg0-f41.google.com ([74.125.82.41]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WvPPA-0003If-Tp for linux-arm-kernel@lists.infradead.org; Fri, 13 Jun 2014 11:12:21 +0000 Received: by mail-wg0-f41.google.com with SMTP id a1so2531905wgh.0 for ; Fri, 13 Jun 2014 04:11:58 -0700 (PDT) X-Received: by 10.180.92.69 with SMTP id ck5mr3766759wib.15.1402657918261; Fri, 13 Jun 2014 04:11:58 -0700 (PDT) Received: from ards-macbook-pro.local ([188.207.72.65]) by mx.google.com with ESMTPSA id u7sm11248080eeo.23.2014.06.13.04.11.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Jun 2014 04:11:57 -0700 (PDT) From: Ard Biesheuvel To: matt.fleming@intel.com, catalin.marinas@arm.com Subject: [PATCH] efi/arm64: efistub: remove local copy of linux_banner Date: Fri, 13 Jun 2014 13:11:51 +0200 Message-Id: <1402657911-7779-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140613_041221_109620_2764C74A X-CRM114-Status: GOOD ( 11.18 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.41 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: roy.franz@linaro.org, linux-efi@vger.kernel.org, leif.lindholm@linaro.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The shared efistub code for ARM and arm64 contains a local copy of linux_banner, allowing it to be referenced from separate executables such as the ARM decompressor. However, this introduces a dependency on generated header files, causing unnecessary rebuilds of the stub itself and, in case of arm64, vmlinux which contains it. On arm64, the copy is not actually needed since we can reference the original symbol directly, and as it turns out, there may be better ways to deal with this for ARM as well, so let's remove it from the shared code. If it still needs to be reintroduced for ARM later, it should live under arch/arm anyway and not in shared code. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/efi-stub.c | 2 -- drivers/firmware/efi/fdt.c | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index 60e98a639ac5..e786e6cdc400 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include /* * AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from diff --git a/drivers/firmware/efi/fdt.c b/drivers/firmware/efi/fdt.c index 5c6a8e8a9580..3aec36d7aae9 100644 --- a/drivers/firmware/efi/fdt.c +++ b/drivers/firmware/efi/fdt.c @@ -23,16 +23,6 @@ static efi_status_t update_fdt(efi_system_table_t *sys_table, void *orig_fdt, u32 fdt_val32; u64 fdt_val64; - /* - * Copy definition of linux_banner here. Since this code is - * built as part of the decompressor for ARM v7, pulling - * in version.c where linux_banner is defined for the - * kernel brings other kernel dependencies with it. - */ - const char linux_banner[] = - "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" - LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; - /* Do some checks on provided FDT, if it exists*/ if (orig_fdt) { if (fdt_check_header(orig_fdt)) {