Commit graph

403 commits

Author SHA1 Message Date
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
Gabor Juhos
58e3d03ae0 ar71xx: image: allow to build initramfs for Planex devices
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38138
2013-09-23 12:14:19 +00:00
Gabor Juhos
0ff5dc2f38 ar71xx: image: build Planex kernels in a separate step
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38137
2013-09-23 12:14:18 +00:00
Gabor Juhos
cdda5b041f ar71xx: add profile and build image for the TEW-732BR board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38133
2013-09-23 09:49:04 +00:00
Gabor Juhos
3f5fae5e1a ar71xx: image: update the Image/Build/CameoHornet macro
- append the root squashfs directly to the kernel,
 - use the 64kraw-nojffs template instead of sqashfs-only
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on a TEW-712BR devices only.

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

SVN-Revision: 38130
2013-09-23 09:22:50 +00:00
Gabor Juhos
4dd84248d2 ar71xx: update the Image/Build/Cameo macro
- append the root squashfs directly to the kernel,
 - use the 64kraw/64kraw-nojffs template instead of 64k/squashfs-only,
 - ensure, that the signature is placed at the correct offset in
   the *-factory images,
 - ensure that the generated images have enough erase blocks
   for JFFS2 garbage collection,

Tested on DIR-600-A1 and TEW-632BR devices only.

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

SVN-Revision: 38129
2013-09-23 09:01:06 +00:00
Gabor Juhos
3131a1c11a ar71xx: image: add new macros for AP99 based Cameo devices
The MTD layout of the AP99 based devices is different.
Add new macros to reflect that and use the new macros
for the DIR-615-E4 board.

This prevents overwriting of the 'mac' partition which
contain vital informations. The disadvantage of the change
is that the usable space is reduced by 192KiB. Blame the
vendors for the unfriendly partition layout.

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

SVN-Revision: 38128
2013-09-23 08:24:10 +00:00
Gabor Juhos
ac2cd03c73 ar71xx: image: rename the Cameo macros
Use the reference board name in the macro
instead of the SoC number.

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

SVN-Revision: 38127
2013-09-23 08:24:05 +00:00
Gabor Juhos
dd171f7d14 ar71xx: image: add optional JFFS2 padding support to the CatFiles macro
Also remove the similar code from the Netgear
profile and use the new feature instead.

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

SVN-Revision: 38126
2013-09-22 20:14:23 +00:00
Gabor Juhos
d3c75d79cd ar71xx: image: remove too big files in the CatFiles macro
Also improve the warning message.

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

SVN-Revision: 38125
2013-09-22 20:14:22 +00:00
Gabor Juhos
3b00bf1a68 ar71xx: simplify wndr3700 image generation
- remove the kernel and rootfs partitions from the mtd layout,
   the kernel creates those automatically,
 - remove estimation step, it is not needed anymore
 - put the root squashfs directly after the kernel
 - use the 64kraw template

With the default configuration, this allows to use more space for
rootfs_data with 64KiB. Tested on WNDR3700 v1 only.

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

SVN-Revision: 38120
2013-09-22 11:45:09 +00:00
Gabor Juhos
ea0ff700e8 ar71xx: image: add mtdpartsize macro
The new macro will be used to determine the firmware
partition size from an MTD layout.

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

SVN-Revision: 38117
2013-09-22 09:11:25 +00:00
Gabor Juhos
48a3a30fec ar71xx: image: improve the rootfs_align macro
Improve the macro to return correct value for
all squashfs variant.

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

SVN-Revision: 38116
2013-09-22 09:11:24 +00:00
Gabor Juhos
b77d4d8d19 ar71xx: image: improve the CatFiles macro
Make it possible to append the rootfs image directly
to the kernel.

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

SVN-Revision: 38115
2013-09-22 09:11:22 +00:00
Gabor Juhos
20c8252a8f ar71xx: image: override mkcameofw status
This allows to build images for other boards, even if
the image is too big for Cameo devices.

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

SVN-Revision: 38095
2013-09-21 14:56:22 +00:00
Gabor Juhos
cf5891fb39 ar71xx: fix Cameo934x initramfs image generation
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38084
2013-09-20 16:41:28 +00:00
Gabor Juhos
cd9ff05845 ar71xx: add profile and build image for the WD My Net N600 board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38076
2013-09-19 22:36:43 +00:00
Gabor Juhos
54c0e72f9d ar71xx: add profile and build image for the TL-MR13U board
Signed-off-by: Oleg Titov <oleg.titov@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/4063/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38066
2013-09-19 17:52:45 +00:00
Gabor Juhos
fe781581df ar71xx: add profile and build image for the WNR2200 board
Signed-off-by: Aidan Kissane <aidankissane@googlemail.com>
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Patchwork: http://patchwork.openwrt.org/patch/4055/
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38061
2013-09-19 16:56:51 +00:00
Gabor Juhos
9754aca374 ar71xx: add support for TL-MR3040 v2
This patch adds support for building firmware images for the
TP-Link TL-MR3040 v2. Tested and working on v2.1 hardware.

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

SVN-Revision: 37964
2013-09-13 15:28:50 +00:00
Gabor Juhos
abad211388 ar71xx: use the lzma loader for the WRT160NL
Partition layout before:
  0x000000040000-0x0000001a0000 : "kernel"
  0x0000001a0000-0x0000007e0000 : "rootfs"
  mtd: partition "rootfs" set to be root filesystem
  mtd: partition "rootfs_data" created automatically, ofs=0x350000, len=0x490000
  0x000000350000-0x0000007e0000 : "rootfs_data"

after:
  0x000000040000-0x000000140000 : "kernel"
  0x000000140000-0x0000007e0000 : "rootfs"
  mtd: partition "rootfs" set to be root filesystem
  mtd: partition "rootfs_data" created automatically, ofs=0x2f0000, len=0x4f0000
  0x0000002f0000-0x0000007e0000 : "rootfs_data"

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

SVN-Revision: 37915
2013-09-07 11:40:45 +00:00
Gabor Juhos
07216b9f46 ar71xx: fix NetGear initramfs image names
The '-initramfs' string is duplicated in the image names,
fix it.

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

SVN-Revision: 37892
2013-09-03 07:22:27 +00:00
Gabor Juhos
c8cd8c94d8 ar71xx: image: reorder Image/Build/* macros
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37889
2013-09-02 19:05:58 +00:00
Gabor Juhos
1712fdd658 ar71xx: image: simplify more oneliner macros
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37888
2013-09-02 19:05:57 +00:00
Gabor Juhos
02551d3883 ar71xx: image: simplify oneliner loader macros
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37887
2013-09-02 19:05:56 +00:00
Gabor Juhos
0cdf133d20 ar71xx: image: simplify oneliner initramfs macros
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37886
2013-09-02 19:05:55 +00:00