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
This commit is contained in:
Imre Kaloz 2015-02-14 22:18:35 +00:00
parent 428dd56a60
commit 9b1c7a9de4

View File

@ -31,6 +31,7 @@ endef
# $(3): Erase Block Size # $(3): Erase Block Size
# $(4): Page Size # $(4): Page Size
# $(5): Sub-Page Size (optional) # $(5): Sub-Page Size (optional)
# $(6): VID offset (optional)
define NANDProfile define NANDProfile
define Image/BuildKernel/Profile/$(1) define Image/BuildKernel/Profile/$(1)
$(call Image/Build/DTB,$(2)) $(call Image/Build/DTB,$(2))
@ -48,7 +49,7 @@ define NANDProfile
endef endef
define Image/Build/Profile/$(1)/squashfs define Image/Build/Profile/$(1)/squashfs
$(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m $(4) $(if $(5),-s $(5))) $(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m $(4) $(if $(5),-s $(5)) $(if $(6),-O $(6)))
# The next line will be dropped, migrate your board to use a single firmware file # The next line will be dropped, migrate your board to use a single firmware file
cp $(KDIR)/$$(IMG_PREFIX)-$(2)-squashfs-ubinized.bin $(BIN_DIR) cp $(KDIR)/$$(IMG_PREFIX)-$(2)-squashfs-ubinized.bin $(BIN_DIR)
endef endef
@ -136,7 +137,7 @@ $(eval $(call NANDProfile,XP-DB,armada-xp-db,512KiB,4096))
$(eval $(call NANDProfile,XP-GP,armada-xp-gp,512KiB,4096)) $(eval $(call NANDProfile,XP-GP,armada-xp-gp,512KiB,4096))
# Boards with NAND, with subpages # Boards with NAND, with subpages
$(eval $(call NANDProfile,Mamba,armada-xp-mamba,128KiB,2048,512)) $(eval $(call NANDProfile,Mamba,armada-xp-mamba,128KiB,2048,512,2048))
# Boards with large NOR, where we want to use UBI # Boards with large NOR, where we want to use UBI
$(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB)) $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB))
@ -145,7 +146,7 @@ $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB)
$(eval $(call NORProfile,385-RD,armada-385-rd,256KiB)) $(eval $(call NORProfile,385-RD,armada-385-rd,256KiB))
define Image/Build/Profile/Mamba/squashfs define Image/Build/Profile/Mamba/squashfs
$(call Image/Build/UbinizeImage,armada-xp-mamba,,squashfs, -p 128KiB -m 2048 -s 512) $(call Image/Build/UbinizeImage,armada-xp-mamba,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048)
( \ ( \
dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \ dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \
dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \ dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \