Commit graph

28 commits

Author SHA1 Message Date
Alberto Bursi
e13d9cd07f uboot-kirkwood: fix malformed boot configuration
With current uboot default configuration the bootloader will
fail to start the OpenWrt firmware with the following error:
-----
unexpected character 'b' at the end of partition
Error initializing mtdparts!
incorrect device type in ubi
Partition ubi not found!
Error, no UBI device/partition selected!
Wrong Image Format for bootm command
Error occured, error code = 112
-----

If the uboot configuration is examined with printenv
I can see that mdtparts line (on a nsa310) is wrong:
-----
mtdparts=mtdparts=orion_nand:0x0c0000(uboot),
0x80000(uboot_env),0x7ec0000(ubi)bootargs_root=
----

The "bootargs_root=" that was appended to it should not be there.

Fix the issue by adding a \0 line terminator at the end of affected lines,
mimicking what is also done by uboot upstream.

This issue was detected and confirmed on a nsa310, nsa325 and
a pogoplug v4, but it's not hardware-specific, so apply the same fix
to other devices as well.

Note that the issue is with the uboot's integrated boot configuration,
which is not used unless the uboot configuration in flash is unavailable
(erased or corrupted), which happens only on first time installation,
or if the user deletes the uboot configuration when upgrading uboot.
People just upgrading from an older uboot without erasing their previous
uboot configuration stored in flash would not have noticed this issue.

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-06-27 08:42:54 +02:00
Alberto Bursi
ccd1dc3d20 uboot-kirkwood: fix whitespaces
remove whitespaces from the patches

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-06-27 08:42:54 +02:00
Paul Wassi
f21cd96400 uboot-kirkwood: update to 2018.03
U-Boot now requires GCC > 5

Catch up with upstream and move some configuration options from
the header files to the corresponding defconfig files.
Also move some options of patch 010 affecting the whole platform
to 010's device only.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2018-03-20 21:45:27 +01:00
Alberto Bursi
f5d267df63 uboot-kirkwood: add uboot for pogoplug v4
add an uboot able to boot a kernel in an ubi partition

This uboot also has a "recovery" feature, before
booting from flash it will try to boot a initramfs
image called "initramfs.bin" from a FAT32-formatted
USB drive connected to the USB 2.0 port.
(u-boot lacks drivers for usb 3.0 controllers)

Just rename the initramfs image and place it on
the usb drive, the uboot will load it.

In case there is no USB drive or no such file
is found, the uboot will boot from internal flash.

The whole check takes less than a second, boot times
are not impacted.

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2018-01-09 22:06:55 +01:00
Mathias Kresin
0ebdf0c1d3 kirkwood: drop support for orphaned boards
No image build code for the Guruplug, Sheevaplug and NSA310S exists. Drop
support for the boards for now.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2018-01-09 22:06:54 +01:00
Paul Wassi
67da6a7c5e uboot-kirkwood: update to 2017.09
Upgrade uboot-kirkwood to upstream release 2017.09
Catch up with upstream and move configuration options from
simple defines to Kconfig, as otherwise dependencies would
not be resolved and code would not compile.

Tested-by: Alberto Bursi <alberto.bursi@outlook.it>
Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2017-11-03 20:04:52 +01:00
Paul Wassi
55920643b1 package/boot/uboot-kirkwood: fix build errors for nsa310 and nsa325
With upstream changes, the last update to U-Boot 2017.03
broke the nsa310 and nsa325 targets. Also fix some redefines.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2017-03-27 08:09:00 +02:00
Paul Wassi
c95c3165b9 package/boot: update uboot-kirkwood to 2017.03
Bump uboot-kirkwood to upstream release 2017.03

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2017-03-20 08:19:35 +01:00
Alberto Bursi
3b90ed8c18 uboot-kirkwood: fix usb of nsa310b u-boot
fixes issue "nsa 310b u-boot can initialize usb but cannot
use usb storage so it cannot load files from usb"

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-02-14 12:26:20 +01:00
Alberto Bursi
add1dd0081 uboot-kirkwood: add Zyxel NSA325 uboot
add uboot for NSA325

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-02-11 21:16:28 +01:00
Alberto Bursi
a9d347c11c uboot-kirkwood: fix goflexhome/net bootcommand
Goflexhome/net use uImage, and to boot an uImage the u-boot
must use bootm command, not bootz.

Fixes the "i cannot boot LEDE with this u-boot" issue that I
found out myself with my goflexnet.

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-02-09 12:26:48 +01:00
Alberto Bursi
a6ef5933f8 uboot-kirkwood: remove obsolete patches
all patches for CONFIG_SYS_GENERIC_BOARD are obsolete for
uboot 2016 sources.

Run-tested with the uboot of goflexnet, also the md5sum of
all other uboots is the same with or without these patches.

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-02-09 12:26:42 +01:00
Alberto Bursi
3d1b2b22d6 uboot-kirkwood: add uboot for nsa310b
this commit allows to make a standalone u-boot for nsa310b.

