From patchwork Thu Jan 10 14:58:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 211051 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 A12C02C00D8 for ; Fri, 11 Jan 2013 02:02:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B52D34A1B9; Thu, 10 Jan 2013 16:01:30 +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 H+CY3B-zIczC; Thu, 10 Jan 2013 16:01:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A3DB94A1BA; Thu, 10 Jan 2013 15:59:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E1D804A190 for ; Thu, 10 Jan 2013 15:59:20 +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 6M-gRNJcs2DK for ; Thu, 10 Jan 2013 15:59:19 +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-ye0-f201.google.com (mail-ye0-f201.google.com [209.85.213.201]) by theia.denx.de (Postfix) with ESMTPS id 2DB864A156 for ; Thu, 10 Jan 2013 15:58:58 +0100 (CET) Received: by mail-ye0-f201.google.com with SMTP id r11so68964yen.0 for ; Thu, 10 Jan 2013 06:58:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=FsOsDZFC5fgS1PJAI2jbwT6KgLDUhlW/ltcVXKhO3rg=; b=mc+VF2J8QNnlzwBPZtngxCMpZbEayCcYmL1Apq4w83OebuCO6Bpsb7DTSJGNrjqPeF YWfZZQYV37MpOLS9PMQMt0/LxlBwq4z/COMky4rUrpU8DoC+qaYb9DhIa7278aEr6CpT 41x4NqUKwIaDKlBSscxIqQ/tZtyZUP9231zm3xyp97HMSs/Mqwv5dZHZYs3a6C1qaosq soL6TdaEBgx1L/Q7CLZ684Ok4V6yWe/UjTmmxPeSMvZayIgWpybjg/NVFNAd9KElkd4/ y/cqK0SzLk9isGieoRlW88D0Dal+8BZ5M4ZFdScVB9HRJamz4ntnku9uDoL7zMcrYhXR p3QA== X-Received: by 10.236.138.100 with SMTP id z64mr37984416yhi.26.1357829936289; Thu, 10 Jan 2013 06:58:56 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id p19si81855yhi.1.2013.01.10.06.58.56 (version=TLSv1 cipher=AES128-SHA bits=128/128); Thu, 10 Jan 2013 06:58:56 -0800 (PST) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id E2225100049; Thu, 10 Jan 2013 06:58:55 -0800 (PST) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id 92F78160E99; Thu, 10 Jan 2013 06:58:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 10 Jan 2013 06:58:14 -0800 Message-Id: <1357829905-6579-12-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1357829905-6579-1-git-send-email-sjg@chromium.org> References: <1357829905-6579-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQmeVRCWsxY1JorXJkj/akWoLKLCMtLrzoEc1EcSYSrXu+05+wrwoF5HfmEOy2UYyrhzJHPVwEF4K57yNG0VWVOXZMx2TANrOkUL+OYoZXCZuZV4FjGnREP9Htae0uCdzymvDBM9WoPK5KXO00ZoumXY1XSJjnutTnBWLP6pcqWR0xXZ30vLzYVJKR/VlY7R9aJVksI/ Cc: Joe Hershberger , Tom Rini , Vadim Bendebury Subject: [U-Boot] [RFC PATCH 11/22] sparc: Use image_setup_linux() instead of local code 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 Sparc only really sets up the ramdisk, but we should still use image_setup_linux() so that setup is common across all architectures that use the FDT. Signed-off-by: Simon Glass --- arch/sparc/lib/bootm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/sparc/lib/bootm.c b/arch/sparc/lib/bootm.c index bcc6358..472f9ac 100644 --- a/arch/sparc/lib/bootm.c +++ b/arch/sparc/lib/bootm.c @@ -131,17 +131,16 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t * im * extracted and is writeable. */ + ret = image_setup_boot(images); + if (ret) { + puts("### Failed to relocate RAM disk\n"); + goto error; + } + /* Calc length of RAM disk, if zero no ramdisk available */ rd_len = images->rd_end - images->rd_start; if (rd_len) { - ret = boot_ramdisk_high(lmb, images->rd_start, rd_len, - &initrd_start, &initrd_end); - if (ret) { - puts("### Failed to relocate RAM disk\n"); - goto error; - } - /* Update SPARC kernel header so that Linux knows * what is going on and where to find RAM disk. *