summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-08-01 09:19:55 +0200
committerHans de Goede <hdegoede@redhat.com>2014-08-12 08:40:12 +0200
commitb9fb3b94cbb76884df4e8425abc2a95bb7aa6a56 (patch)
tree1bf9edc4ab66b091b84efba0eb9113837d2c2f51
parent85a4455c517b15e7f08700d3e1f2523ac64aae35 (diff)
downloadu-boot-imx-b9fb3b94cbb76884df4e8425abc2a95bb7aa6a56.zip
u-boot-imx-b9fb3b94cbb76884df4e8425abc2a95bb7aa6a56.tar.gz
u-boot-imx-b9fb3b94cbb76884df4e8425abc2a95bb7aa6a56.tar.bz2
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>
-rw-r--r--include/configs/sunxi-common.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index cbe8b40..4c712f3 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