From patchwork Sat Jul 21 08:03:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Perkov X-Patchwork-Id: 172409 X-Patchwork-Delegate: prafulla@marvell.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id AA8862C023F for ; Sat, 21 Jul 2012 18:03:54 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 47046280D2; Sat, 21 Jul 2012 10:03:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1R6LEMLvGX6v; Sat, 21 Jul 2012 10:03:52 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D994B280C9; Sat, 21 Jul 2012 10:03:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9C1C5280C9 for ; Sat, 21 Jul 2012 10:03:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GjHZ14ijwU0v for ; Sat, 21 Jul 2012 10:03:48 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by theia.denx.de (Postfix) with ESMTPS id 12AD0280C8 for ; Sat, 21 Jul 2012 10:03:46 +0200 (CEST) Received: by wibhr14 with SMTP id hr14so1011529wib.9 for ; Sat, 21 Jul 2012 01:03:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=lx3sr997q6cIYKuMClxuX4dZVC6z/hmCm/aAmY/ZyBU=; b=DGCh5yepHUcMNfmAl7LmTMX/uhObuzselFSYrW1DQ2qJUVxveDvDWEQKJzM/tXD6f9 BFm0RK4aX4AXmIJyubd6Bwv0xNAuC9013nfQLe4vi7FWNRcsryMfUfcszKD0VraGaOVo CqgetondKWKtTJlz2NHpChXXS55wMdFwU9GiFC+aL5NfF6stuw4cPWju0w8LDpWVsWca buds68yLjGHc+LtBJqkkDGpu9TERtHmwzy2vQyL+Z2G4WtW+OTTpxLQfdoZB/Lao21PP m2VwAoOxEZjzVZN3Jttu6/RARP7QGld70D8VTBoB1oQjiFX5W+I0f1Ek6YA8JUsos7Bx h3kQ== Received: by 10.180.98.200 with SMTP id ek8mr13293207wib.0.1342857825924; Sat, 21 Jul 2012 01:03:45 -0700 (PDT) Received: from localhost (213-191-157-110.dhcp.iskon.hr. [213.191.157.110]) by mx.google.com with ESMTPS id t8sm2477333wiy.3.2012.07.21.01.03.44 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Jul 2012 01:03:45 -0700 (PDT) Date: Sat, 21 Jul 2012 10:03:44 +0200 From: Luka Perkov To: Simon Baatz Message-ID: <20120721080344.GB22944@w500.iskon.local> Mail-Followup-To: Simon Baatz , u-boot@lists.denx.de, dreagle@doukki.net, prafulla@marvell.com References: <1342814355-25472-1-git-send-email-gmbnomis@gmail.com> <1342814355-25472-2-git-send-email-gmbnomis@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1342814355-25472-2-git-send-email-gmbnomis@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnBPeh2az7t66MSUxzvhwVxzeeqnw1MhzXNzwSIi5rAfRtAFp4MUAoY1jOYYYoaHPWCGZef Cc: dreagle@doukki.net, u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH 2/2] kirkwood: ib62x0: Support flattened devicetree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On Fri, Jul 20, 2012 at 09:59:15PM +0200, Simon Baatz wrote: > Support for the IB-NAS62x0 was added to the Linux mainline kernel > as of 3.5-rc1 using flattened devicetree. Change the config for > this board accordingly. > > Signed-off-by: Simon Baatz > Cc: Luka Perkov > Cc: Prafulla Wadaskar > --- > include/configs/ib62x0.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h > index 85856f2..34c83a4 100644 > --- a/include/configs/ib62x0.h > +++ b/include/configs/ib62x0.h > @@ -37,9 +37,9 @@ > #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ > > /* > - * Machine type > + * Enable device tree support > */ > -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210 > +#define CONFIG_OF_LIBFDT Do we need to change environment variables too? This is how I'm booting OpenWrt with linux 3.3 now: Regards, Luka diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 85856f2..b1c11fd 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -87,25 +87,23 @@ */ #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ - "ubi part root; " \ - "ubifsmount root; " \ + "ubi part rootfs; " \ + "ubifsmount rootfs; " \ "ubifsload 0x800000 ${kernel}; " \ - "ubifsload 0x1100000 ${initrd}; " \ - "bootm 0x800000 0x1100000" + "bootm 0x800000" #define CONFIG_MTDPARTS \ "mtdparts=orion_nand:" \ "0x80000@0x0(uboot)," \ "0x20000@0x80000(uboot_env)," \ - "-@0xa0000(root)\0" + "-@0xa0000(rootfs)\0" #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ "mtdparts="CONFIG_MTDPARTS \ "kernel=/boot/uImage\0" \ - "initrd=/boot/uInitrd\0" \ - "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0" + "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" /* * Ethernet driver configuration