From patchwork Wed Jul 13 01:14:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hao X-Patchwork-Id: 647683 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rq1JP34ZTz9sCt for ; Wed, 13 Jul 2016 11:21:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=x5I/Bl8a; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rq1JP21LTzDqLh for ; Wed, 13 Jul 2016 11:21:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=x5I/Bl8a; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-yw0-x243.google.com (mail-yw0-x243.google.com [IPv6:2607:f8b0:4002:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rq19T4VcWzDqFX for ; Wed, 13 Jul 2016 11:15:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=x5I/Bl8a; dkim-atps=neutral Received: by mail-yw0-x243.google.com with SMTP id y188so2167859ywf.3 for ; Tue, 12 Jul 2016 18:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CS75+UJNNFTeZ6+0bv/Umlfmi0a4dlP4eMZUwWDjJec=; b=x5I/Bl8ax/CYuz5R9o7nbmJeoduVvHzrmVji0Rvfspc8Vp3dLSqwTwwWilG4Dp3N/g pBxvPdFhjeF7vFX3v5OX3Z+N5iwCJTT0QNnZL3tST44AUOyCKtknc/+hBZVlAXnMwyUe YSrwi4Z5mlQNDRtbkaM67R2PgjW5cYRCbutaH95gBH+9On86am6l4DkoYH+/o92qY4PQ olp6mn7+tD7PlKFD0QQlVXqF3sgErFGGsOmr6GyXU5WDA9tVvuNZSm5Lfv+tWe37kKv/ XQoqFQg+smsoTrqX/Bxe2FLu+aAFqt9hCGm7AXPQy0+EsnlqcmmqvWELtQ098mEm27Qs fZNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CS75+UJNNFTeZ6+0bv/Umlfmi0a4dlP4eMZUwWDjJec=; b=XL5P8pbMMb9kbBzGRWsD+fHzuGxNqS12x/+kzR/SUBhnV9ncVJTHhXswttvQuH18Ew N5WHEbNQKXw1q4StHXfVpKNbM0Mb9VBBGqceGJJ4oHuG2O1cBywJcYcjRzcBjEjSyzc6 nqYF5kcsG92NQuwhJj/qRJuj7sXx8BX0d+gUlbcGhiXPdvD00FZuI7zVzwO0KHtZ5QTP 5hhPJmfRfduipmtSglYLgZ1reu3zZQftHVU4x0TBs2jMBSYvhz8Q0Kt0kNoJsikcq0Z/ REqy4qs+G2nu9k+jQvOZXW+XVAmicTXcHbOSfckWq5ht8yiNJZCr0t5bUfV7XjATq9Ps rUjA== X-Gm-Message-State: ALyK8tKKBusY+k0uB1G19JvZuqdfTqNo2AyufrrtnFPTg6wx6YdGO2i+2BDpj//JYcPnVQ== X-Received: by 10.129.155.215 with SMTP id s206mr3662297ywg.84.1468372539764; Tue, 12 Jul 2016 18:15:39 -0700 (PDT) Received: from pek-khao-d1.wrs.com ([106.120.101.38]) by smtp.gmail.com with ESMTPSA id n18sm8418830ywn.36.2016.07.12.18.15.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 18:15:39 -0700 (PDT) From: Kevin Hao To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 3/3] powerpc32: kill RELOCATABLE_PPC32 Date: Wed, 13 Jul 2016 09:14:40 +0800 Message-Id: <1468372480-6453-4-git-send-email-haokexin@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1468372480-6453-1-git-send-email-haokexin@gmail.com> References: <1468372480-6453-1-git-send-email-haokexin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood , Paul Mackerras MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" It is seldom used in the kernel code and can be easily replaced by either RELOCATABLE or PPC32. So there is no reason to keep a separate kernel option for this. Signed-off-by: Kevin Hao --- arch/powerpc/Kconfig | 4 ---- arch/powerpc/include/asm/page.h | 6 +++--- arch/powerpc/kernel/Makefile | 3 +-- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/powerpc/mm/init_32.c | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a9d847c8a20d..98f7e29e5680 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -481,10 +481,6 @@ config RELOCATABLE setting can still be useful to bootwrappers that need to know the load address of the kernel (eg. u-boot/mkimage). -config RELOCATABLE_PPC32 - def_bool y - depends on PPC32 && RELOCATABLE - config CRASH_DUMP bool "Build a kdump crash kernel" depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP) diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 51db3a37bced..56398e7e6100 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -96,7 +96,7 @@ extern unsigned int HPAGE_SHIFT; extern phys_addr_t memstart_addr; extern phys_addr_t kernstart_addr; -#ifdef CONFIG_RELOCATABLE_PPC32 +#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC32) extern long long virt_phys_offset; #endif @@ -139,9 +139,9 @@ extern long long virt_phys_offset; * determine MEMORY_START until then. However we can determine PHYSICAL_START * from information at hand (program counter, TLB lookup). * - * On BookE with RELOCATABLE (RELOCATABLE_PPC32) + * On BookE with RELOCATABLE && PPC32 * - * With RELOCATABLE_PPC32, we support loading the kernel at any physical + * With RELOCATABLE && PPC32, we support loading the kernel at any physical * address without any restriction on the page alignment. * * We find the runtime address of _stext and relocate ourselves based on diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 0c7106df90e6..0719b1a3fb24 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -47,7 +47,6 @@ obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o hmi.o -obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o @@ -92,7 +91,7 @@ extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o extra-$(CONFIG_8xx) := head_8xx.o extra-y += vmlinux.lds -obj-$(CONFIG_RELOCATABLE_PPC32) += reloc_32.o +obj-$(CONFIG_RELOCATABLE) += reloc_$(CONFIG_WORD_SIZE).o obj-$(CONFIG_PPC32) += entry_32.o setup_32.o obj-$(CONFIG_PPC64) += dma-iommu.o iommu.o diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 2dd91f79de05..b5fba689fca6 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -165,7 +165,7 @@ SECTIONS . = ALIGN(8); .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { -#ifdef CONFIG_RELOCATABLE_PPC32 +#ifdef CONFIG_PPC32 __dynamic_symtab = .; #endif *(.dynsym) diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index e2d7ba124618..448685fbf27c 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c @@ -64,7 +64,7 @@ EXPORT_SYMBOL(memstart_addr); phys_addr_t kernstart_addr; EXPORT_SYMBOL(kernstart_addr); -#ifdef CONFIG_RELOCATABLE_PPC32 +#ifdef CONFIG_RELOCATABLE /* Used in __va()/__pa() */ long long virt_phys_offset; EXPORT_SYMBOL(virt_phys_offset);