diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-03-20 20:30:02 +0200 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-22 12:18:41 +0000 |
commit | a9506dbaf410d9b2d297661f51f0e0b9842170e1 (patch) | |
tree | b442dc8f162549abb0e11377c80bc624a69e896a /src/soc/imgtec/pistachio/include | |
parent | 9c8044bdcd2aa77d8a8092b270ca36fd3aa23b87 (diff) |
arch/mips: Fix <arch/mmio.h> prototypes
These signatures need to be consistent across different
architectures.
Change-Id: Ide8502ee8cda8995828c77fe1674d8ba6f3aa15f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31995
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/imgtec/pistachio/include')
-rw-r--r-- | src/soc/imgtec/pistachio/include/soc/cpu.h | 2 | ||||
-rw-r--r-- | src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/imgtec/pistachio/include/soc/cpu.h b/src/soc/imgtec/pistachio/include/soc/cpu.h index 2ceb624771..c22dceba45 100644 --- a/src/soc/imgtec/pistachio/include/soc/cpu.h +++ b/src/soc/imgtec/pistachio/include/soc/cpu.h @@ -28,7 +28,7 @@ * If we're not working on the FPGA this will be 0 */ #define PRIMARY_FPGA_VERSION 0xB8149060 -#define IMG_PLATFORM_ID() read32(PRIMARY_FPGA_VERSION) +#define IMG_PLATFORM_ID() read32_x(PRIMARY_FPGA_VERSION) #define IMG_PLATFORM_ID_FPGA 0xD1400003 /* Last FPGA image */ #define IMG_PLATFORM_ID_SILICON 0 diff --git a/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h b/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h index 1026d5bce1..eab5b3a142 100644 --- a/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h +++ b/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h @@ -132,7 +132,7 @@ static int wait_for_completion(u32 reg, u32 exp_val) struct stopwatch sw; stopwatch_init_usecs_expire(&sw, DDR_TIMEOUT_VALUE_US); - while (read32(reg) != exp_val) { + while (read32_x(reg) != exp_val) { if (stopwatch_expired(&sw)) return DDR_TIMEOUT; } |