KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

image: fix jffs2(_nand) image generation

Browse source 
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
This commit is contained in:
Jonas Gorski 2015-08-05 13:55:52 +00:00
parent 3368b4799b
commit dbe4173b20
8 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/linux/ar71xx/image/Makefile
View file

@ -4,13 +4,14 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default) IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default)
JFFS2_BLOCKSIZE = 64k 128k 256k
KERNEL_LOADADDR = 0x80060000 KERNEL_LOADADDR = 0x80060000
DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS

5
target/linux/au1000/image/Makefile
View file

@ -4,6 +4,9 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE = 128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
@ -11,8 +14,6 @@ LOADADDR = 0x81000000 # RAM start + 16M
KERNEL_ENTRY = 0x80100000 KERNEL_ENTRY = 0x80100000
RAMSIZE = 0x00100000 # 1MB RAMSIZE = 0x00100000 # 1MB
JFFS2_BLOCKSIZE = 128k
FLASH_KERNEL := 0xBFD00000 FLASH_KERNEL := 0xBFD00000
FLASH_FS := 0xBE000000 FLASH_FS := 0xBE000000

5
target/linux/kirkwood/image/Makefile
View file

@ -4,11 +4,12 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
NAND_BLOCKSIZE := 2048-128k NAND_BLOCKSIZE := 2048-128k
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
define sanitize_profile_name define sanitize_profile_name
$(shell echo $(PROFILE) | tr '[:upper:]' '[:lower:]') $(shell echo $(PROFILE) | tr '[:upper:]' '[:lower:]')
endef endef

3
target/linux/lantiq/image/Makefile
View file

@ -8,10 +8,11 @@
# boards missing since devicetree update # boards missing since devicetree update
#EASY50712 ARV3527P #EASY50712 ARV3527P
JFFS2_BLOCKSIZE = 64k 128k 256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE = 64k 128k 256k
KDIR_TMP:=$(KDIR)/tmp KDIR_TMP:=$(KDIR)/tmp
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)

5
target/linux/mcs814x/image/Makefile
View file

@ -4,6 +4,9 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE = 128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
@ -13,8 +16,6 @@ DTBS_DIR:=dts/
LOADADDR:=0x00008000 LOADADDR:=0x00008000
JFFS2_BLOCKSIZE = 128k
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Image/Build/MkuImage define Image/Build/MkuImage

4
target/linux/mvebu/image/Makefile
View file

@ -4,12 +4,14 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE = 128k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
LOADADDR:=0x00008000 LOADADDR:=0x00008000
JFFS2_BLOCKSIZE = 128k
KDIR_TMP:=$(KDIR)/tmp KDIR_TMP:=$(KDIR)/tmp

4
target/linux/ppc44x/image/Makefile
View file

@ -4,10 +4,12 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
JFFS2_BLOCKSIZE=256k
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=256k
define Image/Prepare define Image/Prepare
$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb $(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(DTS_DIR)/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb

5
target/linux/xburst/image/Makefile
View file

@ -4,11 +4,12 @@
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=256k 512k JFFS2_BLOCKSIZE=256k 512k
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
ifneq ($(CONFIG_TARGET_xburst_qi_lb60),) ifneq ($(CONFIG_TARGET_xburst_qi_lb60),)
UBI_OPTS = -m 4096 -p 512KiB UBI_OPTS = -m 4096 -p 512KiB
UBIFS_OPTS = -m 4096 -e 516096 -c 4095 UBIFS_OPTS = -m 4096 -e 516096 -c 4095