diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:03:39 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | c7ccb2c032a8a0c25ebd76e7c616952b0f52eb5d (patch) | |
| tree | b89fbd56f4a5f6c58f06dc178dd8b9daf208bbbf | |
| parent | 8d8f3acda976f2f400df660b8da12b9b2c702986 (diff) | |
| download | u-boot-imx-c7ccb2c032a8a0c25ebd76e7c616952b0f52eb5d.zip u-boot-imx-c7ccb2c032a8a0c25ebd76e7c616952b0f52eb5d.tar.gz u-boot-imx-c7ccb2c032a8a0c25ebd76e7c616952b0f52eb5d.tar.bz2 | |
x86: ivybridge: Fix types for 64-bit compilation
Fix a few types that causes warnings on 64-bit machines.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/x86/cpu/ivybridge/sata.c | 4 | ||||
| -rw-r--r-- | drivers/video/ivybridge_igd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c index 87ff872..c7ffbc1 100644 --- a/arch/x86/cpu/ivybridge/sata.c +++ b/arch/x86/cpu/ivybridge/sata.c @@ -53,7 +53,7 @@ static void bd82x6x_sata_init(struct udevice *dev, struct udevice *pch) mode = fdt_getprop(blob, node, "intel,sata-mode", NULL); if (!mode || !strcmp(mode, "ahci")) { - u32 abar; + ulong abar; debug("SATA: Controller in AHCI mode\n"); @@ -72,7 +72,7 @@ static void bd82x6x_sata_init(struct udevice *dev, struct udevice *pch) /* Initialize AHCI memory-mapped space */ abar = dm_pci_read_bar32(dev, 5); - debug("ABAR: %08X\n", abar); + debug("ABAR: %08lx\n", abar); /* CAP (HBA Capabilities) : enable power management */ reg32 = readl(abar + 0x00); reg32 |= 0x0c006000; /* set PSC+SSC+SALP+SSS */ diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index 95d62a5..f16d725 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -802,7 +802,7 @@ static int gma_func0_init(struct udevice *dev) mtrr_add_request(MTRR_TYPE_WRCOMB, base, 256 << 20); mtrr_commit(true); - gtt_bar = (void *)dm_pci_read_bar32(dev, 0); + gtt_bar = (void *)(ulong)dm_pci_read_bar32(dev, 0); debug("GT bar %p\n", gtt_bar); ret = gma_pm_init_pre_vbios(gtt_bar, rev); if (ret) @@ -824,7 +824,7 @@ static int bd82x6x_video_probe(struct udevice *dev) return ret; /* Post VBIOS init */ - gtt_bar = (void *)dm_pci_read_bar32(dev, 0); + gtt_bar = (void *)(ulong)dm_pci_read_bar32(dev, 0); ret = gma_pm_init_post_vbios(dev, rev, gtt_bar); if (ret) return ret; |