mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-28 07:03:31 +08:00
Fix some more printf() format issues.
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
d5996dd555
commit
25dbe98abb
@ -67,7 +67,7 @@ static void *npe_alloc(int size)
|
||||
p = npe_alloc_free;
|
||||
npe_alloc_free += size;
|
||||
} else {
|
||||
printf("%s: failed (count=%d, size=%d)!\n", count, size);
|
||||
printf("npe_alloc: failed (count=%d, size=%d)!\n", count, size);
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
@ -126,7 +126,10 @@
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
#define CONFIG_BOOTCOMMAND "bootm 40000"
|
||||
#define CONFIG_BOOTARGS "root=/dev/mtdblock2 rootfstype=cramfs console=ttyS0,115200"
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||
/* #define CONFIG_INITRD_TAG 1 */
|
||||
|
||||
/*
|
||||
* Current memory map for Vibren supplied Linux images:
|
||||
@ -208,10 +211,6 @@
|
||||
/* "protect off" */
|
||||
|
||||
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||
/* #define CONFIG_INITRD_TAG 1 */
|
||||
|
||||
#if defined(CONFIG_CMD_KGDB)
|
||||
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
|
||||
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
|
||||
|
@ -54,7 +54,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
||||
char *commandline = getenv ("bootargs");
|
||||
char env_buf[12];
|
||||
int ret;
|
||||
const char *cp;
|
||||
char *cp;
|
||||
|
||||
/* find kernel entry point */
|
||||
if (images->legacy_hdr_valid) {
|
||||
@ -89,15 +89,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
||||
linux_params_init (UNCACHED_SDRAM (gd->bd->bi_boot_params), commandline);
|
||||
|
||||
#ifdef CONFIG_MEMSIZE_IN_BYTES
|
||||
sprintf (env_buf, "%lu", gd->ram_size);
|
||||
#ifdef DEBUG
|
||||
printf ("## Giving linux memsize in bytes, %lu\n", gd->ram_size);
|
||||
#endif
|
||||
sprintf (env_buf, "%lu", (ulong)gd->ram_size);
|
||||
debug ("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
|
||||
#else
|
||||
sprintf (env_buf, "%lu", gd->ram_size >> 20);
|
||||
#ifdef DEBUG
|
||||
printf ("## Giving linux memsize in MB, %lu\n", gd->ram_size >> 20);
|
||||
#endif
|
||||
sprintf (env_buf, "%lu", (ulong)(gd->ram_size >> 20));
|
||||
debug ("## Giving linux memsize in MB, %lu\n", (ulong)(gd->ram_size >> 20));
|
||||
#endif /* CONFIG_MEMSIZE_IN_BYTES */
|
||||
|
||||
linux_env_set ("memsize", env_buf);
|
||||
|
@ -627,7 +627,7 @@ int eth_initialize(bd_t *bis)
|
||||
#if defined(CONFIG_MCF52x2)
|
||||
mcf52x2_miiphy_initialize(bis);
|
||||
#endif
|
||||
#if defined(CONFIG_NETARM)
|
||||
#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
|
||||
ns7520_miiphy_initialize(bis);
|
||||
#endif
|
||||
#if defined(CONFIG_DRIVER_TI_EMAC)
|
||||
|
Loading…
Reference in New Issue
Block a user