Fix CONFIG_BOOTFILE value, use it in fw upgrade script

diff --git a/u-boot/include/configs/qca9k_common.h b/u-boot/include/configs/qca9k_common.h
index 3a58a66b862566d8e04ffe6e1049c1eb9a6e53ac..d13c99e32640f1c50c29f4408fa0ea01eca958ee 100644 (file)
--- a/u-boot/include/configs/qca9k_common.h
+++ b/u-boot/include/configs/qca9k_common.h
@@ -83,7 +83,7 @@
 #define CONFIG_NETCONSOLE_PORT 6666
 
 /* Other environment variables */
-#define CONFIG_BOOTFILE        "firmware.bin"
+#define CONFIG_BOOTFILE        firmware.bin
 #define CONFIG_LOADADDR        0x80800000
 
 /* This is needed for time calculation */

diff --git a/u-boot/include/upg_scripts.h b/u-boot/include/upg_scripts.h
index 0ee3503218fa5c5d4b9a789aea9c5f593d3d8bff..4d144e76f889ac308317b4008e296ed378a5ba54 100644 (file)
--- a/u-boot/include/upg_scripts.h
+++ b/u-boot/include/upg_scripts.h
@@ -96,11 +96,10 @@
        #endif
 
        #define CONFIG_ENV_UPG_SCRIPTS_FW       \
-               "fw_name=firmware.bin\0" \
                "fw_addr=" MK_STR(CONFIG_UPG_SCRIPTS_FW_ADDR_HEX) "\0" \
                "fw_upg=" \
                        "if ping $serverip; then " \
-                               "tftp $loadaddr $fw_name && " \
+                               "tftp $loadaddr $bootfile && " \
                                "erase $fw_addr +$filesize && " \
                                "cp.b $loadaddr $fw_addr $filesize && " \
                                "echo DONE! Firmware upgraded!; " \

diff --git a/u-boot/net/tftp.c b/u-boot/net/tftp.c
index 19280d6bbd133c0522acd4b16c3b04cb83f67d6a..afa322ff5404661062ebd4d523e6c72e8b98fbf3 100644 (file)
--- a/u-boot/net/tftp.c
+++ b/u-boot/net/tftp.c
@@ -350,7 +350,7 @@ void TftpStart(void){
            }
        }
 
-       printf("\n    Filename: '%s'", tftp_filename);
+       printf("\n    Filename: %s", tftp_filename);
 
        if(NetBootFileSize){
                printf("\n        Size: 0x%x Bytes = ", NetBootFileSize<<9);