by Fangrui Song
(
For posterity, read https://reviews.llvm.org/D71035 to get some
understanding how objcopy -O binary works.
Program headers don't occupy space after objcopy -O binary, so there is
no need deleting PT_GNU_STACK via a PHDRS command.
)
This deletes a strip rule and avoids an immediate target rom.o
Signed-off-by: Fangrui Song <maskray(a)google.com>
---
Makefile | 10 +++-------
scripts/layoutrom.py | 7 ++-----
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 7a16195..e52b395 100644
--- a/Makefile
+++ b/Makefile
@@ -182,13 +182,13 @@ $(OUT)rom32seg.o: $(OUT)code32seg.o $(OUT)romlayout32seg.lds
@echo " Linking $@"
$(Q)$(LD) -T $(OUT)romlayout32seg.lds $< -o $@
-$(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds
+$(OUT)bios.bin.elf: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT)romlayout32flat.lds
@echo " Linking $@"
$(Q)$(LD) -N -T $(OUT)romlayout32flat.lds $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o -o $@
-$(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py
+$(OUT)bios.bin.prep: $(OUT)bios.bin.elf scripts/checkrom.py
@echo " Prepping $@"
- $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf
+ $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin
$(Q)$(READELF) -WSrs $< > $<.readelf
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
$(Q)$(PYTHON) ./scripts/checkrom.py $<.readelf $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep
@@ -201,10 +201,6 @@ $(OUT)Csm16.bin: $(OUT)bios.bin.prep
@echo " Creating $@"
$(Q)cp $< $@
-$(OUT)bios.bin.elf: $(OUT)rom.o $(OUT)bios.bin.prep
- @echo " Creating $@"
- $(Q)$(STRIP) -R .comment $< -o $(OUT)bios.bin.elf
-
################ VGA build rules
diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
index 3595371..c14966d 100755
--- a/scripts/layoutrom.py
+++ b/scripts/layoutrom.py
@@ -25,6 +25,7 @@ COMMONTRAILER = """
/DISCARD/ : {
*(.text*) *(.data*) *(.bss*) *(.rodata*)
*(COMMON) *(.discard*) *(.eh_frame) *(.note*)
+ *(.comment)
}
}
"""
@@ -438,7 +439,7 @@ def writeLinkerScripts(li, out16, out32seg, out32flat):
%s
%s
code32flat_end = ABSOLUTE(.) ;
- } :text
+ }
""" % (li.sec32init_align,
li.zonefseg_start,
li.zonefseg_end,
@@ -455,10 +456,6 @@ def writeLinkerScripts(li, out16, out32seg, out32flat):
outRelSections(li.sections, 'code32flat_start'))
out = COMMONHEADER + out + COMMONTRAILER + """
ENTRY(%s)
-PHDRS
-{
- text PT_LOAD AT ( code32flat_start ) ;
-}
""" % (li.entrysym.name,)
outfile = open(out32flat, 'w')
outfile.write(out)
--
2.25.1
by Fangrui Song
(Note, with this patch, make READELF=llvm-readelf
qemu-system-x86_64 -boot menu=on,splash-time=15000 -bios out/bios.bin -nographic
seems working
)
readelf is generally better than objdump when dumping ELF section/symbol information.
objdump -h relies heavily on BFD internals and the output is difficult to emulate in llvm-objdump.
Signed-off-by: Fangrui Song <maskray(a)google.com>
---
Makefile | 18 +++---
scripts/checkrom.py | 2 +-
scripts/layoutrom.py | 146 +++++++++++++++++++++----------------------
3 files changed, 80 insertions(+), 86 deletions(-)
diff --git a/Makefile b/Makefile
index 5f7d537..7a16195 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ endif
AS=$(CROSS_PREFIX)as
LD=$(CROSS_PREFIX)ld
OBJCOPY=$(CROSS_PREFIX)objcopy
-OBJDUMP=$(CROSS_PREFIX)objdump
+READELF=$(CROSS_PREFIX)readelf
STRIP=$(CROSS_PREFIX)strip
PYTHON=python
CPP=cpp
@@ -161,14 +161,14 @@ $(OUT)romlayout.o: src/romlayout.S $(OUT)autoconf.h $(OUT)asm-offsets.h
$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)ccode16.o $(OUT)romlayout.o src/version.c scripts/layoutrom.py scripts/buildversion.py
@echo " Building ld scripts"
- $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(OBJDUMP);$(STRIP)" $(OUT)autoversion.h
+ $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(READELF);$(STRIP)" $(OUT)autoversion.h
$(Q)$(CC) $(CFLAGS32FLAT) -c src/version.c -o $(OUT)version.o
$(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o
$(Q)$(LD) $(LD32BIT_FLAG) -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.o
- $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.o.objdump
- $(Q)$(OBJDUMP) -thr $(OUT)code32seg.o > $(OUT)code32seg.o.objdump
- $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
- $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
+ $(Q)$(READELF) -WSrs $(OUT)code32flat.o > $(OUT)code32flat.o.readelf
+ $(Q)$(READELF) -WSrs $(OUT)code32seg.o > $(OUT)code32seg.o.readelf
+ $(Q)$(READELF) -WSrs $(OUT)code16.o > $(OUT)code16.o.readelf
+ $(Q)$(PYTHON) ./scripts/layoutrom.py $(OUT)code16.o.readelf $(OUT)code32seg.o.readelf $(OUT)code32flat.o.readelf $(OUT)$(KCONFIG_AUTOHEADER) $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds
# These are actually built by scripts/layoutrom.py above, but by pulling them
# into an extra rule we prevent make -j from spawning layoutrom.py 4 times.
@@ -189,9 +189,9 @@ $(OUT)rom.o: $(OUT)rom16.strip.o $(OUT)rom32seg.strip.o $(OUT)code32flat.o $(OUT
$(OUT)bios.bin.prep: $(OUT)rom.o scripts/checkrom.py
@echo " Prepping $@"
$(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf
- $(Q)$(OBJDUMP) -thr $< > $<.objdump
+ $(Q)$(READELF) -WSrs $< > $<.readelf
$(Q)$(OBJCOPY) -O binary $< $(OUT)bios.bin.raw
- $(Q)$(PYTHON) ./scripts/checkrom.py $<.objdump $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep
+ $(Q)$(PYTHON) ./scripts/checkrom.py $<.readelf $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep
$(OUT)bios.bin: $(OUT)bios.bin.prep
@echo " Creating $@"
@@ -233,7 +233,7 @@ $(OUT)vgaentry.o: vgasrc/vgaentry.S $(OUT)autoconf.h $(OUT)asm-offsets.h
$(OUT)vgarom.o: $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgasrc/vgalayout.lds vgasrc/vgaversion.c scripts/buildversion.py
@echo " Linking $@"
- $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(OBJDUMP);$(STRIP)" $(OUT)autovgaversion.h
+ $(Q)$(PYTHON) ./scripts/buildversion.py -e "$(EXTRAVERSION)" -t "$(CC);$(AS);$(LD);$(OBJCOPY);$(READELF);$(STRIP)" $(OUT)autovgaversion.h
$(Q)$(CC) $(CFLAGS16) -c vgasrc/vgaversion.c -o $(OUT)vgaversion.o
$(Q)$(LD) --gc-sections -T $(OUT)vgasrc/vgalayout.lds $(OUT)vgaccode16.o $(OUT)vgaentry.o $(OUT)vgaversion.o -o $@
diff --git a/scripts/checkrom.py b/scripts/checkrom.py
index aced5e2..721444d 100755
--- a/scripts/checkrom.py
+++ b/scripts/checkrom.py
@@ -23,7 +23,7 @@ def main():
# Read in symbols
objinfofile = open(objinfo, 'r')
- symbols = layoutrom.parseObjDump(objinfofile, 'in')[1]
+ symbols = layoutrom.parseReadElf(objinfofile, 'in')[1]
# Read in raw file
f = open(rawfile, 'rb')
diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
index 14e6ada..6cc9e04 100755
--- a/scripts/layoutrom.py
+++ b/scripts/layoutrom.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Script to analyze code and arrange ld sections.
#
# Copyright (C) 2008-2014 Kevin O'Connor <kevin(a)koconnor.net>
@@ -7,6 +7,7 @@
import operator
import sys
+from ipdb import set_trace as bp
# LD script headers/trailers
COMMONHEADER = """
@@ -544,87 +545,80 @@ class Reloc:
class Symbol:
name = offset = section = None
-# Read in output from objdump
-def parseObjDump(file, fileid):
+def parseReadElf(file, fileid):
# sections = [section, ...]
sections = []
sectionmap = {}
# symbols[symbolname] = symbol
symbols = {}
+ lines = file.readlines()
- state = None
- for line in file.readlines():
- line = line.rstrip()
- if line == 'Sections:':
- state = 'section'
- continue
- if line == 'SYMBOL TABLE:':
- state = 'symbol'
- continue
- if line.startswith('RELOCATION RECORDS FOR ['):
- sectionname = line[24:-2]
- if sectionname.startswith('.debug_'):
- # Skip debugging sections (to reduce parsing time)
- state = None
- continue
- state = 'reloc'
- relocsection = sectionmap[sectionname]
- continue
+ i = 0
+ while not lines[i].startswith('Section Headers'):
+ i += 1
+ i += 3 # Skip [Nr] and [ 0]
+ while ']' in lines[i]:
+ parts = lines[i][lines[i].find(']')+1:].split()
+ if len(parts) == 10:
+ name, _, _, _, size, _, _, _, _, align = parts
+ else: # not SHF_ALLOC
+ name, _, _, _, size, _, _, _, align = parts
+ section = Section()
+ section.name = name
+ section.size = int(size, 16)
+ section.align = int(align)
+ section.fileid = fileid
+ section.relocs = []
+ sections.append(section)
+ sectionmap[name] = section
+ i += 1
- if state == 'section':
- try:
- idx, name, size, vma, lma, fileoff, align = line.split()
- if align[:3] != '2**':
- continue
- section = Section()
- section.name = name
- section.size = int(size, 16)
- section.align = 2**int(align[3:])
- section.fileid = fileid
- section.relocs = []
- sections.append(section)
- sectionmap[name] = section
- except ValueError:
- pass
+ while not lines[i].startswith('Symbol table '):
+ i += 1
+ i += 3 # Skip Num: and 0:
+ while i < len(lines) and ':' in lines[i]:
+ colon = lines[i].find(':')
+ parts = lines[i].split()
+ try:
+ ndx = int(parts[6])
+ name = sections[ndx-1].name
+ except ValueError: # ABS or UND
+ ndx = 0
+ name = ''
+ if parts[3] != 'SECTION':
+ name = parts[7]
+ symbol = Symbol()
+ symbol.size = int(parts[2])
+ symbol.offset = int(parts[1], 16)
+ symbol.name = name
+ symbol.section = sections[ndx-1] if ndx > 0 else None
+ symbols[name] = symbol
+ i += 1
+
+ i = 0
+ while i < len(lines):
+ if not lines[i].startswith('Relocation section'):
+ i += 1
continue
- if state == 'symbol':
- try:
- parts = line[17:].split()
- if len(parts) == 3:
- sectionname, size, name = parts
- elif len(parts) == 4 and parts[2] == '.hidden':
- sectionname, size, hidden, name = parts
- else:
- continue
- symbol = Symbol()
- symbol.size = int(size, 16)
- symbol.offset = int(line[:8], 16)
- symbol.name = name
- symbol.section = sectionmap.get(sectionname)
- symbols[name] = symbol
- except ValueError:
- pass
+ rel_name = lines[i][20:lines[i].index("'", 20)]
+ i += 2
+ if rel_name.startswith('.rel.debug_'):
+ # Skip debugging sections (to reduce parsing time)
continue
- if state == 'reloc':
- try:
- off, type, symbolname = line.split()
- reloc = Reloc()
- reloc.offset = int(off, 16)
- reloc.type = type
- reloc.symbolname = symbolname
- reloc.symbol = symbols.get(symbolname)
- if reloc.symbol is None:
- # Some binutils (2.20.1) give section name instead
- # of a symbol - create a dummy symbol.
- reloc.symbol = symbol = Symbol()
- symbol.size = 0
- symbol.offset = 0
- symbol.name = symbolname
- symbol.section = sectionmap.get(symbolname)
- symbols[symbolname] = symbol
- relocsection.relocs.append(reloc)
- except ValueError:
- pass
+ assert rel_name.startswith('.rel')
+ relocated = sectionmap[rel_name[4:]]
+ while lines[i][0].isalnum():
+ line = lines[i]
+ off, _, typ, _, symbolname = line.split()
+ reloc = Reloc()
+ reloc.offset = int(off, 16)
+ reloc.type = typ
+ reloc.symbolname = symbolname
+ reloc.symbol = symbols.get(symbolname)
+ assert reloc.symbol is not None
+ relocated.relocs.append(reloc)
+ i += 1
+
return sections, symbols
# Parser for constants in simple C header files.
@@ -653,9 +647,9 @@ def main():
infile32flat = open(in32flat, 'r')
# infoX = (sections, symbols)
- info16 = parseObjDump(infile16, '16')
- info32seg = parseObjDump(infile32seg, '32seg')
- info32flat = parseObjDump(infile32flat, '32flat')
+ info16 = parseReadElf(infile16, '16')
+ info32seg = parseReadElf(infile32seg, '32seg')
+ info32flat = parseReadElf(infile32flat, '32flat')
# Read kconfig config file
config = scanconfig(cfgfile)
--
2.25.1
by Fangrui Song
(1) In romlayout.S, .fixedaddr.\addr sections do have not the SHF_ALLOC flag.
It does not make sense to reference a SHF_ALLOC section from a non-SHF_ALLOC section via R_386_PC16.
GNU ld allows it but lld will warn. Add the SHF_ALLOC flag.
(2) lld requires output section descriptions to be sorted by address.
Signed-off-by: Fangrui Song <maskray(a)google.com>
(Note: with
https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/CJR7WU…
and this patch, qemu-system-x86_64 -boot menu=on,splash-time=15000 -bios out/bios.bin -nographic
seems to work for me with a small change to lld (allow ET_EXEC to used
as if a relocatable object)
More precisely, during:
ld.lld -N -T out/romlayout32flat.lds out/rom16.strip.o out/rom32seg.strip.o out/code32flat.o -o out/rom.o
out/rom16.strip.o and out/rom32seg.strip.o are ET_EXEC, instead of ET_REL. lld<11 will reject such input.
)
---
scripts/layoutrom.py | 4 ++++
src/romlayout.S | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/layoutrom.py b/scripts/layoutrom.py
index bbf07aa..14e6ada 100755
--- a/scripts/layoutrom.py
+++ b/scripts/layoutrom.py
@@ -321,6 +321,10 @@ def outXRefs(sections, useseg=0, exportsyms=[], forcedelta=0):
# Write LD script includes for the given sections
def outSections(sections, useseg=0):
+ if useseg:
+ sections.sort(key=lambda x: x.finalsegloc)
+ else:
+ sections.sort(key=lambda x: x.finalloc)
out = ""
for section in sections:
loc = section.finalloc
diff --git a/src/romlayout.S b/src/romlayout.S
index c4a4635..a854783 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -587,7 +587,7 @@ entry_18:
// Specify a location in the fixed part of bios area.
.macro ORG addr
- .section .fixedaddr.\addr
+ .section .fixedaddr.\addr,"a"
.endm
ORG 0xe05b
--
2.25.1
by Paul Menzel
From: Matt DeVillier <matt.devillier(a)gmail.com>
Date: Fri, 13 Jun 2014 17:21:57 -0500
Currently, booting from a USB device displays the same text as
booting from a hard disk ('Booting from Hard Disk').
Identify USB devices based on the description string and display
identifying text when booting.
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de>
---
Upstream commit from https://github.com/MrChromebox/SeaBIOS
src/boot.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index afeb36a..69c602f 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -487,6 +487,7 @@ static struct hlist_head BootList VARVERIFY32INIT;
#define IPL_TYPE_FLOPPY 0x01
#define IPL_TYPE_HARDDISK 0x02
#define IPL_TYPE_CDROM 0x03
+#define IPL_TYPE_USB 0x04
#define IPL_TYPE_CBFS 0x20
#define IPL_TYPE_BEV 0x80
#define IPL_TYPE_BCV 0x81
@@ -564,8 +565,17 @@ boot_add_floppy(struct drive_s *drive, const char *desc, int prio)
void
boot_add_hd(struct drive_s *drive, const char *desc, int prio)
{
- bootentry_add(IPL_TYPE_HARDDISK, defPrio(prio, DefaultHDPrio)
+ char *usb = "USB";
+ char short_desc[4];
+ memcpy(short_desc, desc, 3);
+ short_desc[3]='\0';
+ if (strcmp(short_desc, usb) == 0) {
+ bootentry_add(IPL_TYPE_USB, defPrio(prio, DefaultHDPrio)
, (u32)drive, desc);
+ } else {
+ bootentry_add(IPL_TYPE_HARDDISK, defPrio(prio, DefaultHDPrio)
+ , (u32)drive, desc);
+ }
}
void
@@ -764,7 +774,7 @@ static int HaveHDBoot, HaveFDBoot;
static void
add_bev(int type, u32 vector)
{
- if (type == IPL_TYPE_HARDDISK && HaveHDBoot++)
+ if ((type == IPL_TYPE_HARDDISK || type == IPL_TYPE_USB) && HaveHDBoot++)
return;
if (type == IPL_TYPE_FLOPPY && HaveFDBoot++)
return;
@@ -802,6 +812,10 @@ bcv_prepboot(void)
map_hd_drive(pos->drive);
add_bev(IPL_TYPE_HARDDISK, 0);
break;
+ case IPL_TYPE_USB:
+ map_hd_drive(pos->drive);
+ add_bev(IPL_TYPE_USB, 0);
+ break;
case IPL_TYPE_CDROM:
map_cd_drive(pos->drive);
// NO BREAK
@@ -962,6 +976,10 @@ do_boot(int seq_nr)
printf("Booting from Hard Disk...\n");
boot_disk(0x80, 1);
break;
+ case IPL_TYPE_USB:
+ printf("Booting from USB Device...\n");
+ boot_disk(0x80, 1);
+ break;
case IPL_TYPE_CDROM:
boot_cdrom((void*)ie->vector);
break;
--
2.25.0
by Gerd Hoffmann
Factor out TimerKHz and ShiftTSC calculation to tsctimer_configure().
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/hw/timer.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/hw/timer.c b/src/hw/timer.c
index bdcb3bfca211..ce3d63cd75f6 100644
--- a/src/hw/timer.c
+++ b/src/hw/timer.c
@@ -58,6 +58,18 @@ u8 ShiftTSC VARFSEG;
* Internal timer setup
****************************************************************/
+static void
+tsctimer_configure(u64 t)
+{
+ while (t >= (1<<24)) {
+ ShiftTSC++;
+ t = (t + 1) >> 1;
+ }
+ TimerKHz = DIV_ROUND_UP((u32)t, 1000 * PMTIMER_TO_PIT);
+ TimerPort = 0;
+ dprintf(1, "CPU Mhz=%u\n", (TimerKHz << ShiftTSC) / 1000);
+}
+
#define CALIBRATE_COUNT 0x800 // Approx 1.7ms
// Calibrate the CPU time-stamp-counter
@@ -87,14 +99,7 @@ tsctimer_setup(void)
dprintf(6, "tsc calibrate start=%u end=%u diff=%u\n"
, (u32)start, (u32)end, (u32)diff);
u64 t = DIV_ROUND_UP(diff * PMTIMER_HZ, CALIBRATE_COUNT);
- while (t >= (1<<24)) {
- ShiftTSC++;
- t = (t + 1) >> 1;
- }
- TimerKHz = DIV_ROUND_UP((u32)t, 1000 * PMTIMER_TO_PIT);
- TimerPort = 0;
-
- dprintf(1, "CPU Mhz=%u\n", (TimerKHz << ShiftTSC) / 1000);
+ tsctimer_configure(t);
}
// Setup internal timers.
--
2.18.2
by Ottavio Caruso
On 06/03/2020 09:03, Gerd Hoffmann wrote:
> Fixes console redirection for NetBSD primary bootloader.
>
> https://bugs.launchpad.net/bugs/1743191
> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
> ---
> src/sercon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/sercon.c b/src/sercon.c
> index a5dadb7261af..66a1f2412e77 100644
> --- a/src/sercon.c
> +++ b/src/sercon.c
> @@ -464,7 +464,7 @@ static void sercon_104f(struct bregs *regs)
> regs->ax = 0x0100;
> } else {
> // Disable sercon entry point on any vesa modeset
> - if (regs->al == 0x00)
> + if (regs->al == 0x02)
> SET_LOW(sercon_enable, 0);
> }
> }
>
Unfortunately, this patch doesn't sort it for me. It also slightly
messes up with the console, see:
https://i.imgur.com/3ANAQC7.png
--
Ottavio Caruso
by Gerd Hoffmann
Fixes console redirection for NetBSD primary bootloader.
https://bugs.launchpad.net/bugs/1743191
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/sercon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sercon.c b/src/sercon.c
index a5dadb7261af..66a1f2412e77 100644
--- a/src/sercon.c
+++ b/src/sercon.c
@@ -464,7 +464,7 @@ static void sercon_104f(struct bregs *regs)
regs->ax = 0x0100;
} else {
// Disable sercon entry point on any vesa modeset
- if (regs->al == 0x00)
+ if (regs->al == 0x02)
SET_LOW(sercon_enable, 0);
}
}
--
2.18.2
by Matt DeVillier
Since the USB stack doesn't handle stalled pipes,
don't abort keyboard setup if the set_idle command fails,
since it's a non-critical feature. Instead, log a warning.
Test: build/boot Google Pixel Slate, observe keyboard functional
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
src/hw/usb-hid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hw/usb-hid.c b/src/hw/usb-hid.c
index cedec0b..9e92dfe 100644
--- a/src/hw/usb-hid.c
+++ b/src/hw/usb-hid.c
@@ -70,7 +70,7 @@ usb_kbd_setup(struct usbdevice_s *usbdev
// Periodically send reports to enable key repeat.
ret = set_idle(usbdev->defpipe, KEYREPEATMS);
if (ret)
- return -1;
+ dprintf(3, "Warning: Failed to set key repeat rate\n");
keyboard_pipe = usb_alloc_pipe(usbdev, epdesc);
if (!keyboard_pipe)
--
2.20.1
