From patchwork Wed Aug 31 15:37:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Hobbs X-Patchwork-Id: 112591 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 B8DA6B6F7F for ; Thu, 1 Sep 2011 01:40:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 495FC2817C; Wed, 31 Aug 2011 17:39:44 +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 8o-Y4X7ix2KE; Wed, 31 Aug 2011 17:39:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1CDFE2818B; Wed, 31 Aug 2011 17:39:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2F55B280FC for ; Wed, 31 Aug 2011 17:38:46 +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 7UpTc5mVpHUT for ; Wed, 31 Aug 2011 17:38:45 +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 smtp205.dfw.emailsrvr.com (smtp205.dfw.emailsrvr.com [67.192.241.205]) by theia.denx.de (Postfix) with ESMTPS id 4D5A228121 for ; Wed, 31 Aug 2011 17:38:18 +0200 (CEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp10.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 0B7A21B86A3; Wed, 31 Aug 2011 11:38:17 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp10.relay.dfw1a.emailsrvr.com (Authenticated sender: jason.hobbs-AT-calxeda.com) with ESMTPSA id E53231B84C5; Wed, 31 Aug 2011 11:38:15 -0400 (EDT) Received: by jhobbs-laptop (sSMTP sendmail emulation); Wed, 31 Aug 2011 10:37:59 -0500 From: "Jason Hobbs" To: u-boot@lists.denx.de Date: Wed, 31 Aug 2011 10:37:32 -0500 Message-Id: <1314805054-16250-12-git-send-email-jason.hobbs@calxeda.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1314805054-16250-1-git-send-email-jason.hobbs@calxeda.com> References: <1314805054-16250-1-git-send-email-jason.hobbs@calxeda.com> Subject: [U-Boot] [PATCH v5 11/13] Convert ca9x4_ct_vxp to standard env variables X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 Signed-off-by: Jason Hobbs Cc: Matt Waddel Tested-by: Matt Waddel --- new in v4 changes for v5: - none include/configs/ca9x4_ct_vxp.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index 8c57eab..7e5dc66 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -129,10 +129,10 @@ #define CONFIG_BOOTCOMMAND "run bootflash;" #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80008000\0" \ - "initrd=0x61000000\0" \ - "kerneladdr=0x44100000\0" \ - "initrdaddr=0x44800000\0" \ - "maxinitrd=0x1800000\0" \ + "ramdisk_addr_r=0x61000000\0" \ + "kernel_addr=0x44100000\0" \ + "ramdisk_addr=0x44800000\0" \ + "maxramdisk=0x1800000\0" \ "console=ttyAMA0,38400n8\0" \ "dram=1024M\0" \ "root=/dev/sda1 rw\0" \ @@ -142,8 +142,8 @@ "mem=${dram} mtdparts=${mtd} mmci.fmax=190000 " \ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ - "cp ${initrdaddr} ${initrd} ${maxinitrd}; " \ - "bootm ${kerneladdr} ${initrd}\0" + "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */