From patchwork Fri Mar 6 21:51:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie Dawydiuk X-Patchwork-Id: 24166 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 1B153DDF6F for ; Sat, 7 Mar 2009 08:50:48 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from oz.embeddedARM.com (oz.embeddedarm.com [67.40.67.44]) by ozlabs.org (Postfix) with ESMTP id 64040DDE41 for ; Sat, 7 Mar 2009 08:49:11 +1100 (EST) Received: from [192.168.0.200] (oz3 [192.168.0.200]) by oz.embeddedARM.com (8.12.11.20060614/8.11.6) with ESMTP id n26Ln8vO029934; Fri, 6 Mar 2009 14:49:08 -0700 (MST) Message-ID: <49B19AE0.3080609@embeddedarm.com> Date: Fri, 06 Mar 2009 14:51:28 -0700 From: Eddie Dawydiuk Organization: Technologic Systems User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Josh Boyer Subject: Re: [PATCH, RFC] References: <49B1605C.7090709@embeddedarm.com> <20090306184038.GA20537@zod.rchland.ibm.com> In-Reply-To: <20090306184038.GA20537@zod.rchland.ibm.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (oz.embeddedARM.com [192.168.0.11]); Fri, 06 Mar 2009 14:49:08 -0700 (MST) 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-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Hello, > Your patch is word-wrapped. It also lacks the Signed-off-by tag, which > is required. I apologize please see an updated patch below. > The changelog sounds as if there are bugs being fixed here, but really > you're adding support for something entirely new. The yosemite board > comes with U-Boot, which uses uImages. You seem to be adding support > for using simpleboot on the Yosemite board. Is that correct? Yes, the patch ensures the simpleboot image works on the Yosemite board. I was under the impression the code was broken as one can build a simpleImage for the Yosemite board as described in Documentation/powerpc/bootwrapper.txt without any modification on a vanilla kernel, although the resulting image does not work without the following patches. > You can't do this. If you hard code the MAC address of whatever board > you are using in the kernel, everyone will have to edit it. You need > to specify this in your board DTS file or via some other configurable > mechansim. Oops, sorry I forgot to pull out the debug code... Signed-off-by: Eddie Dawydiuk diff -urN linux-2.6.28.orig/arch/powerpc/boot/Makefile linux-2.6.28/arch/powerpc/boot/Makefile --- linux-2.6.28.orig/arch/powerpc/boot/Makefile 2008-12-24 16:26:37.000000000 -0700 +++ linux-2.6.28/arch/powerpc/boot/Makefile 2009-03-05 17:35:53.000000000 -0700 @@ -70,7 +70,7 @@ cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \ cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \ virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \ - cuboot-acadia.c + cuboot-acadia.c simpleboot-yosemite.c src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot)) @@ -224,7 +224,7 @@ image-$(CONFIG_TAISHAN) += cuImage.taishan image-$(CONFIG_KATMAI) += cuImage.katmai image-$(CONFIG_WARP) += cuImage.warp -image-$(CONFIG_YOSEMITE) += cuImage.yosemite +image-$(CONFIG_YOSEMITE) += cuImage.yosemite simpleImage.yosemite # Board ports in arch/powerpc/platform/8xx/Kconfig image-$(CONFIG_MPC86XADS) asp834x-redboot) diff -urN linux-2.6.28.orig/arch/powerpc/boot/simpleboot-yosemite.c linux-2.6.28/arch/powerpc/boot/simpleboot-yosemite.c --- linux-2.6.28.orig/arch/powerpc/boot/simpleboot-yosemite.c 1969-12-31 17:00:00.000000000 -0700 +++ linux-2.6.28/arch/powerpc/boot/simpleboot-yosemite.c 2009-03-06 14:55:46.000000000 -0700 @@ -0,0 +1,24 @@ +#include "ops.h" +#include "stdio.h" +#include "4xx.h" +#include "44x.h" + +#define TARGET_4xx +#define TARGET_44x +#include "ppcboot.h" + +static void yosemite_fixups(void) +{ + unsigned long sysclk = 50000000; + + ibm440ep_fixup_clocks(sysclk, 11059200, 400000000); + ibm4xx_sdram_fixup_memsize(); + dt_fixup_mac_address_by_alias("ethernet0", eth0adr); + dt_fixup_mac_address_by_alias("ethernet1", eth1adr); +} + +void platform_specific_init(void) +{ + platform_ops.fixups = yosemite_fixups; + platform_ops.exit = ibm44x_dbcr_reset; +} Signed-off-by: Eddie Dawydiuk diff -urN linux-2.6.28.orig/arch/powerpc/boot/wrapper linux-2.6.28/arch/powerpc/boot/wrapper --- linux-2.6.28.orig/arch/powerpc/boot/wrapper 2008-12-24 16:26:37.000000000 -0700 +++ linux-2.6.28/arch/powerpc/boot/wrapper 2009-03-05 17:36:10.000000000 -0700 @@ -214,8 +214,12 @@ platformo="$object/simpleboot.o $object/virtex.o" binary=y ;; +simpleboot-yosemite) + platformo="$object/fixed-head.o $object/simpleboot.o $object/simpleboot-yosemite.o" + binary=y + ;; simpleboot-*) - platformo="$object/simpleboot.o" + platformo="$object/fixed-head.o $object/simpleboot.o" binary=y ;;