Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11280
-gerrit
commit e052d34b51ce756e0584f41196b0630b5bda9a31
Author: Duncan Laurie <dlaurie(a)chromium.org>
Date: Thu Aug 13 12:52:08 2015 -0700
chromeec: Add helper function to read EC switch state
Add a helper function to read the EC switch state on LPC based
ECs instead of having each board need to understand and use the
specific EC LPC IO method that is required.
BUG=chrome-os-partner:43515
BRANCH=none
TEST=build and boot on glados
Original-Change-Id: Id046c7ddf3a1689d4bf2241be5da31184c32c0e1
Original-Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/293514
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Change-Id: Id11009e0711b13823e4f76dc9db9c9c20abf4809
Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org>
---
src/ec/google/chromeec/ec.h | 1 +
src/ec/google/chromeec/ec_lpc.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index 8dfefd4..3bc62c9 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -53,6 +53,7 @@ int google_chromeec_kbbacklight(int percent);
void google_chromeec_post(u8 postcode);
void google_chromeec_log_events(u32 mask);
int google_chromeec_vbnv_context(int is_read, uint8_t *data, int len);
+uint8_t google_chromeec_get_switches(void);
/* For MEC, access ranges 0x800 thru 0x9ff using EMI interface instead of LPC */
#define MEC_EMI_RANGE_START EC_HOST_CMD_REGION0
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 9d1121b..003a5f2 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -364,6 +364,12 @@ static int google_chromeec_command_v1(struct chromeec_command *cec_command)
return 0;
}
+/* Return the byte of EC switch states */
+uint8_t google_chromeec_get_switches(void)
+{
+ return read_byte(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES);
+}
+
#ifdef __PRE_RAM__
int google_chromeec_command(struct chromeec_command *cec_command)
Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11279
-gerrit
commit 4e01c52c7acb9efcc5687a30741dbda7b6cdfe95
Author: Duncan Laurie <dlaurie(a)chromium.org>
Date: Sat Aug 1 00:25:02 2015 -0700
glados: Fix SPD part number for Hynix H9CCNNN8JTBLAR
The part number was the same as the H9CCNNNBLTLAR which means it
is not possible to distinguish the two based on part number alone.
This breaks mosys and thus the factory tests.
BUG=chrome-os-partner:43514
BRANCH=none
TEST=boot on glados P2 SKU3 and verify memory reported by mosys
Original-Change-Id: I606ef3989bd7273d134a258bc933088ccc865542
Original-Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/293513
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Change-Id: I7cea7cc4c61a20fda47673c8e25c431d391aa3bc
Signed-off-by: Duncan Laurie <dlaurie(a)chromium.org>
---
src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex b/src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex
index f724c74..c296c88 100644
--- a/src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex
+++ b/src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex
@@ -6,7 +6,7 @@
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 80 AD 00 00 00 55 00 00 00 00 00
-48 39 43 43 4E 4E 4E 42 4C 54 4D 4C 41 52 2D 4E
+48 39 43 43 4E 4E 4E 38 4A 54 42 4C 41 52 2D 4E
54 4D 00 00 80 AD 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11276
-gerrit
commit 091b4a8b94b7900cb079516eb70cbffbd05f6be8
Author: Naveen Krishna Chatradhi <naveenkrishna.ch(a)intel.com>
Date: Mon Aug 10 11:49:07 2015 +0530
kunimitsu: Enable SMBus device in devicetree
this patch enables SMBus in device tree for kunimitsu board.
BRANCH=none
BUG=none
TEST=built for kunimitsu; booted on kunimitsu fab3 and verified with
lspci
Original-Change-Id: I3b2b8c202b71c2a0c602169841978ed0c4d8bf8d
Original-Signed-off-by: Naveen Krishna Chatradhi <naveenkrishna.ch(a)intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/292971
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Change-Id: Id20e6cafda8664bd0ae3a5acecdd66c58c220694
Signed-off-by: Naveen Krishna Chatradhi <naveenkrishna.ch(a)intel.com>
---
src/mainboard/intel/kunimitsu/devicetree.cb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/intel/kunimitsu/devicetree.cb b/src/mainboard/intel/kunimitsu/devicetree.cb
index b5f0dbb..6d0e2f4 100644
--- a/src/mainboard/intel/kunimitsu/devicetree.cb
+++ b/src/mainboard/intel/kunimitsu/devicetree.cb
@@ -140,7 +140,7 @@ chip soc/intel/skylake
end # LPC Interface
device pci 1f.2 on end # Power Management Controller
device pci 1f.3 on end # Intel High Definition Audio (Intel HD Audio) (Audio, Voice, Speech)
- device pci 1f.4 off end # SMBus Controller
+ device pci 1f.4 on end # SMBus Controller
device pci 1f.5 on end # SPI
device pci 1f.6 off end # GbE Controller
end
Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11275
-gerrit
commit 6ab5c7937929bf8055ca90c8b2b5da39ad1b5926
Author: pchandri <preetham.chandrian(a)intel.com>
Date: Thu Aug 6 10:26:00 2015 -0700
Kunimitsu : FAB3 Adding BoardId support
BRANCH=None
BUG=chrome-os-partner:44087
TEST=Build and Boot kunimitsu.
Original-Change-Id: I30ba8bad69a4fdf8ec29f9eb43a27d2e1c6b93dd
Original-Signed-off-by: pchandri <preetham.chandrian(a)intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/293832
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Change-Id: I8f85547865387091c9a6400611e3314f457076d5
Signed-off-by: pchandri <preetham.chandrian(a)intel.com>
---
src/mainboard/intel/kunimitsu/Makefile.inc | 2 ++
src/mainboard/intel/kunimitsu/boardid.c | 34 ++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.inc
index da996a5..522308f 100644
--- a/src/mainboard/intel/kunimitsu/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/Makefile.inc
@@ -28,4 +28,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += pei_data.c
ramstage-y += ramstage.c
+ramstage-y += boardid.c
+romstage-y += boardid.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/intel/kunimitsu/boardid.c b/src/mainboard/intel/kunimitsu/boardid.c
new file mode 100644
index 0000000..58da22e
--- /dev/null
+++ b/src/mainboard/intel/kunimitsu/boardid.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright(C) 2013 Google Inc.
+ * Copyright (C) 2015 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+#include <boardid.h>
+#include <ec/google/chromeec/ec.h>
+
+
+uint8_t board_id(void)
+{
+ MAYBE_STATIC int id = -1;
+
+ if (id < 0)
+ id = google_chromeec_get_board_version();
+
+ return id;
+}
+
the following patch was just integrated into master:
commit 188e37072fbd79a7a947a903f9918a49f32a08d6
Author: Rizwan Qureshi <rizwan.qureshi(a)intel.com>
Date: Thu Jul 23 17:40:32 2015 +0530
Skylake: update cbmem_top
cbmem_top was using CHIPSET_RESERVED_MEM_BYTES to w/a unknown memory
regions reserved by fsp for chipset use. With that being removed, the
function needs to properly walk though the memory map resulted from fsp
memory init to find out the usable address for cbmem root.
Refer the FSP 1.3.0 Integartion guide for more details on the Memory
Map.
systemagent should also use the same mechanism to create the reserved
RAM resource.
BRANCH=None
BUG=None
TEST=Build and Boot kunimitsu (FAB3)
CQ-DEPEND=CL:*226035,CL:*226045,CL:291573
Original-Change-Id: Id0954cf8e6388e549c7d4df67b468572b5bea539
Original-Signed-off-by: Rizwan Qureshi <rizwan.qureshi(a)intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/291611
Original-Tested-by: Wenkai Du <wenkai.du(a)intel.com>
Original-Reviewed-by: Aaron Durbin <adurbin(a)chromium.org>
Original-Commit-Queue: Robbie Zhang <robbie.zhang(a)intel.com>
Change-Id: I4e716170f40936081ce9d4878bf74c75f469f78d
Signed-off-by: Rizwan Qureshi <rizwan.qureshi(a)intel.com>
Reviewed-on: http://review.coreboot.org/11239
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See http://review.coreboot.org/11239 for details.
-gerrit