Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3223
-gerrit
commit da9dfd48fb99f9908b5849ff71ffb4c3bed0ce24
Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
Date: Tue May 28 13:46:12 2013 +0200
Provide sane Kconfig default for cmos.default.
Without that fix we have with CONFIG_USE_OPTION_TABLE:
OPTION cmos_layout.bin
build/util/nvramtool/nvramtool -y /home/gnutoo/x86/coreboot-alix/src/mainboard/pcengines/alix1c/cmos.layout -L build/cmos_layout.bin
make: *** No rule to make target `nvramtool', needed by `build/coreboot.pre1'. Stop.
rm build/util/sconfig/sconfig.tab.c build/cbfs/fallback/bootblock.elf build/util/sconfig/lex.yy.c
That log was captured with make V=1 but the error also appear with make.
This commit was tested on the PC Engines ALIX.1C with the following commit:
PC Engines ALIX.1C: Add CMOS defaults.
Change-Id: I548005a58f430ed7b6da5249a24bbdcae440a1e9
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org>
---
src/arch/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 5f46145..c7b2434 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -81,6 +81,7 @@ config HAVE_CMOS_DEFAULT
config CMOS_DEFAULT_FILE
string
+ default "src/mainboard/$(MAINBOARDDIR)/cmos.default"
depends on HAVE_CMOS_DEFAULT
config BOOTBLOCK_SOUTHBRIDGE_INIT
the following patch was just integrated into master:
commit 1a71f4c21f86fe058da9dee3be1d9db5448fe1b7
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Wed May 29 14:53:03 2013 +0200
qemu: remove vga hook
Extra care for the qemu vga should not be needed any more.
Since release 0.12 qemu loads the vgabios into the PCI ROM
bar, so everything works exactly like it does on real hardware.
Change-Id: I4b9bf1244cad437cbe5168600aeee52031456033
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
Reviewed-on: http://review.coreboot.org/3333
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net>
Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com>
See http://review.coreboot.org/3333 for details.
-gerrit
Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3328
-gerrit
commit ecc77dbe909599373a999574d273726b2b9f98bd
Author: Gabe Black <gabeblack(a)chromium.org>
Date: Wed May 29 16:42:27 2013 +0200
beaglebone: Reduce the size of the "ROM" from 128K to 64K
The RAM internal to the SOC isn't quite 128K in size, and has some things in it
that would be best not to trample. The current model is to load the entire
image into this memory and then to seperately load the RAM stage into the
system memory when that gets set up.
Change-Id: I89dc658fb1d14457a657ce3ecd2fd4d6acfb893f
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/mainboard/ti/beaglebone/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 97fdf48..9260a2f 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CPU_TI_AM335X
select HAVE_UART_MEMORY_MAPPED
# FIXME: This should be much smaller
- select BOARD_ROMSIZE_KB_128
+ select BOARD_ROMSIZE_KB_64
config MAINBOARD_DIR
string
Gerd Hoffmann (kraxel(a)redhat.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3333
-gerrit
commit a942b9da56b9d9d369f03f89a9b8e857604c93b4
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Wed May 29 14:53:03 2013 +0200
qemu: remove vga hook
Extra care for the qemu vga should not be needed any more.
Since release 0.12 qemu loads the vgabios into the PCI ROM
bar, so everything works exactly like it does on real hardware.
Change-Id: I4b9bf1244cad437cbe5168600aeee52031456033
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/mainboard/emulation/qemu-x86/mainboard.c | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index 71bc893..ae92654 100644
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -64,29 +64,3 @@ static const struct pci_driver nb_driver __pci_driver = {
.vendor = 0x8086,
.device = 0x1237,
};
-
-static void qemu_init(device_t dev)
-{
- /* The VGA OPROM already lives at 0xc0000,
- * force coreboot to use it.
- */
- dev->on_mainboard = 1;
-
- /* Now do the usual initialization */
- pci_dev_init(dev);
-}
-
-static struct device_operations vga_operations = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = qemu_init,
- .ops_pci = 0,
-};
-
-static const struct pci_driver vga_driver __pci_driver = {
- .ops = &vga_operations,
- .vendor = 0x1013,
- .device = 0x00b8,
-};
-
Gerd Hoffmann (kraxel(a)redhat.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3334
-gerrit
commit b27c38c53d5a2653caa85d81e5c2979620d5a64d
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Wed May 29 14:59:36 2013 +0200
qemu: fix IRQ routing setup
Do it for all PCI slots, not only 3. Also remove the bogous message,
slot 3 may carry any device, not only NICs.
Change-Id: Ie96be39185f2f1cbde3c9fc50e29faff59c28493
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/mainboard/emulation/qemu-x86/mainboard.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index ae92654..4f86e16 100644
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -26,8 +26,7 @@
#include <pc80/keyboard.h>
#include <arch/io.h>
-/* not sure how these are routed in qemu */
-static const unsigned char enetIrqs[4] = { 11, 0, 0, 0 };
+static const unsigned char qemu_i440fx_irqs[4] = { 10, 10, 11, 11 };
static void qemu_nb_init(device_t dev)
{
@@ -44,11 +43,10 @@ static void qemu_nb_init(device_t dev)
*/
pc_keyboard_init(0);
- /* The PIRQ table is not working well for interrupt routing purposes.
- * so we'll just set the IRQ directly.
- */
- printk(BIOS_INFO, "Setting up ethernet...\n");
- pci_assign_irqs(0, 3, enetIrqs);
+ /* setup IRQ routing */
+ for (i = 0; i < 32; i++) {
+ pci_assign_irqs(0, i, qemu_i440fx_irqs);
+ }
}
static struct device_operations nb_operations = {
Gabe Black (gabeblack(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3328
-gerrit
commit ea76abf68de8af3c8753f002ab1846f6a943d06c
Author: Gabe Black <gabeblack(a)chromium.org>
Date: Wed May 29 16:42:27 2013 +0200
beaglebone: Reduce the size of the "ROM" from 128K to 64K
The RAM interal to the SOC isn't quite 128K in size, and has some things in it
that would be best not to trample. The current model is to load the entire
image into this memory and then to seperately load the RAM stage into the
system memory when that gets set up.
Change-Id: I89dc658fb1d14457a657ce3ecd2fd4d6acfb893f
Signed-off-by: Gabe Black <gabeblack(a)chromium.org>
---
src/mainboard/ti/beaglebone/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 97fdf48..9260a2f 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CPU_TI_AM335X
select HAVE_UART_MEMORY_MAPPED
# FIXME: This should be much smaller
- select BOARD_ROMSIZE_KB_128
+ select BOARD_ROMSIZE_KB_64
config MAINBOARD_DIR
string