From patchwork Thu Feb 2 02:57:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 139069 X-Patchwork-Delegate: albert.aribaud@free.fr 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 E6894104785 for ; Thu, 2 Feb 2012 13:59:13 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 88CBA28100; Thu, 2 Feb 2012 03:58:52 +0100 (CET) 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 sPlaQ+9n1+ba; Thu, 2 Feb 2012 03:58:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 26B3728101; Thu, 2 Feb 2012 03:58:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03868280C6 for ; Thu, 2 Feb 2012 03:58:34 +0100 (CET) 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 AQSpBbLSIT0G for ; Thu, 2 Feb 2012 03:58:33 +0100 (CET) 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-tul01m020-f172.google.com (mail-tul01m020-f172.google.com [209.85.214.172]) by theia.denx.de (Postfix) with ESMTPS id B96B7280AC for ; Thu, 2 Feb 2012 03:58:23 +0100 (CET) Received: by mail-tul01m020-f172.google.com with SMTP id wd15so2200089obb.3 for ; Wed, 01 Feb 2012 18:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=zO9QitUzhJveCcj+ZGo7QTHhoWg/MuvJ8oCv9AzRFko=; b=I41slxp59pQkIZhrM+XagXWpJwUkboTDFojiMT3gzN2yu8JtyK/hOA5kdEPsWEGG+l isRhq7/w6o2wlmJUijzI3RPzxwg0q7tLdUJ/rcONLtzK9qUF030wwv50Jaq0I7n/HLlE 9jfYDKCHy1TLY3z7x2/ps+K9ajj9ZjhCPXOts= Received: by 10.182.86.229 with SMTP id s5mr991916obz.37.1328151503460; Wed, 01 Feb 2012 18:58:23 -0800 (PST) Received: from rob-laptop.i.smooth-stone.com (65-36-72-55.dyn.grandenetworks.net. [65.36.72.55]) by mx.google.com with ESMTPS id y4sm1140854obj.10.2012.02.01.18.58.22 (version=SSLv3 cipher=OTHER); Wed, 01 Feb 2012 18:58:22 -0800 (PST) From: Rob Herring To: u-boot@lists.denx.de Date: Wed, 1 Feb 2012 20:57:56 -0600 Message-Id: <1328151477-8026-6-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1328151477-8026-1-git-send-email-robherring2@gmail.com> References: <1328151477-8026-1-git-send-email-robherring2@gmail.com> Cc: Rob Herring Subject: [U-Boot] [PATCH 5/6] ARM: highbank: change env config to use nvram 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Jason Hobbs Update the highbank config to use env from NVRAM. Also remove extra env settings as they are not used unless the default env is used. Signed-off-by: Jason Hobbs Signed-off-by: Rob Herring --- include/configs/highbank.h | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 801f4ae..7f93d5e 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -93,12 +93,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x800000 -#define CONFIG_EXTRA_ENV_SETTINGS \ - "fdtaddr_r=0x600000\0" \ - "pxefile_addr_r=0x700000\0" \ - "kernel_addr_r=0x800000\0" \ - "ramdisk_addr_r=0x01000000\0" \ - /*----------------------------------------------------------------------- * Stack sizes * @@ -118,9 +112,13 @@ #define CONFIG_SYS_MEMTEST_START 0x100000 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1_SIZE - 0x100000) -/* Room required on the stack for the environment data */ -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_IS_NOWHERE +/* Environment data setup +*/ +#define CONFIG_ENV_IS_IN_NVRAM +#define CONFIG_SYS_NVRAM_BASE_ADDR 0xfff88000 /* NVRAM base address */ +#define CONFIG_SYS_NVRAM_SIZE 0x8000 /* NVRAM size */ +#define CONFIG_ENV_SIZE 0x2000 /* Size of Environ */ +#define CONFIG_ENV_ADDR CONFIG_SYS_NVRAM_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_TEXT_BASE 0x00008000