coreboot-gerrit October 2013

coreboot-gerrit@coreboot.org

1 participants
159 discussions

Patch merged into coreboot/master: 569ad76 util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde
by gerrit＠coreboot.org 22 Oct '13

22 Oct '13

the following patch was just integrated into master: commit 569ad760cc4d7e3595bd9d4f569d08b021a64663 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Wed Oct 2 22:10:11 2013 +0200 util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde Some editors like gedit create auxiliary files ending with a tilde '~'. As these are not checked into the Git repository, do not check these for whitespace errors. Change-Id: I2c4cf00f9d623be73ea3bbb7b2da4f1e1900c8e9 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-on: http://review.coreboot.org/3952 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> See http://review.coreboot.org/3952 for details. -gerrit

1 0

Patch set updated for coreboot: 1dcef53 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16`
by Ronald G. Minnich 22 Oct '13

22 Oct '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3984 -gerrit commit 1dcef53d9db49a589d564ea1b18f091c181ed395 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Mon Oct 21 21:22:09 2013 +0200 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16` Change-Id: Id4a758644a7b799e7662113c07d395e053525934 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/northbridge/intel/i945/raminit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index b50f1d8..512d8e9 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -1952,8 +1952,6 @@ static void sdram_set_channel_mode(struct sys_info *sysinfo) static void sdram_program_pll_settings(struct sys_info *sysinfo) { - volatile u16 reg16; - MCHBAR32(PLLMON) = 0x80800000; sysinfo->fsb_frequency = fsbclk(); @@ -1970,7 +1968,7 @@ static void sdram_program_pll_settings(struct sys_info *sysinfo) MCHBAR16(CPCTL) &= ~(1 << 11); - reg16 = MCHBAR16(CPCTL); /* Read back register to activate settings */ + MCHBAR16(CPCTL); /* Read back register to activate settings */ } static void sdram_program_graphics_frequency(struct sys_info *sysinfo)

1 0

Patch set updated for coreboot: fec4f86 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16`
by Paul Menzel 21 Oct '13

21 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3984 -gerrit commit fec4f868b1d3915c80d2603b675d88a520b5de7c Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Mon Oct 21 21:22:09 2013 +0200 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16` Removing `-Wno-unused-but-set-variable` from `CFLAGS` results in the following error. CC northbridge/intel/i945/raminit.romstage.o src/northbridge/intel/i945/raminit.c: In function 'sdram_detect_cas_latency_and_ram_speed': src/northbridge/intel/i945/raminit.c:497:6: error: variable 'lowest_common_cas' set but not used [-Werror=unused-but-set-variable] src/northbridge/intel/i945/raminit.c: In function 'sdram_program_pll_settings': src/northbridge/intel/i945/raminit.c:1955:15: error: variable 'reg16' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors The variable is declared as `volatile`, but as it is not read anywhere it can be removed. Change-Id: Id4a758644a7b799e7662113c07d395e053525934 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/northbridge/intel/i945/raminit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index b50f1d8..512d8e9 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -1952,8 +1952,6 @@ static void sdram_set_channel_mode(struct sys_info *sysinfo) static void sdram_program_pll_settings(struct sys_info *sysinfo) { - volatile u16 reg16; - MCHBAR32(PLLMON) = 0x80800000; sysinfo->fsb_frequency = fsbclk(); @@ -1970,7 +1968,7 @@ static void sdram_program_pll_settings(struct sys_info *sysinfo) MCHBAR16(CPCTL) &= ~(1 << 11); - reg16 = MCHBAR16(CPCTL); /* Read back register to activate settings */ + MCHBAR16(CPCTL); /* Read back register to activate settings */ } static void sdram_program_graphics_frequency(struct sys_info *sysinfo)

1 0

Patch set updated for coreboot: af4bb56 southbridge/via/vt8237r/ctrl.c: Remove set but unused variable `regm3`
by Paul Menzel 21 Oct '13

