From bde2081e753b90734af9f198b1ae84d26930363d Mon Sep 17 00:00:00 2001 From: Ionela Voinescu Date: Mon, 19 Jan 2015 02:41:49 +0000 Subject: [PATCH] libpayload: mips: correct platform ID BUG=chrome-os-partner:31438 TEST=tested on Pistachio bring up board; behaves as expected. BRANCH=none Change-Id: I8e5ac80e95b5169102eaa075bc22045c0789d486 Signed-off-by: Patrick Georgi Original-Commit-Id: 4afe332bcc41afeb7e31e918e345c3336f7dc604 Original-Change-Id: I55b788faf7984bafc2509cac69867a772c7cb863 Original-Signed-off-by: Ionela Voinescu Original-Reviewed-on: https://chromium-review.googlesource.com/241427 Original-Reviewed-by: David Hendricks Reviewed-on: http://review.coreboot.org/8745 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/libpayload/include/mips/arch/cpu.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/include/mips/arch/cpu.h b/payloads/libpayload/include/mips/arch/cpu.h index 952ec7c528..93e42ea455 100644 --- a/payloads/libpayload/include/mips/arch/cpu.h +++ b/payloads/libpayload/include/mips/arch/cpu.h @@ -22,8 +22,15 @@ * Reading at this address allows to identify the platform the code is running * on */ -#define IMG_PLATFORM_ID() (*((unsigned *)0xB8149060)) -#define IMG_PLATFORM_ID_SILICON 0xF00D0006 + +/* + * This register holds the FPGA image version + * 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_FPGA 0xD1400003 /* Last FPGA image */ +#define IMG_PLATFORM_ID_SILICON 0 #define CP0_COUNT 9 #define CP0_COMPARE 11