Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34107 )
Change subject: drivers/pc80: Move UDELAY_IO and UDELAY_TIMER2
......................................................................
drivers/pc80: Move UDELAY_IO and UDELAY_TIMER2
No longer fallback to UDELAY_IO as default.
Since these are not cpu properties or features,
move the Kconfig location.
Change-Id: I9809cdc285c7bf741aa391ddb5755390bbfc2909
Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
---
M src/cpu/x86/Kconfig
M src/drivers/pc80/pc/Kconfig
2 files changed, 13 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/34107/1
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index 608afd7..99a7075 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -17,11 +17,6 @@
Allow APs to do other work after initialization instead of going
to sleep.
-config UDELAY_IO
- bool
- default y if !UDELAY_LAPIC && !UDELAY_TSC && !UDELAY_TIMER2 && !GENERIC_UDELAY
- default n
-
config UDELAY_LAPIC
bool
default n
@@ -54,11 +49,6 @@
help
Expose monotonic time using the TSC.
-# This option is used in code but never selected.
-config UDELAY_TIMER2
- bool
- default n
-
config TSC_SYNC_LFENCE
bool
default n
diff --git a/src/drivers/pc80/pc/Kconfig b/src/drivers/pc80/pc/Kconfig
index c44cf91..bba45f6 100644
--- a/src/drivers/pc80/pc/Kconfig
+++ b/src/drivers/pc80/pc/Kconfig
@@ -1,10 +1,11 @@
+if PC80_SYSTEM
+
# Might be removed (alongside with the PS/2 init code) once payloads
# reliably support PS/2 init themselves.
config DRIVERS_PS2_KEYBOARD
bool "PS/2 keyboard init"
default n
- depends on PC80_SYSTEM
help
Enable this option to initialize PS/2 keyboards found connected
to the PS/2 port.
@@ -16,3 +17,14 @@
If you know you will only use a payload which does not require
this option, then you can say N here to speed up boot time.
Otherwise say Y.
+
+config UDELAY_IO
+ bool
+ default n
+
+# This option is used in code but never selected.
+config UDELAY_TIMER2
+ bool
+ default n
+
+endif
--
To view, visit https://review.coreboot.org/c/coreboot/+/34107
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9809cdc285c7bf741aa391ddb5755390bbfc2909
Gerrit-Change-Number: 34107
Gerrit-PatchSet: 1
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com>
Gerrit-MessageType: newchange
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33783
Change subject: device/oprom: Fix coding standard problem from // to /* */
......................................................................
device/oprom: Fix coding standard problem from // to /* */
Change-Id: I321d9e54fee42cd9f0cff5f962246934209577f7
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/device/oprom/realmode/x86.c
1 file changed, 17 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/33783/1
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index a7631a1..80455a5 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -104,9 +104,9 @@
printk(BIOS_INFO, "Oops, exception %d while executing option rom\n",
regs->vector);
- x86_exception(regs); // Call coreboot exception handler
+ x86_exception(regs); /* Call coreboot exception handler */
- return 0; // Never really returns
+ return 0; /* Never really returns */
}
static int intXX_unknown_handler(void)
@@ -238,9 +238,9 @@
static u8 vbe_set_mode(vbe_mode_info_t * mi)
{
printk(BIOS_DEBUG, "VBE: Setting VESA mode %04x\n", mi->video_mode);
- // request linear framebuffer mode
+ /* request linear framebuffer mode */
mi->video_mode |= (1 << 14);
- // request clearing of framebuffer
+ /* request clearing of framebuffer */
mi->video_mode &= ~(1 << 15);
realmode_interrupt(0x10, VESA_SET_MODE, mi->video_mode,
0x0000, 0x0000, 0x0000, 0x0000);
@@ -393,8 +393,9 @@
ip, cs, flags);
#endif
- // Fetch arguments from the stack and put them to a place
- // suitable for the interrupt handlers
+ /* Fetch arguments from the stack and put them to a place
+ * suitable for the interrupt handlers
+ */
X86_EAX = eax;
X86_ECX = ecx;
X86_EDX = edx;
@@ -409,15 +410,16 @@
X86_CS = cs;
X86_EFLAGS = flags;
- // Call the interrupt handler for this int#
+ /* Call the interrupt handler for this int# */
ret = intXX_handler[intnumber]();
- // Put registers back on the stack. The assembler code
- // will later pop them.
- // What happens here is that we force (volatile!) changing
- // the values of the parameters of this function. We do this
- // because we know that they stay alive on the stack after
- // we leave this function. Don't say this is bollocks.
+ /* Put registers back on the stack. The assembler code
+ * will later pop them.
+ * What happens here is that we force (volatile!) changing
+ * the values of the parameters of this function. We do this
+ * because we know that they stay alive on the stack after
+ * we leave this function. Don't say this is bollocks.
+ */
*(volatile u32 *)&eax = X86_EAX;
*(volatile u32 *)&ecx = X86_ECX;
*(volatile u32 *)&edx = X86_EDX;
@@ -428,10 +430,10 @@
/* Pass success or error back to our caller via the CARRY flag */
if (ret) {
- flags &= ~1; // no error: clear carry
+ flags &= ~1; /* no error: clear carry */
}else{
printk(BIOS_DEBUG,"int%02x call returned error.\n", intnumber);
- flags |= 1; // error: set carry
+ flags |= 1; /* error: set carry */
}
*(volatile u16 *)&stackflags = flags;
--
To view, visit https://review.coreboot.org/c/coreboot/+/33783
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I321d9e54fee42cd9f0cff5f962246934209577f7
Gerrit-Change-Number: 33783
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-MessageType: newchange
Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33782
Change subject: vbe.h: Convert hardcode vega mode into macro
......................................................................
vbe.h: Convert hardcode vega mode into macro
This patch replaces vega framebuffer mode hard coded value into
macro (MAX_VBE_FRAMEBUFFER_MODE).
Also make use of __packed to align data access.
Change-Id: I5e79b21acf44f6ca184a09d42acdf69c31dd4841
Signed-off-by: Subrata Banik <subrata.banik(a)intel.com>
---
M src/include/vbe.h
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/33782/1
diff --git a/src/include/vbe.h b/src/include/vbe.h
index 2c40d05..88888e8 100644
--- a/src/include/vbe.h
+++ b/src/include/vbe.h
@@ -14,6 +14,10 @@
#define VBE_H
#include <boot/coreboot_tables.h>
+
+/* Let's hope we never have more than 256 video modes. */
+#define MAX_VBE_FRAMEBUFFER_MODE 256
+
// these structs are for input from and output to OF
typedef struct {
u8 display_type; // 0 = NONE, 1 = analog, 2 = digital
@@ -41,10 +45,9 @@
u16 version;
u8 *oem_string_ptr;
u32 capabilities;
- u16 video_mode_list[256]; // lets hope we never have more than
- // 256 video modes...
+ u16 video_mode_list[MAX_VBE_FRAMEBUFFER_MODE];
u16 total_memory;
-} vbe_info_t;
+} __packed vbe_info_t;
typedef struct {
u16 mode_attributes; // 00
--
To view, visit https://review.coreboot.org/c/coreboot/+/33782
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5e79b21acf44f6ca184a09d42acdf69c31dd4841
Gerrit-Change-Number: 33782
Gerrit-PatchSet: 1
Gerrit-Owner: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-MessageType: newchange
Martin Kepplinger has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32613
Change subject: payloads/external/Memtest86Plus: update to version 002 stable
......................................................................
payloads/external/Memtest86Plus: update to version 002 stable
The memtest86plus project has been tagged as stable. Update the coreboot
build accordingly.
Change-Id: I078ac5d91e60a424efb5e14f39ae59e7ae9cbfe2
Signed-off-by: Martin Kepplinger <martink(a)posteo.de>
---
M payloads/external/Memtest86Plus/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/32613/1
diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile
index 4b3132d..b799f9e 100644
--- a/payloads/external/Memtest86Plus/Makefile
+++ b/payloads/external/Memtest86Plus/Makefile
@@ -15,7 +15,7 @@
TAG-$(CONFIG_MEMTEST_MASTER)=origin/master
NAME-$(CONFIG_MEMTEST_MASTER)=Master
-TAG-$(CONFIG_MEMTEST_STABLE)=3754fd440f4009b62244e0f95c56bbb12c2fffcb
+TAG-$(CONFIG_MEMTEST_STABLE)=0bd34c22604660e4283316331f3e7bf8a3863753
NAME-$(CONFIG_MEMTEST_STABLE)=Stable
TAG-$(CONFIG_MEMTEST_REVISION)=$(CONFIG_MEMTEST_REVISION_ID)
--
To view, visit https://review.coreboot.org/c/coreboot/+/32613
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I078ac5d91e60a424efb5e14f39ae59e7ae9cbfe2
Gerrit-Change-Number: 32613
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Kepplinger <martink(a)posteo.de>
Gerrit-MessageType: newchange