From patchwork Wed Aug 1 04:13:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 174375 X-Patchwork-Delegate: trini@ti.com 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 CCF1D2C009B for ; Wed, 1 Aug 2012 14:15:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 389A528104; Wed, 1 Aug 2012 06:14:56 +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 xMD2+8xz2QDC; Wed, 1 Aug 2012 06:14:55 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 11FB5280C7; Wed, 1 Aug 2012 06:14:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 94C0C2808C for ; Wed, 1 Aug 2012 06:14:00 +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 FQds5JzU5tqs for ; Wed, 1 Aug 2012 06:14:00 +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 avon.wwwdotorg.org (avon.wwwdotorg.org [70.85.31.133]) by theia.denx.de (Postfix) with ESMTPS id 09F5E28082 for ; Wed, 1 Aug 2012 06:13:58 +0200 (CEST) Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 1A3D49EA39; Tue, 31 Jul 2012 22:19:53 -0600 (MDT) Received: from dart.wwwdotorg.org.wwwdotorg.org (c-98-245-172-142.hsd1.co.comcast.net [98.245.172.142]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 90D76E47A3; Tue, 31 Jul 2012 22:13:56 -0600 (MDT) From: Stephen Warren To: Albert Aribaud Date: Tue, 31 Jul 2012 22:13:38 -0600 Message-Id: <1343794423-30553-9-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343794423-30553-1-git-send-email-swarren@wwwdotorg.org> References: <1343794423-30553-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean Cc: u-boot@lists.denx.de, linux-rpi-kernel@lists.infradead.org, Tom Rini , Oleksandr Tymoshenko Subject: [U-Boot] [PATCH V2 08/13] ARM: rpi_b: enable booting the Linux kernel 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 CONFIG_OF_LIBFDT allows bootm/bootz to pass a device tree to the kernel. Set bi_boot_params to define where ATAGs will be written (extracted from work by Oleksandr Tymoshenko ). Add ATAG support for bootm/bootz. Newer kernels use device tree, so this isn't that useful. However, old kernels all use board files, so this might still see some use. Enable bootz command to allow booting a zImage directly. Signed-off-by: Stephen Warren --- v2: Squashed the following commits into one: ARM: rpi_b: add ATAG support for bootm/bootz ARM: rpi_b: set bi_boot_params ARM: rpi_b: enable CONFIG_OF_LIBFDT ARM: rpi_b: enabled bootz command --- board/raspberrypi/rpi_b/rpi_b.c | 2 ++ include/configs/rpi_b.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index f39440f..26df74b 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -28,5 +28,7 @@ int dram_init(void) int board_init(void) { + gd->bd->bi_boot_params = 0x100; + return 0; } diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h index f34cc03..9c96d0e 100644 --- a/include/configs/rpi_b.h +++ b/include/configs/rpi_b.h @@ -81,10 +81,18 @@ /* Commands */ #include +#define CONFIG_CMD_BOOTZ /* Some things don't make sense on this HW or yet */ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS #undef CONFIG_CMD_SAVEENV +/* Device tree support for bootm/bootz */ +#define CONFIG_OF_LIBFDT +/* ATAGs support for bootm/bootz */ +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_CMDLINE_TAG +#define CONFIG_INITRD_TAG + #endif