From 621707b52e431e74ef9e6ffac92680ea0092aaac Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 16 Jan 2006 10:53:22 -0600 Subject: [PATCH] --- yaml --- r: 20197 b: refs/heads/master c: 00adbf62bd16f6527e046b422349a54d783a3d86 h: refs/heads/master i: 20195: e03fdd3f5e8d6d62323c8136a0b26143c507aeba 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 bf0b65f8fb85..5d521dbd57a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad71f123a9e9b809f6c829db1222ce0423a1153c +refs/heads/master: 00adbf62bd16f6527e046b422349a54d783a3d86 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index df338c5cc910..80d114a3a837 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)