From a9506dbaf410d9b2d297661f51f0e0b9842170e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 20 Mar 2019 20:30:02 +0200 Subject: arch/mips: Fix prototypes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These signatures need to be consistent across different architectures. Change-Id: Ide8502ee8cda8995828c77fe1674d8ba6f3aa15f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/31995 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/soc/imgtec/pistachio/include/soc/cpu.h | 2 +- src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/soc/imgtec/pistachio/include') 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; } -- cgit v1.2.3