diff options
33 files changed, 139 insertions, 96 deletions
diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 07f320b367..f7a6169d70 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -386,7 +386,7 @@ static int do_cpufreq(struct command *cmdtp, int argc, char *argv[]) return COMMAND_ERROR_USAGE; } - printf("Switched CPU frequency to %dMHz\n", freq); + printf("Switched CPU frequency to %ldMHz\n", freq); return 0; } diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 6d7a99bc84..e30f8e5c8e 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/arch/arm/boards/guf-cupid/board.c @@ -408,7 +408,7 @@ static int do_cpufreq(struct command *cmdtp, int argc, char *argv[]) return COMMAND_ERROR_USAGE; } - printf("Switched CPU frequency to %dMHz\n", freq); + printf("Switched CPU frequency to %ldMHz\n", freq); return 0; } diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c index 38f1b8f522..36bde4578c 100644 --- a/arch/arm/boards/pcm043/pcm043.c +++ b/arch/arm/boards/pcm043/pcm043.c @@ -354,7 +354,7 @@ static int do_cpufreq(struct command *cmdtp, int argc, char *argv[]) return COMMAND_ERROR_USAGE; } - printf("Switched CPU frequency to %dMHz\n", freq); + printf("Switched CPU frequency to %ldMHz\n", freq); return 0; } diff --git a/arch/arm/boards/versatile/env/config b/arch/arm/boards/versatile/env/config new file mode 100644 index 0000000000..9dec3f25bd --- /dev/null +++ b/arch/arm/boards/versatile/env/config @@ -0,0 +1,43 @@ +#!/bin/sh + +# use 'dhcp' to do dhcp in barebox and in kernel +# use 'none' if you want to skip kernel ip autoconfiguration +ip=dhcp + +# or set your networking parameters here +#eth0.ipaddr=a.b.c.d +#eth0.netmask=a.b.c.d +#eth0.gateway=a.b.c.d +#eth0.serverip=a.b.c.d + +# can be either 'net' or 'nor' +kernel_loc=net +# can be either 'net', 'nor' or 'initrd' +rootfs_loc=initrd + +# can be either 'jffs2' or 'ubifs' +rootfs_type=ubifs +rootfsimage=root.$rootfs_type + +# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo +#kernelimage_type=zimage +#kernelimage=zImage +kernelimage_type=uimage +kernelimage=uImage +#kernelimage_type=raw +#kernelimage=Image +#kernelimage_type=raw_lzo +#kernelimage=Image.lzo + +nfsroot="$eth0.serverip:/opt/work/busybox/arm9/rootfs_arm" + +nor_parts="256k(barebox)ro,64k(bareboxenv),1536k(kernel),-(root)" +rootfs_mtdblock_nor=3 + +autoboot_timeout=3 + +bootargs="console=ttyAMA0,115200n8 CONSOLE=/dev/ttyAMA0" + +# set a fancy prompt (if support is compiled in) +PS1="\e[1;31m[barebox@\h]:\w\e[0m\n# " + diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 6fd09d55b5..4d77a37837 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -679,7 +679,7 @@ static int at91_clock_display(void) if (pll_overclock) pr_info("Clocks: PLLA overclocked, %ld MHz\n", plla.rate_hz / 1000000); - printf("Clocks: CPU %u MHz, master %u MHz, main %u.%03u MHz\n", + printf("Clocks: CPU %lu MHz, master %u MHz, main %u.%03u MHz\n", mck.parent->rate_hz / 1000000, (unsigned) mck.rate_hz / 1000000, (unsigned) main_clk.rate_hz / 1000000, ((unsigned) main_clk.rate_hz % 1000000) / 1000); diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index f3506af5d9..c9f55b5f92 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -56,7 +56,6 @@ choice config ARCH_IMX_INTERNAL_BOOT_NAND bool "NAND, SD/MMC, Serial ROM" - select NAND_IMX_BOOT config ARCH_IMX_INTERNAL_BOOT_NOR bool "NOR" diff --git a/arch/arm/mach-imx/speed-imx1.c b/arch/arm/mach-imx/speed-imx1.c index a4b4f9612c..6fd549f6db 100644 --- a/arch/arm/mach-imx/speed-imx1.c +++ b/arch/arm/mach-imx/speed-imx1.c @@ -81,15 +81,15 @@ ulong imx_get_gptclk(void) void imx_dump_clocks(void) { - printf("spll: %10d Hz\n", imx_get_spllclk()); - printf("mpll: %10d Hz\n", imx_get_mpllclk()); - printf("fclk: %10d Hz\n", imx_get_fclk()); - printf("hclk: %10d Hz\n", imx_get_hclk()); - printf("bclk: %10d Hz\n", imx_get_bclk()); - printf("perclk1: %10d Hz\n", imx_get_perclk1()); - printf("perclk2: %10d Hz\n", imx_get_perclk2()); - printf("perclk3: %10d Hz\n", imx_get_perclk3()); - printf("uart: %10d Hz\n", imx_get_uartclk()); - printf("gpt: %10d Hz\n", imx_get_gptclk()); + printf("spll: %10ld Hz\n", imx_get_spllclk()); + printf("mpll: %10ld Hz\n", imx_get_mpllclk()); + printf("fclk: %10ld Hz\n", imx_get_fclk()); + printf("hclk: %10ld Hz\n", imx_get_hclk()); + printf("bclk: %10ld Hz\n", imx_get_bclk()); + printf("perclk1: %10ld Hz\n", imx_get_perclk1()); + printf("perclk2: %10ld Hz\n", imx_get_perclk2()); + printf("perclk3: %10ld Hz\n", imx_get_perclk3()); + printf("uart: %10ld Hz\n", imx_get_uartclk()); + printf("gpt: %10ld Hz\n", imx_get_gptclk()); } diff --git a/arch/arm/mach-imx/speed-imx21.c b/arch/arm/mach-imx/speed-imx21.c index 9ae8026a81..6ab1dca3f3 100644 --- a/arch/arm/mach-imx/speed-imx21.c +++ b/arch/arm/mach-imx/speed-imx21.c @@ -145,16 +145,16 @@ void imx_dump_clocks(void) uint32_t cid = CID; printf("chip id: [%08x]\n", cid); - printf("mpll: %10d Hz\n", imx_get_mpllclk()); - printf("spll: %10d Hz\n", imx_get_spllclk()); - printf("arm: %10d Hz\n", imx_get_armclk()); - printf("fclk: %10d Hz\n", imx_get_fclk()); - printf("nfcclk: %10d Hz\n", imx_get_nfcclk()); - printf("perclk1: %10d Hz\n", imx_get_perclk1()); - printf("perclk2: %10d Hz\n", imx_get_perclk2()); - printf("perclk3: %10d Hz\n", imx_get_perclk3()); - printf("perclk4: %10d Hz\n", imx_get_perclk4()); - printf("clkin26: %10d Hz\n", clk_in_26m()); + printf("mpll: %10ld Hz\n", imx_get_mpllclk()); + printf("spll: %10ld Hz\n", imx_get_spllclk()); + printf("arm: %10ld Hz\n", imx_get_armclk()); + printf("fclk: %10ld Hz\n", imx_get_fclk()); + printf("nfcclk: %10ld Hz\n", imx_get_nfcclk()); + printf("perclk1: %10ld Hz\n", imx_get_perclk1()); + printf("perclk2: %10ld Hz\n", imx_get_perclk2()); + printf("perclk3: %10ld Hz\n", imx_get_perclk3()); + printf("perclk4: %10ld Hz\n", imx_get_perclk4()); + printf("clkin26: %10ld Hz\n", clk_in_26m()); } /* diff --git a/arch/arm/mach-imx/speed-imx25.c b/arch/arm/mach-imx/speed-imx25.c index cb28e9f77d..68b50e943b 100644 --- a/arch/arm/mach-imx/speed-imx25.c +++ b/arch/arm/mach-imx/speed-imx25.c @@ -89,16 +89,16 @@ unsigned long imx_get_mmcclk(void) void imx_dump_clocks(void) { - printf("mpll: %10d Hz\n", imx_get_mpllclk()); - printf("upll: %10d Hz\n", imx_get_upllclk()); - printf("arm: %10d Hz\n", imx_get_armclk()); - printf("ahb: %10d Hz\n", imx_get_ahbclk()); - printf("uart: %10d Hz\n", imx_get_perclk(15)); - printf("gpt: %10d Hz\n", imx_get_ipgclk()); - printf("nand: %10d Hz\n", imx_get_perclk(8)); - printf("lcd: %10d Hz\n", imx_get_perclk(7)); - printf("i2c: %10d Hz\n", imx_get_perclk(6)); - printf("sdhc1: %10d Hz\n", imx_get_perclk(3)); + printf("mpll: %10ld Hz\n", imx_get_mpllclk()); + printf("upll: %10ld Hz\n", imx_get_upllclk()); + printf("arm: %10ld Hz\n", imx_get_armclk()); + printf("ahb: %10ld Hz\n", imx_get_ahbclk()); + printf("uart: %10ld Hz\n", imx_get_perclk(15)); + printf("gpt: %10ld Hz\n", imx_get_ipgclk()); + printf("nand: %10ld Hz\n", imx_get_perclk(8)); + printf("lcd: %10ld Hz\n", imx_get_perclk(7)); + printf("i2c: %10ld Hz\n", imx_get_perclk(6)); + printf("sdhc1: %10ld Hz\n", imx_get_perclk(3)); } /* diff --git a/arch/arm/mach-imx/speed-imx27.c b/arch/arm/mach-imx/speed-imx27.c index 0a92d29f1c..aba50976f6 100644 --- a/arch/arm/mach-imx/speed-imx27.c +++ b/arch/arm/mach-imx/speed-imx27.c @@ -172,16 +172,16 @@ void imx_dump_clocks(void) (cid >> 28) & 0xf, (cid >> 16) & 0xfff, (cid >> 12) & 0xf, (cid >> 0) & 0xfff); - printf("mpll: %10d Hz\n", imx_get_mpllclk()); - printf("spll: %10d Hz\n", imx_get_spllclk()); - printf("arm: %10d Hz\n", imx_get_armclk()); - printf("perclk1: %10d Hz\n", imx_get_perclk1()); - printf("perclk2: %10d Hz\n", imx_get_perclk2()); - printf("perclk3: %10d Hz\n", imx_get_perclk3()); - printf("perclk4: %10d Hz\n", imx_get_perclk4()); - printf("clkin26: %10d Hz\n", clk_in_26m()); - printf("ahb: %10d Hz\n", imx_get_ahbclk()); - printf("ipg: %10d Hz\n", imx_get_ipgclk()); + printf("mpll: %10ld Hz\n", imx_get_mpllclk()); + printf("spll: %10ld Hz\n", imx_get_spllclk()); + printf("arm: %10ld Hz\n", imx_get_armclk()); + printf("perclk1: %10ld Hz\n", imx_get_perclk1()); + printf("perclk2: %10ld Hz\n", imx_get_perclk2()); + printf("perclk3: %10ld Hz\n", imx_get_perclk3()); + printf("perclk4: %10ld Hz\n", imx_get_perclk4()); + printf("clkin26: %10ld Hz\n", clk_in_26m()); + printf("ahb: %10ld Hz\n", imx_get_ahbclk()); + printf("ipg: %10ld Hz\n", imx_get_ipgclk()); } /* diff --git a/arch/arm/mach-imx/speed-imx31.c b/arch/arm/mach-imx/speed-imx31.c index 70b1330d96..32a517d724 100644 --- a/arch/arm/mach-imx/speed-imx31.c +++ b/arch/arm/mach-imx/speed-imx31.c @@ -67,8 +67,8 @@ ulong imx_get_perclk1(void) void imx_dump_clocks(void) { ulong cpufreq = imx_get_mcu_main_clk(); - printf("mx31 cpu clock: %dMHz\n",cpufreq / 1000000); - printf("ipg clock : %dHz\n", imx_get_perclk1()); + printf("mx31 cpu clock: %ldMHz\n",cpufreq / 1000000); + printf("ipg clock : %ldHz\n", imx_get_perclk1()); } ulong imx_get_uartclk(void) diff --git a/arch/arm/mach-imx/speed-imx35.c b/arch/arm/mach-imx/speed-imx35.c index 8937ef1bbf..b2a339c6c2 100644 --- a/arch/arm/mach-imx/speed-imx35.c +++ b/arch/arm/mach-imx/speed-imx35.c @@ -187,15 +187,15 @@ ulong imx_get_i2cclk(void) void imx_dump_clocks(void) { - printf("mpll: %10d Hz\n", imx_get_mpllclk()); - printf("ppll: %10d Hz\n", imx_get_ppllclk()); - printf("arm: %10d Hz\n", imx_get_armclk()); - printf("gpt: %10d Hz\n", imx_get_gptclk()); - printf("ahb: %10d Hz\n", imx_get_ahbclk()); - printf("ipg: %10d Hz\n", imx_get_ipgclk()); - printf("ipg_per: %10d Hz\n", imx_get_ipg_perclk()); - printf("uart: %10d Hz\n", imx_get_uartclk()); - printf("sdhc1: %10d Hz\n", imx_get_mmcclk()); + printf("mpll: %10ld Hz\n", imx_get_mpllclk()); + printf("ppll: %10ld Hz\n", imx_get_ppllclk()); + printf("arm: %10ld Hz\n", imx_get_armclk()); + printf("gpt: %10ld Hz\n", imx_get_gptclk()); + printf("ahb: %10ld Hz\n", imx_get_ahbclk()); + printf("ipg: %10ld Hz\n", imx_get_ipgclk()); + printf("ipg_per: %10ld Hz\n", imx_get_ipg_perclk()); + printf("uart: %10ld Hz\n", imx_get_uartclk()); + printf("sdhc1: %10ld Hz\n", imx_get_mmcclk()); } /* diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index de1e1b0434..6966def9f8 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -41,7 +41,7 @@ static int xc_check_ptr(int xcno, unsigned long adr, unsigned int size) adr + size < NETX_PA_XPEC(xcno) + XPEC_MEM_SIZE) return 0; - printf("%s: illegal pointer %p\n",__FUNCTION__,adr); + printf("%s: illegal pointer 0x%08lx\n", __func__ ,adr); return -1; } diff --git a/arch/blackfin/boards/ipe337/cmd_alternate.c b/arch/blackfin/boards/ipe337/cmd_alternate.c index 2883c77d32..116f910ef1 100644 --- a/arch/blackfin/boards/ipe337/cmd_alternate.c +++ b/arch/blackfin/boards/ipe337/cmd_alternate.c @@ -21,7 +21,7 @@ static int do_alternate(struct command *cmdtp, int argc, char *argv[]) ptr = buf; if ((*ptr) != MAGIC) { - printf("Wrong magic! Expected 0x%08x, got 0x%08x.\n", MAGIC, *ptr); + printf("Wrong magic! Expected 0x%08x, got 0x%08lx.\n", MAGIC, *ptr); return 1; } @@ -38,7 +38,7 @@ static int do_alternate(struct command *cmdtp, int argc, char *argv[]) } while (val >>= 1); } - printf("Bitcount : %d\n", bitcount); + printf("Bitcount : %ld\n", bitcount); free(buf); return (bitcount & 1) ? 3 : 2; diff --git a/arch/blackfin/lib/blackfin_linux.c b/arch/blackfin/lib/blackfin_linux.c index eda3f4c011..a20cf55748 100644 --- a/arch/blackfin/lib/blackfin_linux.c +++ b/arch/blackfin/lib/blackfin_linux.c @@ -48,7 +48,7 @@ static int do_bootm_linux(struct image_data *idata) image_header_t *os_header = &os_handle->header; appl = (int (*)(char *))image_get_ep(os_header); - printf("Starting Kernel at 0x%08x\n", appl); + printf("Starting Kernel at 0x%p\n", appl); if (relocate_image(os_handle, (void *)image_get_load(os_header))) return -1; diff --git a/arch/blackfin/lib/traps.c b/arch/blackfin/lib/traps.c index ce479b9d1b..14f1da9ff1 100644 --- a/arch/blackfin/lib/traps.c +++ b/arch/blackfin/lib/traps.c @@ -81,7 +81,7 @@ static const char *trap_to_string(int trapnr) void trap_c (struct pt_regs *regs) { - unsigned long trapnr = (regs->seqstat) & SEQSTAT_EXCAUSE; + uint32_t trapnr = (regs->seqstat) & SEQSTAT_EXCAUSE; const char *str; printf("Exception occured!\n\n"); diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index fc22a87170..f27955d444 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -219,7 +219,7 @@ static int do_bootm_linux(struct image_data *idata) else of_start = (ulong)kbd - of_len - 8192; of_start &= ~(4096 - 1); /* align on page */ - debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n", + debug ("## device tree at 0x%p ... 0x%p (len=%ld=0x%lX)\n", of_data, of_data + of_len - 1, of_len, of_len); of_flat_tree = (char *)of_start; diff --git a/arch/ppc/mach-mpc5xxx/cpu.c b/arch/ppc/mach-mpc5xxx/cpu.c index 4d08c55714..be7c19d136 100644 --- a/arch/ppc/mach-mpc5xxx/cpu.c +++ b/arch/ppc/mach-mpc5xxx/cpu.c @@ -65,7 +65,7 @@ int checkcpu (void) printf (" v%d.%d, Core v%d.%d", SVR_MJREV (svr), SVR_MNREV (svr), PVR_MAJ(pvr), PVR_MIN(pvr)); #endif - printf (" at %s Hz\n", clock); + printf (" at %ld Hz\n", clock); return 0; } diff --git a/commands/nand.c b/commands/nand.c index 0902f21869..d3921b9f2d 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -63,7 +63,7 @@ static ssize_t nand_bb_read(struct cdev *cdev, void *buf, size_t count, return ret; if (ret) { - printf("skipping bad block at 0x%08x\n", bb->offset); + printf("skipping bad block at 0x%08lx\n", bb->offset); bb->offset += bb->info.erasesize; continue; } diff --git a/common/ft_build.c b/common/ft_build.c index 4a7ff31370..4c27cfa8de 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -311,7 +311,7 @@ void ft_dump_blob(const void *bphp) } if (tag != OF_DT_PROP) { - fprintf(stderr, "%*s ** Unknown tag 0x%08x at 0x%x\n", + fprintf(stderr, "%*s ** Unknown tag 0x%08x at 0x%p\n", depth * shift, "", tag, --p); break; } diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot index 509b4632c4..fa6874827b 100644 --- a/defaultenv/bin/boot +++ b/defaultenv/bin/boot @@ -59,13 +59,13 @@ fi if [ ! -e /dev/ram0.kernelraw ]; then # arm raw kernel images are usually located at sdram start + 0x8000 - addpart dev/ram0 8M@0x8000(kernelraw) + addpart /dev/ram0 8M@0x8000(kernelraw) fi if [ ! -e /dev/ram0.kernel ]; then # Here we can safely put the kernel without risking of overwriting it # while extracting - addpart dev/ram0 8M@8M(kernel) + addpart /dev/ram0 8M@8M(kernel) fi if [ x$kernel_loc = xnet ]; then diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 63cd059f6d..29371567be 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -355,7 +355,7 @@ void set_sysctl(struct mci_host *mci, u32 clock) div -= 1; pre_div >>= 1; - dev_dbg(host->dev, "set clock: wanted: %d got: %d\n", clock, host->cur_clock); + dev_dbg(host->dev, "set clock: wanted: %d got: %ld\n", clock, host->cur_clock); dev_dbg(host->dev, "pre_div: %d div: %d\n", pre_div, div); clk = (pre_div << 8) | (div << 4); diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index c196185b8a..01371523d8 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1001,13 +1001,13 @@ static int mci_sd_read(struct device_d *disk_dev, uint64_t sector_start, while (sector_count) { int now = min(sector_count, 32U); if (sector_start > MAX_BUFFER_NUMBER) { - pr_err("Cannot handle block number %lu. Too large!\n", + pr_err("Cannot handle block number %u. Too large!\n", (unsigned)sector_start); return -EINVAL; } rc = mci_read_block(mci_dev, buffer, (unsigned)sector_start, now); if (rc != 0) { - pr_err("Reading block %lu failed with %d\n", (unsigned)sector_start, rc); + pr_err("Reading block %u failed with %d\n", (unsigned)sector_start, rc); return rc; } sector_count -= now; diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 30b8308dcc..5520132c3e 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -24,7 +24,7 @@ static ssize_t ubi_volume_cdev_read(struct cdev *cdev, void *buf, size_t size, loff_t offp = offset; int usable_leb_size = vol->usable_leb_size; - printf("%s: %d @ 0x%08x\n", __func__, size, offset); + printf("%s: %d @ 0x%08lx\n", __func__, size, offset); len = size > usable_leb_size ? usable_leb_size : size; diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 187c0fb425..de6d038674 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -364,7 +364,7 @@ static void cs8900_info(struct device_d *dev) struct cs8900_priv *priv = (struct cs8900_priv *)edev->priv; u16 v; - printf("%s Rev. %s (PID: 0x%04x) at 0x%08x\n", priv->chip->name, + printf("%s Rev. %s (PID: 0x%04x) at 0x%p\n", priv->chip->name, priv->product->rev_name, priv->product->product_id, priv->regs); @@ -399,7 +399,7 @@ static int cs8900_check_id(struct cs8900_priv *priv) u16 v; v = cs8900_ior(priv, PP_BI_VID); if (v != CRYSTAL_SEMI_EISA_ID) { - printf("No CS89x0 variant found at 0x%08x vid: 0x%04x\n", + printf("No CS89x0 variant found at 0x%p vid: 0x%04x\n", priv->regs, v); return -1; } @@ -424,7 +424,7 @@ static int cs8900_check_id(struct cs8900_priv *priv) printf("Invalid chip type %d\n", product->chip_type); goto out; } - printf("%s Rev. %s (PID: 0x%04x) found at 0x%08x\n", chip->name, + printf("%s Rev. %s (PID: 0x%04x) found at 0x%p\n", chip->name, product->rev_name, v, priv->regs); priv->chip = chip; priv->product = product; diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index c31cf1a17d..b0e88227c9 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -165,8 +165,8 @@ #define IMR_PRM (1<<0) struct dm9000_priv { - unsigned long iobase; - unsigned long iodata; + void __iomem *iobase; + void __iomem *iodata; struct mii_device miidev; int buswidth; }; @@ -246,11 +246,11 @@ static int dm9000_check_id(struct dm9000_priv *priv) id_val |= DM9000_ior(priv, DM9000_PIDL) << 16; id_val |= DM9000_ior(priv, DM9000_PIDH) << 24; if (id_val == DM9000_ID) { - printf("dm9000 i/o: 0x%x, id: 0x%x \n", priv->iobase, + printf("dm9000 i/o: 0x%p, id: 0x%x \n", priv->iobase, id_val); return 0; } else { - printf("dm9000 not found at 0x%08x id: 0x%08x\n", + printf("dm9000 not found at 0x%p id: 0x%08x\n", priv->iobase, id_val); return -1; } @@ -489,8 +489,8 @@ static int dm9000_probe(struct device_d *dev) priv = edev->priv; priv->buswidth = pdata->buswidth; - priv->iodata = pdata->iodata; - priv->iobase = pdata->iobase; + priv->iodata = (void *)pdata->iodata; + priv->iobase = (void *)pdata->iobase; edev->init = dm9000_init_dev; edev->open = dm9000_eth_open; diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 49036f2d9c..440ef1ff83 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -458,7 +458,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) /* Check for valid length of data. */ if ((data_length > 1500) || (data_length <= 0)) { - printf("Payload (%d) to large!\n"); + printf("Payload (%d) to large!\n", data_length); return -1; } @@ -519,7 +519,7 @@ static int fec_recv(struct eth_device *dev) { struct fec_priv *fec = (struct fec_priv *)dev->priv; struct buffer_descriptor __iomem *rbd = &fec->rbd_base[fec->rbd_index]; - unsigned long ievent; + uint32_t ievent; int frame_length, len = 0; struct fec_frame *frame; uint16_t bd_status; @@ -577,7 +577,7 @@ static int fec_recv(struct eth_device *dev) len = frame_length; } else { if (bd_status & FEC_RBD_ERR) { - printf("error frame: 0x%08x 0x%08x\n", rbd, bd_status); + printf("error frame: 0x%p 0x%08x\n", rbd, bd_status); } } /* diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index b559590bf4..e5c0e7e08e 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -687,7 +687,7 @@ static int smc911x_probe(struct device_d *dev) { struct eth_device *edev; struct smc911x_priv *priv; - ulong val; + uint32_t val; int i; debug("smc911x_eth_init()\n"); diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c index faf965ad69..39c2bf18d8 100644 --- a/drivers/nor/cfi_flash.c +++ b/drivers/nor/cfi_flash.c @@ -424,14 +424,12 @@ static ulong flash_get_size (struct flash_info *info, ulong base) /* multiply the size by the number of chips */ info->size = (1 << qry.dev_size) * size_ratio; info->buffer_size = (1 << le16_to_cpu(qry.max_buf_write_size)); - tmp = 1 << qry.block_erase_timeout_typ; - info->erase_blk_tout = (tmp * (1 << qry.block_erase_timeout_max)); - tmp = (1 << qry.buf_write_timeout_typ) * - (1 << qry.buf_write_timeout_max); - info->buffer_write_tout = tmp * 1000; - tmp = (1 << qry.word_write_timeout_typ) * - (1 << qry.word_write_timeout_max); - info->write_tout = tmp * 1000; + info->erase_blk_tout = 1 << (qry.block_erase_timeout_typ + + qry.block_erase_timeout_max); + info->buffer_write_tout = 1 << (qry.buf_write_timeout_typ + + qry.buf_write_timeout_max); + info->write_tout = 1 << (qry.word_write_timeout_typ + + qry.word_write_timeout_max); info->flash_id = FLASH_MAN_CFI; if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) { info->portwidth >>= 1; /* XXX - Need to test on x8/x16 in parallel. */ @@ -699,11 +697,11 @@ static void cfi_info (struct device_d* dev) if (info->device_id == 0x7E) { printf("%04X", info->device_id2); } - printf ("\n Erase timeout: %ld ms, write timeout: %ld ms\n", + printf ("\n Erase timeout: %ld ms, write timeout: %ld us\n", info->erase_blk_tout, info->write_tout); if (info->buffer_size > 1) { - printf (" Buffer write timeout: %ld ms, buffer size: %d bytes\n", + printf (" Buffer write timeout: %ld us, buffer size: %d bytes\n", info->buffer_write_tout, info->buffer_size); } diff --git a/drivers/video/fb.c b/drivers/video/fb.c index aad0e1f409..ba34b9c809 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -79,6 +79,8 @@ static int fb_setup_mode(struct device_d *dev, struct param_d *param, ret = info->fbops->fb_activate_var(info); + dev->map_base = (unsigned long)info->screen_base; + if (ret == 0) dev_param_set_generic(dev, param, val); diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index c38082d6c6..d9e1e212cc 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -488,7 +488,7 @@ static int sdc_init_panel(struct fb_info *info, enum pixel_fmt pixel_fmt) div = 0x40; } - dev_dbg(&info->dev, "pixel clk = %u, divider %u.%u\n", + dev_dbg(&info->dev, "pixel clk = %lu, divider %u.%u\n", pixel_clk, div >> 4, (div & 7) * 125); /* diff --git a/include/usb/usb.h b/include/usb/usb.h index 1b936ecab4..1e4d750ca9 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -30,6 +30,7 @@ #include <driver.h> #include <usb/usb_defs.h> +#include <asm/byteorder.h> /* Everything is aribtrary */ #define USB_ALTSETTINGALLOC 4 @@ -166,7 +166,7 @@ int eth_register(struct eth_device *edev) if (edev->get_ethaddr(edev, ethaddr) == 0) { ethaddr_to_string(ethaddr, ethaddr_str); - printf("got MAC address from EEPROM: %s\n",ðaddr_str); + printf("got MAC address from EEPROM: %s\n", ethaddr_str); dev_set_param(dev, "ethaddr", ethaddr_str); } |