From: Piotr Dymacz <pepe2k@gmail.com>
Date: Thu, 1 Sep 2016 19:19:06 +0000 (+0200)
Subject: Set autoload variable to 'no' by default
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c999470ac5808a85e91d37dcc7e05bbe4030b6b6;p=oweals%2Fu-boot_mod.git

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 f9e8de9..9e9e58e 100644
--- 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 ac6c8fb..31bcd8a 100644
--- 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 1b929d1..49c0903 100644
--- 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 */