aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2009-12-03 11:21:21 +0100
committerWolfgang Denk <wd@denx.de>2009-12-08 22:14:07 +0100
commit4b142febff71eabdb7ddbb125c7b583b24ddc434 (patch)
treedcddb5bcbf00a28467eb8bb096fe857b8f86a858 /common
parent00b6d927ba8900cdf218b90b277e1090e284bea6 (diff)
downloadu-boot-linaro-natty-4b142febff71eabdb7ddbb125c7b583b24ddc434.tar.gz
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. Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_fdt.c14
-rw-r--r--common/cmd_ide.c4
-rw-r--r--common/cmd_onenand.c4
-rw-r--r--common/image.c4
4 files changed, 4 insertions, 22 deletions
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 919a0bf6e..5df79ae3e 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -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) {
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index ec9a1df38..093ca9f90 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -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
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index 9090940ae..565257cf4 100644
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -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;
diff --git a/common/image.c b/common/image.c
index 5cc3ab49d..82e7aa436 100644
--- a/common/image.c
+++ b/common/image.c
@@ -436,11 +436,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;
}