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 <dev@kresin.me>

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 d215393ba4cda1618027d02f7c77de0a13f3644d..b9164389aa7de1d6a5dc0a1b900a4641e64d3550 100755 (executable)
--- 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 c2a1fbe680a937e2441110bba4fcb3f9db9743b3..bc61a733629c886eada0dffbfd6e9532bfdc648b 100755 (executable)
--- 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 28fc66b98351f2363d3b7d7d765bb7b9dd683d2f..9afcb75e3809c66a2cff15938543b22051d93c7c 100644 (file)
--- 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 18afb9977f88d1779834ebf60ffa3e98ead1069f..0e5b89d50e16a701029de24e59196c83e17ac58a 100644 (file)
--- 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 4dbfe41b63415c4b39f1cac4abadbd26d096e95a..812ffb6c5ccfd81258200dd5a03e39574720ea86 100644 (file)
--- 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 90fc52c47a874ad821ae85fd8efdabe9f5d30394..4fb5ba577df3e600467d76b753a787c3cfa4c1f8 100644 (file)
--- 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 1ddb9217913094b62a1625bfbabcc5654200944a..fbe640103e6f610cda9f2224a8dde336f476db65 100644 (file)
--- 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 1d459c445349379774fe17fb25b8576e723d0f09..da2ef10ccf0fe8725b2d89c489db9f96bc200ea9 100644 (file)
--- 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 df2026c1dca1b5e25ec38cb51f120c115a21e6c0..1019e52581320ab68b7dcae0ee0d38d0e0c04452 100644 (file)
--- 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 9bc034d9d6af138847bb3ac39a840a4e58cc4925..bab7a2df0252ea302cf81c997644b641c38aca5c 100644 (file)
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -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";
        };

diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/dts/VGV7510KW22BRN.dts
index 719e7f3ff891733e0181cc93d2191c8b97a05f88..2fec1aeddea8e9b74c858ebf8d073eddf6230977 100644 (file)
--- 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 399d0cf6246016dd966fbae8e92f8630d9b8d8f3..5dfc149c3b9159c3d5c322084840385de15e2529 100644 (file)
--- 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 b83596732666298948b1d2dd523a1f2a99c6997b..9875e2143fcba3ac452486b5deb4f6742bc51036 100644 (file)
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -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";
        };

diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts
index b6b0393411e19112e332e19946ffe2c66548e06f..3d51aaa43a85bb86de7df4b5a5feffaa95e89d10 100644 (file)
--- 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 501b45f00c322af3a7de34666364a095cb68a51d..4ca820844bbd1b1d179bd67d74d8386dc95d102f 100644 (file)
--- 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 {