2006-01-04 22:23:24

by Peter Korsgaard

Subject: [PATCH] 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.

Signed-off-by: Peter Korsgaard <[email protected]>

diff -urpN linux-2.6.15.orig/arch/ppc/boot/simple/Makefile linux-2.6.15/arch/ppc/boot/simple/Makefile
--- linux-2.6.15.orig/arch/ppc/boot/simple/Makefile 2006-01-03 12:04:08.000000000 +0100
+++ linux-2.6.15/arch/ppc/boot/simple/Makefile 2006-01-04 15:08:46.000000000 +0100
@@ -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


--
Bye, Peter Korsgaard

2006-01-06 22:36:39

by Tom Rini

Subject: Re: [PATCH] ppc32: Re-add embed_config.c to ml300/ep405

On Wed, Jan 04, 2006 at 11:24:32PM +0100, Peter Korsgaard wrote:

> 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.
>
> Signed-off-by: Peter Korsgaard <[email protected]>

I've seen this from others as well,
Acked-by: Tom Rini <[email protected]>

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

> diff -urpN linux-2.6.15.orig/arch/ppc/boot/simple/Makefile linux-2.6.15/arch/ppc/boot/simple/Makefile
> --- linux-2.6.15.orig/arch/ppc/boot/simple/Makefile 2006-01-03 12:04:08.000000000 +0100
> +++ linux-2.6.15/arch/ppc/boot/simple/Makefile 2006-01-04 15:08:46.000000000 +0100
> @@ -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

--
Tom Rini
http://gate.crashing.org/~trini/