Skip to contentSkip to conversation

ppc32: Re-add embed_config.c to ml300/ep405

PATCH In review Peter Korsgaard 2 participants 2 messages Jan 4, 2006 – Jan 6, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc32: Re-add embed_config.c to ml300/ep405

Hi,

Commit 3e9e7c1d0b7a36fb8affb973a054c5098e27baa8 (ppc32: cleanup AMCC PPC40x eval boards to support U-Boot) broke the kernel for ML300 / EP405.

It still compiles as there's a weak definition of the function in misc-embedded.c, but the kernel crashes as the bd_t fixup isn't performed.

arch/ppc/boot/simple/Makefile +2 -0
diff -urpN linux-2.6.15.orig/arch/ppc/boot/simple/Makefile linux-2.6.15/arch/ppc/boot/simple/Makefile
@@ -190,6 +190,8 @@ boot-$(CONFIG_REDWOOD_5)	+= embed_config
 boot-$(CONFIG_REDWOOD_6)	+= embed_config.o
 boot-$(CONFIG_8xx)		+= embed_config.o
 boot-$(CONFIG_8260)		+= embed_config.o
+boot-$(CONFIG_EP405)		+= embed_config.o
+boot-$(CONFIG_XILINX_ML300)	+= embed_config.o
 boot-$(CONFIG_BSEIP)		+= iic.o
 boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o
Signature · 1 line
Bye, Peter Korsgaard
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Peter Korsgaard

Hi,

Commit 3e9e7c1d0b7a36fb8affb973a054c5098e27baa8 (ppc32: cleanup AMCC PPC40x eval boards to support U-Boot) broke the kernel for ML300 / EP405.

It still compiles as there's a weak definition of the function in misc-embedded.c, but the kernel crashes as the bd_t fixup isn't performed.

I've seen this from others as well,

... and this should goto stable@ once in Linus' tree.

Quoted 12 lines

diff -urpN linux-2.6.15.orig/arch/ppc/boot/simple/Makefile linux-2.6.15/arch/ppc/boot/simple/Makefile

arch/ppc/boot/simple/Makefile +2 -0
@@ -190,6 +190,8 @@ boot-$(CONFIG_REDWOOD_5)	+= embed_config
 boot-$(CONFIG_REDWOOD_6)	+= embed_config.o
 boot-$(CONFIG_8xx)		+= embed_config.o
 boot-$(CONFIG_8260)		+= embed_config.o
+boot-$(CONFIG_EP405)		+= embed_config.o
+boot-$(CONFIG_XILINX_ML300)	+= embed_config.o
 boot-$(CONFIG_BSEIP)		+= iic.o
 boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o
Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/