Commit Graph

63 Commits

Author SHA1 Message Date
Jonas Gorski
c0841b3c4e mvebu: append metadata to clearfog sd card images
Fixes the following issue:

root@LEDE:/# sysupgrade /tmp/lede-mvebu-armada-388-clearfog-sdcard.img.gz
Saving metaconfig...
Image metadata not found
Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware
Image check 'fwtool_check_image' failed.
root@LEDE:/#

Acked-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
2017-02-13 17:50:41 +01:00
Jo-Philipp Wich
237bd36135 mvebu: put u-boot images into image staging directory
Do not put the u-boot images into the kernel build directory as this directory
might get removed after kernel updates while the u-boot packages InstallDev
recipe is not getting re-executed because it is still considered current,
leading to image build failures later on due to missing u-boot images.

To ensure that built bootloader images persist over kernel version updates in
the buildroot, put them into the new STAGING_DIR_IMAGE directory.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-27 16:53:31 +01:00
Felix Fietkau
366c33962c uboot-mvebu: switch to u-boot.mk
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-01-24 16:21:24 +01:00
Felix Fietkau
6f57e32f95 mvebu: remove the clearfog-bundle
It is obsoleted by proper SD card image support

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-01-13 16:59:28 +01:00
Mathias Kresin
c95e4e715d mvebu: fix image validation error
The name from the Device define will be used in the metadata. Due to
typo/different spelling, this name might not match the one exported in
/lib/mvebu.sh.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-12-04 07:03:17 +01:00
Mathias Kresin
7cc0d8b3bd mvebu: fix typo in image metadata support
Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-11-27 15:34:22 +01:00
Felix Fietkau
9fc0bcdd18 mvebu: use image metadata for firmware validation
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-11-24 12:53:17 +01:00
Imre Kaloz
3764caa934 mvebu: add support for the Linksys WRT3200ACM (Rango)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2016-10-24 08:45:06 +02:00
Jonas Gorski
6859098d97 mvebu: add sysupgrade support for clearfog
Add and enable sysupgrade support for clearfog boards, based on how the
brcm2708 target does it.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
2016-09-26 13:04:53 +02:00
Jonas Gorski
c359d7e81b mvebu: add switch node to clearfog
Add a switch node to clearfog to probe and initialize it on Clearfog
Pro. This make the switch work and allows using all six switch ports.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
2016-09-26 13:04:47 +02:00
Jonas Gorski
d8075b15d0 uboot-mvebu: make hidden and be m for clearfog to fix IB failing to add it
Uboot-mvebu isn't a real package, which will break the image builder
when it tries to install it during the packing step. Instead of cleafog
selecting it through its default packages, make it default to m if the
clearfog profile is selected.

This will ensure it is always build, but never added to the rootfs. This
fixes creating images for clearfog with IB.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
2016-09-26 12:48:18 +02:00
Jonas Gorski
bc1f006b4e uboot-mvebu: also install into KDIR to ensure it packaged in IB
The clearfog image requires u-boot, so package it into KDIR to make sure
it is available in imageBuilder.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
2016-09-26 12:47:36 +02:00
Mathias Kresin
61c2a7339a image: remove padding parameter from append-kernel/append-rootfs
Using pad-to instead of passing the optional padding to append-kernel
or append-rootfs. It could be that the value of a variable is passed.
In case the variable is empty no error is thrown.

