the following patch was just integrated into master:
commit 21a530981df1af8d648a4b2d46af0febbd56a8c5
Author: Paul Menzel <paulepanter(a)users.sourceforge.net>
Date: Tue Feb 17 11:04:30 2015 +0100
soc/intel/baytrail/Kconfig: Remove explicit `HAVE_MONOTONIC_TIMER`
Fix up commit ce7ecf9c (baytrail: enable monotonic timer), which
selected `HAVE_MONOTONIC_TIMER` explicitly, although it is already
selected by `TSC_MONOTONIC_TIMER` (cf. `src/cpu/x86/Kconfig`).
Therefore remove the explicit selection of that Kconfig option.
Change-Id: I8964771947a6f7457dcdefe7a17be623ae0ef900
Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/8471
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin(a)google.com>
See http://review.coreboot.org/8471 for details.
-gerrit
the following patch was just integrated into master:
commit e5853d5235478897632dee3467f81b3b2467cf73
Author: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Sun Feb 1 14:33:55 2015 +0100
nvramcui: drop unused variable
nvramcui.c: In function ‘main’:
nvramcui.c:68:8: warning: unused variable ‘cur’ [-Wunused-variable]
ITEM *cur;
^
Change-Id: I5c692fc2e6da460cd7c6f7978378c92587d829d2
Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk>
Reviewed-on: http://review.coreboot.org/8525
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
See http://review.coreboot.org/8525 for details.
-gerrit
the following patch was just integrated into master:
commit f3a235e9770035d429e66da511edef24a2e88b6b
Author: Patrick Georgi <patrick(a)georgi-clan.de>
Date: Sun Feb 22 16:51:23 2015 +0100
intel/broadwell: free local heap object
No real harm done (thanks to our free() implementation),
but let's do it right.
Change-Id: Ib98d28aabc043dff5c288728c33490a79f09f35a
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Found-by: Coverity Scan
Reviewed-on: http://review.coreboot.org/8511
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
See http://review.coreboot.org/8511 for details.
-gerrit
the following patch was just integrated into master:
commit bdd185a355c15a6f18c11cf173cdeb4f599059a6
Author: Patrick Georgi <patrick(a)georgi-clan.de>
Date: Sun Feb 22 17:54:18 2015 +0100
amd/sb600: Fix NULL test after use issue
Change-Id: Icecbcc1dee837ecfe0dd52bade3b83fdcdd15bad
Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de>
Found-by: Coverity Scan
Reviewed-on: http://review.coreboot.org/8513
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com>
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
See http://review.coreboot.org/8513 for details.
-gerrit
Kevin Paul Herbert (kph(a)meraki.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8530
-gerrit
commit 8a7b81119db78dbfd4979c92d26f04de3aa87282
Author: Kevin Paul Herbert <kph(a)meraki.net>
Date: Wed Feb 25 00:36:51 2015 -0800
x86: Fix pointer arithmetic regressions from MMIO changes
During the development of bde6d30, there were several iterations
and patterns tried. An intermediate pattern was the use of u32 pointers,
and division by sizeof(u32). Some of these did not get properly
changed to pointer types of length 1, causing a regression in
the ibexpeak SATA driver.
Other regressions of this pattern are fixed here. I audited all changes
to u32 types, and the other ones are safe.
Change-Id: I9e73ac8f4329df8bf0cdd1a14759f0280f974052
Signed-off-by: Kevin Paul Herbert <kph(a)meraki.net>
---
src/soc/intel/fsp_baytrail/southcluster.c | 4 ++--
src/southbridge/amd/agesa/hudson/enable_usbdebug.c | 2 +-
src/southbridge/amd/amd8111/nic.c | 2 +-
src/southbridge/intel/fsp_rangeley/lpc.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 878535f..ec2f94f 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -91,8 +91,8 @@ static void sc_enable_ioapic(struct device *dev)
* Set SCI IRQ to IRQ9
*/
write32(ilb_base + ILB_OIC, 0x100); /* AEN */
- reg32 = read32(ilb_base + (ILB_OIC/sizeof(u32))); /* Read back per BWG */
- write32(ilb_base + (ILB_ACTL/sizeof(u32)), 0); /* ACTL bit 2:0 SCIS IRQ9 */
+ reg32 = read32(ilb_base + ILB_OIC); /* Read back per BWG */
+ write32(ilb_base + ILB_ACTL, 0); /* ACTL bit 2:0 SCIS IRQ9 */
*ioapic_index = 0;
*ioapic_data = (1 << 25);
diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
index 5463d2b..9deeb45 100644
--- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
@@ -48,7 +48,7 @@ void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)
reg32 &= ~(0xf << 28);
reg32 |= (port << 28);
reg32 |= (1 << 27); /* Enable Debug Port port number remapping. */
- write32(base_regs + (DEBUGPORT_MISC_CONTROL / sizeof(u32)), reg32);
+ write32(base_regs + DEBUGPORT_MISC_CONTROL, reg32);
}
diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c
index 21df6c0..05ca871 100644
--- a/src/southbridge/amd/amd8111/nic.c
+++ b/src/southbridge/amd/amd8111/nic.c
@@ -11,7 +11,7 @@
#include "amd8111.h"
-#define CMD3 (0x54/(sizeof(u32)))
+#define CMD3 0x54
typedef enum {
VAL3 = (1 << 31), /* VAL bit for byte 3 */
diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c
index 8f29670..80673a6 100644
--- a/src/southbridge/intel/fsp_rangeley/lpc.c
+++ b/src/southbridge/intel/fsp_rangeley/lpc.c
@@ -52,7 +52,7 @@ static void soc_enable_apic(struct device *dev)
u32 reg32;
volatile u32 *ioapic_index = (volatile u32 *)(IO_APIC_ADDR);
volatile u32 *ioapic_data = (volatile u32 *)(IO_APIC_ADDR + 0x10);
- u32 *ilb_base = (u32 *)(pci_read_config32(dev, IBASE) & ~0x0f);
+ u8 *ilb_base = (u8 *)(pci_read_config32(dev, IBASE) & ~0x0f);
/*
* Enable ACPI I/O and power management.
Kevin Paul Herbert (kph(a)meraki.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8530
-gerrit
commit e72fbd1984763032a51952da3b842a97b33380da
Author: Kevin Paul Herbert <kph(a)meraki.net>
Date: Wed Feb 25 00:36:51 2015 -0800
x86: Fix pointer arithmetic regressions from MMIO changes
During the development of bde6d30, there were several iterations
and patterns tried. An intermediate pattern was the use of u32 pointers,
and division by sizeof(u32). Some of these did not get properly
changed to pointer types of length 1, causing a regression in
the ibexpeak SATA driver.
Other regressions of this pattern are fixed here. I audited all changes
to u32 types, and the other ones are safe.
Change-Id: I9e73ac8f4329df8bf0cdd1a14759f0280f974052
Signed-off-by: Kevin Paul Herbert <kph(a)meraki.net>
---
src/soc/intel/fsp_baytrail/southcluster.c | 4 ++--
src/southbridge/amd/agesa/hudson/enable_usbdebug.c | 2 +-
src/southbridge/amd/amd8111/nic.c | 2 +-
src/southbridge/intel/fsp_rangeley/lpc.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index 878535f..ec2f94f 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -91,8 +91,8 @@ static void sc_enable_ioapic(struct device *dev)
* Set SCI IRQ to IRQ9
*/
write32(ilb_base + ILB_OIC, 0x100); /* AEN */
- reg32 = read32(ilb_base + (ILB_OIC/sizeof(u32))); /* Read back per BWG */
- write32(ilb_base + (ILB_ACTL/sizeof(u32)), 0); /* ACTL bit 2:0 SCIS IRQ9 */
+ reg32 = read32(ilb_base + ILB_OIC); /* Read back per BWG */
+ write32(ilb_base + ILB_ACTL, 0); /* ACTL bit 2:0 SCIS IRQ9 */
*ioapic_index = 0;
*ioapic_data = (1 << 25);
diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
index 5463d2b..0d032b3 100644
--- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
@@ -48,7 +48,7 @@ void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port)
reg32 &= ~(0xf << 28);
reg32 |= (port << 28);
reg32 |= (1 << 27); /* Enable Debug Port port number remapping. */
- write32(base_regs + (DEBUGPORT_MISC_CONTROL / sizeof(u32)), reg32);
+ write32(base_regs + DEBUGPORT_MISC_CONTROL), reg32);
}
diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c
index 21df6c0..05ca871 100644
--- a/src/southbridge/amd/amd8111/nic.c
+++ b/src/southbridge/amd/amd8111/nic.c
@@ -11,7 +11,7 @@
#include "amd8111.h"
-#define CMD3 (0x54/(sizeof(u32)))
+#define CMD3 0x54
typedef enum {
VAL3 = (1 << 31), /* VAL bit for byte 3 */
diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c
index 8f29670..32fb220 100644
--- a/src/southbridge/intel/fsp_rangeley/lpc.c
+++ b/src/southbridge/intel/fsp_rangeley/lpc.c
@@ -52,7 +52,7 @@ static void soc_enable_apic(struct device *dev)
u32 reg32;
volatile u32 *ioapic_index = (volatile u32 *)(IO_APIC_ADDR);
volatile u32 *ioapic_data = (volatile u32 *)(IO_APIC_ADDR + 0x10);
- u32 *ilb_base = (u32 *)(pci_read_config32(dev, IBASE) & ~0x0f);
+ u8 *ilb_base = (u32 *)(pci_read_config32(dev, IBASE) & ~0x0f);
/*
* Enable ACPI I/O and power management.
Marc Jones (marc.jones(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8467
-gerrit
commit 7a0dc4bd334c40127c1871bcbf30e28f2ec3036e
Author: Aaron Durbin <adurbin(a)chromium.org>
Date: Tue Jun 24 14:22:36 2014 -0500
rush: Correct version field to match t132
The version field for t132 cpus is 0x00130001. Update it to
the correct version.
BUG=chrome-os-partner:29882
BRANCH=None
TEST=Built and was able to see serial with subsequent changes.
Original-Change-Id: I39d560307261fdfc34e071f5c35a4397c134e03c
Original-Signed-off-by: Aaron Durbin <adurbin(a)chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/205435
Original-Reviewed-by: Tom Warren <twarren(a)nvidia.com>
Original-Reviewed-by: Furquan Shaikh <furquan(a)chromium.org>
(cherry picked from commit 14916b3ba5545ab2cb35b6a4a7fa231b895ede46)
Signed-off-by: Marc Jones <marc.jones(a)se-eng.com>
Change-Id: I785069d3eb82ed24bafd52ef627d53505a35c09a
---
src/mainboard/google/rush/bct/emmc.cfg | 2 +-
src/mainboard/google/rush/bct/spi.cfg | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/mainboard/google/rush/bct/emmc.cfg b/src/mainboard/google/rush/bct/emmc.cfg
index be8f79f..430ffd6 100644
--- a/src/mainboard/google/rush/bct/emmc.cfg
+++ b/src/mainboard/google/rush/bct/emmc.cfg
@@ -1,7 +1,7 @@
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
-Version = 0x00350001;
+Version = 0x00130001;
BlockSize = 0x00004000;
PageSize = 0x00000200;
PartitionSize = 0x01000000;
diff --git a/src/mainboard/google/rush/bct/spi.cfg b/src/mainboard/google/rush/bct/spi.cfg
index 7d05363..a5ded0b 100644
--- a/src/mainboard/google/rush/bct/spi.cfg
+++ b/src/mainboard/google/rush/bct/spi.cfg
@@ -1,13 +1,11 @@
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
-Version = 0x00350001;
+Version = 0x00130001;
BlockSize = 32768;
PageSize = 2048;
PartitionSize = 4194304;
-Bctcopy = 1;
-
DevType[0] = NvBootDevType_Spi;
DeviceParam[0].SpiFlashParams.ReadCommandTypeFast = NV_FALSE;
DeviceParam[0].SpiFlashParams.ClockDivider = 0x16;