the following patch was just integrated into master:
commit f92c3fb260e083d4548a4029548cf90675c6ec29
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Fri Feb 19 11:58:16 2016 +0100
optionslist: Don't add a timestamp
The commit description is enough and this avoids hourly updates of the
timestamp by a cron job.
Change-Id: I30e9fcf28caf94edbb816c22bc8fbcb7ab09ae6d
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: https://review.coreboot.org/13744
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Rudolph <siro(a)das-labor.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See https://review.coreboot.org/13744 for details.
-gerrit
the following patch was just integrated into master:
commit 2d5d552fa5d91328c406f4b1b1886c6eaab8fcfe
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Fri Feb 19 10:24:07 2016 +0100
board-status: make push-to-wiki more flexible
Change-Id: I952a694f645caf9d9726965e39afc09c6fdce0e3
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: https://review.coreboot.org/13741
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See https://review.coreboot.org/13741 for details.
-gerrit
the following patch was just integrated into master:
commit 8a0dae628fafd3e419d9d3b9ec7aac551e02af71
Author: Patrick Georgi <pgeorgi(a)chromium.org>
Date: Fri Feb 19 10:19:39 2016 +0100
board-status: move wiki cookiejar elsewhere
Change-Id: I1240c215f3d6c3934911c096e2ecbabff175d501
Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org>
Reviewed-on: https://review.coreboot.org/13740
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth(a)google.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
See https://review.coreboot.org/13740 for details.
-gerrit
Leroy P Leahy (leroy.p.leahy(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13755
-gerrit
commit 30131e4e500f8af651c24272663834b46119e9ea
Author: Lee Leahy <leroy.p.leahy(a)intel.com>
Date: Sat Feb 20 05:39:10 2016 -0800
console: Add higher baud rates
Enable baud rates of 230400, 460800 and 921600. Leave the default set
to 115200.
TEST=Build and run on Galileo at 921600.
Change-Id: I8e3980f33665bc183b454cf97c68e297f1b0502c
Signed-off-by: Lee Leahy <leroy.p.leahy(a)intel.com>
---
src/console/Kconfig | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 83adc4f..847d17e 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -73,6 +73,18 @@ choice
prompt "Baud rate"
default CONSOLE_SERIAL_115200
+config CONSOLE_SERIAL_921600
+ bool "921600"
+ help
+ Set serial port Baud rate to 921600.
+config CONSOLE_SERIAL_460800
+ bool "460800"
+ help
+ Set serial port Baud rate to 460800.
+config CONSOLE_SERIAL_230400
+ bool "230400"
+ help
+ Set serial port Baud rate to 230400.
config CONSOLE_SERIAL_115200
bool "115200"
help
@@ -99,6 +111,9 @@ endchoice
#FIXME(dhendrix): Change name to SERIAL_BAUD? (Stefan sayz: yes!!)
config TTYS0_BAUD
int
+ default 921600 if CONSOLE_SERIAL_921600
+ default 460800 if CONSOLE_SERIAL_460800
+ default 230400 if CONSOLE_SERIAL_230400
default 115200 if CONSOLE_SERIAL_115200
default 57600 if CONSOLE_SERIAL_57600
default 38400 if CONSOLE_SERIAL_38400
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13754
-gerrit
commit f632e97fa49d61a318f48a02e8e46b5a6a786f4d
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Fri Feb 19 22:50:50 2016 +0100
qemu/vexpress-a9: Discover RAM size.
Probe RAM to find its size instead of hardcoding 1024M.
Also properly export it to memory map.
Change-Id: Ib411f0a068bd247a9e0cd0a59689a3896921483e
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/mainboard/emulation/qemu-armv7/Kconfig | 4 ---
src/mainboard/emulation/qemu-armv7/cbmem.c | 42 +++++++++++++++++++++++++-
src/mainboard/emulation/qemu-armv7/mainboard.c | 39 ++++++++++++++++++++++++
src/mainboard/emulation/qemu-armv7/mainboard.h | 21 +++++++++++++
4 files changed, 101 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 2654f0f..f30dcd1 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -48,8 +48,4 @@ config MAINBOARD_VENDOR
string
default "ARM Ltd."
-config DRAM_SIZE_MB
- int
- default 1024
-
endif # BOARD_EMULATION_QEMU_ARMV7
diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index a626ec6..b634bf6 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -14,8 +14,48 @@
#include <stddef.h>
#include <cbmem.h>
#include <symbols.h>
+#include "mainboard.h"
+
+/* Returns 1 if megabyte mb is present and 0 otherwise. */
+static int probe_mb(int mb)
+{
+ volatile char *ptr = (char *) 0x60000000 + (mb << 20) + 0xfffff;
+ char old;
+ if (ptr < (volatile char *) &_eprogram) {
+ /* Don't probe below _end to avoid accidentally clobering
+ oneself.
+ */
+ return 1;
+ }
+
+ old = *ptr;
+ *ptr = 0x55;
+ if (*ptr != 0x55)
+ return 0;
+ *ptr = 0xaa;
+ if (*ptr != 0xaa)
+ return 0;
+ *ptr = old;
+ return 1;
+}
+
+int probe_ramsize(void)
+{
+ int i;
+ int discovered = 0;
+ static int saved_result;
+ if (saved_result)
+ return saved_result;
+ /* Compact binary search. */
+ for (i = 9; i >= 0; i--)
+ if (probe_mb(discovered | (1 << i)))
+ discovered |= (1 << i);
+ discovered++;
+ saved_result = discovered;
+ return discovered;
+}
void *cbmem_top(void)
{
- return _dram + (CONFIG_DRAM_SIZE_MB << 20);
+ return _dram + (probe_ramsize() << 20);
}
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
new file mode 100644
index 0000000..a5ae0d0
--- /dev/null
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Vladimir Serbinenko <phcoder(a)gmail.com>
+ *
+ * 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 or, at your option, any later
+ * version 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.
+ */
+
+#include <console/console.h>
+#include <device/device.h>
+#include <cbmem.h>
+#include <string.h>
+#include "mainboard.h"
+
+static void mainboard_enable(device_t dev)
+{
+ int discovered;
+ if (!dev) {
+ printk(BIOS_EMERG, "No dev0; die\n");
+ while (1);
+ }
+
+ discovered = probe_ramsize();
+ printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
+ ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
+ cbmem_recovery(0);
+}
+
+struct chip_operations mainboard_ops = {
+ .enable_dev = mainboard_enable,
+};
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.h b/src/mainboard/emulation/qemu-armv7/mainboard.h
new file mode 100644
index 0000000..3691c36
--- /dev/null
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Vladimir Serbinenko <phcoder(a)gmail.com>
+ *
+ * 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 or, at your option, any later
+ * version 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.
+ */
+
+#ifndef QEMU_ARMV7_MAINBOARD_H
+#define QEMU_ARMV7_MAINBOARD_H
+
+int probe_ramsize(void);
+#endif
Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13754
-gerrit
commit 6bfa3b2255665443cc792e815b17f15f9ed73991
Author: Vladimir Serbinenko <phcoder(a)gmail.com>
Date: Fri Feb 19 22:50:50 2016 +0100
qemu/vexpress-a9: Discover RAM size.
Probe RAM to find its size instead of hardcoding 1024M.
Also properly export it to memory map.
Change-Id: Ib411f0a068bd247a9e0cd0a59689a3896921483e
Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com>
---
src/mainboard/emulation/qemu-armv7/Kconfig | 4 ---
src/mainboard/emulation/qemu-armv7/cbmem.c | 42 +++++++++++++++++++++++++-
src/mainboard/emulation/qemu-armv7/mainboard.c | 40 ++++++++++++++++++++++++
src/mainboard/emulation/qemu-armv7/mainboard.h | 21 +++++++++++++
4 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 2654f0f..f30dcd1 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -48,8 +48,4 @@ config MAINBOARD_VENDOR
string
default "ARM Ltd."
-config DRAM_SIZE_MB
- int
- default 1024
-
endif # BOARD_EMULATION_QEMU_ARMV7
diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index a626ec6..b634bf6 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -14,8 +14,48 @@
#include <stddef.h>
#include <cbmem.h>
#include <symbols.h>
+#include "mainboard.h"
+
+/* Returns 1 if megabyte mb is present and 0 otherwise. */
+static int probe_mb(int mb)
+{
+ volatile char *ptr = (char *) 0x60000000 + (mb << 20) + 0xfffff;
+ char old;
+ if (ptr < (volatile char *) &_eprogram) {
+ /* Don't probe below _end to avoid accidentally clobering
+ oneself.
+ */
+ return 1;
+ }
+
+ old = *ptr;
+ *ptr = 0x55;
+ if (*ptr != 0x55)
+ return 0;
+ *ptr = 0xaa;
+ if (*ptr != 0xaa)
+ return 0;
+ *ptr = old;
+ return 1;
+}
+
+int probe_ramsize(void)
+{
+ int i;
+ int discovered = 0;
+ static int saved_result;
+ if (saved_result)
+ return saved_result;
+ /* Compact binary search. */
+ for (i = 9; i >= 0; i--)
+ if (probe_mb(discovered | (1 << i)))
+ discovered |= (1 << i);
+ discovered++;
+ saved_result = discovered;
+ return discovered;
+}
void *cbmem_top(void)
{
- return _dram + (CONFIG_DRAM_SIZE_MB << 20);
+ return _dram + (probe_ramsize() << 20);
}
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
new file mode 100644
index 0000000..d2ce62e
--- /dev/null
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Vladimir Serbinenko <phcoder(a)gmail.com>
+ *
+ * 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 or, at your option, any later
+ * version 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.
+ */
+
+#include <console/console.h>
+#include <device/device.h>
+#include <cbmem.h>
+#include <string.h>
+#include "mainboard.h"
+
+static void mainboard_enable(device_t dev)
+{
+ int discovered;
+ if (!dev) {
+ printk(BIOS_EMERG, "No dev0; die\n");
+ while (1);
+ }
+
+ discovered = probe_ramsize();
+ printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
+ ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
+ cbmem_recovery(0);
+ init_gfx();
+}
+
+struct chip_operations mainboard_ops = {
+ .enable_dev = mainboard_enable,
+};
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.h b/src/mainboard/emulation/qemu-armv7/mainboard.h
new file mode 100644
index 0000000..3691c36
--- /dev/null
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.h
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Vladimir Serbinenko <phcoder(a)gmail.com>
+ *
+ * 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 or, at your option, any later
+ * version 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.
+ */
+
+#ifndef QEMU_ARMV7_MAINBOARD_H
+#define QEMU_ARMV7_MAINBOARD_H
+
+int probe_ramsize(void);
+#endif