lantiq: fix image validation errors
authorMathias Kresin <dev@kresin.me>
Thu, 1 Dec 2016 06:29:49 +0000 (07:29 +0100)
committerMathias Kresin <dev@kresin.me>
Sun, 4 Dec 2016 06:03:17 +0000 (07:03 +0100)
The boards did not have the name set that is expected during metadata
validation on sysupgrade.

Signed-off-by: Mathias Kresin <dev@kresin.me>
15 files changed:
target/linux/lantiq/base-files/etc/board.d/01_leds
target/linux/lantiq/base-files/etc/board.d/02_network
target/linux/lantiq/dts/EASY50712.dts
target/linux/lantiq/dts/EASY98000NAND.dts
target/linux/lantiq/dts/EASY98000NOR.dts
target/linux/lantiq/dts/EASY98000SFLASH.dts
target/linux/lantiq/dts/EASY98020V18.dts
target/linux/lantiq/dts/FALCON-MDU.dts
target/linux/lantiq/dts/FALCON-SFP.dts
target/linux/lantiq/dts/VGV7510KW22.dtsi
target/linux/lantiq/dts/VGV7510KW22BRN.dts
target/linux/lantiq/dts/VGV7510KW22NOR.dts
target/linux/lantiq/dts/VGV7519.dtsi
target/linux/lantiq/dts/VGV7519BRN.dts
target/linux/lantiq/dts/VGV7519NOR.dts

index d215393..b916438 100755 (executable)
@@ -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)
index c2a1fbe..bc61a73 100755 (executable)
@@ -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"
index 28fc66b..9afcb75 100644 (file)
@@ -3,6 +3,8 @@
 #include "danube.dtsi"
 
 / {
+       model = "EASY50712 - Intel EASY50712 Nand";
+
        chosen {
                bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
        };
index 18afb99..0e5b89d 100644 (file)
@@ -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 {
index 4dbfe41..812ffb6 100644 (file)
@@ -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 {
index 90fc52c..4fb5ba5 100644 (file)
@@ -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 {
index 1ddb921..fbe6401 100644 (file)
@@ -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 {
index 1d459c4..da2ef10 100644 (file)
@@ -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 {
index df2026c..1019e52 100644 (file)
@@ -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 {
index 9bc034d..bab7a2d 100644 (file)
@@ -3,8 +3,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-       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";
        };
index 719e7f3..2fec1ae 100644 (file)
@@ -3,6 +3,8 @@
 #include "VGV7510KW22.dtsi"
 
 / {
+       model = "VGV7510KW22BRN - o2 Box 6431";
+
        sram@1F000000 {
                cgu@103000 {
                        lantiq,phy-clk-src = <0x2>;
index 399d0cf..5dfc149 100644 (file)
@@ -3,6 +3,8 @@
 #include "VGV7510KW22.dtsi"
 
 / {
+       model = "VGV7510KW22NOR - o2 Box 6431";
+
        fpi@10000000 {
                localbus@0 {
                        nor-boot@0 {
index b835967..9875e21 100644 (file)
@@ -3,9 +3,6 @@
 #include <dt-bindings/input/input.h>
 
 / {
-
-       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";
        };
index b6b0393..3d51aaa 100644 (file)
@@ -4,6 +4,8 @@
 #include "VGV7519.dtsi"
 
 / {
+       model = "VGV7519BRN - KPN Experiabox V8";
+
        fpi@10000000 {
                localbus@0 {
                        nor-boot@0 {
index 501b45f..4ca8208 100644 (file)
@@ -4,6 +4,8 @@
 #include "VGV7519.dtsi"
 
 / {
+       model = "VGV7519NOR - KPN Experiabox V8";
+
        fpi@10000000 {
                localbus@0 {
                        nor-boot@0 {