aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-05-23 08:17:01 +0000
committerLuka Perkov <luka@openwrt.org>2014-05-23 08:17:01 +0000
commitd3fc4fbd74dcd4dbeaa29d222337eeb6c187a4fd (patch)
tree17c9660df2f09ff138ea72327fc0a3df1848cb69
parent3bb20dedcd822ad5ed44e8bb2bcff7b15d447eef (diff)
downloadupstream-d3fc4fbd74dcd4dbeaa29d222337eeb6c187a4fd.tar.gz
upstream-d3fc4fbd74dcd4dbeaa29d222337eeb6c187a4fd.tar.bz2
upstream-d3fc4fbd74dcd4dbeaa29d222337eeb6c187a4fd.zip
uboot-kirkwood: re-add Pogoplug E02 support
This patch modifies the u-boot config for the Pogoplug E02 to work with OpenWrt. It also enables building a second stage bootloader image. Signed-off-by: Felix Kaechele <heffer@fedoraproject.org> SVN-Revision: 40828
-rw-r--r--package/boot/uboot-kirkwood/Makefile6
-rw-r--r--package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch58
-rw-r--r--package/boot/uboot-kirkwood/patches/200-openwrt-config.patch2
3 files changed, 64 insertions, 2 deletions
diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile
index 45046690ff..0f0314319f 100644
--- a/package/boot/uboot-kirkwood/Makefile
+++ b/package/boot/uboot-kirkwood/Makefile
@@ -61,6 +61,10 @@ define uboot/pogo_e02
TITLE:=U-Boot for Cloud Engines Pogoplug E02
endef
+define uboot/pogo_e02_second_stage
+ TITLE:=second stage U-Boot for Cloud Engines Pogoplug E02
+endef
+
define uboot/sheevaplug
TITLE:=U-Boot for SheevaPlug
endef
@@ -70,7 +74,7 @@ UBOOTS:= \
goflexhome \
ib62x0 ib62x0_second_stage \
iconnect iconnect_second_stage \
- pogo_e02 \
+ pogo_e02 pogo_e02_second_stage \
sheevaplug
define Package/uboot/template
diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
new file mode 100644
index 0000000000..b8c9c12ba7
--- /dev/null
+++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@ -0,0 +1,58 @@
+--- a/boards.cfg
++++ b/boards.cfg
+@@ -168,6 +168,7 @@ Active arm arm926ejs davin
+ Active arm arm926ejs kirkwood buffalo lsxl lschlv2 lsxl:LSCHLV2 Michael Walle <michael@walle.cc>
+ Active arm arm926ejs kirkwood buffalo lsxl lsxhl lsxl:LSXHL Michael Walle <michael@walle.cc>
+ Active arm arm926ejs kirkwood cloudengines - pogo_e02 - Dave Purdy <david.c.purdy@gmail.com>
++Active arm arm926ejs kirkwood cloudengines pogo_e02 pogo_e02_second_stage pogo_e02:SECOND_STAGE Felix Kaechele <felix@fetzig.org>
+ Active arm arm926ejs kirkwood d-link - dns325 - Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
+ Active arm arm926ejs kirkwood iomega - iconnect - Luka Perkov <luka@openwrt.org>
+ Active arm arm926ejs kirkwood iomega iconnect iconnect_second_stage iconnect:SECOND_STAGE Luka Perkov <luka@openwrt.org>
+--- a/include/configs/pogo_e02.h
++++ b/include/configs/pogo_e02.h
+@@ -62,23 +62,35 @@
+ #endif
+
+ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
+-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
++#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
+
+ /*
+ * Default environment variables
+ */
+ #define CONFIG_BOOTCOMMAND \
+- "setenv bootargs $(bootargs_console); " \
+- "run bootcmd_usb; " \
+- "bootm 0x00800000 0x01100000"
++ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
++ "ubi part root; " \
++ "ubifsmount ubi:rootfs; " \
++ "ubifsload 0x800000 ${kernel}; " \
++ "ubifsload 0x700000 ${fdt}; " \
++ "ubifsumount; " \
++ "fdt addr 0x700000; fdt resize; fdt chosen; " \
++ "bootz 0x800000 - 0x700000"
++
++#define CONFIG_MTDPARTS \
++ "mtdparts=orion_nand:" \
++ "0xe0000@0x0(uboot)," \
++ "0x20000@0xe0000(uboot_env)," \
++ "0x100000@0x100000(second_stage_uboot)," \
++ "-@0x200000(root)\0"
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+- "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
+- "32M(rootfs),-(data)\0"\
+- "mtdids=nand0=orion_nand\0"\
+- "bootargs_console=console=ttyS0,115200\0" \
+- "bootcmd_usb=usb start; ext2load usb 0:1 0x00800000 /uImage; " \
+- "ext2load usb 0:1 0x01100000 /uInitrd\0"
++ "console=console=ttyS0,115200\0" \
++ "mtdids=nand0=orion_nand\0" \
++ "mtdparts="CONFIG_MTDPARTS \
++ "kernel=/boot/zImage\0" \
++ "fdt=/boot/pogo_e02.dtb\0" \
++ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
+
+ /*
+ * Ethernet Driver configuration
diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
index 0c3e6781cc..f9aae0faaf 100644
--- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@ -82,7 +82,7 @@
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -102,4 +102,6 @@
+@@ -114,4 +114,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO