From edf03c1ee84e5095e8f4a4b8ad6e0784118cb176 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 31 Oct 2005 20:08:40 -0500 Subject: [PATCH] [PATCH] powerpc: move mmio_nvram.c over to arch/powerpc The nvram code formally known as bpa_nvram.c is rather generic really, so it is quite likely to be useful to future boards not based on cell. This patch puts it into arch/powerpc/sysdev. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras --- arch/powerpc/Kconfig | 5 +++++ arch/powerpc/sysdev/Makefile | 1 + .../kernel/bpa_nvram.c => powerpc/sysdev/mmio_nvram.c} | 0 arch/ppc64/kernel/Makefile | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) rename arch/{ppc64/kernel/bpa_nvram.c => powerpc/sysdev/mmio_nvram.c} (100%) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index aa13a9d95ea2..1c44a1dac421 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -325,6 +325,7 @@ config PPC_CELL depends on PPC_MULTIPLATFORM && PPC64 select PPC_RTAS select RTAS_FW + select MMIO_NVRAM config PPC_OF bool @@ -360,6 +361,10 @@ config RTAS_FW depends on PPC_RTAS default n +config MMIO_NVRAM + bool + default n + config MPIC_BROKEN_U3 bool depends on PPC_MAPLE diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 8acd21dee05d..6b7efcfc352a 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_MPC106) += grackle.o obj-$(CONFIG_BOOKE) += dcr.o obj-$(CONFIG_40x) += dcr.o obj-$(CONFIG_U3_DART) += u3_iommu.o +obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o diff --git a/arch/ppc64/kernel/bpa_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c similarity index 100% rename from arch/ppc64/kernel/bpa_nvram.c rename to arch/powerpc/sysdev/mmio_nvram.c diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index a01a9de9eb56..afd445114446 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile @@ -31,7 +31,7 @@ endif obj-$(CONFIG_PPC_PSERIES) += rtasd.o udbg_16550.o -obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o bpa_nvram.o \ +obj-$(CONFIG_PPC_CELL) += bpa_setup.o bpa_iommu.o \ bpa_iic.o spider-pic.o obj-$(CONFIG_KEXEC) += machine_kexec.o -- 2.39.5