Set autoload variable to 'no' by default

This will stop running tftpboot after receiving
dhcp/bootp configuration.

diff --git a/u-boot/common/env_common.c b/u-boot/common/env_common.c
index f9e8de930a0eb263c7f76cd18cfc86db88240430..9e9e58e3e95fb09baf506fd7fc51b7cdabcfe151 100644 (file)
--- a/u-boot/common/env_common.c
+++ b/u-boot/common/env_common.c
@@ -96,8 +96,8 @@ uchar default_environment[] = {
 #if defined(CONFIG_SERVERIP)
        "serverip=" MK_STR(CONFIG_SERVERIP) "\0"
 #endif
-#if defined(CFG_AUTOLOAD)
-       "autoload=" CFG_AUTOLOAD "\0"
+#if defined(CONFIG_AUTOLOAD)
+       "autoload=" MK_STR(CONFIG_AUTOLOAD) "\0"
 #endif
 #if defined(CONFIG_ROOTPATH)
        "rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"

diff --git a/u-boot/common/environment.c b/u-boot/common/environment.c
index ac6c8fbbd1a41fb1263feb119c66added0e365a9..31bcd8aa9bbc0477df0d6d1e55c46c5ca7e6366d 100644 (file)
--- a/u-boot/common/environment.c
+++ b/u-boot/common/environment.c
@@ -158,8 +158,8 @@ env_t environment __PPCENV__ = {
 #if defined(CONFIG_SERVERIP)
                "serverip=" MK_STR(CONFIG_SERVERIP) "\0"
 #endif
-#if defined(CFG_AUTOLOAD)
-               "autoload=" CFG_AUTOLOAD "\0"
+#if defined(CONFIG_AUTOLOAD)
+               "autoload=" MK_STR(CONFIG_AUTOLOAD) "\0"
 #endif
 #if defined(CONFIG_ROOTPATH)
                "rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"

diff --git a/u-boot/include/configs/qca9k_common.h b/u-boot/include/configs/qca9k_common.h
index 1b929d1649d6e9a0f65044ea06df471c47940e61..49c09034402da563cb2294ca128a193d15df2ac3 100644 (file)
--- a/u-boot/include/configs/qca9k_common.h
+++ b/u-boot/include/configs/qca9k_common.h
@@ -85,6 +85,7 @@
 /* Other environment variables */
 #define CONFIG_BOOTFILE        firmware.bin
 #define CONFIG_LOADADDR        0x80800000
+#define CONFIG_AUTOLOAD        no
 #define CONFIG_BOOTP_RANDOM_DELAY      1
 
 /* This is needed for time calculation */