Commit 170c1972 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

NAND: Fix warning Please define CONFIG_SYS_64BIT_VSPRINTF...

Commit 8d2effea

 added a warning for configurations that use NAND
without defining the (then necessary) CONFIG_SYS_64BIT_VSPRINTF but
failed to fix the affected boards.
Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 6e897a66
...@@ -157,8 +157,10 @@ ...@@ -157,8 +157,10 @@
#define CONFIG_SYS_NAND_CLE (0x80000000 >> 2) /* our CLE is GPIO2 */ #define CONFIG_SYS_NAND_CLE (0x80000000 >> 2) /* our CLE is GPIO2 */
#define CONFIG_SYS_NAND_ALE (0x80000000 >> 3) /* our ALE is GPIO3 */ #define CONFIG_SYS_NAND_ALE (0x80000000 >> 3) /* our ALE is GPIO3 */
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* PCI stuff * PCI stuff
......
...@@ -165,6 +165,8 @@ ...@@ -165,6 +165,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* /*
* For booting Linux, the board info and command line data * For booting Linux, the board info and command line data
* have to be in the first 8 MB of memory, since this is * have to be in the first 8 MB of memory, since this is
......
...@@ -219,6 +219,8 @@ ...@@ -219,6 +219,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* PCI stuff * PCI stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
......
...@@ -160,6 +160,8 @@ ...@@ -160,6 +160,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* PCI stuff * PCI stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
......
...@@ -265,6 +265,8 @@ ...@@ -265,6 +265,8 @@
#define CONFIG_SYS_NAND0_BASE 0xE1000000 #define CONFIG_SYS_NAND0_BASE 0xE1000000
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif /* CONFIG_CMD_NAND */ #endif /* CONFIG_CMD_NAND */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* /*
* PCI stuff * PCI stuff
*/ */
......
...@@ -210,6 +210,9 @@ ...@@ -210,6 +210,9 @@
* NAND-FLASH stuff * NAND-FLASH stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* /*
* nand device 1 on dave (PPChameleonEVB) needs more time, * nand device 1 on dave (PPChameleonEVB) needs more time,
* so we just introduce additional wait in nand_wait(), * so we just introduce additional wait in nand_wait(),
......
...@@ -439,6 +439,8 @@ ...@@ -439,6 +439,8 @@
WRITE_NAND(d, addr); \ WRITE_NAND(d, addr); \
} while(0) } while(0)
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif /* CONFIG_CMD_NAND */ #endif /* CONFIG_CMD_NAND */
#define CONFIG_PCI #define CONFIG_PCI
......
...@@ -374,6 +374,8 @@ ...@@ -374,6 +374,8 @@
#define NAND_BIG_DELAY_US 25 /* max tR for Samsung devices */ #define NAND_BIG_DELAY_US 25 /* max tR for Samsung devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif /* CONFIG_NAND */ #endif /* CONFIG_NAND */
/* /*
......
...@@ -169,6 +169,8 @@ ...@@ -169,6 +169,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_NAND_QUIET 1 #define CONFIG_SYS_NAND_QUIET 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* PCI stuff * PCI stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
......
...@@ -157,6 +157,8 @@ ...@@ -157,6 +157,8 @@
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* PCI stuff * PCI stuff
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
......
...@@ -265,6 +265,8 @@ ...@@ -265,6 +265,8 @@
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS) #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */ #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* External Bus Controller (EBC) Setup * External Bus Controller (EBC) Setup
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
......
...@@ -217,6 +217,8 @@ ...@@ -217,6 +217,8 @@
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS) #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */ #define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* DDR SDRAM * DDR SDRAM
*----------------------------------------------------------------------*/ *----------------------------------------------------------------------*/
......
...@@ -225,6 +225,8 @@ ...@@ -225,6 +225,8 @@
#define CONFIG_SYS_NAND_CLE 31 /* our CLE is GPIO31 */ #define CONFIG_SYS_NAND_CLE 31 /* our CLE is GPIO31 */
#define CONFIG_SYS_NAND_ALE 30 /* our ALE is GPIO30 */ #define CONFIG_SYS_NAND_ALE 30 /* our ALE is GPIO30 */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
......
...@@ -426,6 +426,7 @@ extern unsigned long offsetOfEnvironment; ...@@ -426,6 +426,7 @@ extern unsigned long offsetOfEnvironment;
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x77D00000 #define CONFIG_SYS_NAND_BASE 0x77D00000
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */
......
...@@ -188,6 +188,8 @@ ...@@ -188,6 +188,8 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* LIME GDC */ /* LIME GDC */
#define CONFIG_SYS_LIME_BASE 0xc8000000 #define CONFIG_SYS_LIME_BASE 0xc8000000
#define CONFIG_SYS_LIME_SIZE 0x04000000 /* 64 MB */ #define CONFIG_SYS_LIME_SIZE 0x04000000 /* 64 MB */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment