diff options
| author | Frans Kaashoek <[email protected]> | 2015-04-03 08:22:02 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2015-04-03 08:22:02 -0400 |
| commit | c24ac5d76353d04955cc348f1cb5b95743c42b38 (patch) | |
| tree | cd58ba052fc238fe7f47a495c22c65e7d4bcbd45 /bootmain.c | |
| parent | 7443b9649a6d83443439ae95458434038313b42b (diff) | |
| download | xv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.tar.gz xv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.tar.bz2 xv6-labs-c24ac5d76353d04955cc348f1cb5b95743c42b38.zip | |
Disentangle block size from the disk's sector size. Set block size to 1024 to show
that they can be different. Clean up mkfs, simplifying specifying fs parameters,
remove some redundancy between fs and mkfs, and fix disk layout bugs. Call blocks
in the file system blocks instead of sectors. Passes usertests for different
block sizes.
Diffstat (limited to 'bootmain.c')
| -rw-r--r-- | bootmain.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ // Boot loader. // -// Part of the boot sector, along with bootasm.S, which calls bootmain(). +// Part of the boot block, along with bootasm.S, which calls bootmain(). // bootasm.S has put the processor into protected 32-bit mode. // bootmain() loads an ELF kernel image from the disk starting at // sector 1 and then jumps to the kernel entry routine. |