From patchwork Sat Oct 18 07:50:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DrEagle X-Patchwork-Id: 400657 X-Patchwork-Delegate: sr@denx.de 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 45B271400A6 for ; Sat, 18 Oct 2014 18:50:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4608CA73E5; Sat, 18 Oct 2014 09:50:44 +0200 (CEST) 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 jminwKjgAi5S; Sat, 18 Oct 2014 09:50:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71AFD4B608; Sat, 18 Oct 2014 09:50:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7756D4B608 for ; Sat, 18 Oct 2014 09:50:38 +0200 (CEST) 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 48OE2IN30KZO for ; Sat, 18 Oct 2014 09:50:38 +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 milenium.gk2.net (louche.gk2.net [88.178.80.34]) by theia.denx.de (Postfix) with ESMTPS id 458044B604 for ; Sat, 18 Oct 2014 09:50:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by milenium.gk2.net (Postfix) with ESMTP id D5F16110C2B6; Sat, 18 Oct 2014 09:50:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at milenium.gk2.net Received: from milenium.gk2.net ([127.0.0.1]) by localhost (milenium.gk2.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KeirhIClA4FG; Sat, 18 Oct 2014 09:50:29 +0200 (CEST) Received: from BARATARIA.louche.gk2.net (stargate.louche.gk2.net [192.168.0.1]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: gege@milenium.gk2.net) by milenium.gk2.net (Postfix) with ESMTPSA id C9056110C2A7; Sat, 18 Oct 2014 09:50:28 +0200 (CEST) From: Gerald Kerma To: u-boot@lists.denx.de Date: Sat, 18 Oct 2014 09:50:25 +0200 Message-Id: <1413618625-14787-1-git-send-email-drEagle@doukki.net> X-Mailer: git-send-email 1.9.1 Cc: Gerald Kerma , panto@antoniou-consulting.com Subject: [U-Boot] [PATCH 2/2] ARM: sheevaplug: fix ENV offset and MTDPARTS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch redefine ENV offset and MTDPARTS Signed-off-by: Gerald Kerma Changes in v1: - define ENV offset to 0xe0000 - define MTDPARTS and BOOTARGS to stay backward compatibles Signed-off-by: Gerald Kerma --- include/configs/sheevaplug.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 247789c..72b8af1 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -75,8 +75,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ -#define CONFIG_ENV_ADDR 0x80000 -#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ +#define CONFIG_ENV_ADDR 0xe0000 +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */ /* * Default environment variables @@ -86,15 +86,18 @@ "${x_bootcmd_usb}; bootm 0x6400000;" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:512K(uboot)," \ - "512K(env),1M(script),6M(kernel)," \ - "12M(ramdisk),4M(spare),-(rootfs)" + "mtdparts=orion_nand:" \ + "0xe0000@0x0(uboot)," \ + "0x20000@0xe0000(uboot_env)," \ + "3m@1m(kernel)" \ + "1m@4m(script)" \ + "-@5m(root)\0" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ "x_bootcmd_usb=usb start\0" \ - "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" + "x_bootargs_root=root=/dev/mtdblock4 rw rootfstype=jffs2\0" #define MTDIDS_DEFAULT "nand0=orion_nand"