diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-06 15:12:38 +0200 |
commit | 7772c13ba07eaabd42499998f3713b23350fc119 (patch) | |
tree | 32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /board/matrix_vision | |
parent | b2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff) | |
parent | 0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff) | |
download | u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2 |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
MAKEALL
Makefile
Diffstat (limited to 'board/matrix_vision')
-rw-r--r-- | board/matrix_vision/mvbc_p/mvbc_p.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/board/matrix_vision/mvbc_p/mvbc_p.c b/board/matrix_vision/mvbc_p/mvbc_p.c index b61e84e..5c71dec 100644 --- a/board/matrix_vision/mvbc_p/mvbc_p.c +++ b/board/matrix_vision/mvbc_p/mvbc_p.c @@ -32,6 +32,7 @@ #include <malloc.h> #include <pci.h> #include <i2c.h> +#include <fpga.h> #include <environment.h> #include <fdt_support.h> #include <asm/io.h> @@ -109,7 +110,7 @@ void mvbc_init_gpio(void) struct mpc5xxx_gpio *gpio = (struct mpc5xxx_gpio*)MPC5XXX_GPIO; printf("Ports : 0x%08x\n", gpio->port_config); - printf("PORCFG: 0x%08x\n", *(vu_long*)MPC5XXX_CDM_PORCFG); + printf("PORCFG: 0x%08lx\n", *(vu_long*)MPC5XXX_CDM_PORCFG); out_be32(&gpio->simple_ddr, SIMPLE_DDR); out_be32(&gpio->simple_dvo, SIMPLE_DVO); |