diff -Nru seabios-1.7.4/debian/changelog seabios-1.7.5/debian/changelog --- seabios-1.7.4/debian/changelog 2014-02-17 17:35:59.000000000 +0000 +++ seabios-1.7.5/debian/changelog 2014-05-31 08:29:25.000000000 +0000 @@ -1,3 +1,12 @@ +seabios (1.7.5-1) unstable; urgency=medium + + * new upstream release + * dropped all patches taken from upstream + * disabled more features (XEN & USB_UAS) from the 128k bios build to fit + * set upstream source URL (Closes: #740471) + + -- Michael Tokarev Sat, 31 May 2014 12:29:13 +0400 + seabios (1.7.4-4) unstable; urgency=low * apply vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff: diff -Nru seabios-1.7.4/debian/copyright seabios-1.7.5/debian/copyright --- seabios-1.7.4/debian/copyright 2014-02-04 12:38:52.000000000 +0000 +++ seabios-1.7.5/debian/copyright 2014-05-31 08:01:30.000000000 +0000 @@ -1,7 +1,7 @@ This package was debianized by Aurelien Jarno on Sun, 03 Jan 2010 21:27:52 +0100. -It was downloaded from http://linuxtogo.org/~kevin/legacybios/ +It was downloaded from http://code.coreboot.org/p/seabios/downloads/ Author: Kevin O'Connor diff -Nru seabios-1.7.4/debian/patches/series seabios-1.7.5/debian/patches/series --- seabios-1.7.4/debian/patches/series 2014-02-17 17:28:48.000000000 +0000 +++ seabios-1.7.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -vgabios-Make-sure-exported-structs-use-PACKED.diff -vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff diff -Nru seabios-1.7.4/debian/patches/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff seabios-1.7.5/debian/patches/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff --- seabios-1.7.4/debian/patches/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff 2014-02-17 17:28:48.000000000 +0000 +++ seabios-1.7.5/debian/patches/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -From: Kevin O'Connor -Date: Wed Feb 5 22:47:29 2014 -0500 -Subject: vgabios: Attempt to detect old x86emu and force a fault. -Upstream-Commit: 8032b8a0fec550de5cb2f7d37aa031cebc2200c3 -Bug-Debian: http://bugs.debian.org/737142 - -Check for cases where the leal instruction does not work. This -instruction is known to not be emulated properly on old versions of -x86emu. If a broken version of x86emu is found, force a fault that -x86emu will easily detect. This should help prevent soft failures -when running old software. - -Signed-off-by: Kevin O'Connor - -diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S -index 9854448..6e31c4e 100644 ---- a/vgasrc/vgaentry.S -+++ b/vgasrc/vgaentry.S -@@ -45,9 +45,26 @@ _rom_header_signature: - * Entry points - ****************************************************************/ - -- // This macro is the same as ENTRY_ARG except the "calll" -- // instruction is avoided to work around known issues in the -- // emulation of some versions of x86emu. -+ // Force a fault if found to be running on broken x86emu versions. -+ DECLFUNC x86emu_fault -+x86emu_fault: -+1: hlt -+ jmp 1b -+ -+ // This macro implements a call while avoiding instructions -+ // that old versions of x86emu have problems with. -+ .macro VGA_CALLL cfunc -+ // Make sure leal instruction works. -+ movl $0x8000, %ecx -+ leal (%ecx, %ecx, 1), %ecx -+ cmpl $0x10000, %ecx -+ jne x86emu_fault -+ // Use callw instead of calll -+ push %ax -+ callw \cfunc -+ .endm -+ -+ // This macro is the same as ENTRY_ARG except VGA_CALLL is used. - .macro ENTRY_ARG_VGA cfunc - cli - cld -@@ -57,7 +74,7 @@ _rom_header_signature: - movl %esp, %ebx // Backup %esp, then zero high bits - movzwl %sp, %esp - movl %esp, %eax // First arg is pointer to struct bregs -- pushw %ax ; callw \cfunc -+ VGA_CALLL \cfunc - movl %ebx, %esp // Restore %esp (including high bits) - POPBREGS - .endm -@@ -103,7 +120,7 @@ entry_10_extrastack: - movw %ds, %dx // Setup %ss/%esp and call function - movw %dx, %ss - movl %eax, %esp -- pushw %ax ; callw handle_10 -+ VGA_CALLL handle_10 - - movl %esp, %eax // Restore registers and return - movw BREGS_size+4(%eax), %ss diff -Nru seabios-1.7.4/debian/patches/vgabios-Make-sure-exported-structs-use-PACKED.diff seabios-1.7.5/debian/patches/vgabios-Make-sure-exported-structs-use-PACKED.diff --- seabios-1.7.4/debian/patches/vgabios-Make-sure-exported-structs-use-PACKED.diff 2014-02-06 19:33:23.000000000 +0000 +++ seabios-1.7.5/debian/patches/vgabios-Make-sure-exported-structs-use-PACKED.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -Date: Wed, 5 Feb 2014 18:59:20 -0500 -From: Kevin O'Connor -To: seabios@seabios.org -Message-ID: <0e216572159ad2649be6d3d68352c4524ec70c6c.1391644710.git.kevin@koconnor.net> -Subject: [SeaBIOS] [PATCH] vgabios: Make sure exported structs use PACKED. - -Commit ca668640 introduced structs for data returned from the -handle_101b and handle_101c calls. However, the structs were not -declared as packed and that caused incorrect behavior for -handle_101b. This was seen to break some old DOS programs (Win3 setup -and DISPLAY.SYS). This patch adds in the necessary PACKED declaration -to the structs. - -The 'struct saveBDAstate' remains un-packed, as it does not appear -that its contents are documented. (And, its format already differs -from what was in the previous "lgpl vgabios".) - -Signed-off-by: Kevin O'Connor ---- - vgasrc/stdvga.c | 4 ++-- - vgasrc/vgabios.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c -index e0661f1..c94ec06 100644 ---- a/vgasrc/stdvga.c -+++ b/vgasrc/stdvga.c -@@ -338,7 +338,7 @@ struct saveVideoHardware { - u8 grdc_regs[9]; - u16 crtc_addr; - u8 plane_latch[4]; --}; -+} PACKED; - - static void - stdvga_save_hw_state(u16 seg, struct saveVideoHardware *info) -@@ -412,7 +412,7 @@ struct saveDACcolors { - u8 pelmask; - u8 dac[768]; - u8 color_select; --}; -+} PACKED; - - static void - stdvga_save_dac_state(u16 seg, struct saveDACcolors *info) -diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c -index 57f1c1f..f70b2b6 100644 ---- a/vgasrc/vgabios.c -+++ b/vgasrc/vgabios.c -@@ -1114,7 +1114,7 @@ struct funcInfo { - u8 save_flags; - u8 disp_info; - u8 reserved_34[12]; --}; -+} PACKED; - - static void - handle_101b(struct bregs *regs) --- -1.8.5.3 - - -_______________________________________________ -SeaBIOS mailing list -SeaBIOS@seabios.org -http://www.seabios.org/mailman/listinfo/seabios diff -Nru seabios-1.7.4/debian/rules seabios-1.7.5/debian/rules --- seabios-1.7.4/debian/rules 2014-02-17 17:26:22.000000000 +0000 +++ seabios-1.7.5/debian/rules 2014-05-31 08:20:17.000000000 +0000 @@ -48,7 +48,7 @@ # Qemu past 1.7 version will load bios-256k.bin by default (for new machine # types), but the size is still a concern when specifying older machine # types (1.7 and before). - $(call build-bios,bios,QEMU=y ROM_SIZE=128 USB_XHCI=n PVSCSI=n) + $(call build-bios,bios,QEMU=y ROM_SIZE=128 PVSCSI=n USB_XHCI=n USB_UAS=n XEN=n) build/bios-256k.bin: $(call build-bios,bios,QEMU=y ROM_SIZE=256) diff -Nru seabios-1.7.4/Makefile seabios-1.7.5/Makefile --- seabios-1.7.4/Makefile 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/Makefile 2014-05-10 01:56:32.000000000 +0000 @@ -24,21 +24,22 @@ PYTHON=python CPP=cpp IASL:=iasl +LD32BIT_FLAG:=-melf_i386 # Source files SRCBOTH=misc.c stacks.c output.c string.c x86.c block.c cdrom.c mouse.c kbd.c \ serial.c clock.c resume.c pnpbios.c vgahooks.c pcibios.c apm.c \ fw/smp.c \ hw/pci.c hw/timer.c hw/rtc.c hw/dma.c hw/pic.c hw/ps2port.c hw/serialio.c \ - hw/usb.c hw/usb-uhci.c hw/usb-ohci.c hw/usb-ehci.c hw/usb-xhci.c \ + hw/usb.c hw/usb-uhci.c hw/usb-ohci.c hw/usb-ehci.c \ hw/usb-hid.c hw/usb-msc.c hw/usb-uas.c \ hw/blockcmd.c hw/floppy.c hw/ata.c hw/ramdisk.c \ hw/virtio-ring.c hw/virtio-pci.c hw/virtio-blk.c hw/virtio-scsi.c \ - hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c hw/pvscsi.c + hw/lsi-scsi.c hw/esp-scsi.c hw/megasas.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c memmap.c malloc.c pmm.c romfile.c optionroms.c \ boot.c bootsplash.c jpeg.c bmp.c \ - hw/ahci.c hw/usb-hub.c \ + hw/ahci.c hw/pvscsi.c hw/usb-xhci.c hw/usb-hub.c \ fw/coreboot.c fw/lzmadecode.c fw/csm.c fw/biostables.c \ fw/paravirt.c fw/shadow.c fw/pciinit.c fw/smm.c fw/mtrr.c fw/xen.c \ fw/acpi.c fw/mptable.c fw/pirtable.c fw/smbios.c fw/romfile_loader.c @@ -146,7 +147,7 @@ $(OUT)ccode32flat.o: $(OUT)autoconf.h $(patsubst %.c, $(OUT)src/%.o,$(SRC32FLAT)) ; $(call whole-compile, $(CFLAGS32FLAT), $(addprefix src/, $(SRC32FLAT)),$@) -$(OUT)romlayout.o: src/romlayout.S $(OUT)asm-offsets.h +$(OUT)romlayout.o: src/romlayout.S $(OUT)autoconf.h $(OUT)asm-offsets.h @echo " Compiling (16bit) $@" $(Q)$(CC) $(CFLAGS16) -c -D__ASSEMBLY__ $< -o $@ @@ -154,8 +155,8 @@ @echo " Building ld scripts" $(Q)./scripts/buildversion.sh $(OUT)version.c $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o - $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o - $(Q)$(LD) -melf_i386 -r $(OUT)ccode16.o $(OUT)romlayout.o -o $(OUT)code16.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 @@ -182,8 +183,7 @@ $(Q)rm -f $(OUT)bios.bin $(OUT)Csm16.bin $(OUT)bios.bin.elf $(Q)$(OBJDUMP) -thr $< > $<.objdump $(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 $<.objdump $(CONFIG_ROM_SIZE) $(OUT)bios.bin.raw $(OUT)bios.bin.prep $(OUT)bios.bin: $(OUT)bios.bin.prep @echo " Creating $@" @@ -205,7 +205,8 @@ vgasrc/vgainit.c vgasrc/vgabios.c vgasrc/vgafb.c \ vgasrc/vgafonts.c vgasrc/vbe.c \ vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \ - vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c + vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c \ + src/fw/coreboot.c vgasrc/cbvga.c CFLAGS16VGA = $(CFLAGS16INC) -Isrc @@ -260,7 +261,7 @@ endef $(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig) -$(KCONFIG_CONFIG): src/Kconfig vgasrc/Kconfig ; $(call do-kconfig, defconfig) +$(KCONFIG_CONFIG): src/Kconfig vgasrc/Kconfig ; $(call do-kconfig, olddefconfig) %onfig: ; $(call do-kconfig, $@) help: ; $(call do-kconfig, $@) diff -Nru seabios-1.7.4/scripts/acpi_extract_preprocess.py seabios-1.7.5/scripts/acpi_extract_preprocess.py --- seabios-1.7.4/scripts/acpi_extract_preprocess.py 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/scripts/acpi_extract_preprocess.py 2014-02-06 16:18:16.000000000 +0000 @@ -8,9 +8,9 @@ # We also put each directive on a new line, the machinery # in tools/acpi_extract.py requires this. -import re; -import sys; -import fileinput; +import re +import sys +import fileinput def die(diag): sys.stderr.write("Error: %s\n" % (diag)) @@ -22,7 +22,7 @@ ACPI_EXTRACT_\w+ # directive \s+ # some whitespace \w+ # array name - )''', re.VERBOSE); + )''', re.VERBOSE) lineno = 0 for line in fileinput.input(): @@ -30,7 +30,7 @@ lineno = lineno + 1 debug = "input line %d: %s" % (lineno, line.rstrip()) - s = psplit.split(line); + s = psplit.split(line) # The way split works, each odd item is the matching ACPI_EXTRACT directive. # Put each in a comment, and on a line by itself. for i in range(len(s)): diff -Nru seabios-1.7.4/scripts/acpi_extract.py seabios-1.7.5/scripts/acpi_extract.py --- seabios-1.7.4/scripts/acpi_extract.py 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/scripts/acpi_extract.py 2014-02-06 16:18:16.000000000 +0000 @@ -38,9 +38,9 @@ # # ACPI_EXTRACT is not allowed anywhere else in code, except in comments. -import re; -import sys; -import fileinput; +import re +import sys +import fileinput aml = [] asl = [] @@ -55,7 +55,7 @@ def die(diag): sys.stderr.write("Error: %s; %s\n" % (diag, debug)) sys.exit(1) - + #Store an ASL command, matching AML offset, and input line (for debugging) def add_asl(lineno, line): l = asl_line() @@ -67,28 +67,28 @@ #Store an AML byte sequence #Verify that offset output by iasl matches # of bytes so far def add_aml(offset, line): - o = int(offset, 16); + o = int(offset, 16) # Sanity check: offset must match size of code so far if (o != len(aml)): die("Offset 0x%x != 0x%x" % (o, len(aml))) # Strip any trailing dots and ASCII dump after " - line = re.sub(r'\s*\.*\s*".*$',"", line) + line = re.sub(r'\s*\.*\s*".*$', "", line) # Strip traling whitespace - line = re.sub(r'\s+$',"", line) + line = re.sub(r'\s+$', "", line) # Strip leading whitespace - line = re.sub(r'^\s+',"", line) + line = re.sub(r'^\s+', "", line) # Split on whitespace code = re.split(r'\s+', line) for c in code: # Require a legal hex number, two digits if (not(re.search(r'^[0-9A-Fa-f][0-9A-Fa-f]$', c))): - die("Unexpected octet %s" % c); - aml.append(int(c, 16)); + die("Unexpected octet %s" % c) + aml.append(int(c, 16)) # Process aml bytecode array, decoding AML def aml_pkglen_bytes(offset): # PkgLength can be multibyte. Bits 8-7 give the # of extra bytes. - pkglenbytes = aml[offset] >> 6; + pkglenbytes = aml[offset] >> 6 return pkglenbytes + 1 def aml_pkglen(offset): @@ -113,23 +113,23 @@ #0x14 MethodOp PkgLength NameString MethodFlags TermList if (aml[offset] != 0x14): die( "Method offset 0x%x: expected 0x14 actual 0x%x" % - (offset, aml[offset])); - offset += 1; + (offset, aml[offset])) + offset += 1 pkglenbytes = aml_pkglen_bytes(offset) - offset += pkglenbytes; - return offset; + offset += pkglenbytes + return offset # Given name offset, find its NameString offset def aml_name_string(offset): #0x08 NameOp NameString DataRef if (aml[offset] != 0x08): die( "Name offset 0x%x: expected 0x08 actual 0x%x" % - (offset, aml[offset])); + (offset, aml[offset])) offset += 1 # Block Name Modifier. Skip it. if (aml[offset] == 0x5c or aml[offset] == 0x5e): offset += 1 - return offset; + return offset # Given data offset, find 8 byte buffer offset def aml_data_buffer8(offset): @@ -145,24 +145,24 @@ #0x08 NameOp NameString DataRef if (aml[offset] != 0x0C): die( "Name offset 0x%x: expected 0x0C actual 0x%x" % - (offset, aml[offset])); - return offset + 1; + (offset, aml[offset])) + return offset + 1 # Given data offset, find word const offset def aml_data_word_const(offset): #0x08 NameOp NameString DataRef if (aml[offset] != 0x0B): die( "Name offset 0x%x: expected 0x0B actual 0x%x" % - (offset, aml[offset])); - return offset + 1; + (offset, aml[offset])) + return offset + 1 # Given data offset, find byte const offset def aml_data_byte_const(offset): #0x08 NameOp NameString DataRef if (aml[offset] != 0x0A): die( "Name offset 0x%x: expected 0x0A actual 0x%x" % - (offset, aml[offset])); - return offset + 1; + (offset, aml[offset])) + return offset + 1 # Find name'd buffer8 def aml_name_buffer8(offset): @@ -184,7 +184,7 @@ #0x5B 0x82 DeviceOp PkgLength NameString if ((aml[offset] != 0x5B) or (aml[offset + 1] != 0x82)): die( "Name offset 0x%x: expected 0x5B 0x82 actual 0x%x 0x%x" % - (offset, aml[offset], aml[offset + 1])); + (offset, aml[offset], aml[offset + 1])) return offset def aml_device_string(offset): @@ -206,7 +206,7 @@ #0x5B 0x83 ProcessorOp PkgLength NameString ProcID if ((aml[offset] != 0x5B) or (aml[offset + 1] != 0x83)): die( "Name offset 0x%x: expected 0x5B 0x83 actual 0x%x 0x%x" % - (offset, aml[offset], aml[offset + 1])); + (offset, aml[offset], aml[offset + 1])) return offset def aml_processor_string(offset): @@ -229,14 +229,14 @@ # 0x12 PkgLength NumElements PackageElementList if (aml[offset] != 0x12): die( "Name offset 0x%x: expected 0x12 actual 0x%x" % - (offset, aml[offset])); + (offset, aml[offset])) offset += 1 return offset + aml_pkglen_bytes(offset) + 1 lineno = 0 for line in fileinput.input(): # Strip trailing newline - line = line.rstrip(); + line = line.rstrip() # line number and debug string to output in case of errors lineno = lineno + 1 debug = "input line %d: %s" % (lineno, line) @@ -244,7 +244,7 @@ pasl = re.compile('^\s+([0-9]+)(:\s\s|\.\.\.\.)\s*') m = pasl.search(line) if (m): - add_asl(lineno, pasl.sub("", line)); + add_asl(lineno, pasl.sub("", line)) # AML listing: offset in hex, then ...., then code paml = re.compile('^([0-9A-Fa-f]+)(:\s\s|\.\.\.\.)\s*') m = paml.search(line) @@ -267,7 +267,7 @@ # Ignore any non-words for the purpose of this test. m = re.search(r'\w+', l) if (m): - prev_aml_offset = asl[i].aml_offset + prev_aml_offset = asl[i].aml_offset continue if (a > 1): @@ -337,11 +337,11 @@ def get_value_type(maxvalue): #Use type large enough to fit the table if (maxvalue >= 0x10000): - return "int" + return "int" elif (maxvalue >= 0x100): - return "short" + return "short" else: - return "char" + return "char" # Pretty print output for array in output.keys(): @@ -351,4 +351,4 @@ odata.append("0x%x" % value) sys.stdout.write("static unsigned %s %s[] = {\n" % (otype, array)) sys.stdout.write(",\n".join(odata)) - sys.stdout.write('\n};\n'); + sys.stdout.write('\n};\n') diff -Nru seabios-1.7.4/scripts/buildrom.py seabios-1.7.5/scripts/buildrom.py --- seabios-1.7.4/scripts/buildrom.py 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/scripts/buildrom.py 2014-05-28 12:09:15.000000000 +0000 @@ -5,15 +5,20 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. -import sys +import sys, struct + +from python23compat import as_bytes def alignpos(pos, alignbytes): mask = alignbytes - 1 return (pos + mask) & ~mask def checksum(data): - ords = map(ord, data) - return sum(ords) + if (sys.version_info > (3, 0)): + cksum = sum(data) + else: + cksum = sum(map(ord, data)) + return struct.pack(' 128*1024: finalsize = 256*1024 if datasize > finalsize: - print "Error! ROM doesn't fit (%d > %d)" % (datasize, finalsize) - print " You have to either increate the size (CONFIG_ROM_SIZE)" - print " or turn off some features (such as hardware support not" - print " needed) to make it fit. Trying a more recent gcc version" - print " might work too." + print("Error! ROM doesn't fit (%d > %d)" % (datasize, finalsize)) + print(" You have to either increate the size (CONFIG_ROM_SIZE)") + print(" or turn off some features (such as hardware support not") + print(" needed) to make it fit. Trying a more recent gcc version") + print(" might work too.") sys.exit(1) # Sanity checks @@ -52,17 +50,17 @@ end = symbols['code32flat_end'].offset expend = layoutrom.BUILD_BIOS_ADDR + layoutrom.BUILD_BIOS_SIZE if end != expend: - print "Error! Code does not end at 0x%x (got 0x%x)" % ( - expend, end) + print("Error! Code does not end at 0x%x (got 0x%x)" % ( + expend, end)) sys.exit(1) if datasize > finalsize: - print "Error! Code is too big (0x%x vs 0x%x)" % ( - datasize, finalsize) + print("Error! Code is too big (0x%x vs 0x%x)" % ( + datasize, finalsize)) sys.exit(1) expdatasize = end - start if datasize != expdatasize: - print "Error! Unknown extra data (0x%x vs 0x%x)" % ( - datasize, expdatasize) + print("Error! Unknown extra data (0x%x vs 0x%x)" % ( + datasize, expdatasize)) sys.exit(1) # Fix up CSM Compatibility16 table @@ -74,23 +72,23 @@ tableofs = symbols['csm_compat_table'].offset - symbols['code32flat_start'].offset entry_addr = symbols['entry_csm'].offset - layoutrom.BUILD_BIOS_ADDR - byte1 = chr(entry_addr & 0xff) - byte2 = chr(entry_addr >> 8) - rawdata = subst(rawdata, tableofs+ENTRY_FIELD_OFS, byte1+byte2) + entry_addr = struct.pack('", 0, 0, 0, None)) yieldstr = "" if callinfo[4] is not None: yieldstr = ",%d" % (stackusage + callinfo[4]) - print " %04s:%-40s [%d+%d,%d%s]" % ( + print(" %04s:%-40s [%d+%d,%d%s]" % ( insnaddr, callinfo[0], stackusage, callinfo[1] - , stackusage+callinfo[2], yieldstr) + , stackusage+callinfo[2], yieldstr)) def main(): calc() diff -Nru seabios-1.7.4/scripts/checksum.py seabios-1.7.5/scripts/checksum.py --- seabios-1.7.4/scripts/checksum.py 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/scripts/checksum.py 2014-02-06 16:18:16.000000000 +0000 @@ -10,7 +10,7 @@ def main(): data = sys.stdin.read() ords = map(ord, data) - print "sum=%x\n" % sum(ords) + print("sum=%x\n" % sum(ords)) if __name__ == '__main__': main() diff -Nru seabios-1.7.4/scripts/encodeint.py seabios-1.7.5/scripts/encodeint.py --- seabios-1.7.4/scripts/encodeint.py 2013-12-23 15:40:05.000000000 +0000 +++ seabios-1.7.5/scripts/encodeint.py 2014-02-06 16:18:16.000000000 +0000 @@ -10,7 +10,7 @@ def main(): filename = sys.argv[1] - value = int(sys.argv[2]) + value = int(sys.argv[2], 0) outval = struct.pack('flags |= def_flags; break; } - conf_warning("symbol value '%s' invalid for %s", p, sym->name); + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); return 1; case S_OTHER: if (*p != '"') { @@ -161,7 +163,8 @@ memmove(p2, p2 + 1, strlen(p2)); } if (!p2) { - conf_warning("invalid string found"); + if (def != S_DEF_AUTO) + conf_warning("invalid string found"); return 1; } /* fall through */ @@ -172,7 +175,9 @@ sym->def[def].val = strdup(p); sym->flags |= def_flags; } else { - conf_warning("symbol value '%s' invalid for %s", p, sym->name); + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); return 1; } break; diff -Nru seabios-1.7.4/scripts/kconfig/expr.h seabios-1.7.5/scripts/kconfig/expr.h --- seabios-1.7.4/scripts/kconfig/expr.h 2013-12-23 15:40:06.000000000 +0000 +++ seabios-1.7.5/scripts/kconfig/expr.h 2014-02-06 16:18:16.000000000 +0000 @@ -93,7 +93,7 @@ #define SYMBOL_CHOICEVAL 0x0020 /* used as a value in a choice block */ #define SYMBOL_VALID 0x0080 /* set when symbol.curr is calculated */ #define SYMBOL_OPTIONAL 0x0100 /* choice is optional - values can be 'n' */ -#define SYMBOL_WRITE 0x0200 /* ? */ +#define SYMBOL_WRITE 0x0200 /* write symbol to file (KCONFIG_CONFIG) */ #define SYMBOL_CHANGED 0x0400 /* ? */ #define SYMBOL_AUTO 0x1000 /* value from environment variable */ #define SYMBOL_CHECKED 0x2000 /* used during dependency checking */ diff -Nru seabios-1.7.4/scripts/kconfig/mconf.c seabios-1.7.5/scripts/kconfig/mconf.c --- seabios-1.7.4/scripts/kconfig/mconf.c 2013-12-23 15:40:06.000000000 +0000 +++ seabios-1.7.5/scripts/kconfig/mconf.c 2014-02-06 16:18:16.000000000 +0000 @@ -25,7 +25,7 @@ static const char mconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build.\n" +"This interface lets you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" @@ -39,15 +39,15 @@ "\n" "To change any of these features, highlight it with the cursor\n" "keys and press to build it in, to make it a module or\n" -" to removed it. You may also press the to cycle\n" -"through the available options (ie. Y->N->M->Y).\n" +" to remove it. You may also press the to cycle\n" +"through the available options (i.e. Y->N->M->Y).\n" "\n" "Some additional keyboard hints:\n" "\n" "Menus\n" "----------\n" -"o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" -" you wish to change or submenu wish to select and press .\n" +"o Use the Up/Down arrow keys (cursor keys) to highlight the item you\n" +" wish to change or the submenu you wish to select and press .\n" " Submenus are designated by \"--->\", empty ones by \"----\".\n" "\n" " Shortcut: Press the option's highlighted letter (hotkey).\n" @@ -65,7 +65,7 @@ " there is a delayed response which you may find annoying.\n" "\n" " Also, the and cursor keys will cycle between