Commit graph

428 commits

Author SHA1 Message Date
Gabor Juhos
d6cb5215a9 ar71xx: WNR2200: fix mounting root fs problem
Solves ticket #14356 <https://dev.openwrt.org/ticket/14356>

Without this patch, UART output will show only 4 partitions:
  [    0.740000] 4 cmdlinepart partitions found on MTD device spi0.0
  [    0.750000] Creating 4 MTD partitions on "spi0.0":
  [    0.750000] 0x000000000000-0x000000050000 : "u-boot"
  [    0.760000] 0x000000050000-0x000000070000 : "u-boot-env"
  [    0.770000] 0x000000070000-0x0000007f0000 : "firmware"
  [    0.790000] 0x0000007f0000-0x000000800000 : "art"
and then linux complains :VFS: Cannot open root device "(null)"

With this patch, UART out will show 7 partitions:
  [    0.740000] 4 cmdlinepart partitions found on MTD device spi0.0
  [    0.750000] Creating 4 MTD partitions on "spi0.0":
  [    0.750000] 0x000000000000-0x000000040000 : "u-boot"
  [    0.760000] 0x000000040000-0x000000050000 : "u-boot-env"
  [    0.770000] 0x000000050000-0x0000007f0000 : "firmware"
  [    0.780000] 2 netgear-fw partitions found on MTD device firmware
  [    0.780000] 0x000000050000-0x00000014b440 : "kernel"
  [    0.790000] mtd: partition "kernel" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only
  [    0.800000] 0x00000014b440-0x0000007f0000 : "rootfs"
  [    0.810000] mtd: partition "rootfs" must either start or end on erase block boundary or be smaller than an erase block -- forcing read-only
  [    0.820000] mtd: device 4 (rootfs) set to be root filesystem
  [    0.830000] 1 squashfs-split partitions found on MTD device rootfs
  [    0.830000] 0x000000340000-0x0000007f0000 : "rootfs_data"
  [    0.840000] 0x0000007f0000-0x000000800000 : "art"

This patch is tested against r39502 of trunk.

