diff mbox

[U-Boot,2/2] ARM: bcm2835: add Raspberry Pi model B board

Message ID 1339047925-29052-2-git-send-email-swarren@wwwdotorg.org
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren June 7, 2012, 5:45 a.m. UTC
The Raspberry Pi model B uses the BCM2835 SoC, has 256MB of RAM, contains
an SMSC 9512 USB LAN/Hub chip, and various IO connectors. For more details,
see http://www.raspberrypi.org/.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
 MAINTAINERS                      |    4 ++
 board/raspberrypi/rpi_b/Makefile |   34 ++++++++++++++++
 board/raspberrypi/rpi_b/rpi_b.c  |   32 +++++++++++++++
 boards.cfg                       |    1 +
 include/configs/rpi_b.h          |   80 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 151 insertions(+)
 create mode 100644 board/raspberrypi/rpi_b/Makefile
 create mode 100644 board/raspberrypi/rpi_b/rpi_b.c
 create mode 100644 include/configs/rpi_b.h

Comments

Graeme Russ June 16, 2012, 5:42 a.m. UTC | #1
Hi Stephen,

On 06/07/2012 03:45 PM, Stephen Warren wrote:
> The Raspberry Pi model B uses the BCM2835 SoC, has 256MB of RAM, contains
> an SMSC 9512 USB LAN/Hub chip, and various IO connectors. For more details,
> see http://www.raspberrypi.org/.
> 
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

Now I really can't wait for my Raspberry Pi to turn up (due on 25 June)

Looking forward to trying this out - any hints / traps for young players?

Regards,

Graeme
Stephen Warren June 18, 2012, 3:54 a.m. UTC | #2
On 06/15/2012 11:42 PM, Graeme Russ wrote:
> Hi Stephen,
> 
> On 06/07/2012 03:45 PM, Stephen Warren wrote:
>> The Raspberry Pi model B uses the BCM2835 SoC, has 256MB of RAM, contains
>> an SMSC 9512 USB LAN/Hub chip, and various IO connectors. For more details,
>> see http://www.raspberrypi.org/.
>>
>> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
> 
> Now I really can't wait for my Raspberry Pi to turn up (due on 25 June)
> 
> Looking forward to trying this out - any hints / traps for young players?

Mostly U-Boot on RPi works like it would anywhere else. The few things
to watch out for are:

a) Pick the correct toolchain to build with. For my branch, I assumed
everyone was building for armhf/hardfp these days, and so from the tools
repo:

https://github.com/raspberrypi/tools.git

I picked the toolchain in the x86-linux64-cross-arm-linux-hardfp
sub-directory, and adjusted the U-Boot Makefiles to suite options
required for that toolchain.

However, Oleksandr's U-Boot branch appears to rely upon the armel/softfp
toolchain in the linux-x86 sub-directory.

b) You need to appropriate stuff in config.txt on the SD card - I
apparently have:

device_tree=kernel.dtb
device_tree_address=0x100
kernel_address=0x8000
disable_commandline_tags=1

and I store U-Boot in kernel.img.

(although I think the DT-related values are irrelevant when I'm booting
U-Boot instead of a kernel)

You will of course need a 3.3v serial->something (USB or true RS232)
adapter hooked up to GPIO header pins 6/8/10 for the console, since
there's no video output support in U-Boot yet (although I suppose we
could add USB keyboard support soon...)

Oh, and you'll probably want to update the binary firmware images on
your SD card to the latest from:
https://github.com/raspberrypi/firmware.git

The following email from Oleksandr will be interesting too:
http://lists.infradead.org/pipermail/linux-rpi-kernel/2012-June/000060.html

Of course, this is all if you specifically want to use U-Boot. The
default boot process already works completely, without involving U-Boot,
but of course doesn't support e.g. network booting.
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index f796872..f12d862 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -913,6 +913,10 @@  Stephen Warren <swarren@nvidia.com>
 	ventana		Tegra2 (ARM7 & A9 Dual Core)
 	paz00		Tegra2 (ARM7 & A9 Dual Core)
 
+Stephen Warren <swarren@wwwdotorg.org>
+
+	rpi_b		BCM2835 (ARM1176)
+
 Thomas Weber <weber@corscience.de>
 
 	devkit8000	ARM ARMV7 (OMAP3530 SoC)
diff --git a/board/raspberrypi/rpi_b/Makefile b/board/raspberrypi/rpi_b/Makefile
new file mode 100644
index 0000000..9d0c377
--- /dev/null
+++ b/board/raspberrypi/rpi_b/Makefile
@@ -0,0 +1,34 @@ 
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c
new file mode 100644
index 0000000..f39440f
--- /dev/null
+++ b/board/raspberrypi/rpi_b/rpi_b.c
@@ -0,0 +1,32 @@ 
+/*
+ * (C) Copyright 2012 Stephen Warren
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+	gd->ram_size = SZ_256M;
+
+	return 0;
+}
+
+int board_init(void)
+{
+	return 0;
+}
diff --git a/boards.cfg b/boards.cfg
index 0dee43f..b82534e 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -48,6 +48,7 @@  mx35pdk                      arm         arm1136     -                   freesca
 apollon			     arm	 arm1136     apollon		 -	        omap24xx
 omap2420h4                   arm         arm1136     -                   ti             omap24xx
 tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
+rpi_b                        arm         arm1176     rpi_b               raspberrypi    bcm2835
 integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
 integratorap_cm920t          arm         arm920t     integrator          armltd         -           integratorap:CM920T
 integratorcp_cm920t          arm         arm920t     integrator          armltd         -           integratorcp:CM920T
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
new file mode 100644
index 0000000..f547027
--- /dev/null
+++ b/include/configs/rpi_b.h
@@ -0,0 +1,80 @@ 
+/*
+ * (C) Copyright 2012 Stephen Warren
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <asm/sizes.h>
+
+/* Architecture, CPU, etc.*/
+#define CONFIG_ARM1176
+#define CONFIG_BCM2835
+
+/* Timer */
+#define CONFIG_SYS_HZ			1000000
+
+/* Memory layout */
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_TEXT_BASE		0x00008000
+#define CONFIG_SYS_SDRAM_BASE		0x00000000
+#define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_INIT_RAM_SIZE	SZ_4K
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_MALLOC_LEN		SZ_4M
+#define CONFIG_SYS_MEMTEST_START	0x00100000
+#define CONFIG_SYS_MEMTEST_END		0x00200000
+
+/* Flash */
+#define CONFIG_SYS_NO_FLASH
+
+/* Devices */
+/* None yet */
+
+/* Console UART */
+#define CONFIG_PL011_SERIAL
+#define CONFIG_PL011_CLOCK		3000000
+#define CONFIG_PL01x_PORTS		{ (void *)0x20201000 }
+#define CONFIG_CONS_INDEX		0
+#define CONFIG_BAUDRATE			115200
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+
+/* Console configuration */
+#define CONFIG_SYS_CBSIZE		1024
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE +		\
+					 sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/* Environment */
+#define CONFIG_ENV_SIZE			SZ_16K
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_SYS_LOAD_ADDR		0x1000000
+
+/* Shell */
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_MAXARGS		8
+#define CONFIG_SYS_PROMPT		"U-Boot> "
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_COMMAND_HISTORY
+#define CONFIG_AUTO_COMPLETE
+
+/* Commands */
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_MISC
+
+#endif