mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-23 15:32:25 +00:00
97b978c6c8
The sector number was not calculated correctly for sector sizes < 2048 bytes. This commit updates the stage2_eltorito binary file, which was created from CVS GRUB legacy (tag 'release_0_97') after applying Adam Lackorzynski's 'os.8' patch (http://os.inf.tu-dresden.de/~adam/grub/0.97/grub-0.97-os.8.diff.gz) and the following patch: diff --git a/stage2/asm.S b/stage2/asm.S --- a/stage2/asm.S +++ b/stage2/asm.S @@ -98,7 +98,7 @@ .string VERSION VARIABLE(config_file) #ifndef STAGE1_5 - .string "(nd)/tftp/menu.lst" + .string "/boot/grub/menu.lst" #else /* STAGE1_5 */ .long 0xffffffff .string "/boot/grub/stage2" diff --git a/stage2/fsys_iso9660.c b/stage2/fsys_iso9660.c --- a/stage2/fsys_iso9660.c +++ b/stage2/fsys_iso9660.c @@ -81,12 +81,12 @@ if (byte_len <= 0) return 1; - sector += (byte_offset >> sector_size_lg2); - byte_offset &= (buf_geom.sector_size - 1); asm volatile ("shl%L0 %1,%0" : "=r"(sector) : "Ic"((int8_t)(ISO_SECTOR_BITS - sector_size_lg2)), "0"(sector)); + sector += (byte_offset >> sector_size_lg2); + byte_offset &= (buf_geom.sector_size - 1); #if !defined(STAGE1_5) if (disk_read_hook && debug) This patch fixes #97. This patch fixes #98. |
||
|---|---|---|
| .. | ||
| boot | ||
| builddir | ||
| autopilot | ||
| autopilot.list | ||
| beautify | ||
| create_builddir | ||
| create_iso | ||
| cxx_to_html | ||
| fix_include_ifndef | ||
| libgcc_libc_stub.h | ||
| parse_cxx | ||
| README | ||
| run | ||
| tool_chain | ||
This directory contains tools for managing and using the source code of Genode. :'create_builddir' The 'create_builddir' tool provides a convenient way to create build directories for different platforms. Its usage information is printed when starting the tool without arguments. :'builddir/': This directory contains a Makefile template and configuration snippets used by the 'create_builddir' tool. :'tool_chain': This tool downloads, builds, and installs the tool chain needed to build the Genode OS Framework. For getting usage information, start the tool without arguments. :'create_iso': This simple tool helps to build bootable ISO images from your build of Genode. For getting usage information, start the tool without arguments. :'beautify': Beautify is a coding-style checking tool that analyzes source code for its adherence to Genode's coding style as described in 'doc/coding_style.txt'. Whenever possible, the tool tries to fix the issues and outputs a corrected file. Some corrections, however, require human interaction. In this case, the tool stops the analysis with an error. :'parse_cxx': This tool is a C++ parser used as front-end for Beautify. :'cxx_to_html': This tool converts a C++ source file to a HTML view to be used for the API documentation at the genode.org website. It relies on 'parse_cxx' to do the actual C++ parsing. :'fix_include_ifndef': This tool helps with assigning consistent include guards to header files. :'boot': This directory contains boot-loader files needed to create boot images. :'autopilot': Autopilot is a tool for the automatic execution of run scripts among multiple base platforms.