Skip to contentSkip to conversation

Remove prototypes of nand_init() in favor of including nand.h.

PATCH New Scott Wood 3 participants 5 messages May 22, 2008 – Jul 9, 2008

lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 2/2 Remove prototypes of nand_init() in favor of including nand.h.

Likewise with onenand_init().

Signed-off-by Scott Wood <[email protected]>
---
 lib_arm/board.c |   10 ++--------
 lib_ppc/board.c |    4 +---
 lib_sh/board.c  |    2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)
lib_arm/board.c +2 -8
index 67506b3..5e04553 100644
@@ -45,6 +45,8 @@
 #include <version.h>
 #include <net.h>
 #include <serial.h>
+#include <nand.h>
+#include <onenand_uboot.h>
 
 #ifdef CONFIG_DRIVER_SMC91111
 #include "../drivers/net/smc91111.h"

@@ -55,14 +57,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_CMD_NAND)
-void nand_init (void);
-#endif
-
-#if defined(CONFIG_CMD_ONENAND)
-void onenand_init(void);
-#endif
-
 ulong monitor_flash_len;
 
 #ifdef CONFIG_HAS_DATAFLASH
lib_ppc/board.c +1 -3
index 4956403..6f7242d 100644
@@ -93,9 +93,7 @@ void doc_init (void);
 #if defined(CONFIG_HARD_SPI)
 #include <spi.h>
 #endif
-#if defined(CONFIG_CMD_NAND)
-void nand_init (void);
-#endif
+#include <nand.h>
 
 static char *failed = "*** failed ***\n";
lib_sh/board.c +1 -1
index 883c381..807415c 100644
@@ -76,7 +76,7 @@ static int sh_flash_init(void)
 }
 
 #if defined(CONFIG_CMD_NAND)
-void nand_init (void);
+#include <nand.h>
 static int sh_nand_init(void)
 {
 	printf("NAND: ");
Signature · 1 line
1.5.3
#1 lore raw

PATCH 2/2 Remove prototypes of nand_init() in favor of including nand.h.

Hi Scott,

Quoted 12 lines · Scott Wood
Signed-off-by Scott Wood <[email protected]>
---
 lib_arm/board.c |   10 ++--------
 lib_ppc/board.c |    4 +---
 lib_sh/board.c  |    2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)
lib_arm/board.c +0 -0
index 67506b3..5e04553 100644

lib_arm/board.c line 48

Quoted 4 lines
lib_arm/board.c +1 -0
@@ -45,6 +45,8 @@
 #include <version.h>
 #include <net.h>
 #include <serial.h>
+#include <nand.h>

Today, I updated my local git tree to the current U-Boot. Running my board I saw the message "RAM Configuration:", which didn't appear before.

I think the reason is the following:
nand.h includes linux/mtd/mtd.h, which defines a macro #define DEBUG(n, args...) do { } while(0).
This causes #ifdef DEBUG in line 198 of board.c to become true.

Could you please fix this?
Thank you very much.

Best Regards,
Jens

author
#2 lore raw

PATCH 2/2 Remove prototypes of nand_init() in favor of including nand.h.

Quoted 10 lines · Jens Gehrlein

Today, I updated my local git tree to the current U-Boot. Running my board I saw the message "RAM Configuration:", which didn't appear before.

I think the reason is the following:
nand.h includes linux/mtd/mtd.h, which defines a macro #define DEBUG(n, args...) do { } while(0).
This causes #ifdef DEBUG in line 198 of board.c to become true.

Could you please fix this?
Thank you very much.

It's already fixed in u-boot-nand-flash.git.

-Scott

#3 lore raw

PATCH 2/2 Remove prototypes of nand_init() in favor of including nand.h.

Hi Scott,

Quoted 9 lines · Scott Wood
Quoted 8 lines · Jens Gehrlein

Today, I updated my local git tree to the current U-Boot. Running my board I saw the message "RAM Configuration:", which didn't appear before.

I think the reason is the following:
nand.h includes linux/mtd/mtd.h, which defines a macro #define DEBUG(n, args...) do { } while(0).
This causes #ifdef DEBUG in line 198 of board.c to become true.

Quoted 6 lines
Quoted 2 lines

Could you please fix this?
Thank you very much.

It's already fixed in u-boot-nand-flash.git.

-Scott

Okay. Found it. Thank you for the hint.

Kind regards,
Jens

#4 lore raw

PATCH 2/2 Remove prototypes of nand_init() in favor of including nand.h.

In reply to Scott Wood
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 8 lines · Jens Gehrlein

Today, I updated my local git tree to the current U-Boot. Running my board I saw the message "RAM Configuration:", which didn't appear before.

I think the reason is the following:
nand.h includes linux/mtd/mtd.h, which defines a macro #define DEBUG(n, args...) do { } while(0).
This causes #ifdef DEBUG in line 198 of board.c to become true.

Quoted 4 lines
Quoted 2 lines

Could you please fix this?
Thank you very much.

It's already fixed in u-boot-nand-flash.git.

When will I see a pull request so this gets fixed in mainline, too?

I would like to have some -rc1 later this week.

Thanks in advance.

Best regards,

Wolfgang Denk

Signature · 6 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
You are an excellent tactician, Captain. You let your second in  com-
mand attack while you sit and watch for weakness.
	-- Khan Noonian Singh, "Space Seed", stardate 3141.9