From patchwork Wed Dec 21 20:11:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josh Boyer X-Patchwork-Id: 132729 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 80338B741A for ; Thu, 22 Dec 2011 07:11:59 +1100 (EST) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id B03AEB7119 for ; Thu, 22 Dec 2011 07:11:47 +1100 (EST) Received: by wibhm4 with SMTP id hm4so2257293wib.38 for ; Wed, 21 Dec 2011 12:11:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=57rwR8eAHvMAZEIaMskH6bQADM0IrbXRnau+2XA3/uQ=; b=gua+gHCvjzhaZp8lSaRrrFxph8UOTJuGMJBZMrr8GMxg3wNraov9moVefIXfAWUHy/ gbvXGQ3gBGfe4Yw2+ih+i0AqJKkCT1nc6Tiu9di3sbnc4esudA1I4HC5UHMdd719zRMY 5MH8qNddMWcODlA12sPk4VN5a6L47+3uDin0M= MIME-Version: 1.0 Received: by 10.181.13.162 with SMTP id ez2mr17257487wid.17.1324498300917; Wed, 21 Dec 2011 12:11:40 -0800 (PST) Received: by 10.216.47.209 with HTTP; Wed, 21 Dec 2011 12:11:40 -0800 (PST) In-Reply-To: References: Date: Wed, 21 Dec 2011 15:11:40 -0500 Message-ID: Subject: Re: Please pull 'next' branch of 4xx tree From: Josh Boyer To: Benjamin Herrenschmidt Cc: Artem Bityutskiy , Stephen Rothwell , linuxppc-dev X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org On Tue, Dec 20, 2011 at 11:23 AM, Josh Boyer wrote: > Hi Ben, > > This is the relocatable series from Suzie that has been brewing for quite a > while.  I also included a small fix for currituck that I hit when I was building > various kernels. > > NOTE: To build anything config that includes the NDFC driver, you need the fix > Tony posted and is in linux-next to the ndfc driver.  I didn't include it here > since it is already queued up in the MTD tree. > I've added Suzie's patch from today to change the WARN to INFO in the boot wrapper thing. Updated tree info below. josh The following changes since commit 3f53638c805f75989f4b4be07efcfd173cdd5e2d: powerpc: Fix old bug in prom_init setting of the color (2011-12-19 14:41:25 +1100) are available in the git repository at: git://git.infradead.org/users/jwboyer/powerpc-4xx.git next Josh Boyer (1): powerpc/44x: Fix build error on currituck platform Suzuki Poulose (8): powerpc: Rename mapping based RELOCATABLE to DYNAMIC_MEMSTART for BookE powerpc/44x: Enable DYNAMIC_MEMSTART for 440x powerpc: Process dynamic relocations for kernel powerpc: Define virtual-physical translations for RELOCATABLE powerpc/44x: Enable CONFIG_RELOCATABLE for PPC44x powerpc/44x: Enable CRASH_DUMP for 440x powerpc/boot: Change the load address for the wrapper to fit the kernel powerpc/boot: Change the WARN to INFO for boot wrapper overlap message arch/powerpc/Kconfig | 45 +++++- arch/powerpc/Makefile | 6 +- arch/powerpc/boot/wrapper | 20 +++ arch/powerpc/configs/44x/iss476-smp_defconfig | 3 +- arch/powerpc/include/asm/kdump.h | 4 +- arch/powerpc/include/asm/page.h | 89 ++++++++++- arch/powerpc/kernel/Makefile | 2 + arch/powerpc/kernel/crash_dump.c | 4 +- arch/powerpc/kernel/head_44x.S | 105 +++++++++++++ arch/powerpc/kernel/head_fsl_booke.S | 2 +- arch/powerpc/kernel/machine_kexec.c | 2 +- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kernel/reloc_32.S | 208 +++++++++++++++++++++++++ arch/powerpc/kernel/vmlinux.lds.S | 8 +- arch/powerpc/mm/44x_mmu.c | 2 +- arch/powerpc/mm/init_32.c | 7 + arch/powerpc/platforms/44x/currituck.c | 2 +- arch/powerpc/relocs_check.pl | 14 ++- 18 files changed, 496 insertions(+), 29 deletions(-) create mode 100644 arch/powerpc/kernel/reloc_32.S