Commit f9c3a570 authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

powerpc: Enable HAVE_ARCH_NVRAM_OPS and disable GENERIC_NVRAM 



Switch PPC32 kernels from the generic_nvram module to the nvram module.

Also fix a theoretical bug where CHRP omits the chrp_nvram_init() call
when CONFIG_NVRAM_MODULE=m.

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 066ac5c3

arch/powerpc/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ config PPC 
	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_MMAP_RND_COMPAT_BITS	if COMPAT

	select HAVE_ARCH_NVRAM_OPS		if PPC32

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_CBPF_JIT			if !PPC64
@@ -274,11 +275,6 @@ config SYSVIPC_COMPAT 
	depends on COMPAT && SYSVIPC

	default y



# All PPC32s use generic nvram driver through ppc_md

config GENERIC_NVRAM

	bool

	default y if PPC32



config SCHED_OMIT_FRAME_POINTER

	bool

	default y

arch/powerpc/include/asm/nvram.h

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ extern int pmac_get_partition(int partition); 
extern u8	pmac_xpram_read(int xpaddr);

extern void	pmac_xpram_write(int xpaddr, u8 data);



/* Synchronize NVRAM */

extern void	nvram_sync(void);



/* Initialize NVRAM OS partition */

extern int __init nvram_init_os_partition(struct nvram_os_partition *part);

arch/powerpc/kernel/setup_32.c

+0 −11
Original line number Diff line number Diff line
@@ -148,17 +148,6 @@ static int __init ppc_setup_l3cr(char *str) 
}

__setup("l3cr=", ppc_setup_l3cr);



#ifdef CONFIG_GENERIC_NVRAM



void nvram_sync(void)

{

	if (ppc_md.nvram_sync)

		ppc_md.nvram_sync();

}

EXPORT_SYMBOL(nvram_sync);



#endif /* CONFIG_NVRAM */



static int __init ppc_init(void)

{

	/* clear the progress line */

arch/powerpc/platforms/chrp/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				+= setup.o time.o pegasos_eth.o pci.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_NVRAM)		+= nvram.o
 
obj-$(CONFIG_NVRAM:m=y)		+= nvram.o

arch/powerpc/platforms/chrp/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static void __init chrp_init_IRQ(void) 
static void __init

chrp_init2(void)

{

#ifdef CONFIG_NVRAM

#if IS_ENABLED(CONFIG_NVRAM)

	chrp_nvram_init();

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE