common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
Subsystems (4)
RFC PATCH 1/1 common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL defines.
---
based against git://git.denx.de/u-boot.git next
README | 9 +-------- common/cmd_fdt.c | 14 ++------------ common/cmd_ide.c | 4 ++-- common/cmd_onenand.c | 4 ---- common/image.c | 4 ---- cpu/mpc85xx/mp.c | 4 ---- disk/part.c | 2 +- drivers/mtd/nand/nand_util.c | 4 ---- fs/ubifs/ubifs.c | 4 ---- include/common.h | 2 -- include/configs/ASH405.h | 2 -- include/configs/CMS700.h | 2 -- include/configs/HH405.h | 2 -- include/configs/HUB405.h | 2 -- include/configs/IDS8247.h | 2 -- include/configs/MPC8313ERDB.h | 1 - include/configs/MPC8315ERDB.h | 1 - include/configs/MPC8360ERDK.h | 1 - include/configs/MPC837XEMDS.h | 3 --- include/configs/MPC837XERDB.h | 3 --- include/configs/MPC8536DS.h | 4 ---- include/configs/MPC8540ADS.h | 3 --- include/configs/MPC8541CDS.h | 3 --- include/configs/MPC8544DS.h | 3 --- include/configs/MPC8548CDS.h | 3 --- include/configs/MPC8555CDS.h | 3 --- include/configs/MPC8560ADS.h | 3 --- include/configs/MPC8568MDS.h | 3 --- include/configs/MPC8569MDS.h | 3 --- include/configs/MPC8572DS.h | 3 --- include/configs/MPC8610HPCD.h | 3 --- include/configs/MPC8641HPCN.h | 4 ---- include/configs/P1_P2_RDB.h | 3 --- include/configs/P2020DS.h | 3 --- include/configs/PLU405.h | 2 -- include/configs/PPChameleonEVB.h | 2 -- include/configs/SIMPC8313.h | 1 - include/configs/TQM8272.h | 2 -- include/configs/TQM85xx.h | 2 -- include/configs/VOH405.h | 2 -- include/configs/WUH405.h | 2 -- include/configs/XPEDITE5170.h | 3 --- include/configs/XPEDITE5200.h | 3 --- include/configs/XPEDITE5370.h | 3 --- include/configs/acadia.h | 2 -- include/configs/afeb9260.h | 1 - include/configs/apollon.h | 2 -- include/configs/aria.h | 2 -- include/configs/at91cap9adk.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9rlek.h | 1 - include/configs/bfin_adi_common.h | 3 --- include/configs/cpu9260.h | 1 - include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 1 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 1 - include/configs/delta.h | 2 -- include/configs/devkit8000.h | 2 -- include/configs/keymile-common.h | 2 -- include/configs/kilauea.h | 2 -- include/configs/mecp5123.h | 2 -- include/configs/meesc.h | 1 - include/configs/mpc5121ads.h | 2 -- include/configs/netstar.h | 2 -- include/configs/nhk8815.h | 1 - include/configs/omap3_beagle.h | 2 -- include/configs/omap3_evm.h | 2 -- include/configs/omap3_overo.h | 2 -- include/configs/omap3_pandora.h | 3 --- include/configs/omap3_zoom1.h | 3 --- include/configs/omap3_zoom2.h | 2 -- include/configs/openrd_base.h | 1 - include/configs/pdnb3.h | 1 - include/configs/pm9261.h | 3 --- include/configs/pm9263.h | 1 - include/configs/quad100hd.h | 1 - include/configs/rd6281a.h | 1 - include/configs/sbc35_a9g20.h | 1 - include/configs/sbc8641d.h | 3 --- include/configs/sc3.h | 2 -- include/configs/sheevaplug.h | 1 - include/configs/smdk6400.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/socrates.h | 2 -- include/configs/tny_a9260.h | 1 - include/configs/vct.h | 6 ------ include/configs/zylonite.h | 2 -- include/ppc4xx.h | 6 ------ lib_generic/vsprintf.c | 18 +----------------- 97 files changed, 7 insertions(+), 239 deletions(-)
README +1 -8
@@ -773,7 +773,7 @@ The following options need to be configured: CONFIG_LBA48 Set this to enable support for disks larger than 137GB - Also look at CONFIG_SYS_64BIT_LBA ,CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL + Also look at CONFIG_SYS_64BIT_LBA. Whithout these , LBA48 support uses 32bit variables and will 'only' support disks up to 2.1TB.
@@ -2520,13 +2520,6 @@ use the "saveenv" command to store a valid environment. - CONFIG_SYS_FAULT_MII_ADDR: MII address of the PHY to check for the Ethernet link state. -- CONFIG_SYS_64BIT_VSPRINTF: - Makes vsprintf (and all *printf functions) support printing - of 64bit values by using the L quantifier - -- CONFIG_SYS_64BIT_STRTOUL: - Adds simple_strtoull that returns a 64bit value - - CONFIG_NS16550_MIN_FUNCTIONS: Define this if you desire to only have use of the NS16550_init and NS16550_putc functions for the serial driver located at
common/cmd_fdt.c +2 -12
@@ -364,13 +364,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }else if (strncmp (argv[1 ],"me" ,2 ) ==0 ) {uint64_t addr, size;int err; -#ifdef CONFIG_SYS_64BIT_STRTOUL - addr =simple_strtoull (argv[2 ],NULL ,16 ); - size =simple_strtoull (argv[3 ],NULL ,16 ); -#else - addr =simple_strtoul (argv[2 ],NULL ,16 ); - size =simple_strtoul (argv[3 ],NULL ,16 ); -#endif + addr =simple_strtoull (argv[2 ],NULL ,16 ); + size =simple_strtoull (argv[3 ],NULL ,16 ); err =fdt_fixup_memory (working_fdt, addr, size);if (err <0 )return err;
@@ -402,13 +397,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }else if (argv[2 ][0 ] =='a' ) {uint64_t addr, size;int err; -#ifdef CONFIG_SYS_64BIT_STRTOUL addr =simple_strtoull (argv[3 ],NULL ,16 ); size =simple_strtoull (argv[4 ],NULL ,16 ); -#else - addr =simple_strtoul (argv[3 ],NULL ,16 ); - size =simple_strtoul (argv[4 ],NULL ,16 ); -#endif err =fdt_add_mem_rsv (working_fdt, addr, size);if (err <0 ) {
common/cmd_ide.c +2 -2
@@ -1354,7 +1354,7 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer) }if ((c&(ATA_STAT_DRQ |ATA_STAT_BUSY |ATA_STAT_ERR )) !=ATA_STAT_DRQ ) { -#if defined(CONFIG_SYS_64BIT_LBA ) && defined(CONFIG_SYS_64BIT_VSPRINTF ) +#if defined(CONFIG_SYS_64BIT_LBA )printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n" , device, blknr, c);#else
@@ -1444,7 +1444,7 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer) c =ide_wait (device,IDE_TIME_OUT );/* can't take over 500 ms */ if ((c&(ATA_STAT_DRQ |ATA_STAT_BUSY |ATA_STAT_ERR )) !=ATA_STAT_DRQ ) { -#if defined(CONFIG_SYS_64BIT_LBA ) && defined(CONFIG_SYS_64BIT_VSPRINTF ) +#if defined(CONFIG_SYS_64BIT_LBA )printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n" , device, blknr, c);#else
common/cmd_onenand.c +0 -4
@@ -19,10 +19,6 @@#include <asm/io.h> -#if !defined(CONFIG_SYS_64BIT_VSPRINTF ) -#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! -#endif -static struct mtd_info *mtd;static loff_t next_ofs;
common/image.c +0 -4
@@ -435,11 +435,7 @@ phys_size_t getenv_bootm_size(void)char *s =getenv ("bootm_size" );if (s) {phys_size_t tmp; -#ifdef CONFIG_SYS_64BIT_STRTOUL tmp = (phys_size_t )simple_strtoull (s,NULL ,16 ); -#else - tmp = (phys_size_t )simple_strtoul (s,NULL ,16 ); -#endif return tmp; }
cpu/mpc85xx/mp.c +0 -4
@@ -90,11 +90,7 @@ int cpu_release(int nr, int argc, char *argv[])return 1 ; } -#ifdef CONFIG_SYS_64BIT_STRTOUL boot_addr =simple_strtoull (argv[0 ],NULL ,16 ); -#else - boot_addr =simple_strtoul (argv[0 ],NULL ,16 ); -#endif /* handle pir, r3, r6 */ for (i =1 ; i <4 ; i++) {
disk/part.c +1 -1
@@ -196,7 +196,7 @@ void dev_print (block_dev_desc_t *dev_desc)if (dev_desc->lba48)printf (" Supports 48-bit addressing\n" );#endif -#if defined(CONFIG_SYS_64BIT_LBA ) && defined(CONFIG_SYS_64BIT_VSPRINTF ) +#if defined(CONFIG_SYS_64BIT_LBA ) printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n", mb_quot, mb_rem, gb_quot, gb_rem,
drivers/mtd/nand/nand_util.c +0 -4
@@ -41,10 +41,6 @@#include <nand.h> #include <jffs2/jffs2.h> -#if !defined(CONFIG_SYS_64BIT_VSPRINTF ) -#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! -#endif -typedef struct erase_info erase_info_t ;typedef struct mtd_info mtd_info_t ;
fs/ubifs/ubifs.c +0 -4
@@ -26,10 +26,6 @@#include "ubifs.h" #include <u-boot/zlib.h> -#if !defined(CONFIG_SYS_64BIT_VSPRINTF ) -#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! -#endif -DECLARE_GLOBAL_DATA_PTR ;/* compress.c */
include/common.h +0 -2
@@ -614,9 +614,7 @@ int init_timebase (void);/* lib_generic/vsprintf.c */ ulong simple_strtoul (const char *cp,char **endp,unsigned int base); -#ifdef CONFIG_SYS_64BIT_VSPRINTF unsigned long long simple_strtoull (const char *cp,char **endp,unsigned int base); -#endif long simple_strtol (const char *cp,char **endp,unsigned int base);void panic (const char *fmt, ...) __attribute__ ((format (__printf__,1 ,2 )));
include/configs/ASH405.h +0 -2
@@ -160,8 +160,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * PCI stuff *-----------------------------------------------------------------------
include/configs/CMS700.h +0 -2
@@ -165,8 +165,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #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 * have to be in the first 8 MB of memory, since this is
include/configs/HH405.h +0 -2
@@ -219,8 +219,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * PCI stuff *-----------------------------------------------------------------------
include/configs/HUB405.h +0 -2
@@ -160,8 +160,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * PCI stuff *-----------------------------------------------------------------------
include/configs/IDS8247.h +0 -2
@@ -263,8 +263,6 @@#define CONFIG_SYS_NAND0_BASE 0xE1000000#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 */ /*-----------------------------------------------------------------------
include/configs/MPC8313ERDB.h +0 -1
@@ -236,7 +236,6 @@#define CONFIG_CMD_NAND 1#define CONFIG_NAND_FSL_ELBC 1#define CONFIG_SYS_NAND_BLOCK_SIZE 16384 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
include/configs/MPC8315ERDB.h +0 -1
@@ -228,7 +228,6 @@#define CONFIG_MTD_NAND_VERIFY_WRITE 1#define CONFIG_CMD_NAND 1#define CONFIG_NAND_FSL_ELBC 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_BR1_PRELIM ( CONFIG_SYS_NAND_BASE \ | (2<<BR_DECC_SHIFT)/* Use HW ECC */ \
include/configs/MPC8360ERDK.h +0 -1
@@ -213,7 +213,6 @@#define CONFIG_NAND_FSL_UPM 1#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_MTD_NAND_VERIFY_WRITE -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE#define CONFIG_SYS_LBLAWAR1_PRELIM 0x8000001b/* Access window size 4K */
include/configs/MPC837XEMDS.h +0 -3
@@ -321,9 +321,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -/* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C/* I2C bit-banged */
include/configs/MPC837XERDB.h +0 -3
@@ -343,9 +343,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -/* I2C */ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C/* I2C bit-banged */
include/configs/MPC8536DS.h +0 -4
@@ -440,10 +440,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 - -/* * I2C */
include/configs/MPC8540ADS.h +0 -3
@@ -260,9 +260,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8541CDS.h +0 -3
@@ -293,9 +293,6 @@ extern unsigned long get_clock_freq(void);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8544DS.h +0 -3
@@ -249,9 +249,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -/* I2C */ #define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_HARD_I2C /* I2C with hardware support */
include/configs/MPC8548CDS.h +0 -3
@@ -316,9 +316,6 @@ extern unsigned long get_clock_freq(void);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8555CDS.h +0 -3
@@ -291,9 +291,6 @@ extern unsigned long get_clock_freq(void);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8560ADS.h +0 -3
@@ -253,9 +253,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8568MDS.h +0 -3
@@ -277,9 +277,6 @@ extern unsigned long get_clock_freq(void);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8569MDS.h +0 -3
@@ -254,9 +254,6 @@ extern unsigned long get_clock_freq(void);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8572DS.h +0 -3
@@ -374,9 +374,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* new uImage format support */ #define CONFIG_FIT 1#define CONFIG_FIT_VERBOSE 1/* enable fit_format_{error,warning}() */
include/configs/MPC8610HPCD.h +0 -3
@@ -251,9 +251,6 @@/* maximum size of the flat tree (8K) */ #define OF_FLAT_TREE_MAX_SIZE 8192 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/MPC8641HPCN.h +0 -4
@@ -301,10 +301,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 - -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/P1_P2_RDB.h +0 -3
@@ -310,9 +310,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* new uImage format support */ #define CONFIG_FIT 1#define CONFIG_FIT_VERBOSE 1/* enable fit_format_{error,warning}() */
include/configs/P2020DS.h +0 -3
@@ -408,9 +408,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* new uImage format support */ #define CONFIG_FIT 1#define CONFIG_FIT_VERBOSE 1/* enable fit_format_{error,warning}() */
include/configs/PLU405.h +0 -2
@@ -181,8 +181,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* * PCI stuff */
include/configs/PPChameleonEVB.h +0 -2
@@ -211,8 +211,6 @@*----------------------------------------------------------------------- */ -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* * nand device 1 on dave (PPChameleonEVB) needs more time, * so we just introduce additional wait in nand_wait(),
include/configs/SIMPC8313.h +0 -1
@@ -132,7 +132,6 @@#define CONFIG_MTD_NAND_VERIFY_WRITE #define CONFIG_CMD_NAND 1#define CONFIG_NAND_FSL_ELBC 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
include/configs/TQM8272.h +0 -2
@@ -442,8 +442,6 @@WRITE_NAND (d, addr); \ } while(0) -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -#endif /* CONFIG_CMD_NAND */ #define CONFIG_PCI
include/configs/TQM85xx.h +0 -2
@@ -372,8 +372,6 @@#define NAND_BIG_DELAY_US 25/* max tR for Samsung devices */ -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -#endif /* CONFIG_NAND */ /*
include/configs/VOH405.h +0 -2
@@ -169,8 +169,6 @@#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1/* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * PCI stuff *-----------------------------------------------------------------------
include/configs/WUH405.h +0 -2
@@ -157,8 +157,6 @@#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 *-----------------------------------------------------------------------
include/configs/XPEDITE5170.h +0 -3
@@ -239,9 +239,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/XPEDITE5200.h +0 -3
@@ -213,9 +213,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/XPEDITE5370.h +0 -3
@@ -244,9 +244,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/acadia.h +0 -2
@@ -266,8 +266,6 @@#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_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup *----------------------------------------------------------------------*/
include/configs/afeb9260.h +0 -1
@@ -107,7 +107,6 @@#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 */
include/configs/apollon.h +0 -2
@@ -258,8 +258,6 @@#define CONFIG_ENV_ADDR 0x00020000#define CONFIG_ENV_ADDR_FLEX 0x00040000 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -#ifdef CONFIG_SYS_USE_UBI #define CONFIG_CMD_MTDPARTS #define MTDIDS_DEFAULT "onenand0=onenand"
include/configs/aria.h +0 -2
@@ -251,8 +251,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* * Configuration parameters for MPC5121 NAND driver */
include/configs/at91cap9adk.h +0 -1
@@ -131,7 +131,6 @@#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 */
include/configs/at91sam9260ek.h +0 -1
@@ -123,7 +123,6 @@#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 */
include/configs/at91sam9261ek.h +0 -1
@@ -133,7 +133,6 @@#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 */
include/configs/at91sam9263ek.h +0 -1
@@ -267,7 +267,6 @@#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 */
include/configs/at91sam9m10g45ek.h +0 -2
@@ -118,7 +118,6 @@/* 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
@@ -142,7 +141,6 @@#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 */
include/configs/at91sam9rlek.h +0 -1
@@ -119,7 +119,6 @@#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 */
include/configs/bfin_adi_common.h +0 -3
@@ -87,9 +87,6 @@# define CONFIG_CMD_SPIBOOTLDR # endif #endif -#ifdef CONFIG_CMD_NAND -# define CONFIG_SYS_64BIT_VSPRINTF -#endif /* * Console Settings
include/configs/cpu9260.h +0 -1
@@ -295,7 +295,6 @@#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)#define CONFIG_SYS_NAND_MASK_CLE (1 << 22) -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ /* NOR flash */ #define CONFIG_SYS_FLASH_CFI 1
include/configs/davinci_dm355evm.h +0 -1
@@ -69,7 +69,6 @@#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
include/configs/davinci_dm355leopard.h +0 -1
@@ -114,7 +114,6 @@#define CONFIG_ENV_SIZE (256 << 10)/* 256 KiB */ #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x3C0000 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #undef CONFIG_ENV_IS_IN_FLASH#define CONFIG_ENV_OVERWRITE #endif
include/configs/davinci_dm365evm.h +0 -1
@@ -77,7 +77,6 @@#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_SYS_NAND_LARGEPAGE #define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
include/configs/davinci_dm6467evm.h +0 -1
@@ -77,7 +77,6 @@#define CONFIG_NAND_DAVINCI #undef CONFIG_ENV_IS_IN_FLASH#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #define CONFIG_ENV_SIZE (16 << 10)/* 16 KiB */ #define CONFIG_SYS_NAND_BASE_LIST {0x42000000, }#define CONFIG_SYS_NAND_HW_ECC
include/configs/davinci_dvevm.h +0 -1
@@ -138,7 +138,6 @@#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 */ #define DEF_BOOTM ""#elif defined(CONFIG_SYS_USE_NOR )#ifdef CONFIG_NOR_UART_BOOT
include/configs/davinci_schmoogie.h +0 -1
@@ -92,7 +92,6 @@#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 */ /*=====================*/
include/configs/davinci_sffsdr.h +0 -1
@@ -87,7 +87,6 @@#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. */
include/configs/davinci_sonata.h +0 -1
@@ -125,7 +125,6 @@#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 */ #define DEF_BOOTM ""#elif defined(CONFIG_SYS_USE_NOR )#ifdef CONFIG_NOR_UART_BOOT
include/configs/delta.h +0 -2
@@ -226,8 +226,6 @@#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
include/configs/devkit8000.h +0 -2
@@ -132,8 +132,6 @@#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"
include/configs/keymile-common.h +0 -2
@@ -127,8 +127,6 @@#define CONFIG_SYS_MALLOC_LEN (1024 * 1024)/* Reserved for malloc */ -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for UBI/UBIFS */ -/* UBI Support for all Keymile boards */ #define CONFIG_CMD_UBI #define CONFIG_RBTREE
include/configs/kilauea.h +0 -2
@@ -217,8 +217,6 @@#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_64BIT_VSPRINTF /* needed for nand_util.c */ -/*----------------------------------------------------------------------- * DDR SDRAM *----------------------------------------------------------------------*/
include/configs/mecp5123.h +0 -2
@@ -177,8 +177,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* * Configuration parameters for MPC5121 NAND driver */
include/configs/meesc.h +0 -1
@@ -121,7 +121,6 @@#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 */
include/configs/mpc5121ads.h +0 -2
@@ -239,8 +239,6 @@#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE#define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */ -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* * Configuration parameters for MPC5121 NAND driver */
include/configs/netstar.h +0 -2
@@ -111,8 +111,6 @@#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
include/configs/nhk8815.h +0 -1
@@ -91,7 +91,6 @@#define CONFIG_SYS_MEMTEST_END 0x0FFFFFFF#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256 * 1024)#define CONFIG_SYS_GBL_DATA_SIZE 128/* for initial data */ -#define CONFIG_SYS_64BIT_VSPRINTF /* mtd desires this */ #define BOARD_LATE_INIT /* call board_late_init during start up */
include/configs/omap3_beagle.h +0 -2
@@ -151,8 +151,6 @@#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"
include/configs/omap3_evm.h +0 -2
@@ -146,8 +146,6 @@#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"
include/configs/omap3_overo.h +0 -2
@@ -137,8 +137,6 @@#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"
include/configs/omap3_pandora.h +0 -3
@@ -140,9 +140,6 @@#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"
include/configs/omap3_zoom1.h +0 -3
@@ -147,9 +147,6 @@#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"
include/configs/omap3_zoom2.h +0 -2
@@ -167,8 +167,6 @@#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
include/configs/openrd_base.h +0 -1
@@ -114,7 +114,6 @@#define NAND_MAX_CHIPS 1#define CONFIG_SYS_NAND_BASE 0xD8000000/* KW_DEFADR_NANDF */ #define NAND_ALLOW_ERASE_ALL 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /*
include/configs/pdnb3.h +0 -1
@@ -266,7 +266,6 @@*/ #define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_SYS_NAND_BASE 0x51000000/* NAND FLASH Base Address */ -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /*
include/configs/pm9261.h +0 -3
@@ -236,9 +236,6 @@#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#define CONFIG_FLASH_CFI_DRIVER 1
include/configs/pm9263.h +0 -1
@@ -259,7 +259,6 @@#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
include/configs/quad100hd.h +0 -1
@@ -226,7 +226,6 @@#define CONFIG_SYS_NAND_ALE 30/* our ALE is GPIO30 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /*-----------------------------------------------------------------------
include/configs/rd6281a.h +0 -1
@@ -107,7 +107,6 @@#define NAND_MAX_CHIPS 1#define CONFIG_SYS_NAND_BASE 0xD8000000/* KW_DEFADR_NANDF */ #define NAND_ALLOW_ERASE_ALL 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /*
include/configs/sbc35_a9g20.h +0 -1
@@ -161,7 +161,6 @@#define CONFIG_ENV_OFFSET 0x60000#define CONFIG_ENV_OFFSET_REDUND 0x80000#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif #define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
include/configs/sbc8641d.h +0 -3
@@ -285,9 +285,6 @@#define CONFIG_OF_BOARD_SETUP 1#define CONFIG_OF_STDOUT_VIA_ALIAS 1 -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 -/* * I2C */
include/configs/sc3.h +0 -2
@@ -422,8 +422,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#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 */ /* No command line, one static partition */
include/configs/sheevaplug.h +0 -1
@@ -107,7 +107,6 @@#define NAND_MAX_CHIPS 1#define CONFIG_SYS_NAND_BASE 0xD8000000/* KW_DEFADR_NANDF */ #define NAND_ALLOW_ERASE_ALL 1 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /*
include/configs/smdk6400.h +0 -2
@@ -268,8 +268,6 @@ 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
include/configs/smdkc100.h +0 -2
@@ -213,8 +213,6 @@#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* 256 KiB */ #define CONFIG_IDENT_STRING " for SMDKC100" -#define CONFIG_SYS_64BIT_VSPRINTF -#if !defined(CONFIG_NAND_SPL ) && (TEXT_BASE >=0xc0000000 )#define CONFIG_ENABLE_MMU #endif
include/configs/socrates.h +0 -2
@@ -188,8 +188,6 @@#define CONFIG_SYS_MAX_NAND_DEVICE 1#define CONFIG_CMD_NAND -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ -/* LIME GDC */ #define CONFIG_SYS_LIME_BASE 0xc8000000#define CONFIG_SYS_LIME_SIZE 0x04000000/* 64 MB */
include/configs/tny_a9260.h +0 -1
@@ -138,7 +138,6 @@#define CONFIG_ENV_OFFSET 0x60000#define CONFIG_ENV_OFFSET_REDUND 0x80000#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif #define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
include/configs/vct.h +0 -6
@@ -284,12 +284,6 @@ int vct_gpio_get(int pin);#define CONFIG_BOOTDELAY 5/* autoboot after 5 seconds */ /* -* Needed for 64bit printf format -*/ -#define CONFIG_SYS_64BIT_VSPRINTF 1 -#define CONFIG_SYS_64BIT_STRTOUL 1 - -/* * UBI configuration */ #if defined(CONFIG_VCT_ONENAND )
include/configs/zylonite.h +0 -2
@@ -205,8 +205,6 @@#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
include/ppc4xx.h +0 -6
@@ -100,12 +100,6 @@#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/ #if defined(CONFIG_440 ) -/* -* Enable long long (%ll ...) printf format on 440 PPC's since most of -* them support 36bit physical addressing -*/ -#define CONFIG_SYS_64BIT_VSPRINTF -#define CONFIG_SYS_64BIT_STRTOUL #include <ppc440.h> #else #include <ppc405.h>
lib_generic/vsprintf.c +1 -17
@@ -21,21 +21,10 @@extern int do_reset (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);#endif -#ifdef CONFIG_SYS_64BIT_VSPRINTF #include <div64.h> # define NUM_TYPE long long -#else -# define NUM_TYPE long -#define do_div (n, base) ({ \ - unsigned int __res; \ - __res = ((unsigned NUM_TYPE) n) % base; \ - n = ((unsigned NUM_TYPE) n) / base; \ - __res; \ -}) -#endif #define noinline __attribute__((noinline)) -const char hex_asc[] ="0123456789abcdef" ;#define hex_asc_lo (x) hex_asc[((x) & 0x0f)]#define hex_asc_hi (x) hex_asc[((x) & 0xf0) >> 4]
@@ -104,7 +93,6 @@ int ustrtoul(const char *cp, char **endp, unsigned int base)return result; } -#ifdef CONFIG_SYS_64BIT_STRTOUL unsigned long long simple_strtoull (const char *cp,char **endp,unsigned int base) {unsigned long long result =0 , value;
@@ -132,7 +120,6 @@ unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int ba *endp = (char *) cp;return result; } -#endif /* CONFIG_SYS_64BIT_STRTOUL */ /* we use this so that we can do without the ctype library */ #define is_digit (c) ((c) >= '0' && (c) <= '9')
@@ -631,12 +618,9 @@ int vsprintf(char *buf, const char *fmt, va_list args) --fmt;continue ; } -#ifdef CONFIG_SYS_64BIT_VSPRINTF if (qualifier =='L' )/* "quad" for 64 bit variables */ num = va_arg(args, unsigned long long); - else -#endif -if (qualifier =='l' ) { +else if (qualifier =='l' ) { num = va_arg(args, unsigned long);if (flags &SIGN ) num = (signed long ) num;
Signature · 5 lines
1.6.2.5 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
RFC PATCH 1/1 common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
Quoted 4 lines · On Thursday 03 December 2009 05:21:21 Heiko Schocher wrote:
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the
CONFIG_SYS_64BIT_VSPRINTFandCONFIG_SYS_64BIT_STRTOULdefines.
no bloatcheck showing the forced size increase on people ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091203/919cb3cc/attachment.pgp
RFC PATCH 1/1 common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
Dear Mike Frysinger,
Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 4 lines · On Thursday 03 December 2009 05:21:21 Heiko Schocher wrote:
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the
CONFIG_SYS_64BIT_VSPRINTFandCONFIG_SYS_64BIT_STRTOULdefines.no bloatcheck showing the forced size increase on people ?
Do you have bloat-o-meter running on U-Boot? Please share!
Regarding the patch: you know that I'm the first to complain about code size increases, and I did so when Stefan proposed a similar thing, but here I finally gave up on protesting: the current situation causes way too many errors and addtional, ugly code. And given that we see more and more areas where the 32 bits are not sufficient any more I tend to give in and accept this.
Best regards,
Wolfgang Denk
Signature · 5 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 In Nature there are neither rewards nor punishments, there are conse- quences. -- R.G. Ingersoll
RFC PATCH 1/1 common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
Quoted 10 lines · On Thursday 03 December 2009 07:20:50 Wolfgang Denk wrote:
Quoted 7 lines · Mike Frysinger
Quoted 4 lines · On Thursday 03 December 2009 05:21:21 Heiko Schocher wrote:
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the
CONFIG_SYS_64BIT_VSPRINTFandCONFIG_SYS_64BIT_STRTOULdefines.no bloatcheck showing the forced size increase on people ?
Do you have bloat-o-meter running on U-Boot? Please share!
the scripts in busybox/kernel arent specific to either ... just give them the objects to bloat compare
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20091203/cae3fb98/attachment.pgp
Wolfgang Denk
AppliedRFC PATCH 1/1 common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
In reply to Heiko SchocherDear Heiko Schocher,
Quoted 99 lines · In message <[email protected]> you wrote:
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the
CONFIG_SYS_64BIT_VSPRINTFandCONFIG_SYS_64BIT_STRTOULdefines.Signed-off-by Heiko Schocher <[email protected]>---
based againstgit://git.denx.de/u-boot.gitnextREADME | 9 +-------- common/cmd_fdt.c | 14 ++------------ common/cmd_ide.c | 4 ++-- common/cmd_onenand.c | 4 ---- common/image.c | 4 ---- cpu/mpc85xx/mp.c | 4 ---- disk/part.c | 2 +- drivers/mtd/nand/nand_util.c | 4 ---- fs/ubifs/ubifs.c | 4 ---- include/common.h | 2 -- include/configs/ASH405.h | 2 -- include/configs/CMS700.h | 2 -- include/configs/HH405.h | 2 -- include/configs/HUB405.h | 2 -- include/configs/IDS8247.h | 2 -- include/configs/MPC8313ERDB.h | 1 - include/configs/MPC8315ERDB.h | 1 - include/configs/MPC8360ERDK.h | 1 - include/configs/MPC837XEMDS.h | 3 --- include/configs/MPC837XERDB.h | 3 --- include/configs/MPC8536DS.h | 4 ---- include/configs/MPC8540ADS.h | 3 --- include/configs/MPC8541CDS.h | 3 --- include/configs/MPC8544DS.h | 3 --- include/configs/MPC8548CDS.h | 3 --- include/configs/MPC8555CDS.h | 3 --- include/configs/MPC8560ADS.h | 3 --- include/configs/MPC8568MDS.h | 3 --- include/configs/MPC8569MDS.h | 3 --- include/configs/MPC8572DS.h | 3 --- include/configs/MPC8610HPCD.h | 3 --- include/configs/MPC8641HPCN.h | 4 ---- include/configs/P1_P2_RDB.h | 3 --- include/configs/P2020DS.h | 3 --- include/configs/PLU405.h | 2 -- include/configs/PPChameleonEVB.h | 2 -- include/configs/SIMPC8313.h | 1 - include/configs/TQM8272.h | 2 -- include/configs/TQM85xx.h | 2 -- include/configs/VOH405.h | 2 -- include/configs/WUH405.h | 2 -- include/configs/XPEDITE5170.h | 3 --- include/configs/XPEDITE5200.h | 3 --- include/configs/XPEDITE5370.h | 3 --- include/configs/acadia.h | 2 -- include/configs/afeb9260.h | 1 - include/configs/apollon.h | 2 -- include/configs/aria.h | 2 -- include/configs/at91cap9adk.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 2 -- include/configs/at91sam9rlek.h | 1 - include/configs/bfin_adi_common.h | 3 --- include/configs/cpu9260.h | 1 - include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 1 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 1 - include/configs/delta.h | 2 -- include/configs/devkit8000.h | 2 -- include/configs/keymile-common.h | 2 -- include/configs/kilauea.h | 2 -- include/configs/mecp5123.h | 2 -- include/configs/meesc.h | 1 - include/configs/mpc5121ads.h | 2 -- include/configs/netstar.h | 2 -- include/configs/nhk8815.h | 1 - include/configs/omap3_beagle.h | 2 -- include/configs/omap3_evm.h | 2 -- include/configs/omap3_overo.h | 2 -- include/configs/omap3_pandora.h | 3 --- include/configs/omap3_zoom1.h | 3 --- include/configs/omap3_zoom2.h | 2 -- include/configs/openrd_base.h | 1 - include/configs/pdnb3.h | 1 - include/configs/pm9261.h | 3 --- include/configs/pm9263.h | 1 - include/configs/quad100hd.h | 1 - include/configs/rd6281a.h | 1 - include/configs/sbc35_a9g20.h | 1 - include/configs/sbc8641d.h | 3 --- include/configs/sc3.h | 2 -- include/configs/sheevaplug.h | 1 - include/configs/smdk6400.h | 2 --
Quoted 8 lines
include/configs/smdkc100.h | 2 -- include/configs/socrates.h | 2 -- include/configs/tny_a9260.h | 1 - include/configs/vct.h | 6 ------ include/configs/zylonite.h | 2 -- include/ppc4xx.h | 6 ------ lib_generic/vsprintf.c | 18 +----------------- 97 files changed, 7 insertions(+), 239 deletions(-)
applied to "next" branch, thanks.
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 Randal said it would be tough to do in sed. He didn't say he didn't understand sed. Randal understands sed quite well. Which is why he uses Perl. :-) - Larry Wall in <[email protected]>