From: Wolfgang Denk <wd@denx.de>
Date: Sun, 19 Jul 2009 17:37:24 +0000 (+0200)
Subject: Fix boards broken after removal of legacy NAND and DoC support
X-Git-Tag: v2009.08-rc1~59
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=7640f41988a456a0b1f05263d2e2dc5cd7d93984;p=karo-tx-uboot.git

Fix boards broken after removal of legacy NAND and DoC support

Commit 2419169f removed support for legacy NAND and disk on chip but
missed to update the code for a few boards. This patch fixes the
resulting build issues.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c
index 870011e6fc..4039145e43 100644
--- a/board/bmw/bmw.c
+++ b/board/bmw/bmw.c
@@ -117,6 +117,7 @@ sys_led_msg(char* msg)
     LED_REG(3) = msg[0];
 }
 
+#ifdef CONFIG_CMD_DOC
 /*
  * Map onboard TSOP-16MB DOC FLASH chip.
  */
@@ -124,6 +125,7 @@ void doc_init (void)
 {
     doc_probe(DOC_BASE_ADDR);
 }
+#endif
 
 #define NV_ADDR	((volatile unsigned char *) CONFIG_ENV_ADDR)
 
diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index 7985f7d711..6ee44d691d 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -147,10 +147,12 @@ void pci_init_board (void)
 	cpc710_pci_enable_timeout ();
 }
 
+#ifdef CONFIG_CMD_DOC
 void doc_init (void)
 {
 	doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC);
 }
+#endif
 
 void pcippc2_cpci3264_init (void)
 {
diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c
index b2949060c0..e10d9f9ff0 100644
--- a/board/rbc823/rbc823.c
+++ b/board/rbc823/rbc823.c
@@ -256,6 +256,7 @@ static long int dram_size (long int mamr_value, long int *base,
 	return (get_ram_size (base, maxsize));
 }
 
+#ifdef CONFIG_CMD_DOC
 void doc_init (void)
 {
 	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
@@ -267,3 +268,4 @@ void doc_init (void)
 
 	doc_probe (FLASH_BASE1_PRELIM);
 }
+#endif
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 8a197ad990..76ca916636 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -120,7 +120,6 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index dda6179753..4f9f9fe0f1 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -134,7 +134,6 @@
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PCMCIA
 #define CONFIG_CMD_PING
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index 167285e0aa..d060cb7a42 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -121,7 +121,6 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index b9cf621633..a18b480127 100644
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -107,7 +107,7 @@
 #define CONFIG_CMD_PING
 
 #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2
-#define CONFIG_CMD_NAND
+/* #define CONFIG_CMD_NAND */ /* disabled */
 #endif