浏览代码

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>
Wolfgang Denk 16 年之前
父节点
当前提交
7640f41988
共有 7 个文件被更改,包括 7 次插入4 次删除
  1. 2 0
      board/bmw/bmw.c
  2. 2 0
      board/pcippc2/pcippc2.c
  3. 2 0
      board/rbc823/rbc823.c
  4. 0 1
      include/configs/NETPHONE.h
  5. 0 1
      include/configs/NETTA.h
  6. 0 1
      include/configs/NETTA2.h
  7. 1 1
      include/configs/NETVIA.h

+ 2 - 0
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)
 

+ 2 - 0
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)
 {

+ 2 - 0
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 1 - 1
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