Furthermore the purpose of the extra parameter is hard to get without
reading the code.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-09-13 19:36:41 +02:00
Mathias Kresin
1cd0a4c688 image: add KERNEL_SIZE to the default device vars
This reverts commit ec37a56587 and fixes
the underlying issue.
2016-09-13 19:36:41 +02:00
Felix Fietkau
d27bce8d28 build: drop UBI EOF marker from images by default
Only add them where they are actually required.
Should help with compatibility issues with stock U-Boot images that
access UBI

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-12 18:21:52 +02:00
Mathias Kresin
306f1c7846 mvebu: fix OpenBlocks AX3 image
The KERNEL_SIZE variable is unset and no padding is applied. This looks
like a typo to me since the ubinized image need to be aligned to the
flash blocksize.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-09-11 19:40:45 +02:00
Felix Fietkau
3cbb7820a4 mvebu: use ext4/f2fs overlay filesystem for solidrun clearfog
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-10 12:17:39 +02:00
Felix Fietkau
bee30de984 mvebu: enable ext4, f2fs and loop device support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-10 12:17:39 +02:00
Mathias Kresin
e7ec7a08aa image: use k as unit suffix for blocksize
Use k as unit suffix for kilobyte to have a the same unit regardless of
the used filesystem.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-09-04 08:56:05 +02:00
Felix Fietkau
2d7d9baf19 mvebu: use ptgen instead of fdisk to make the clearfog image script more portable
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-02 14:43:53 +02:00
Josua Mayer
3242c07649 mvebu: add sdcard image creation script
Added gen_mvebu_sdcard_img.sh to facilitate creating an fixed-size sdcard image,
adding the bootloader and populating it with actual data.

Added the required rules for creating a 4GB sdcard image according to this layout:
p0: boot (fat32)
p1: rootfs (squashfs)
p2: rootfs_data (ext4)
This should be generic to any mvebu boards that can boot from block storage.

Added the new sdcard image to the Clearfog image profile.

Signed-off-by: Josua Mayer <josua.mayer97@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [cleanup]
2016-09-02 14:43:52 +02:00
Josua Mayer
a67183a7bc mvebu: clearfog: require uboot-mvebu-clearfog
The u-boot variant for the clearfog is provided by the uboot-mvebu-clearfog,
and not by the generic uboot-mvebu packae.
Make sure the clearfog variant is selected when building for it.

Signed-off-by: Josua Mayer <josua.mayer97@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-02 14:43:52 +02:00
Jo-Philipp Wich
7347c14cd7 mvebu: rework ClearFog bundle.tar.gz generation
Instead of introducing a fake filesystem type, move the tar generation step
directly into the image build step.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-14 19:47:51 +02:00
Jo-Philipp Wich
b9b665ae49 mvebu: add ClearFog .tar.gz bundle
The previous image building code rework removed the rootfs.tar.gz with embedded
kernel and dtb build artifact which is required to build suitable SD images.

Reintroduce a .tar.gz artifact locally which embeds kernel and dtb, similar to
how the old code handled it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-13 16:24:04 +02:00
Jo-Philipp Wich
db49dd894e build: rename sysupgrade-nand to sysupgrade-tar
Now that the "sysupgrade-nand" step is used by non-NAND targets as well,
rename it to "sysupgrade-tar" to make it more generic.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-07-29 16:53:03 +02:00
Felix Fietkau
b8cd996d92 mvebu: limit image builds to profile selection
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-07-26 08:37:59 +02:00
Felix Fietkau
32727c409e mvebu: switch to the new image build code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-07-21 13:29:04 +02:00
Felix Fietkau
8eab383782 mvebu: fix portability issues in the image makefile code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-20 14:38:10 +02:00
Luka Perkov
4d966e4dde mvebu: add SolidRun ClearFog A1 support
Signed-off-by: Andrej Vlasic <andrej.vlasic@sartura.hr>

SVN-Revision: 48736
2016-02-17 17:49:26 +00:00
Imre Kaloz
58e9e35444 mvebu: armada-385-rd has been renamed to armada-388-rd upstream
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 47834
2015-12-11 13:36:30 +00:00
Imre Kaloz
8bb23cfb66 mvebu: add support for the Linksys WRT1900ACS (Shelby)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 47164
2015-10-08 10:01:30 +00:00
Jonas Gorski
bed330204a image.mk: move KDIR_TMP definition to a central location
Instead of each target defining it the same, move the KDIR_TMP
definition to include/image.mk. In addition Image/Build/SysupgradeNAND
already requires KDIR_TMP to be set, so it makes sense to have it
globally defined.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46592
2015-08-14 10:20:53 +00:00
Jonas Gorski
dbe4173b20 image: fix jffs2(_nand) image generation
Variables dependend on JFFS2_BLOCKSIZE and NANDBLOCK_SIZE are used
for template generation, so need to be present before inclusion of
image.mk in target image Makefiles.
So move all declarations to before any includes.

