Author: jogo
Date: 2015-08-05 15:55:52 +0200 (Wed, 05 Aug 2015)
New Revision: 46564
Modified:
trunk/target/linux/ar71xx/image/Makefile
trunk/target/linux/au1000/image/Makefile
trunk/target/linux/kirkwood/image/Makefile
trunk/target/linux/lantiq/image/Makefile
trunk/target/linux/mcs814x/image/Makefile
trunk/target/linux/mvebu/image/Makefile
trunk/target/linux/ppc44x/image/Makefile
trunk/target/linux/xburst/image/Makefile
Log:
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 <[email protected]>
Modified: trunk/target/linux/ar71xx/image/Makefile
===================================================================
--- trunk/target/linux/ar71xx/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/ar71xx/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,13 +4,14 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE = 64k 128k 256k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
IMAGE_PROFILE:=$(if $(PROFILE),$(PROFILE),Default)
-JFFS2_BLOCKSIZE = 64k 128k 256k
-
KERNEL_LOADADDR = 0x80060000
DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD NETGEAR_ID CMDLINE CONSOLE
IMAGE_SIZE BOARDNAME LOADER_FLASH_OFFS
Modified: trunk/target/linux/au1000/image/Makefile
===================================================================
--- trunk/target/linux/au1000/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/au1000/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,6 +4,9 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE = 128k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
@@ -11,8 +14,6 @@
KERNEL_ENTRY = 0x80100000
RAMSIZE = 0x00100000 # 1MB
-JFFS2_BLOCKSIZE = 128k
-
FLASH_KERNEL := 0xBFD00000
FLASH_FS := 0xBE000000
Modified: trunk/target/linux/kirkwood/image/Makefile
===================================================================
--- trunk/target/linux/kirkwood/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/kirkwood/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,11 +4,12 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+NAND_BLOCKSIZE := 2048-128k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-NAND_BLOCKSIZE := 2048-128k
-
define sanitize_profile_name
$(shell echo $(PROFILE) | tr '[:upper:]' '[:lower:]')
endef
Modified: trunk/target/linux/lantiq/image/Makefile
===================================================================
--- trunk/target/linux/lantiq/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/lantiq/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -8,10 +8,11 @@
# boards missing since devicetree update
#EASY50712 ARV3527P
+JFFS2_BLOCKSIZE = 64k 128k 256k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-JFFS2_BLOCKSIZE = 64k 128k 256k
KDIR_TMP:=$(KDIR)/tmp
LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
Modified: trunk/target/linux/mcs814x/image/Makefile
===================================================================
--- trunk/target/linux/mcs814x/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/mcs814x/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,6 +4,9 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE = 128k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
@@ -13,8 +16,6 @@
LOADADDR:=0x00008000
-JFFS2_BLOCKSIZE = 128k
-
UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Image/Build/MkuImage
Modified: trunk/target/linux/mvebu/image/Makefile
===================================================================
--- trunk/target/linux/mvebu/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/mvebu/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,12 +4,14 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE = 128k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
LOADADDR:=0x00008000
-JFFS2_BLOCKSIZE = 128k
KDIR_TMP:=$(KDIR)/tmp
Modified: trunk/target/linux/ppc44x/image/Makefile
===================================================================
--- trunk/target/linux/ppc44x/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/ppc44x/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,10 +4,12 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE=256k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-JFFS2_BLOCKSIZE=256k
define Image/Prepare
$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000
$(DTS_DIR)/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
Modified: trunk/target/linux/xburst/image/Makefile
===================================================================
--- trunk/target/linux/xburst/image/Makefile 2015-08-05 13:55:42 UTC (rev
46563)
+++ trunk/target/linux/xburst/image/Makefile 2015-08-05 13:55:52 UTC (rev
46564)
@@ -4,11 +4,12 @@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
+
+JFFS2_BLOCKSIZE=256k 512k
+
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-JFFS2_BLOCKSIZE=256k 512k
-
ifneq ($(CONFIG_TARGET_xburst_qi_lb60),)
UBI_OPTS = -m 4096 -p 512KiB
UBIFS_OPTS = -m 4096 -e 516096 -c 4095
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
