Skip to contentSkip to conversation

Fix boards broken after removal of legacy NAND and DoC support

PATCH New Wolfgang Denk 2 participants 3 messages Jul 19, 2009 – Jul 28, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 board/bmw/bmw.c            |    2 ++
 board/pcippc2/pcippc2.c    |    2 ++
 board/rbc823/rbc823.c      |    2 ++
 include/configs/NETPHONE.h |    1 -
 include/configs/NETTA.h    |    1 -
 include/configs/NETTA2.h   |    1 -
 include/configs/NETVIA.h   |    2 +-
 7 files changed, 7 insertions(+), 4 deletions(-)
board/bmw/bmw.c +2 -0
index 870011e..4039145 100644
@@ -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)
 
board/pcippc2/pcippc2.c +2 -0
index 7985f7d..6ee44d6 100644
@@ -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)
 {
board/rbc823/rbc823.c +2 -0
index b294906..e10d9f9 100644
@@ -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
include/configs/NETPHONE.h +0 -1
index 8a197ad..76ca916 100644
@@ -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
include/configs/NETTA.h +0 -1
index dda6179..4f9f9fe 100644
@@ -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
include/configs/NETTA2.h +0 -1
index 167285e..d060cb7 100644
@@ -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
include/configs/NETVIA.h +1 -1
index b9cf621..a18b480 100644
@@ -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
 
 
Signature · 1 line
1.6.0.6
#1 lore raw

PATCH 1/1 Fix boards broken after removal of legacy NAND and DoC support

Quoted 5 lines · Wolfgang Denk

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.

Doh, apparently I forgot to push this amended commit which fixed these issues:

http://lists.denx.de/pipermail/u-boot/2009-July/056769.html

Sorry about that.

Quoted 29 lines
include/configs/NETPHONE.h +0 -1
index 8a197ad..76ca916 100644
@@ -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
include/configs/NETTA.h +0 -1
index dda6179..4f9f9fe 100644
@@ -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
include/configs/NETTA2.h +0 -0
index 167285e..d060cb7 100644

include/configs/NETTA2.h line 126

Quoted 7 lines
include/configs/NETTA2.h +0 -1
@@ -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

Why remove them outright here...

include/configs/NETVIA.h line 111

Quoted 11 lines
include/configs/NETVIA.h +1 -1
index b9cf621..a18b480 100644
@@ -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

...but only comment it out here?

-Scott

#2 lore raw

PATCH 1/1 Fix boards broken after removal of legacy NAND and DoC support

Dear Scott Wood,

Quoted 2 lines · In message <[email protected]> you wrote:

Sorry about that.

No problem.

...

Quoted 9 lines
Quoted 9 lines

#define CONFIG_CMD_PING

include/configs/NETTA2.h +0 -0
index 167285e..d060cb7 100644
@@ -121,7 +121,6 @@
  */
 #include <config_cmd_default.h>
 
Quoted 6 lines

include/configs/NETTA2.h line 126

Quoted 4 lines
include/configs/NETTA2.h +0 -1
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_MII

Why remove them outright here...

Because these are "simple" configurations, and if at a later point of time someone adds CONFIG_CMD_NAND again this is a straightforward thing to do.

Quoted 7 lines
Quoted 7 lines
include/configs/NETVIA.h +0 -0
index b9cf621..a18b480 100644
@@ -107,7 +107,7 @@
 #define CONFIG_CMD_PING
 
Quoted 6 lines

include/configs/NETVIA.h line 111

Quoted 4 lines
include/configs/NETVIA.h +1 -1
 #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2
-#define CONFIG_CMD_NAND
+/* #define CONFIG_CMD_NAND */ /* disabled */
 #endif

...but only comment it out here?

Because here it's dependent on a specific config option, and when removing the #define, the #if makes no sense any more, and somebody trying to re-add CONFIG_CMD_NAND (without carefully studiyng the git history) would probably need more time to come up with the right solution.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
core error - bus dumped