summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>2011-02-03 14:17:08 +0100
committerShinya Kuribayashi <skuribay@pobox.com>2011-02-05 17:15:05 +0900
commit383015b2cc509266da01444bb4b117cf2aeb591a (patch)
treecf9c2a4b3a6ff34a6d978c2f79a7d44cdff44953
parentf69b980d108b5f15ca7dd3f4284d5a66488c3625 (diff)
downloadu-boot-imx-383015b2cc509266da01444bb4b117cf2aeb591a.zip
u-boot-imx-383015b2cc509266da01444bb4b117cf2aeb591a.tar.gz
u-boot-imx-383015b2cc509266da01444bb4b117cf2aeb591a.tar.bz2
MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled
Some VCT boards lacks the support of networking or USB. Additionally that support is disabled in small image configurations. If CONFIG_CMD_NET should not used the CONFIG_CMD_NFS option have to be disabled too. Otherwise the linker fails with unresolved symbols. If CONFIG_VCT_SMALL_IMAGE is set than CONFIG_CMD_NET and CONFIG_CMD_USB are disabled at the end of vct.h. This is not adequate because CONFIG_CMD_USB enables additional options and the linker fails again with unresolved symbols. This patch adds an early check against CONFIG_VCT_SMALL_IMAGE so the additional options are only enabled if they are really needed. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
-rw-r--r--include/configs/vct.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 4894969..325ac8c 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -109,17 +109,20 @@
/*
* Only Premium/Platinum have ethernet support right now
*/
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+ !defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_PING
#define CONFIG_CMD_SNTP
#else
#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
#endif
/*
* Only Premium/Platinum have USB-EHCI support right now
*/
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+ !defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_USB
#define CONFIG_CMD_FAT
#endif