While both first-stage and second-stage u-boot work fine if
installed to flash or loaded with kwboot,
I could not get stock u-boot nor bodhi's u-boot to chainload
any second stage u-boot (I also tried with dockstar's uboot
that works fine on this device if loaded with kwboot).

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
2017-01-24 16:21:24 +01:00
Felix Fietkau
c9e4cf2299 kirkwood: convert iconnect, ib62x0 and pogoplug_e02 to the new image build code
Update the correspoding u-boot configs to stop relying on
kernel-in-rootfs, which was removed a while back

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-12-24 09:40:46 +01:00
Paul Wassi
776aa91b0f uboot-kirkwood: fix default bootcmd for Seagate Dockstar
Fix the default value for the 'bootcmd' environment variable.
Therefore make the default bootcmd work for buildbot's images.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2016-10-27 12:45:02 +02:00
Paul Wassi
705240eeb5 uboot-kirkwood: bump to upstream 2016.09.01
Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches
cleaned up and reworked.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
2016-10-27 12:44:54 +02:00
Luka Perkov
9d0c1f484b uboot-kirkwood/goflexhome: explicit define the size of the last partition
Explicit sets the size of the mtdparts, because the kernel has also an explicit value.
If they have diffent sizes the ubi won't be detected.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 49018
2016-03-14 17:06:18 +00:00
Luka Perkov
35c91a2274 uboot-kirkwood/goflexhome: add forgotten include openwrt-kirkwood-common.h"
otherwise the uboot is missing important commands like bootz

Signed-off-by: Martin Mueller <mm@sig21.net>
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 49017
2016-03-14 17:06:17 +00:00
Luka Perkov
c28e41f0d7 uboot-kirkwood/goflexhome: update bootargs to use new ubi style
Since switching to new ubi(kernel,squashfs,ubifs) layout, the kernel lies in a
ubi volume. Dropping the mtd parts because the mtd layout is saved in the
device-tree, which is appended to the zImage.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 49016
2016-03-14 17:06:16 +00:00
Luka Perkov
f533c86d12 uboot/kirkwood: correct mtdparts + cmdline for new ubifs on dockstar
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

SVN-Revision: 49012
2016-03-14 17:06:11 +00:00
Hauke Mehrtens
923a59315c uboot-kirkwood: fix build with gcc-5
This backports a patch from upstream u-boot to make it compile with gcc-5.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 47537
2015-11-20 22:50:11 +00:00
Luka Perkov
c595a59680 uboot-kirkwood: bump to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 43436
2014-11-30 03:55:44 +00:00
Luka Perkov
ead1765057 uboot-kirkwood: bump to 2014.07
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 42080
2014-08-08 15:55:03 +00:00
Luka Perkov
d3fc4fbd74 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
2014-05-23 08:17:01 +00:00
Luka Perkov
44c890b6f1 uboot-kirkwood: update to 2014.04
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 40804
2014-05-20 12:45:02 +00:00
Luka Perkov
777e7c3ff5 uboot-kirkwood: update to 2013.10
Tested on:

 * Cloud Engines Pogoplug E02
 * RaidSonic ICY BOX IB-NAS62x0
 * Iomega Iconnect

Some users are avoiding to replace their bootloader, because of that add
support for second stage u-boot image. Having ubifs capable bootloader is
required in order to boot current OpenWrt trunk.

Sample ib62x0 commands for running second stage bootloader:

tftpboot 0x800000 uboot-kirkwood-ib62x0_second_stage/openwrt-kirkwood-ib62x0_second_stage-u-boot.img
bootm 0x800000

Sample ib62x0 commands for flashing second stage bootloader:

tftpboot 0x800000 uboot-kirkwood-ib62x0_second_stage/openwrt-kirkwood-ib62x0_second_stage-u-boot.img
nand erase 0x100000 0x100000 ; nand write 0x800000 0x100000 0x${filesize}
nand read 0x800000 0x100000 0x100000 ; bootm 0x800000

While at it include parallel build support, use alphabetic order of the boards
and introduce common OpenWrt configuration.

Signed-off-by: Luka Perkov <luka@openwrt.org>
Tested-by (on ib62x0): Luka Perkov <luka@openwrt.org>
Tested-by (on dockstar): Alexander Couzens <lynxis@fe80.eu>
Tested-by (on iconnect): Wojciech Dubowik <wojciech.dubowik@neratec.com>
CC: Felix Kaechele <heffer@fedoraproject.org>
CC: Wojciech Dubowik <wojciech.dubowik@neratec.com>
CC: Alexander Couzens <lynxis@fe80.eu>
CC: Daniel Engberg <daniel.engberg@pyret.net>
CC: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 39590
2014-02-15 23:53:07 +00:00
Luka Perkov
702f2590ea uboot-kirkwood: update to 2012.10
SVN-Revision: 34303
2012-11-22 21:16:04 +00:00
John Crispin
e75106aa0d move boot related packages to their own folder
SVN-Revision: 33781
2012-10-16 13:44:25 +00:00