Signed-off-by: Jonathan Chang <changcs@santos.ee.ntu.edu.tw>
Patchwork: http://patchwork.openwrt.org/patch/4870/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39625
2014-02-18 17:34:16 +00:00
Jo-Philipp Wich
b1d7ebae09 ar71xx: fix mtdpartsize macro in image Makefile (#14961)
The mtdpartsize macro triggers shell errors on various Linux distributions
when the partname argument $(1) does not appear within the partmap $(2).

Change the sed pattern to only emit anything if a successful substitution
occured and only evaluate the arithmetic expression if something was printed
by the sed program.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 39583
2014-02-13 21:19:00 +00:00
Gabor Juhos
e41e531e3b ar71xx: image: reserve 4 erase blocks on the TP-Link devices
This ensures that the generated images will have enough erase
blocks for JFFS2.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39397
2014-01-25 18:12:13 +00:00
Gabor Juhos
f1a9ed8345 ar71xx: image: move WNDAP360 macro
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39394
2014-01-25 08:31:45 +00:00
Gabor Juhos
09bf46d418 ar71xx: image: generate sysupgrade images for the Compex boards
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39391
2014-01-24 17:15:03 +00:00
Gabor Juhos
0c0b87293e ar71xx: image: use a single firmware partition on Compex devices
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39389
2014-01-24 17:15:01 +00:00
Gabor Juhos
998c89a9a6 ar71xx: image: detect partition sizes in the Image/Build/Ath macro
Get the size of the mtd partitions directly from the
MTD layout and remove the superfluous macro parameters.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39384
2014-01-24 11:59:35 +00:00
Gabor Juhos
4556632578 ar71xx: image: fix size verification in the CatFiles macro
The macro checks the size of the rootfs image even if
the second parameter of the macro contains the size of
an eraseblock. It is wrong because the size of the
kernel image will be adjusted to the next eraseblock
and the resulting image might be too large.

Fix the macro to check the size of the final image
instead of the rootfs image.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39383
2014-01-24 11:59:32 +00:00
Gabor Juhos
56136c0f34 ar71xx: ap83: define mtd layout via command line
Also use the RKuImage macro becasue the original
firmware starts with the rootfs.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39379
2014-01-23 16:47:42 +00:00
Gabor Juhos
a59e82761f ar71xx: ap81: define mtd layout via command line
Also use the RKuImage macro becasue the original
firmware starts with the rootfs.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39378
2014-01-23 16:47:41 +00:00
Gabor Juhos
9f4e2bf326 ar71xx: image: show size limit in warning messages
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39376
2014-01-23 12:27:28 +00:00
Gabor Juhos
447530995a ar71xx: add initramfs image support for Compex devices
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39375
2014-01-23 12:23:10 +00:00
Imre Kaloz
b6e1cbd8dd generate images for the On Networks N150 (rebranded Netgear WNR612v2)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 39320
2014-01-18 19:44:40 +00:00
Gabor Juhos
2318a46d84 ar71xx: enable images for WD My Net N750
Now that the switch works correctly we can enable the images for this
board.

Flashing from the factory firmware, the factory failsafe loader and
sysupgrade was tested successfully.

Signed-off-by: Felix Kaechele <heffer@fedoraproject.org>
Patchwork: http://patchwork.openwrt.org/patch/4617/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39130
2013-12-17 22:14:13 +00:00
Gabor Juhos
749c44b24d ar71xx: build image for the TP-Link TL-WA901ND v3 board
Based-on: http://patchwork.openwrt.org/patch/4507/
Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39075
2013-12-15 21:34:20 +00:00
Gabor Juhos
e2fc4dc4e7 ar71xx: build firmware image for the TL-WA801ND v2
Patch to add the profile for the TP-LINK WA801ND v2

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Patchwork: http://patchwork.openwrt.org/patch/4502/
[juhosg: change subject]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39065
2013-12-15 20:39:12 +00:00
Gabor Juhos
3674062469 ar71xx: image: unify CyberTAN macros
Make the Image/Build/CyberTAN macro more generic,
and use simple wrappers for the GZIP/LZMA variants.
This simplifies the Makefile a bit, and allows to
build sysupgrade images for the devices which are
using LZMA compressed uImages.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38965
2013-11-30 18:31:01 +00:00
Gabor Juhos
cb67115b4c ar71xx: image: fix CyberTAN sysupgrade images
In the current sysupgrade images, the CRC32 value of
the TRX header covers the whole rootfs data. Due to
this, the CRC value should be changed during sysupgrade
otherwise the bootloader refuses to load the image on
the next boot.

Change the image generation to create sysupgrade images
where the CRC32 value covers the kernel data only. This
allows to skip the 'fixtrx' step during sysupgrade on
the target.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38964
2013-11-30 18:30:59 +00:00
Gabor Juhos
a6ecce827a ar71xx: build image for the TL-WR1043ND v2 board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38958
2013-11-29 20:51:16 +00:00
Gabor Juhos
fd892350c2 ar71xx: add profile and build image for the Sitecom WLR-8100
- partitions on factory fw are a bit strange
  - unknown contained some strings in factory
  - unknown2 contains some atheros (2nd art ?)

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Patchwork: http://patchwork.openwrt.org/patch/4149/
[juhosg: edit commit message]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38954
2013-11-29 20:18:50 +00:00
Gabor Juhos
1f34789015 ar71xx: add profile for the WR842N/ND v2
Patch to add the profile for the TP-LINK WR842N/ND v2
Small update, because of a change in the Makefile.

Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/4382/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38815
2013-11-15 10:11:25 +00:00
Felix Fietkau
f38e6c782c ar71xx: use the new padjffs2 padding on Ubiquiti UAP-PRO to make the boot loader stop searching after the kernel partition
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38805
2013-11-14 19:04:48 +00:00
Gabor Juhos
3d341e8ca5 ar71xx: add profile and build image for the TL-WA750RE TL-WA850RE range extender
Patch to add profile and build image for the tplink TL-WA750RE/WA850RE board

Signed-off-by: Martijn Zilverschoon <thefriedzombie@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38719
2013-11-11 08:04:48 +00:00
Gabor Juhos
f02c8802e3 ar71xx: build image for the WD My Net Wi-Fi Range Extender
Patchwork: http://patchwork.openwrt.org/patch/4281/
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
[juhosg:
  - remove the Image/Build/CyberTANLZMA/loader macro, it is not used
  - move the MYNETREXT SingleProfile definition to the correct place]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38688
2013-11-07 22:31:54 +00:00
Gabor Juhos
18d08da07d ar71xx: image: add EOF marker to the WNDR4300 UBI image
Append EOF markers to the END of the UBI image
file. This forces the kernel to erase all blocks
after the marker even if those blocks are not
empty.

Additionally, the resulting image can be flashed
from the original web UI now, so use '-factory'
suffix for that.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38683
2013-11-07 19:53:02 +00:00
Gabor Juhos
04fdff9dc0 ar71x: image: don't use the wndr3700 utility
Pass the uImage magic value directly to mkimage instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38662
2013-11-06 10:16:39 +00:00
Gabor Juhos
0c740a80fd ar71xx: image: fix WNDR4300 initramfs image generation
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38659
2013-11-05 18:41:20 +00:00
Gabor Juhos
c98db0707c ar71xx: image: allow to use optional parameters for MkuImageLzma/initramfs
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38658
2013-11-05 18:41:18 +00:00
Gabor Juhos
08e0613275 ar71xx: generate recovery image for WNDR4300
Extended the Makefile to generate a working factory reset image
for Netgear WNDR4300. The image uses UBI with two volumes squashfs
(rootfs) and JFFS2 (rootfs_data). In order to make stock U-Boot
happy, a fake rootfs image is placed into the last erase block
of the kernel partition.

Signed-off-by: Stefan Agner <stefan@agner.ch>
[juhosg:
  - restore the NetgearNAND/initramfs macro,
  - remove unused {Squash,Ubi}fsTemplate macros,
  - remove board specific mtd options from CONFIG_CMDLINE, append the
    board specific ubi.mtd parameter to the kernel command line instead,
  - increase kernel partition size to 2MiB,
  - use board specific ini file for ubinize,
  - put jffs2 eof mark into the rootfs_data ubi volume,
  - use KDIR_TMP for temporary images,
  - use the squashfs-raw image,
  - increase kernel partition size to 2MiB,
  - use a local ubinize macro,
  - fix macro parameter comments,
  - put the fake rootfs into the last erase block of the kernel
    partition,
  - move Image/Build/NetgearNAND/buildkernel macro before
    define Image/Build/NetgearNAND,
  - don't use the wndr3700 utility, use '-M' parameter of mkimage to set
    the uImage magic,
  - use '-recovery' suffix for the generated image, it is only usable via
    the fw_recovery function of the bootloader,
  - update commit log]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38655
2013-11-05 16:31:14 +00:00
Gabor Juhos
d5555de5b0 ar71xx: move WNDR4300 profile to the nand subtarget
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38647
2013-11-04 18:37:09 +00:00
Gabor Juhos
ccf7320205 ar71xx: image: dd root.* images in fs specific macros
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38644
2013-11-04 18:37:06 +00:00
Gabor Juhos
45d26941b4 ar71xx: image: only define profiles for the generic subtarget
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38636
2013-11-01 18:33:24 +00:00
Gabor Juhos
f0a877e5eb ar71xx: image: add IMAGE_PROFILE variable
Ensures that the 'Default' images are generated
even if the subtarget has no profiles.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38635
2013-11-01 18:33:22 +00:00
Gabor Juhos
5a08328197 ar71xx: don't build uImages for the mikrotik subtarget
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38598
2013-10-30 06:54:55 +00:00
Gabor Juhos
47b7ce5ec2 ar71xx: add profile and build image for the BXU2000n-2 A1 board
Patchwork: http://patchwork.openwrt.org/patch/4183/
Signed-off-by: Terry Yang <yangbo@bhunetworks.com>
[juhosg:
  - remove MultiProfile, it makes no sense for a single board
  - move SingleProfile call and the mtdlayout to a different
    location keep things sorted (well, almost)]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38593
2013-10-30 06:50:59 +00:00
Gabor Juhos
f6638a8994 ar71xx: add profile and build image for the Dragino2 board
Patchwork: http://patchwork.openwrt.org/patch/4234/
Signed-off-by: Pau Escrich <p4u@dabax.net>
[juhosg: remove kernel+rootfs partition and use uimage split instead]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38588
2013-10-30 06:50:53 +00:00
Imre Kaloz
5f272ca813 make the generated images actually flashable on the Unifi devices.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38364
2013-10-11 15:41:42 +00:00
Gabor Juhos
b71c7d8d3c ar71xx: use correct board id for TL-MR3040 v2
Fix the image building code so that the kernel correctly
distinguishes between hardware revisions.

Signed-off-by: Mads Hansen <d@taba.se>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38192
2013-09-25 18:42:14 +00:00
Gabor Juhos
904ffa32d8 ar71xx: image: simplify mynet_n600_mtdlayout
Remove the kernel and rootfs partitions. The Seama
parser can find those automatically:

  0x000000070000-0x000000ff0000 : "firmware"
  2 seama-fw partitions found on MTD device firmware
  0x000000070000-0x0000001b0000 : "kernel"
  0x0000001b0000-0x000000ff0000 : "rootfs"
  mtd: partition "rootfs" set to be root filesystem
  1 squashfs-split partitions found on MTD device rootfs
  0x000000360000-0x000000ff0000 : "rootfs_data"
  0x000000ff0000-0x000001000000 : "radiocfg"

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38155
2013-09-24 12:19:57 +00:00
Gabor Juhos
2ea3cac075 ar71xx: update the Image/Build/WZRHP macro
- append the root squashfs directly after the kernel,
 - use the 64kraw/128kraw template instead of the 64k/128k,
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on WZR-HP-G300NH and WZR-600DHP boards.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38153
2013-09-24 09:36:26 +00:00
Gabor Juhos
d0ba5d1584 ar71xx: image: use a common macro for Buffalo WZRHP devices
The Image/Build/WZRHP64K and the Image/Build/WZRHP128K macros
are similar. Move the common stuff into the Image/Build/WZRHP
macro and update the orignal macros to use that.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38152
2013-09-24 09:36:25 +00:00
Gabor Juhos
370405bfd0 ar71xx: image: update Image/Build/CameoAP94 macro
- append the root squashfs directly after the kernel,
 - use the 64kraw template instead of the 64k,
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on a TEW-673GRU board.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38151
2013-09-24 08:14:44 +00:00
Gabor Juhos
167c4b5fa7 ar71xx: image: use a common macro for Cameo AP94 based devices
The Image/Build/DIR825B1 and the Image/Build/DLRTDEV macros
are identical. Merge those into a new Image/Build/CameoAP94
macro, and update the device profiles to use the new macro.
Also rename the dir825b1_* mtdlayout macros to cameo_ap94_*.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38150
2013-09-24 08:14:43 +00:00
Gabor Juhos
fe525cd2c0 ar71xx: image: use the board name for temporary mtdpart files
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38149
2013-09-24 06:13:14 +00:00
Gabor Juhos
5da3667d79 ar71xx: update the Image/Build/UBNT2 macro
- append the root squashfs directly after the kernel,
 - use the 64kraw template instead of the 64k,
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on a WispStation M5 board.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38148
2013-09-24 05:58:34 +00:00
Gabor Juhos
18141628dc ar71xx: build intramfs images for the Ubiquiti XM boards
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38147
2013-09-24 05:58:32 +00:00
Gabor Juhos
4fc427e211 ar71xx: image: use a common macro for UBNTXM/UBNTDEV
The firmware generation part is the same for both
macros. Move that into a separate macro and use the
new macro for Image/Build/UB{NTXM,DEV}.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38146
2013-09-24 05:58:31 +00:00
Gabor Juhos
0b09a89340 ar71xx: image: update Image/Build/WHRHPG300N macro
- append the root squashfs directly after the kernel,
 - use the 64kraw template instead of the 64k
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on the WHR-G301N board only.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38141
2013-09-23 19:49:27 +00:00
Gabor Juhos
0264fed9bd ar71xx: image use the 64kraw template for the TEW-732BR board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38140
2013-09-23 12:54:05 +00:00
Gabor Juhos
7c8c366a14 ar71xx: image: update Build/Image/Planex macro
- remove the 'kernel' and 'rootfs' partitions from the mtd layout,
 - move the .okli image into the uImage,
 - append the root squashfs directly after the kernel,
 - use the 64kraw template instead of the 64k
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on the MZK-W300NH board only.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38139
2013-09-23 12:14:20 +00:00