From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 1 Aug 2014 07:19:55 +0000 (+0200)
Subject: sunxi-common.h: Don't undef CONFIG_CMD_NET only to redefine it again later
X-Git-Tag: v2014.10-rc2~53^2~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b9fb3b94cbb76884df4e8425abc2a95bb7aa6a56;p=u-boot

sunxi-common.h: Don't undef CONFIG_CMD_NET only to redefine it again later

config_distro_defaults.h which is include later will redefine CONFIG_CMD_NET,
drop the useless / meaningless undef of it.

While at also move the undef of CONFIG_CMD_FPGA up to directly under the
include of config_cmd_defaults.h, to make it clear that it overwrites
the setting done from config_cmd_defaults.h .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
---

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index cbe8b403f2..4c712f35ea 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -127,6 +127,7 @@
 	"bootm_size=0x10000000\0"
 
 #include <config_cmd_default.h>
+#undef CONFIG_CMD_FPGA
 
 #define CONFIG_FAT_WRITE	/* enable write access */
 
@@ -166,9 +167,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x4ff00000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000	/* 512 KiB */
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_NET
-
 /* I2C */
 #define CONFIG_SPL_I2C_SUPPORT
 #define CONFIG_SYS_I2C