From patchwork Mon Apr 28 20:17:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 343570 X-Patchwork-Delegate: sbabic@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 DEB5B14009A for ; Tue, 29 Apr 2014 06:18:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0819F4B8EA; Mon, 28 Apr 2014 22:18:29 +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 OdjkXtc3Y4Oe; Mon, 28 Apr 2014 22:18:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 781B94B946; Mon, 28 Apr 2014 22:18:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 943B84B80F for ; Mon, 28 Apr 2014 22:18:04 +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 82IO7YVAJRYF for ; Mon, 28 Apr 2014 22:18:01 +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-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by theia.denx.de (Postfix) with ESMTPS id 188CF4B803 for ; Mon, 28 Apr 2014 22:17:50 +0200 (CEST) Received: by mail-pb0-f49.google.com with SMTP id rr13so6166193pbb.8 for ; Mon, 28 Apr 2014 13:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dmeq8L9eoctU/XkEcgFcnVEzxSS8VL7LSlaBfZEOfyQ=; b=LmbfxhB1Sals402tQz6IUQzsW0XQsDcRV07xhBQSCBhYlb5NSurUWa83TzMkDd0Kq9 BpSDTuSfrRJc3mAIUIrsp38FWHYDGUrdjpDj4icMR1dWygvjW9BAUautuMjhZuKWvq/i yyvNo+iIWupOH2L5EgPw7f/jLnQa/7ibTLNVFRd1cFq8ktKQKARrKSqqLnGpBWm44fJc EMAfqQ6X+V3fZkwRh4lOslL7CjOamQX4Od+NKM/JbXt497E8G927WtO5uHQ3GBmjq6op y2e7b/pKs5RuZgHg5sMCaZKhEzGfHOakFMPmmcac5QOjYS1abKMPZZ2GsyjWc2b1h1Ch 4RGQ== X-Gm-Message-State: ALoCoQkbzZVZQiIOy5eTgjBbD2OUny1NbLnB3LFQzjylHpJSok4CamkondSC0CB0gdrJUEbnZbcO X-Received: by 10.66.124.163 with SMTP id mj3mr27683227pab.38.1398716267383; Mon, 28 Apr 2014 13:17:47 -0700 (PDT) Received: from tharvey-gw.gw (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by mx.google.com with ESMTPSA id zv3sm96756925pab.20.2014.04.28.13.17.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 13:17:46 -0700 (PDT) From: Tim Harvey To: Stefano Babic Date: Mon, 28 Apr 2014 13:17:27 -0700 Message-Id: <1398716258-8420-2-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398716258-8420-1-git-send-email-tharvey@gateworks.com> References: <1398716258-8420-1-git-send-email-tharvey@gateworks.com> Cc: Otavio Salvador , Scott Wood , u-boot@lists.denx.de, Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH 01/12] SPL: NAND: remove CONFIG_SYS_NAND_PAGE_SIZE 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 We only need to read in the size of struct image_header and thus don't need to know the page size of the nand device. Cc: Scott Wood Signed-off-by: Tim Harvey Acked-by: Stefano Babic Acked-by: Scott Wood --- v2: - cc Scott Wood on this - Acked-by: Stefano Babic - Acked-by: Scott Wood --- common/spl/spl_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 9da0218..062461b 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -76,7 +76,7 @@ void spl_nand_load_image(void) #endif /* Load u-boot */ nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, - CONFIG_SYS_NAND_PAGE_SIZE, (void *)header); + sizeof(*header), (void *)header); spl_parse_image_header(header); nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, spl_image.size, (void *)spl_image.load_addr);