summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKumar Gala <galak@gate.crashing.org>2006-01-16 19:53:22 +0300
committerPaul Mackerras <paulus@samba.org>2006-01-20 08:13:36 +0300
commitf4fc4a5b74cff2a487222f05704a2bd01953d250 (patch)
treefc46b28c23e498662263c929376dbf605d5faca6
parent0ce928e1b2ad4309fae6c4324b9e9e433fbf62a2 (diff)
downloadlinux-f4fc4a5b74cff2a487222f05704a2bd01953d250.tar.xz
[PATCH] powerpc: Add CONFIG_DEFAULT_UIMAGE to build a uImage by default for a board
Embedded boards that u-boot require a kernel image in the uImage format. This allows a given board to specify it wants a uImage built by default. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/Kconfig6
-rw-r--r--arch/powerpc/Makefile1
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8aa39d073dfe..fb0dcb994b84 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -83,6 +83,12 @@ config GENERIC_TBSYNC
default y if PPC32 && SMP
default n
+config DEFAULT_UIMAGE
+ bool
+ help
+ Used to allow a board to specify it wants a uImage built by default
+ default n
+
menu "Processor support"
choice
prompt "Processor Type"
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 44dd82b791d1..15fc3e98ac5c 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -142,6 +142,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
# Default to zImage, override when needed
defaultimage-y := zImage
defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
+defaultimage-$(CONFIG_DEFAULT_UIMAGE) := uImage
KBUILD_IMAGE := $(defaultimage-y)
all: $(KBUILD_IMAGE)