From 4cc8b12a16c13da3b10ef0ac9e78171267df27f6 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 16 Jan 2006 10:53:22 -0600 Subject: [PATCH] --- yaml --- r: 22889 b: refs/heads/master c: f4fc4a5b74cff2a487222f05704a2bd01953d250 h: refs/heads/master i: 22887: 32a867fc9f32a33f85f626879171cd46102756b6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 6 ++++++ trunk/arch/powerpc/Makefile | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0a5258785d1e..07786fa25e6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ce928e1b2ad4309fae6c4324b9e9e433fbf62a2 +refs/heads/master: f4fc4a5b74cff2a487222f05704a2bd01953d250 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 8aa39d073dfe..fb0dcb994b84 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/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/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile index 44dd82b791d1..15fc3e98ac5c 100644 --- a/trunk/arch/powerpc/Makefile +++ b/trunk/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)