From patchwork Tue Sep 9 14:00:28 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Boyer X-Patchwork-Id: 220 Return-Path: X-Original-To: patchwork@ozlabs.org Delivered-To: patchwork@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 2B653DE0D2 for ; Wed, 10 Sep 2008 00:01:46 +1000 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from qw-out-2122.google.com (qw-out-2122.google.com [74.125.92.24]) by ozlabs.org (Postfix) with ESMTP id 3C841DDF61 for ; Wed, 10 Sep 2008 00:01:29 +1000 (EST) Received: by qw-out-2122.google.com with SMTP id 9so218385qwb.15 for ; Tue, 09 Sep 2008 07:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent :sender; bh=tWXN08mCxf9PTV6AzgmyRk6nkNZ4uVCHTxKMO++xyzY=; b=uAXHcR5hblKp7Z+O2I7jf9k3eex3JDcW+bTfrmdFr0quJTRk+z6H6BVu9SFen1dF/E R71CsVr/AAqEgRrPT8JbMrSjhCFmC6PW/wtH7dFPd3vmQrggAyD7AF5ukgA0rqgoGM+Z 6uyqOAUaP4HxNeZRXrKb4zxoX94C3ltsM21BM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent:sender; b=pWBOpgDmIG+NgyMxKy+euIPAse/W332iOfbUuuJ/MmcSG1yq/+5tzyCC5IrqzxynGs YTA407OH326VLVrt3kyd+9SO71MBqu1K67vjQnTE9nrSaC0f9mpM7+raQxETyGi15hgv K0XF3WD9kHswKQCAPK0o5vGSYtkBbzPyfPJxQ= Received: by 10.214.43.8 with SMTP id q8mr13673670qaq.53.1220968887035; Tue, 09 Sep 2008 07:01:27 -0700 (PDT) Received: from yoda.jdub.homelinux.org ( [24.247.237.59]) by mx.google.com with ESMTPS id m56sm8939701rnd.1.2008.09.09.07.01.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 09 Sep 2008 07:01:21 -0700 (PDT) Date: Tue, 9 Sep 2008 10:00:28 -0400 From: Josh Boyer To: paulus@samba.org Subject: [PATCH] powerpc: Holly board needs dtbImage target Message-ID: <20080909140028.GA15005@yoda.jdub.homelinux.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Cc: linuxppc-dev@ozlabs.org X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork=ozlabs.org@ozlabs.org One of the changes in the bootwrapper makefile introduced the dtbImage targets for boards that need a simple zImage with a DTB embedded in them. When this was done, it broke booting on the Holly board as the zImage.holly wrapper did not get the DTB embedded properly. This patch changes the target for the Holly board to a dtbImage so that the wrapper includes the vmlinux, wrapper bits, and DTB. Signed-off-by: Josh Boyer diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 717a3bc..65d1a84 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -195,7 +195,7 @@ image-$(CONFIG_PPC_CELLEB) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac -image-$(CONFIG_PPC_HOLLY) += zImage.holly +image-$(CONFIG_PPC_HOLLY) += dtbImage.holly image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800 image-$(CONFIG_PPC_ISERIES) += zImage.iseries image-$(CONFIG_DEFAULT_UIMAGE) += uImage