From: Jonas Gorski Date: Wed, 4 Nov 2015 11:33:31 +0000 (+0000) Subject: ipq806x: fix BOARD_NAME spellings X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d9197d8b0cf1a799a6a68283cc1c0adfd1bfa29f;p=openwrt%2Fstaging%2Fyousong.git ipq806x: fix BOARD_NAME spellings the board names used by the upgrade check differ from the device names in case, so always set them. We can't rely on tolower or similar since different locales might have different rules for lower case letters, so set them explicitily. Fixes sysupgrade rejecting *-sysupgrade.tar because of the difference. Signed-off-by: Kaspar Schleiser Signed-off-by: Jonas Gorski SVN-Revision: 47381 --- diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index c59e6d446e..14cf442f43 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -47,8 +47,9 @@ define Device/Default KERNEL_PREFIX := $$(IMAGE_PREFIX) IMAGES := KERNEL_IN_UBI := + BOARD_NAME := endef -DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI +DEVICE_VARS += DEVICE_DTS KERNEL_IN_UBI BOARD_NAME define Device/LegacyImage KERNEL_SUFFIX := -uImage @@ -78,12 +79,11 @@ define Device/DniImage KERNEL_NAME := zImage NETGEAR_BOARD_ID := NETGEAR_HW_ID := - BOARD_NAME := IMAGES := factory.img sysupgrade.tar IMAGE/factory.img := append-kernel | append-ubi | netgear-dni IMAGE/sysupgrade.tar = sysupgrade-nand endef -DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE BOARD_NAME +DEVICE_VARS += KERNEL_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID DEVICE_BLOCK_SIZE DEVICE_PAGE_SIZE define Device/AP148 $(call Device/FitImage) @@ -91,6 +91,7 @@ define Device/AP148 DEVICE_DTS := qcom-ipq8064-ap148 BLOCKSIZE := 128KiB PAGESIZE := 2048 + BOARD_NAME := ap148 endef define Device/AP148-legacy @@ -99,13 +100,14 @@ define Device/AP148-legacy DEVICE_DTS := qcom-ipq8064-ap148 BLOCKSIZE := 128KiB PAGESIZE := 2048 - BOARD_NAME := AP148 + BOARD_NAME := ap148 endef define Device/DB149 $(call Device/FitImage) DEVICE_DTS := qcom-ipq8064-db149 KERNEL_INSTALL := 1 + BOARD_NAME := db149 endef define Device/R7500