[coreboot-gerrit] Patch set updated for coreboot: 9ea7843 libpayload: mips: correct platform ID

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8745

-gerrit

commit 9ea7843e4ce3532c55f0f16c24ec510cb946d034
Author: Ionela Voinescu <ionela.voinescu at imgtec.com>
Date:   Mon Jan 19 02:41:49 2015 +0000

    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 <pgeorgi at chromium.org>
    Original-Commit-Id: 4afe332bcc41afeb7e31e918e345c3336f7dc604
    Original-Change-Id: I55b788faf7984bafc2509cac69867a772c7cb863
    Original-Signed-off-by: Ionela Voinescu <ionela.voinescu at imgtec.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/241427
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 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 952ec7c..93e42ea 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