From: Mathias Kresin Date: Thu, 1 Dec 2016 06:29:49 +0000 (+0100) Subject: lantiq: fix image validation errors X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d9d838bc97c5acabebf27ac2a760e7301d0b3625;p=openwrt%2Fstaging%2Frobimarko.git lantiq: fix image validation errors The boards did not have the name set that is expected during metadata validation on sysupgrade. Signed-off-by: Mathias Kresin --- diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds index d215393ba4..b9164389aa 100755 --- a/target/linux/lantiq/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/base-files/etc/board.d/01_leds @@ -52,10 +52,10 @@ FRITZ7320) P2812HNUF*) ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" ;; -VGV7510KW22) +VGV7510KW22*) ucidef_set_led_wlan "wifi" "wifi" "vgv7510kw22:green:wlan" "phy0radio" ;; -VGV7519) +VGV7519*) ucidef_set_led_wlan "wifi" "wifi" "vgv7519:green:wireless" "phy0radio" ;; WBMR300) diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network index c2a1fbe680..bc61a73362 100755 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/base-files/etc/board.d/02_network @@ -134,13 +134,13 @@ VR200v) "0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0" ;; -VGV7510KW22) +VGV7510KW22*) wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2) ucidef_add_switch "switch0" \ "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0" ;; -VGV7519) +VGV7519*) wan_mac=$(mtd_get_mac_binary board_config 22) ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0" diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts index 28fc66b983..9afcb75e38 100644 --- a/target/linux/lantiq/dts/EASY50712.dts +++ b/target/linux/lantiq/dts/EASY50712.dts @@ -3,6 +3,8 @@ #include "danube.dtsi" / { + model = "EASY50712 - Intel EASY50712 Nand"; + chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; }; diff --git a/target/linux/lantiq/dts/EASY98000NAND.dts b/target/linux/lantiq/dts/EASY98000NAND.dts index 18afb9977f..0e5b89d50e 100644 --- a/target/linux/lantiq/dts/EASY98000NAND.dts +++ b/target/linux/lantiq/dts/EASY98000NAND.dts @@ -4,7 +4,7 @@ #include "EASY98000-base.dtsi" / { - model = "EASY98000 - Lantiq Falcon (NAND)"; + model = "EASY98000NAND - Lantiq Falcon (NAND)"; compatible = "lantiq,falcon-easy98000-nand", "lantiq,falcon-easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98000NOR.dts b/target/linux/lantiq/dts/EASY98000NOR.dts index 4dbfe41b63..812ffb6c5c 100644 --- a/target/linux/lantiq/dts/EASY98000NOR.dts +++ b/target/linux/lantiq/dts/EASY98000NOR.dts @@ -4,7 +4,7 @@ #include "EASY98000-base.dtsi" / { - model = "EASY98000 - Lantiq Falcon (NOR)"; + model = "EASY98000NOR - Lantiq Falcon (NOR)"; compatible = "lantiq,falcon-easy98000-nor", "lantiq,falcon-easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98000SFLASH.dts b/target/linux/lantiq/dts/EASY98000SFLASH.dts index 90fc52c47a..4fb5ba577d 100644 --- a/target/linux/lantiq/dts/EASY98000SFLASH.dts +++ b/target/linux/lantiq/dts/EASY98000SFLASH.dts @@ -5,7 +5,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98000 - Lantiq Falcon (SFLASH)"; + model = "EASY98000SFLASH - Lantiq Falcon (SFLASH)"; compatible = "lantiq,falcon-easy98000-sflash", "lantiq,falcon-easy98000", "lantiq,falcon"; aliases { diff --git a/target/linux/lantiq/dts/EASY98020V18.dts b/target/linux/lantiq/dts/EASY98020V18.dts index 1ddb921791..fbe640103e 100644 --- a/target/linux/lantiq/dts/EASY98020V18.dts +++ b/target/linux/lantiq/dts/EASY98020V18.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "EASY98020 - Lantiq Falcon Reference Board V1.8"; + model = "EASY98020V18 - Lantiq Falcon Reference Board V1.8"; compatible = "lantiq,falcon-easy98020-V18", "lantiq,falcon-easy98020", "lantiq,falcon"; chosen { diff --git a/target/linux/lantiq/dts/FALCON-MDU.dts b/target/linux/lantiq/dts/FALCON-MDU.dts index 1d459c4453..da2ef10ccf 100644 --- a/target/linux/lantiq/dts/FALCON-MDU.dts +++ b/target/linux/lantiq/dts/FALCON-MDU.dts @@ -6,7 +6,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "MDU - Lantiq Falcon / Vinax MDU Board"; + model = "FALCON-MDU - Lantiq Falcon / Vinax MDU Board"; compatible = "lantiq,falcon-mdu", "lantiq,falcon"; chosen { diff --git a/target/linux/lantiq/dts/FALCON-SFP.dts b/target/linux/lantiq/dts/FALCON-SFP.dts index df2026c1dc..1019e52581 100644 --- a/target/linux/lantiq/dts/FALCON-SFP.dts +++ b/target/linux/lantiq/dts/FALCON-SFP.dts @@ -4,7 +4,7 @@ #include "falcon-sflash-16M.dtsi" / { - model = "SFP - Lantiq Falcon SFP Stick"; + model = "FALCON-SFP - Lantiq Falcon SFP Stick"; compatible = "lantiq,falcon-sfp", "lantiq,falcon"; chosen { diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi index 9bc034d9d6..bab7a2df02 100644 --- a/target/linux/lantiq/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi @@ -3,8 +3,6 @@ #include / { - model = "VGV7510KW22 - o2 Box 6431"; - chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; }; diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/dts/VGV7510KW22BRN.dts index 719e7f3ff8..2fec1aedde 100644 --- a/target/linux/lantiq/dts/VGV7510KW22BRN.dts +++ b/target/linux/lantiq/dts/VGV7510KW22BRN.dts @@ -3,6 +3,8 @@ #include "VGV7510KW22.dtsi" / { + model = "VGV7510KW22BRN - o2 Box 6431"; + sram@1F000000 { cgu@103000 { lantiq,phy-clk-src = <0x2>; diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/dts/VGV7510KW22NOR.dts index 399d0cf624..5dfc149c3b 100644 --- a/target/linux/lantiq/dts/VGV7510KW22NOR.dts +++ b/target/linux/lantiq/dts/VGV7510KW22NOR.dts @@ -3,6 +3,8 @@ #include "VGV7510KW22.dtsi" / { + model = "VGV7510KW22NOR - o2 Box 6431"; + fpi@10000000 { localbus@0 { nor-boot@0 { diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi index b835967326..9875e2143f 100644 --- a/target/linux/lantiq/dts/VGV7519.dtsi +++ b/target/linux/lantiq/dts/VGV7519.dtsi @@ -3,9 +3,6 @@ #include / { - - model = "VGV7519 - KPN Experiabox V8"; - chosen { bootargs = "console=ttyLTQ0,115200 init=/etc/preinit mem=62M vpe1_load_addr=0x83e00000 vpe1_mem=2M maxvpes=1 maxtcs=1"; }; diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts index b6b0393411..3d51aaa43a 100644 --- a/target/linux/lantiq/dts/VGV7519BRN.dts +++ b/target/linux/lantiq/dts/VGV7519BRN.dts @@ -4,6 +4,8 @@ #include "VGV7519.dtsi" / { + model = "VGV7519BRN - KPN Experiabox V8"; + fpi@10000000 { localbus@0 { nor-boot@0 { diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts index 501b45f00c..4ca820844b 100644 --- a/target/linux/lantiq/dts/VGV7519NOR.dts +++ b/target/linux/lantiq/dts/VGV7519NOR.dts @@ -4,6 +4,8 @@ #include "VGV7519.dtsi" / { + model = "VGV7519NOR - KPN Experiabox V8"; + fpi@10000000 { localbus@0 { nor-boot@0 {