diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-18 21:52:24 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-18 21:56:15 +0200 | 
| commit | 2eb99ca8029b44c988d5f6312f97e68d3b9cb2bd (patch) | |
| tree | 8258cc4f4f47ed8cb6613c25cd04dd0aa04b224b /include | |
| parent | 7024aa14df2981b4e65c6189909da9aadb1c22da (diff) | |
| download | olio-uboot-2014.01-2eb99ca8029b44c988d5f6312f97e68d3b9cb2bd.tar.xz olio-uboot-2014.01-2eb99ca8029b44c988d5f6312f97e68d3b9cb2bd.zip | |
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: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/afeb9260.h | 2 | ||||
| -rw-r--r-- | include/configs/apollon.h | 2 | ||||
| -rw-r--r-- | include/configs/at91cap9adk.h | 2 | ||||
| -rw-r--r-- | include/configs/at91sam9260ek.h | 2 | ||||
| -rw-r--r-- | include/configs/at91sam9261ek.h | 2 | ||||
| -rw-r--r-- | include/configs/at91sam9263ek.h | 2 | ||||
| -rw-r--r-- | include/configs/at91sam9m10g45ek.h | 3 | ||||
| -rw-r--r-- | include/configs/at91sam9rlek.h | 2 | ||||
| -rw-r--r-- | include/configs/davinci_schmoogie.h | 1 | ||||
| -rw-r--r-- | include/configs/davinci_sffsdr.h | 1 | ||||
| -rw-r--r-- | include/configs/delta.h | 2 | ||||
| -rw-r--r-- | include/configs/meesc.h | 2 | ||||
| -rw-r--r-- | include/configs/netstar.h | 2 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_overo.h | 2 | ||||
| -rw-r--r-- | include/configs/omap3_pandora.h | 2 | ||||
| -rw-r--r-- | include/configs/omap3_zoom1.h | 3 | ||||
| -rw-r--r-- | include/configs/omap3_zoom2.h | 2 | ||||
| -rw-r--r-- | include/configs/pdnb3.h | 3 | ||||
| -rw-r--r-- | include/configs/pm9261.h | 2 | ||||
| -rw-r--r-- | include/configs/pm9263.h | 2 | ||||
| -rw-r--r-- | include/configs/smdk6400.h | 2 | ||||
| -rw-r--r-- | include/configs/zylonite.h | 2 | 
24 files changed, 46 insertions, 1 deletions
| diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h index c5134a214..8a1c4f592 100644 --- a/include/configs/afeb9260.h +++ b/include/configs/afeb9260.h @@ -106,6 +106,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC13 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* NOR flash - no real flash on this board */ diff --git a/include/configs/apollon.h b/include/configs/apollon.h index fa5a7a9e2..575f60e16 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -256,6 +256,8 @@  #define	CONFIG_ENV_IS_IN_ONENAND	1  #define CONFIG_ENV_ADDR		0x00020000 +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  #ifdef CONFIG_SYS_USE_UBI  #define CONFIG_CMD_MTDPARTS  #define MTDIDS_DEFAULT		"onenand0=onenand" diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 219eea311..df7366120 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -130,6 +130,8 @@  #define CONFIG_SYS_MAX_NAND_DEVICE		1  #define CONFIG_SYS_NAND_BASE			0x40000000  #define CONFIG_SYS_NAND_DBW_8			1 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* Ethernet */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 1828c63af..7eef9a38e 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -122,6 +122,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC13 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* NOR flash - no real flash on this board */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 6d240230d..028a04f32 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -132,6 +132,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 21)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC15 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* NOR flash - no real flash on this board */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 00f3114fb..9539d18f6 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -266,6 +266,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PD15  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PA22 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* Ethernet */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 572c45bfb..af97afe2b 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -118,6 +118,7 @@  /* NOR flash, if populated */  #ifndef CONFIG_CMD_NAND  #define CONFIG_SYS_NO_FLASH		1 +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #else  #define CONFIG_SYS_FLASH_CFI		1  #define CONFIG_FLASH_CFI_DRIVER		1 @@ -140,6 +141,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC8 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* Ethernet */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index c4668236c..bc2a32bed 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -118,6 +118,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PB6  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PD17 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* Ethernet - not present */ diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 9cb9838b5..79095694a 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -93,6 +93,7 @@  #define CONFIG_SYS_NAND_HW_ECC  #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_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  /*=====================*/  /* Board related stuff */  /*=====================*/ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index a47620fca..531baf1af 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -88,6 +88,7 @@  #define CONFIG_SYS_NAND_HW_ECC  #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_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  /* I2C switch definitions for PCA9543 chip */  #define CONFIG_SYS_I2C_PCA9543_ADDR		0x70  #define CONFIG_SYS_I2C_PCA9543_ADDR_LEN	0	/* Single register. */ diff --git a/include/configs/delta.h b/include/configs/delta.h index e7186e839..1572eef8a 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -228,6 +228,8 @@  #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_64BIT_VSPRINTF		/* needed for nand_util.c */ +  /* nand timeout values */  #define CONFIG_SYS_NAND_PROG_ERASE_TO	3000  #define CONFIG_SYS_NAND_OTHER_TO	100 diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 28c4de021..825317201 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -119,6 +119,8 @@  #define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PD15  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PA22 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  /* Ethernet */ diff --git a/include/configs/netstar.h b/include/configs/netstar.h index 5062cdb16..f0b420781 100644 --- a/include/configs/netstar.h +++ b/include/configs/netstar.h @@ -110,6 +110,8 @@  #define CONFIG_SYS_NAND_BASE		0x04000000 + (2 << 23)  #define NAND_ALLOW_ERASE_ALL		1 +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  #define CONFIG_HARD_I2C  #define CONFIG_SYS_I2C_SPEED		100000  #define CONFIG_SYS_I2C_SLAVE		1 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c2bd7e67e..a1a849e29 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -142,6 +142,7 @@  #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */  							/* devices */ +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #define CONFIG_JFFS2_NAND  /* nand device jffs2 lives on */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index e205c01b4..198c3d1fd 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -138,6 +138,7 @@  #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of */  							/* NAND devices */ +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #define CONFIG_JFFS2_NAND  /* nand device jffs2 lives on */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 89023128c..3bf798a40 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -128,6 +128,8 @@  #define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND */  						/* devices */ +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  #define CONFIG_JFFS2_NAND  /* nand device jffs2 lives on */  #define CONFIG_JFFS2_DEV		"nand0" diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index dbd4dcc03..d7e0ea1c4 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -132,6 +132,8 @@  #define CONFIG_SYS_MAX_NAND_DEVICE	1	/* Max number of NAND */  						/* devices */ +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  #define CONFIG_JFFS2_NAND  /* nand device jffs2 lives on */  #define CONFIG_JFFS2_DEV		"nand0" diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 9e000ed1c..4034ea429 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -138,6 +138,9 @@  #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */  							/* devices */ + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  #define CONFIG_JFFS2_NAND  /* nand device jffs2 lives on */  #define CONFIG_JFFS2_DEV		"nand0" diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index c2ad5bf19..701a296b3 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -158,6 +158,8 @@  #define GPMC_NAND_ECC_LP_x16_LAYOUT	1  #define CONFIG_SYS_MAX_NAND_DEVICE	1 +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  /* Environment information */  #define CONFIG_BOOTDELAY		10 diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index 1255f21e8..2612165cb 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -265,7 +265,8 @@   * NAND-FLASH stuff   */  #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  /* diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 4784c40d4..315d7f877 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -236,6 +236,8 @@  #define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14  #define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PA16 +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  /* NOR flash */  #define CONFIG_SYS_FLASH_CFI			1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 94e1eb9d8..f8197b1f8 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -258,6 +258,8 @@  #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)  #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD15  #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PB30 + +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */  #endif  #define CONFIG_CMD_JFFS2		1 diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 018f576ef..ddc8e7174 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -269,6 +269,8 @@  				 48, 49, 50, 51, 52, 53, 54, 55, \  				 56, 57, 58, 59, 60, 61, 62, 63} +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  /* Boot configuration (define only one of next 3) */  #define CONFIG_BOOT_NAND  /* None of these are currently implemented. Left from the original Samsung diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h index 15c37087f..6b4586ef0 100644 --- a/include/configs/zylonite.h +++ b/include/configs/zylonite.h @@ -206,6 +206,8 @@  #define CONFIG_SYS_NAND_SENDCMD_RETRY	3  #undef NAND_ALLOW_ERASE_ALL	/* Allow erasing bad blocks - don't use */ +#define CONFIG_SYS_64BIT_VSPRINTF		/* needed for nand_util.c */ +  /* NAND Timing Parameters (in ns) */  #define NAND_TIMING_tCH		10  #define NAND_TIMING_tCS		0 |