Skip to content
Snippets Groups Projects
Commit 2eb99ca8 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

NAND: Part 2: 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.

This patch covers the non-PPC boards that were missed in the previous
patch (commit 170c1972).

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 7024aa14
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 1 deletion
...@@ -106,6 +106,8 @@ ...@@ -106,6 +106,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* NOR flash - no real flash on this board */ /* NOR flash - no real flash on this board */
......
...@@ -256,6 +256,8 @@ ...@@ -256,6 +256,8 @@
#define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_IS_IN_ONENAND 1
#define CONFIG_ENV_ADDR 0x00020000 #define CONFIG_ENV_ADDR 0x00020000
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#ifdef CONFIG_SYS_USE_UBI #ifdef CONFIG_SYS_USE_UBI
#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MTDPARTS
#define MTDIDS_DEFAULT "onenand0=onenand" #define MTDIDS_DEFAULT "onenand0=onenand"
......
...@@ -130,6 +130,8 @@ ...@@ -130,6 +130,8 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x40000000 #define CONFIG_SYS_NAND_BASE 0x40000000
#define CONFIG_SYS_NAND_DBW_8 1 #define CONFIG_SYS_NAND_DBW_8 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet */ /* Ethernet */
......
...@@ -122,6 +122,8 @@ ...@@ -122,6 +122,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* NOR flash - no real flash on this board */ /* NOR flash - no real flash on this board */
......
...@@ -132,6 +132,8 @@ ...@@ -132,6 +132,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 21) #define CONFIG_SYS_NAND_MASK_CLE (1 << 21)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* NOR flash - no real flash on this board */ /* NOR flash - no real flash on this board */
......
...@@ -266,6 +266,8 @@ ...@@ -266,6 +266,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet */ /* Ethernet */
......
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
/* NOR flash, if populated */ /* NOR flash, if populated */
#ifndef CONFIG_CMD_NAND #ifndef CONFIG_CMD_NAND
#define CONFIG_SYS_NO_FLASH 1 #define CONFIG_SYS_NO_FLASH 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#else #else
#define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_SYS_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_FLASH_CFI_DRIVER 1
...@@ -140,6 +141,8 @@ ...@@ -140,6 +141,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet */ /* Ethernet */
......
...@@ -118,6 +118,8 @@ ...@@ -118,6 +118,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PB6 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PB6
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD17 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD17
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet - not present */ /* Ethernet - not present */
......
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
#define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_NAND_HW_ECC
#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_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/*=====================*/ /*=====================*/
/* Board related stuff */ /* Board related stuff */
/*=====================*/ /*=====================*/
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
#define CONFIG_SYS_NAND_HW_ECC #define CONFIG_SYS_NAND_HW_ECC
#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_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* I2C switch definitions for PCA9543 chip */ /* I2C switch definitions for PCA9543 chip */
#define CONFIG_SYS_I2C_PCA9543_ADDR 0x70 #define CONFIG_SYS_I2C_PCA9543_ADDR 0x70
#define CONFIG_SYS_I2C_PCA9543_ADDR_LEN 0 /* Single register. */ #define CONFIG_SYS_I2C_PCA9543_ADDR_LEN 0 /* Single register. */
......
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND0_BASE } #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND0_BASE }
#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 */
/* nand timeout values */ /* nand timeout values */
#define CONFIG_SYS_NAND_PROG_ERASE_TO 3000 #define CONFIG_SYS_NAND_PROG_ERASE_TO 3000
#define CONFIG_SYS_NAND_OTHER_TO 100 #define CONFIG_SYS_NAND_OTHER_TO 100
......
...@@ -119,6 +119,8 @@ ...@@ -119,6 +119,8 @@
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15 #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22 #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* Ethernet */ /* Ethernet */
......
...@@ -110,6 +110,8 @@ ...@@ -110,6 +110,8 @@
#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23) #define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)
#define NAND_ALLOW_ERASE_ALL 1 #define NAND_ALLOW_ERASE_ALL 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 1 #define CONFIG_SYS_I2C_SLAVE 1
......
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */ /* nand device jffs2 lives on */
......
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
/* NAND devices */ /* NAND devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */ /* nand device jffs2 lives on */
......
...@@ -128,6 +128,8 @@ ...@@ -128,6 +128,8 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */ /* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_DEV "nand0"
......
...@@ -132,6 +132,8 @@ ...@@ -132,6 +132,8 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */ /* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_DEV "nand0"
......
...@@ -138,6 +138,9 @@ ...@@ -138,6 +138,9 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */ /* devices */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_NAND
/* nand device jffs2 lives on */ /* nand device jffs2 lives on */
#define CONFIG_JFFS2_DEV "nand0" #define CONFIG_JFFS2_DEV "nand0"
......
...@@ -158,6 +158,8 @@ ...@@ -158,6 +158,8 @@
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1 #define GPMC_NAND_ECC_LP_x16_LAYOUT 1
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* Environment information */ /* Environment information */
#define CONFIG_BOOTDELAY 10 #define CONFIG_BOOTDELAY 10
......
...@@ -265,7 +265,8 @@ ...@@ -265,7 +265,8 @@
* NAND-FLASH stuff * NAND-FLASH stuff
*/ */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE 0x51000000 /* NAND FLASH Base Address */ #define CONFIG_SYS_NAND_BASE 0x51000000 /* NAND FLASH Base Address */
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif #endif
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment