[PATCH] ppc64: Build zImage.vmode for G5

Geoff Levand geoffrey.levand at am.sony.com
Fri Sep 23 07:02:23 EST 2005


Benjamin Herrenschmidt wrote:
> zImage.vmode was recently added. It's a version of zImage in which the
> ELF note section used by open firmware indicates that it requires a
> virtual mode instance of OF instead of real mode. This allows it to work
> with Apple OF, and thus is directly bootable (or netbootable) from OF
> command line. (Unfortunately, pSeries OF sort-of requires real mode and
> Apple OF sort-of requires virtual mode, and both tend to be unhappy if
> no notes section specifies the mode at all).
> 
> However, we forgot to add zImage.vmode to the default G5 build. This
> fixes it.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> 
> Index: linux-work/arch/ppc64/Makefile
> ===================================================================
> --- linux-work.orig/arch/ppc64/Makefile	2005-09-20 09:54:18.000000000 +1000
> +++ linux-work/arch/ppc64/Makefile	2005-09-20 11:57:22.000000000 +1000
> @@ -107,7 +107,7 @@
>  	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
>  
>  defaultimage-$(CONFIG_PPC_PSERIES) := zImage
> -defaultimage-$(CONFIG_PPC_PMAC) := vmlinux
> +defaultimage-$(CONFIG_PPC_PMAC) := zImage.vmode
>  defaultimage-$(CONFIG_PPC_MAPLE) := zImage
>  defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
>  KBUILD_IMAGE := $(defaultimage-y)
> 

This is really just a half fix, since if you have say both CONFIG_PPC_PSERIES
and CONFIG_PPC_PMAC, 'make install' will always install zImage.vmode, even for
pSeries machines.

I thought we could have a default platform in Kconfig as below, but it looks 
messy.  Any ideas how we can fix this?  Remember we need to handle cross 
building on different machines/archs.

-Geoff

choice
	prompt "Default Platform"
	depends on PPC_MULTIPLATFORM

config PPC_DEFAULT_PSERIES
	depends on PPC_PSERIES
	bool "  IBM pSeries & new iSeries"

config PPC_DEFAULT_BPA
	depends on PPC_BPA
	bool "  Broadband Processor Architecture"

config PPC_DEFAULT_PMAC
	depends on PPC_PMAC
	bool "  Apple G5 based machines"

config PPC_DEFAULT_MAPLE
	depends on PPC_MAPLE
	bool "  Maple 970FX Evaluation Board"

endchoice

-EOF




More information about the Linuxppc64-dev mailing list