21 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3985 -gerrit commit af4bb566b8eef04ac6f7481bb175cfe3f91d0d9c Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Oct 20 00:41:28 2013 +0200 southbridge/via/vt8237r/ctrl.c: Remove set but unused variable `regm3` Removing `-Wno-unused-but-set-variable` from `CFLAGS` results in the following error. CC southbridge/via/vt8237r/ctrl.ramstage.o src/southbridge/via/vt8237r/ctrl.c: In function 'vt8237_cfg': src/southbridge/via/vt8237r/ctrl.c:32:11: error: variable 'regm3' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors There is already a `FIXME` line regarding this issue, added in commit »remove more warnings.« (3c8ac786). Looking at the history, the file `vt8237_ctrl.c` was based on `k8t890_ctrl.c`, but removed the code needing the variable `regm3` and was not adapted in that place. Therefore remove the variable `regm3` and use `regm` which should also shadow page E correctly now. Change-Id: I6bb652419a54b7b7190e417346581f38335425ae Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/southbridge/via/vt8237r/ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/southbridge/via/vt8237r/ctrl.c b/src/southbridge/via/vt8237r/ctrl.c index 78a15e3..e61b8f2 100644 --- a/src/southbridge/via/vt8237r/ctrl.c +++ b/src/southbridge/via/vt8237r/ctrl.c @@ -29,7 +29,7 @@ static void vt8237_cfg(struct device *dev) { - u8 regm, regm3; + u8 regm; device_t devfun3; devfun3 = dev_find_device(PCI_VENDOR_ID_VIA, @@ -80,8 +80,7 @@ static void vt8237_cfg(struct device *dev) regm = pci_read_config8(devfun3, 0x83); pci_write_config8(dev, 0x63, regm); - // FIXME is this really supposed to be regm3? - regm3 = pci_read_config8(devfun3, 0x82);/* Shadow page E */ + regm = pci_read_config8(devfun3, 0x82);/* Shadow page E */ pci_write_config8(dev, 0x64, regm); regm = pci_read_config8(devfun3, 0x86); /* SMM and APIC decoding */

1 0

New patch to review for coreboot: dd72d75 southbridge/via/vt8237r/ctrl.c: Remove unused variable `regm3`
by Paul Menzel 21 Oct '13

21 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3985 -gerrit commit dd72d75cdde8832cb43e63175cffb50b013ce79f Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Oct 20 00:41:28 2013 +0200 southbridge/via/vt8237r/ctrl.c: Remove unused variable `regm3` A FIXME was added but never discussed. Remove it as I see no downside. CC southbridge/via/vt8237r/ctrl.ramstage.o src/southbridge/via/vt8237r/ctrl.c: In function 'vt8237_cfg': src/southbridge/via/vt8237r/ctrl.c:32:11: error: variable 'regm3' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors Change-Id: I6bb652419a54b7b7190e417346581f38335425ae Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/southbridge/via/vt8237r/ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/southbridge/via/vt8237r/ctrl.c b/src/southbridge/via/vt8237r/ctrl.c index 78a15e3..e61b8f2 100644 --- a/src/southbridge/via/vt8237r/ctrl.c +++ b/src/southbridge/via/vt8237r/ctrl.c @@ -29,7 +29,7 @@ static void vt8237_cfg(struct device *dev) { - u8 regm, regm3; + u8 regm; device_t devfun3; devfun3 = dev_find_device(PCI_VENDOR_ID_VIA, @@ -80,8 +80,7 @@ static void vt8237_cfg(struct device *dev) regm = pci_read_config8(devfun3, 0x83); pci_write_config8(dev, 0x63, regm); - // FIXME is this really supposed to be regm3? - regm3 = pci_read_config8(devfun3, 0x82);/* Shadow page E */ + regm = pci_read_config8(devfun3, 0x82);/* Shadow page E */ pci_write_config8(dev, 0x64, regm); regm = pci_read_config8(devfun3, 0x86); /* SMM and APIC decoding */

1 0

New patch to review for coreboot: 491cf59 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16`
by Paul Menzel 21 Oct '13

21 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3984 -gerrit commit 491cf59a436219c9a947eecd514031d5c675ef32 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Mon Oct 21 21:22:09 2013 +0200 northbridge/intel/i945/raminit.c: Remove set but unused variable `reg16` Removing `-Wno-unused-but-set-variable` from `CFLAGS` results in the following error. src/northbridge/intel/i945/raminit.c: In function 'sdram_program_pll_settings': src/northbridge/intel/i945/raminit.c:1955:15: error: variable 'reg16' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors Change-Id: Id4a758644a7b799e7662113c07d395e053525934 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/northbridge/intel/i945/raminit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index b50f1d8..512d8e9 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -1952,8 +1952,6 @@ static void sdram_set_channel_mode(struct sys_info *sysinfo) static void sdram_program_pll_settings(struct sys_info *sysinfo) { - volatile u16 reg16; - MCHBAR32(PLLMON) = 0x80800000; sysinfo->fsb_frequency = fsbclk(); @@ -1970,7 +1968,7 @@ static void sdram_program_pll_settings(struct sys_info *sysinfo) MCHBAR16(CPCTL) &= ~(1 << 11); - reg16 = MCHBAR16(CPCTL); /* Read back register to activate settings */ + MCHBAR16(CPCTL); /* Read back register to activate settings */ } static void sdram_program_graphics_frequency(struct sys_info *sysinfo)

1 0

New patch to review for coreboot: 427886a usbdebug: Fix boards without EARLY_CBMEM_INIT
by Kyösti Mälkki 21 Oct '13

21 Oct '13

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3983 -gerrit commit 427886a49ffcaa045198fdc5f2d5799e1646bc4e Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri Oct 11 21:14:59 2013 +0300 usbdebug: Fix boards without EARLY_CBMEM_INIT The main usbdebug file lib/usbdebug.c was removed from romstage build with commit f8bf5a10 but the chipset-specific parts were not, leading to unresolved symbol errors for AMD platforms. Add a silent Kconfig variable USBDEBUG_IN_ROMSTAGE for convenient use of this feature. Change-Id: I0cd3fccf2612cf08497aa5c3750c89bf43ff69be Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/console/Kconfig | 5 +++++ src/console/console.c | 2 +- src/lib/Makefile.inc | 2 +- src/lib/usbdebug.c | 2 +- src/southbridge/amd/agesa/hudson/Makefile.inc | 2 +- src/southbridge/amd/cimx/sb700/Makefile.inc | 2 +- src/southbridge/amd/cimx/sb800/Makefile.inc | 2 +- src/southbridge/amd/sb600/Makefile.inc | 2 +- src/southbridge/amd/sb700/Makefile.inc | 2 +- src/southbridge/amd/sb800/Makefile.inc | 2 +- src/southbridge/intel/common/Makefile.inc | 2 +- src/southbridge/nvidia/ck804/Makefile.inc | 2 +- src/southbridge/nvidia/mcp55/Makefile.inc | 2 +- src/southbridge/sis/sis966/Makefile.inc | 2 +- 14 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/console/Kconfig b/src/console/Kconfig index f415d93..d209325 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -173,6 +173,11 @@ config USBDEBUG If unsure, say N. +config USBDEBUG_IN_ROMSTAGE + bool + default y if USBDEBUG && EARLY_CBMEM_INIT && EARLY_CONSOLE + default n + if USBDEBUG config USBDEBUG_HCD_INDEX diff --git a/src/console/console.c b/src/console/console.c index 014a4f7..8a1c969 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -119,7 +119,7 @@ void console_init(void) #if CONFIG_SPKMODEM spkmodem_init(); #endif -#if CONFIG_USBDEBUG && CONFIG_EARLY_CBMEM_INIT && !defined(__BOOT_BLOCK__) +#if CONFIG_USBDEBUG_IN_ROMSTAGE && !defined(__BOOT_BLOCK__) usbdebug_init(); #endif diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 6110b88..b0d9366 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -49,11 +49,11 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += usbdebug.c ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c -romstage-$(CONFIG_USBDEBUG) += usbdebug.c endif romstage-y += compute_ip_checksum.c diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index e5f7902..885599b 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -581,7 +581,7 @@ err: static void enable_usbdebug(void) { -#if defined(__PRE_RAM__) || !(CONFIG_EARLY_CONSOLE && CONFIG_EARLY_CBMEM_INIT) +#if defined(__PRE_RAM__) || !CONFIG_USBDEBUG_IN_ROMSTAGE pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX); pci_ehci_dbg_enable(dbg_dev, CONFIG_EHCI_BAR); #endif diff --git a/src/southbridge/amd/agesa/hudson/Makefile.inc b/src/southbridge/amd/agesa/hudson/Makefile.inc index 44e030c..d50d09e 100644 --- a/src/southbridge/amd/agesa/hudson/Makefile.inc +++ b/src/southbridge/amd/agesa/hudson/Makefile.inc @@ -12,7 +12,7 @@ ramstage-y += sd.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c romstage-y += early_setup.c diff --git a/src/southbridge/amd/cimx/sb700/Makefile.inc b/src/southbridge/amd/cimx/sb700/Makefile.inc index f6f0d86..ff96ca6 100644 --- a/src/southbridge/amd/cimx/sb700/Makefile.inc +++ b/src/southbridge/amd/cimx/sb700/Makefile.inc @@ -30,5 +30,5 @@ ramstage-y += reset.c ramstage-y += smbus.c ramstage-y += lpc.c -romstage-$(CONFIG_USBDEBUG) += ../../sb700/enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += ../../sb700/enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += ../../sb700/enable_usbdebug.c diff --git a/src/southbridge/amd/cimx/sb800/Makefile.inc b/src/southbridge/amd/cimx/sb800/Makefile.inc index 0ff9e1e..2ed5096 100644 --- a/src/southbridge/amd/cimx/sb800/Makefile.inc +++ b/src/southbridge/amd/cimx/sb800/Makefile.inc @@ -34,7 +34,7 @@ ramstage-$(CONFIG_SB800_IMC_FAN_CONTROL) += fan.c ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c -romstage-$(CONFIG_USBDEBUG) += ../../sb800/enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += ../../sb800/enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += ../../sb800/enable_usbdebug.c ramstage-y += smbus.c diff --git a/src/southbridge/amd/sb600/Makefile.inc b/src/southbridge/amd/sb600/Makefile.inc index d0df57c..37fe57d 100644 --- a/src/southbridge/amd/sb600/Makefile.inc +++ b/src/southbridge/amd/sb600/Makefile.inc @@ -8,5 +8,5 @@ ramstage-y += hda.c ramstage-y += ac97.c ramstage-y += pci.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c diff --git a/src/southbridge/amd/sb700/Makefile.inc b/src/southbridge/amd/sb700/Makefile.inc index b457e4a..677aaad 100644 --- a/src/southbridge/amd/sb700/Makefile.inc +++ b/src/southbridge/amd/sb700/Makefile.inc @@ -10,7 +10,7 @@ ramstage-y += pci.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c romstage-y += reset.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c romstage-y += early_setup.c diff --git a/src/southbridge/amd/sb800/Makefile.inc b/src/southbridge/amd/sb800/Makefile.inc index 1253b39..db75d3f 100644 --- a/src/southbridge/amd/sb800/Makefile.inc +++ b/src/southbridge/amd/sb800/Makefile.inc @@ -9,5 +9,5 @@ ramstage-y += pci.c ramstage-y += pcie.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c diff --git a/src/southbridge/intel/common/Makefile.inc b/src/southbridge/intel/common/Makefile.inc index 91b6380..4374ebc 100644 --- a/src/southbridge/intel/common/Makefile.inc +++ b/src/southbridge/intel/common/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -romstage-$(CONFIG_USBDEBUG) += usb_debug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += usb_debug.c ramstage-$(CONFIG_USBDEBUG) += usb_debug.c diff --git a/src/southbridge/nvidia/ck804/Makefile.inc b/src/southbridge/nvidia/ck804/Makefile.inc index 0e57f20..b249f7e 100644 --- a/src/southbridge/nvidia/ck804/Makefile.inc +++ b/src/southbridge/nvidia/ck804/Makefile.inc @@ -15,7 +15,7 @@ ramstage-y += reset.c ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c romstage-y += early_smbus.c diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc index e11fc78..29ad438 100644 --- a/src/southbridge/nvidia/mcp55/Makefile.inc +++ b/src/southbridge/nvidia/mcp55/Makefile.inc @@ -15,7 +15,7 @@ ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c chipset_bootblock_inc += $(src)/southbridge/nvidia/mcp55/romstrap.inc diff --git a/src/southbridge/sis/sis966/Makefile.inc b/src/southbridge/sis/sis966/Makefile.inc index 1555973..1a9ea65 100644 --- a/src/southbridge/sis/sis966/Makefile.inc +++ b/src/southbridge/sis/sis966/Makefile.inc @@ -10,7 +10,7 @@ ramstage-y += pcie.c ramstage-y += aza.c ramstage-y += reset.c -romstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c chipset_bootblock_inc += $(src)/southbridge/sis/sis966/romstrap.inc

1 0

Patch set updated for coreboot: 9e0a26b dmp/vortex86ex: Initialize I2C controller base address/IRQ
by Andrew Wu 21 Oct '13

21 Oct '13

Andrew Wu (arw(a)dmp.com.tw) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3976 -gerrit commit 9e0a26b1d9985011e6bcb400a801b7e533a423ff Author: Andrew Wu <arw(a)dmp.com.tw> Date: Wed Oct 16 13:08:30 2013 +0800 dmp/vortex86ex: Initialize I2C controller base address/IRQ Change-Id: I22f5c877ed441d59f29801d925ee40b24fb796ce Signed-off-by: Andrew Wu <arw(a)dmp.com.tw> --- src/mainboard/dmp/vortex86ex/Kconfig | 8 ++++++++ src/southbridge/dmp/vortex86ex/southbridge.c | 12 ++++++++++++ src/southbridge/dmp/vortex86ex/southbridge.h | 1 + 3 files changed, 21 insertions(+) diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig index 723a251..f4931ca 100644 --- a/src/mainboard/dmp/vortex86ex/Kconfig +++ b/src/mainboard/dmp/vortex86ex/Kconfig @@ -122,6 +122,14 @@ menu "On-Chip Device Power Down Control" endmenu +menu "On-Chip Device I/O Base Address Control" + +config I2C_BASE + hex "I2C base address" + default 0xfb00 + +endmenu + menu "Watchdog Timer setting" config WDT1_INITIALIZE diff --git a/src/southbridge/dmp/vortex86ex/southbridge.c b/src/southbridge/dmp/vortex86ex/southbridge.c index d8914c0..d431c1c 100644 --- a/src/southbridge/dmp/vortex86ex/southbridge.c +++ b/src/southbridge/dmp/vortex86ex/southbridge.c @@ -70,6 +70,7 @@ static const unsigned char irq_to_int_routing[16] = { #define PIDE_IRQ 5 #define SPI1_IRQ 10 +#define I2C0_IRQ 10 #define MOTOR_IRQ 11 /* RT0-3 IRQs. */ @@ -418,6 +419,16 @@ static void ex_sb_uart_init(struct device *dev) //pci_write_config16(SB, SB_REG_UART_CFG_IO_BASE, 0x0); } +static void i2c_init(struct device *dev) +{ + u8 mapped_irq = irq_to_int_routing[I2C0_IRQ]; + u32 cfg = 0; + cfg |= 1 << 31; // UE = enabled. + cfg |= (mapped_irq << 16); // IIRT0. + cfg |= CONFIG_I2C_BASE; // UIOA. + pci_write_config32(dev, SB_REG_II2CCR, cfg); +} + static int get_rtc_update_in_progress(void) { if (cmos_read(RTC_REG_A) & RTC_UIP) @@ -566,6 +577,7 @@ static void southbridge_init(struct device *dev) if (dev->device == 0x6011) { ex_sb_gpio_init(dev); ex_sb_uart_init(dev); + i2c_init(dev); } pci_routing_fixup(dev); diff --git a/src/southbridge/dmp/vortex86ex/southbridge.h b/src/southbridge/dmp/vortex86ex/southbridge.h index 0cc28fa..316d30a 100644 --- a/src/southbridge/dmp/vortex86ex/southbridge.h +++ b/src/southbridge/dmp/vortex86ex/southbridge.h @@ -36,6 +36,7 @@ #define SB_REG_IPFCR 0xc0 #define SB_REG_FRWPR 0xc4 #define SB_REG_STRAP 0xce +#define SB_REG_II2CCR 0xd4 #define SB1 PCI_DEV(0, 7, 1) #define SB1_REG_EXT_PIRQ_ROUTE2 0xb4

1 0

New patch to review for coreboot: 4216224 southbridge/intel/i82801ix/lpc.c: Remove unused variable `dummy`
by Paul Menzel 21 Oct '13

21 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3982 -gerrit commit 42162246f0185ecf8148f6a6a986b743e3a19837 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Mon Oct 21 09:28:19 2013 +0200 southbridge/intel/i82801ix/lpc.c: Remove unused variable `dummy` Removing `-Wno-unused-but-set-variable` from `CFLAGS` the build for QEMU Q35 and Roda RK9, both using the Intel 82801Ix southbridge, fail with the following error. src/southbridge/intel/i82801ix/lpc.c: In function 'i82801ix_enable_apic': src/southbridge/intel/i82801ix/lpc.c:45:5: error: variable 'dummy' set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors Removing `dummy` should be safe as GCC probably optimizes it away before anyway. That no dummy variable is used for an RCBA [1] access in Intel Lynx Point supports that this can be dropped safely. [1] root complex base address [2] src/southbridge/intel/lynxpoint/early_pch.c Change-Id: I1c138a3498228dbd025f68d5e6af0acc29ed3460 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/southbridge/intel/i82801ix/lpc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index fb0dd56..bea0d98 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -42,7 +42,6 @@ typedef struct southbridge_intel_i82801ix_config config_t; static void i82801ix_enable_apic(struct device *dev) { - u8 dummy; u32 reg32; volatile u32 *ioapic_index = (volatile u32 *)(IO_APIC_ADDR); volatile u32 *ioapic_data = (volatile u32 *)(IO_APIC_ADDR + 0x10); @@ -50,7 +49,7 @@ static void i82801ix_enable_apic(struct device *dev) /* Enable IOAPIC. Keep APIC Range Select at zero. */ RCBA8(0x31ff) = 0x03; /* We have to read 0x31ff back if bit0 changed. */ - dummy = RCBA8(0x31ff); + RCBA8(0x31ff); /* Lock maximum redirection entries (MRE), R/WO register. */ *ioapic_index = 0x01;

1 0

New patch to review for coreboot: 1c9431a util/xcompile/xcompile: Remove `-Wno-unused-but-set-variable` from `CFLAGS`
by Paul Menzel 20 Oct '13

20 Oct '13

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3981 -gerrit commit 1c9431aa0498113d1fb45a5d9bd266f139227e31 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sun Oct 20 00:11:34 2013 +0200 util/xcompile/xcompile: Remove `-Wno-unused-but-set-variable` from `CFLAGS` Do not disable warnings about unused but set variables to further improve the code quality. Change-Id: I25fa29ac42c9d09596d03f11fb01f31635a62a11 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- util/xcompile/xcompile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 5388889..9c54760 100644 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -89,11 +89,6 @@ testas() { detect_special_flags() { local architecture="$1" - # GCC 4.6 is much more picky about unused variables. - # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " - # Use bfd linker instead of gold if available: testcc "$CC" "$CFLAGS -fuse-ld=bfd" && CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd'

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit October 2013