diff options
author | Francis Rowe <info@gluglug.org.uk> | 2015-10-18 19:12:53 (EDT) |
---|---|---|
committer | Francis Rowe <info@gluglug.org.uk> | 2015-10-18 21:32:36 (EDT) |
commit | 0622df6194dbb1b2120743c0fd1cc5e72c380128 (patch) | |
tree | 4c858b8c5667fe001a9907ae0578b4ec28a8f513 /resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch | |
parent | 5999dba5f71f1c05040a551d2420ab8c7f3a9da4 (diff) | |
download | libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.zip libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.gz libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.bz2 |
KGPE-D16: update patch set (also update coreboot and vboot)
Also contains other fixes from coreboot, like:
* 551cff0 Derive lvds_dual_channel from EDID timings.
^ makes single/dual channel LVDS selection on GM45 automatic
* 26fc544 lenovo/t60: Enable native intel gfx init.
^ was being maintained in libreboot, now upstreamed so not needed
Framebuffer mode was disabled for the KGPE-D16, because only
text-mode works at the moment.
Diffstat (limited to 'resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch')
-rw-r--r-- | resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch b/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch deleted file mode 100644 index cf6668f..0000000 --- a/resources/libreboot/patch/0001-southbridge-intel-common-spi-Add-Flash-lockdown-opti.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 60b17a1eee72342ff226761caea2501960d44a30 Mon Sep 17 00:00:00 2001 -From: Timothy Pearson <tpearson@raptorengineeringinc.com> -Date: Tue, 7 Apr 2015 13:45:06 -0500 -Subject: [PATCH 01/13] southbridge/intel/common/spi: Add Flash lockdown option - -Under certain circumstances it is desirable to prevent -software from altering the contents of the Flash device. - -This Expert-mode option allows the hardware write protect -to be set on bootup. - -Change-Id: I92d3c60a69f1688579d954d0476e30a6892cf4d5 -Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com> ---- - src/southbridge/intel/common/Kconfig | 9 +++++++++ - src/southbridge/intel/common/spi.c | 20 ++++++++++++++------ - 2 files changed, 23 insertions(+), 6 deletions(-) - -diff --git a/src/southbridge/intel/common/Kconfig b/src/southbridge/intel/common/Kconfig -index 949310b..52ada30 100644 ---- a/src/southbridge/intel/common/Kconfig -+++ b/src/southbridge/intel/common/Kconfig -@@ -1,2 +1,11 @@ - config SOUTHBRIDGE_INTEL_COMMON - def_bool n -+ -+config LOCK_DOWN_BIOS -+ bool "Lock down the Flash" -+ default n -+ depends on EXPERT -+ help -+ Lock down the Flash chip to prevent further modification by software. -+ WARNING: Altering the contents of the Flash chip further WILL require -+ a hardware programmer AND physical access to the Flash device! -\ No newline at end of file -diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c -index 1d3ebf6..04f05ed 100644 ---- a/src/southbridge/intel/common/spi.c -+++ b/src/southbridge/intel/common/spi.c -@@ -2,6 +2,7 @@ - * Copyright (c) 2011 The Chromium OS Authors. - * Copyright (C) 2009, 2010 Carl-Daniel Hailfinger - * Copyright (C) 2011 Stefan Tauner -+ * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering - * - * See file CREDITS for list of people who contributed to this - * project. -@@ -353,11 +354,19 @@ void spi_init(void) - - ich_set_bbar(0); - -- /* Disable the BIOS write protect so write commands are allowed. */ -- pci_read_config_byte(dev, 0xdc, &bios_cntl); -- /* Deassert SMM BIOS Write Protect Disable. */ -- bios_cntl &= ~(1 << 5); -- pci_write_config_byte(dev, 0xdc, bios_cntl | 0x1); -+ if (IS_ENABLED(CONFIG_LOCK_DOWN_BIOS)) { -+ /* Engage lockdown */ -+ hsfs = readw_(&ich9_spi->hsfs); -+ hsfs = hsfs | HSFS_FLOCKDN; -+ writew_(hsfs, &ich9_spi->hsfs); -+ } -+ else { -+ /* Disable the BIOS write protect so write commands are allowed. */ -+ pci_read_config_byte(dev, 0xdc, &bios_cntl); -+ /* Deassert SMM BIOS Write Protect Disable. */ -+ bios_cntl &= ~(1 << 5); -+ pci_write_config_byte(dev, 0xdc, bios_cntl | 0x1); -+ } - } - #ifndef __SMM__ - static void spi_init_cb(void *unused) -@@ -927,7 +936,6 @@ static int ich_hwseq_write(struct spi_flash *flash, - return 0; - } - -- - static struct spi_flash *spi_flash_hwseq(struct spi_slave *spi) - { - struct spi_flash *flash = NULL; --- -1.9.1 - |