[U-Boot-Users] [PATCH 2/2] Remove prototypes of nand_init() in favor of including nand.h.

Likewise with onenand_init().
Signed-off-by: Scott Wood scottwood@freescale.com --- lib_arm/board.c | 10 ++-------- lib_ppc/board.c | 4 +--- lib_sh/board.c | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib_arm/board.c b/lib_arm/board.c index 67506b3..5e04553 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -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 diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 4956403..6f7242d 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -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";
diff --git a/lib_sh/board.c b/lib_sh/board.c index 883c381..807415c 100644 --- a/lib_sh/board.c +++ b/lib_sh/board.c @@ -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: ");

Hi Scott,
Scott Wood schrieb:
Signed-off-by: Scott Wood scottwood@freescale.com
lib_arm/board.c | 10 ++-------- lib_ppc/board.c | 4 +--- lib_sh/board.c | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib_arm/board.c b/lib_arm/board.c index 67506b3..5e04553 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -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

Jens Gehrlein wrote:
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

Hi Scott,
Scott Wood schrieb:
Jens Gehrlein wrote:
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
Okay. Found it. Thank you for the hint.
Kind regards, Jens

In message 486A4830.10300@freescale.com you wrote:
Jens Gehrlein wrote:
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.
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
participants (3)
-
Jens Gehrlein
-
Scott Wood
-
Wolfgang Denk