Fixes: r42878 ("image.mk: clean up and parallelize mkfs calls")
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46564
2015-08-05 13:55:52 +00:00
Imre Kaloz
2705cda813 mvebu: add support for the Linksys Caiman and Cobra
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45456
2015-04-16 09:54:39 +00:00
Imre Kaloz
232c61742e mvebu: copy the initramfs files to the bin dir
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45421
2015-04-13 20:06:47 +00:00
Imre Kaloz
c9e6c7c836 mvebu: add comments to image generation
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45414
2015-04-13 12:15:40 +00:00
Imre Kaloz
e3bd4f0969 mvebu: stop legacy image generation
If you can't find the firmware for you board, send proper patches.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45413
2015-04-13 12:08:42 +00:00
Imre Kaloz
96c793f529 mvebu: generate a single firmware for the 385-db-ap
This has been done without having a board, but should work.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45412
2015-04-13 12:06:56 +00:00
Imre Kaloz
b0ad24f0d5 mvebu: migrate mamba support to the upstreamed code
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 45400
2015-04-12 17:29:50 +00:00
Imre Kaloz
9b1c7a9de4 mvebu: fix WRT1900AC ubinized images
The current pxa3xx_nand driver doesn't support sub-page writing,
so the VID header offset must be specified explicitly.

Signed-off-by: Claudio Leite <leitec@staticky.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44455
2015-02-14 22:18:35 +00:00
Imre Kaloz
865647cea2 mvebu: add note about the move to single firmware files
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44291
2015-02-06 11:18:59 +00:00
Imre Kaloz
eda08dd423 mvebu: support building images for a single board
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44290
2015-02-06 11:16:20 +00:00
Imre Kaloz
9be491f084 mvebu: add Armada 385 DB AP support
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44266
2015-02-05 11:34:21 +00:00
Imre Kaloz
3019f7ecbd mvebu: add the Armada 385 Reference Design support
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44265
2015-02-05 11:29:56 +00:00
Imre Kaloz
40daf9346e mvebu: fix NAND and NOR options
All the boards but Mamba had wrong UBI options so far, making it impossible to
flash the built image on their respective storage medium.

Fix all of the supported boards in order to make the generated images useful.

Tested on a Mirabox, an Armada XP GP and an Openblocks AX3, and used the NAND
chip datasheet for the others.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44264
2015-02-05 11:26:17 +00:00
Imre Kaloz
f14c4e5cff mvebu: add a subprofile for boards based on a small NOR
Some boards only come with a small NOR on it, where UBI isn't a good solution
because of its overhead.

Add a new subprofile for such boards, that rely on the mtd split framework
instead.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44263
2015-02-05 11:25:21 +00:00
Imre Kaloz
e46593a54c mvebu: add large NOR sub-profile implementation
While we supported only the NAND so far, some boards use a large enough NOR,
where UBI is the only reasonable option. Create a new sub-profile template with
a different set of UBI options.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44262
2015-02-05 11:24:10 +00:00
Imre Kaloz
80cfe34291 mvebu: Add sub-profiles
In order to support the various board NAND layout that we support, introduce a
sub-profile similar to the one used by ar71xx.

These subprofiles provide a default implementation for most of the building
functions, while allowing each sub-profile to override any of these operations
in order to have a more specific behaviour, like Mamba expects for example.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44261
2015-02-05 11:22:43 +00:00
Imre Kaloz
a72bf9f3d2 mvebu: Switch to the generic mkuimage macro
The mvebu image makefile define something almost identical to the generic
implementation found in include/image.mk.

Switch to this implementation.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

SVN-Revision: 43969
2015-01-14 11:39:20 +00:00
Imre Kaloz
91b79128dc mvebu: Replace the padjffs2 call by the generic definition
The mvebu image Makefile directly calls the padjffs2 utility, while there's an
generic make function to do just that. Switch to it

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

SVN-Revision: 43968
2015-01-14 11:37:29 +00:00