diff mbox

[U-Boot,V2,08/13] ARM: rpi_b: enable booting the Linux kernel

Message ID 1343794423-30553-9-git-send-email-swarren@wwwdotorg.org
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren Aug. 1, 2012, 4:13 a.m. UTC 
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 <gonzo@bluezbox.com>).

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 <swarren@wwwdotorg.org>
---
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 mbox

Patch

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 <config_cmd_default.h>
+#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