Changeset 04803bf in mainline for boot

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

Location:

boot

Files:

• Makefile (modified) (view diffs)
• Makefile.build (added)
• Makefile.common (added)
• Makefile.empty (moved) (moved from kernel/arch/arm32/src/panic.S ) (view diffs)
• Makefile.grub (moved) (moved from uspace/srv/cir/fhc/Makefile ) (view diffs)
• Makefile.silo (added)
• Makefile.uboot (moved) (moved from uspace/lib/libc/arch/mips32eb/Makefile.inc ) (view diffs)
• Makefile.yaboot (moved) (moved from uspace/lib/libc/arch/ppc32/Makefile.inc ) (view diffs)
• arch/abs32le/Makefile.inc (added)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/arm32/Makefile.inc (modified) (view diffs)
• arch/arm32/_link.ld.in (added)
• arch/arm32/include/arch.h (added)
• arch/arm32/include/asm.h (moved) (moved from boot/arch/arm32/loader/asm.h ) (view diffs)
• arch/arm32/include/main.h (moved) (moved from boot/arch/arm32/loader/print/print.c ) (view diffs)
• arch/arm32/include/mm.h (added)
• arch/arm32/include/types.h (moved) (moved from boot/arch/ppc32/loader/main.h ) (view diffs)
• arch/arm32/loader/Makefile (deleted)
• arch/arm32/loader/_link.ld.in (deleted)
• arch/arm32/loader/asm.S (deleted)
• arch/arm32/loader/main.c (deleted)
• arch/arm32/loader/mm.c (deleted)
• arch/arm32/loader/mm.h (deleted)
• arch/arm32/src/asm.S (moved) (moved from boot/arch/arm32/loader/boot.S ) (view diffs)
• arch/arm32/src/main.c (added)
• arch/arm32/src/mm.c (added)
• arch/arm32/src/putchar.c (added)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/grub (deleted)
• arch/ia64/Makefile.inc (modified) (view diffs)
• arch/ia64/_link.ld.in (moved) (moved from boot/arch/ia64/loader/_link.ld.in ) (view diffs)
• arch/ia64/include/arch.h (moved) (moved from boot/arch/sparc64/loader/stack.h ) (view diffs)
• arch/ia64/include/asm.h (moved) (moved from boot/arch/ia64/loader/asm.h ) (view diffs)
• arch/ia64/include/main.h (moved) (moved from boot/arch/ia64/loader/main.h ) (view diffs)
• arch/ia64/include/ski.h (moved) (moved from kernel/arch/sparc64/include/arg.h ) (view diffs)
• arch/ia64/include/types.h (moved) (moved from boot/arch/mips32/loader/main.h ) (view diffs)
• arch/ia64/loader/Makefile (deleted)
• arch/ia64/loader/gefi/ChangeLog (deleted)
• arch/ia64/loader/gefi/HelenOS/Makefile (deleted)
• arch/ia64/loader/gefi/HelenOS/division.c (deleted)
• arch/ia64/loader/gefi/HelenOS/division.h (deleted)
• arch/ia64/loader/gefi/HelenOS/hello.c (deleted)
• arch/ia64/loader/gefi/HelenOS/mkimage.c (deleted)
• arch/ia64/loader/gefi/Make.defaults (deleted)
• arch/ia64/loader/gefi/Make.rules (deleted)
• arch/ia64/loader/gefi/Makefile (deleted)
• arch/ia64/loader/gefi/README.efilib (deleted)
• arch/ia64/loader/gefi/README.elilo (deleted)
• arch/ia64/loader/gefi/README.gnuefi (deleted)
• arch/ia64/loader/gefi/apps/Makefile (deleted)
• arch/ia64/loader/gefi/apps/printenv.c (deleted)
• arch/ia64/loader/gefi/apps/t.c (deleted)
• arch/ia64/loader/gefi/apps/t2.c (deleted)
• arch/ia64/loader/gefi/apps/t3.c (deleted)
• arch/ia64/loader/gefi/apps/t4.c (deleted)
• arch/ia64/loader/gefi/apps/t5.c (deleted)
• arch/ia64/loader/gefi/apps/t6.c (deleted)
• arch/ia64/loader/gefi/apps/t7.c (deleted)
• arch/ia64/loader/gefi/apps/tpause.c (deleted)
• arch/ia64/loader/gefi/apps/trivial.S (deleted)
• arch/ia64/loader/gefi/gnuefi/Makefile (deleted)
• arch/ia64/loader/gefi/gnuefi/crt0-efi-ia32.S (deleted)
• arch/ia64/loader/gefi/gnuefi/crt0-efi-ia64.S (deleted)
• arch/ia64/loader/gefi/gnuefi/elf_ia32_efi.lds (deleted)
• arch/ia64/loader/gefi/gnuefi/elf_ia64_efi.lds (deleted)
• arch/ia64/loader/gefi/gnuefi/reloc_ia32.c (deleted)
• arch/ia64/loader/gefi/gnuefi/reloc_ia64.S (deleted)
• arch/ia64/loader/gefi/inc/Makefile (deleted)
• arch/ia64/loader/gefi/inc/efi.h (deleted)
• arch/ia64/loader/gefi/inc/efi_nii.h (deleted)
• arch/ia64/loader/gefi/inc/efi_pxe.h (deleted)
• arch/ia64/loader/gefi/inc/efiapi.h (deleted)
• arch/ia64/loader/gefi/inc/eficon.h (deleted)
• arch/ia64/loader/gefi/inc/efidebug.h (deleted)
• arch/ia64/loader/gefi/inc/efidef.h (deleted)
• arch/ia64/loader/gefi/inc/efidevp.h (deleted)
• arch/ia64/loader/gefi/inc/efierr.h (deleted)
• arch/ia64/loader/gefi/inc/efifs.h (deleted)
• arch/ia64/loader/gefi/inc/efigpt.h (deleted)
• arch/ia64/loader/gefi/inc/efilib.h (deleted)
• arch/ia64/loader/gefi/inc/efilink.h (deleted)
• arch/ia64/loader/gefi/inc/efinet.h (deleted)
• arch/ia64/loader/gefi/inc/efipart.h (deleted)
• arch/ia64/loader/gefi/inc/efiprot.h (deleted)
• arch/ia64/loader/gefi/inc/efipxebc.h (deleted)
• arch/ia64/loader/gefi/inc/efirtlib.h (deleted)
• arch/ia64/loader/gefi/inc/efiser.h (deleted)
• arch/ia64/loader/gefi/inc/efistdarg.h (deleted)
• arch/ia64/loader/gefi/inc/efiui.h (deleted)
• arch/ia64/loader/gefi/inc/ia32/efibind.h (deleted)
• arch/ia64/loader/gefi/inc/ia32/efilibplat.h (deleted)
• arch/ia64/loader/gefi/inc/ia32/pe.h (deleted)
• arch/ia64/loader/gefi/inc/ia64/efibind.h (deleted)
• arch/ia64/loader/gefi/inc/ia64/efilibplat.h (deleted)
• arch/ia64/loader/gefi/inc/ia64/pe.h (deleted)
• arch/ia64/loader/gefi/inc/ia64/salproc.h (deleted)
• arch/ia64/loader/gefi/inc/inc.mak (deleted)
• arch/ia64/loader/gefi/inc/libsmbios.h (deleted)
• arch/ia64/loader/gefi/inc/make.inf (deleted)
• arch/ia64/loader/gefi/inc/makefile.hdr (deleted)
• arch/ia64/loader/gefi/inc/pci22.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/adapterdebug.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/eficonsplit.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/efidbg.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/efivar.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/ia64/eficontext.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/intload.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/legacyboot.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/make.inf (deleted)
• arch/ia64/loader/gefi/inc/protocol/makefile.hdr (deleted)
• arch/ia64/loader/gefi/inc/protocol/piflash64.h (deleted)
• arch/ia64/loader/gefi/inc/protocol/readme.txt (deleted)
• arch/ia64/loader/gefi/inc/protocol/vgaclass.h (deleted)
• arch/ia64/loader/gefi/inc/romload.h (deleted)
• arch/ia64/loader/gefi/lib/Makefile (deleted)
• arch/ia64/loader/gefi/lib/boxdraw.c (deleted)
• arch/ia64/loader/gefi/lib/console.c (deleted)
• arch/ia64/loader/gefi/lib/crc.c (deleted)
• arch/ia64/loader/gefi/lib/data.c (deleted)
• arch/ia64/loader/gefi/lib/debug.c (deleted)
• arch/ia64/loader/gefi/lib/dpath.c (deleted)
• arch/ia64/loader/gefi/lib/error.c (deleted)
• arch/ia64/loader/gefi/lib/event.c (deleted)
• arch/ia64/loader/gefi/lib/guid.c (deleted)
• arch/ia64/loader/gefi/lib/hand.c (deleted)
• arch/ia64/loader/gefi/lib/hw.c (deleted)
• arch/ia64/loader/gefi/lib/ia32/initplat.c (deleted)
• arch/ia64/loader/gefi/lib/ia32/math.c (deleted)
• arch/ia64/loader/gefi/lib/ia64/initplat.c (deleted)
• arch/ia64/loader/gefi/lib/ia64/math.c (deleted)
• arch/ia64/loader/gefi/lib/ia64/palproc.S (deleted)
• arch/ia64/loader/gefi/lib/ia64/palproc.h (deleted)
• arch/ia64/loader/gefi/lib/ia64/salpal.c (deleted)
• arch/ia64/loader/gefi/lib/init.c (deleted)
• arch/ia64/loader/gefi/lib/lib.h (deleted)
• arch/ia64/loader/gefi/lib/lock.c (deleted)
• arch/ia64/loader/gefi/lib/misc.c (deleted)
• arch/ia64/loader/gefi/lib/print.c (deleted)
• arch/ia64/loader/gefi/lib/runtime/efirtlib.c (deleted)
• arch/ia64/loader/gefi/lib/runtime/rtdata.c (deleted)
• arch/ia64/loader/gefi/lib/runtime/rtlock.c (deleted)
• arch/ia64/loader/gefi/lib/runtime/rtstr.c (deleted)
• arch/ia64/loader/gefi/lib/runtime/vm.c (deleted)
• arch/ia64/loader/gefi/lib/smbios.c (deleted)
• arch/ia64/loader/gefi/lib/sread.c (deleted)
• arch/ia64/loader/gefi/lib/str.c (deleted)
• arch/ia64/loader/main.c (deleted)
• arch/ia64/src/asm.S (moved) (moved from boot/arch/ia64/loader/asm.S ) (view diffs)
• arch/ia64/src/boot.S (moved) (moved from boot/arch/ia64/loader/boot.S ) (view diffs)
• arch/ia64/src/main.c (added)
• arch/ia64/src/putchar.c (moved) (moved from boot/arch/ia64/loader/stack.h ) (view diffs)
• arch/ia64/src/ski.c (added)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/_link.ld.in (added)
• arch/mips32/include/arch.h (moved) (moved from boot/arch/sparc64/loader/asm.h ) (view diffs)
• arch/mips32/include/asm.h (moved) (moved from boot/arch/mips32/loader/asm.h ) (view diffs)
• arch/mips32/include/main.h (moved) (moved from kernel/arch/ppc32/include/arg.h ) (view diffs)
• arch/mips32/include/regname.h (moved) (moved from boot/arch/mips32/loader/regname.h ) (view diffs)
• arch/mips32/include/types.h (added)
• arch/mips32/loader/main.c (deleted)
• arch/mips32/src/Makefile (moved) (moved from boot/arch/mips32/loader/Makefile ) (view diffs)
• arch/mips32/src/asm.S (added)
• arch/mips32/src/boot.S (moved) (moved from boot/arch/mips32/loader/boot.S ) (view diffs)
• arch/mips32/src/main.c (added)
• arch/mips32/src/msim.h (moved) (moved from boot/arch/mips32/loader/msim.h ) (view diffs)
• arch/mips32/src/putchar.c (moved) (moved from kernel/test/sysinfo/sysinfo1.c ) (view diffs)
• arch/ppc32/Makefile.inc (modified) (view diffs)
• arch/ppc32/_link.ld.in (moved) (moved from boot/arch/ppc32/loader/_link.ld.in ) (view diffs)
• arch/ppc32/include/arch.h (moved) (moved from boot/arch/mips32/loader/types.h ) (view diffs)
• arch/ppc32/include/asm.h (moved) (moved from boot/arch/mips32/loader/msim.c ) (view diffs)
• arch/ppc32/include/main.h (added)
• arch/ppc32/include/ofw.h (moved) (moved from boot/arch/ppc32/loader/ofwarch.h ) (view diffs)
• arch/ppc32/include/regname.h (moved) (moved from boot/arch/ppc32/loader/regname.h ) (view diffs)
• arch/ppc32/include/types.h (moved) (moved from boot/arch/ppc32/loader/types.h ) (view diffs)
• arch/ppc32/loader/Makefile (deleted)
• arch/ppc32/loader/asm.h (deleted)
• arch/ppc32/loader/main.c (deleted)
• arch/ppc32/src/asm.S (moved) (moved from boot/arch/ppc32/loader/asm.S ) (view diffs)
• arch/ppc32/src/main.c (added)
• arch/ppc32/src/ofw.c (moved) (moved from boot/arch/ppc32/loader/ofwarch.c ) (view diffs)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/_link.ld.in (moved) (moved from boot/arch/mips32/loader/_link.ld.in ) (view diffs)
• arch/sparc64/include/arch.h (added)
• arch/sparc64/include/asm.h (moved) (moved from boot/arch/sparc64/loader/register.h ) (view diffs)
• arch/sparc64/include/main.h (added)
• arch/sparc64/include/ofw.h (moved) (moved from boot/arch/sparc64/loader/ofwarch.h ) (view diffs)
• arch/sparc64/include/types.h (moved) (moved from boot/arch/sparc64/loader/types.h ) (view diffs)
• arch/sparc64/loader/Makefile (deleted)
• arch/sparc64/loader/_link.ld.in (deleted)
• arch/sparc64/loader/boot.S (deleted)
• arch/sparc64/loader/main.c (deleted)
• arch/sparc64/silo/silo.conf (deleted)
• arch/sparc64/src/asm.S (moved) (moved from boot/arch/sparc64/loader/asm.S ) (view diffs)
• arch/sparc64/src/main.c (added)
• arch/sparc64/src/ofw.c (moved) (moved from boot/arch/sparc64/loader/ofwarch.c ) (view diffs)
• doc/doxygroups.h (deleted)
• genarch/division.c (deleted)
• genarch/include/division.h (added)
• genarch/include/multiplication.h (added)
• genarch/include/ofw.h (moved) (moved from boot/genarch/ofw.h ) (view diffs)
• genarch/include/ofw_tree.h (moved) (moved from boot/genarch/ofw_tree.h ) (view diffs)
• genarch/include/softint (deleted)
• genarch/ofw.c (deleted)
• genarch/src/division.c (added)
• genarch/src/multiplication.c (added)
• genarch/src/ofw.c (added)
• genarch/src/ofw_tree.c (moved) (moved from boot/genarch/ofw_tree.c ) (view diffs)
• generic/genarch (deleted)
• generic/include/align.h (moved) (moved from boot/generic/align.h ) (view diffs)
• generic/include/balloc.h (moved) (moved from boot/genarch/balloc.h ) (view diffs)
• generic/include/errno.h (added)
• generic/include/halt.h (added)
• generic/include/inflate.h (added)
• generic/include/macros.h (added)
• generic/include/memstr.h (moved) (moved from boot/generic/memstr.h ) (view diffs)
• generic/include/printf.h (moved) (moved from boot/generic/string.h ) (view diffs)
• generic/include/printf_core.h (added)
• generic/include/putchar.h (moved) (moved from kernel/arch/arm32/include/arg.h ) (view diffs)
• generic/include/stdarg.h (moved) (moved from boot/generic/stdarg.h ) (view diffs)
• generic/include/stdint.h (moved) (moved from uspace/lib/libc/include/stdint.h ) (view diffs)
• generic/include/str.h (added)
• generic/include/typedefs.h (added)
• generic/include/version.h (added)
• generic/printf.c (deleted)
• generic/src/balloc.c (moved) (moved from boot/genarch/balloc.c ) (view diffs)
• generic/src/inflate.c (added)
• generic/src/memstr.c (added)
• generic/src/printf.c (added)
• generic/src/printf_core.c (added)
• generic/src/str.c (added)
• generic/src/version.c (added)
• generic/src/vprintf.c (added)
• generic/string.c (deleted)
• grub/COPYING (moved) (moved from boot/arch/amd64/grub/COPYING ) (view diffs)
• grub/README (moved) (moved from boot/arch/amd64/grub/README ) (view diffs)
• grub/menu.lst (moved) (moved from boot/arch/amd64/grub/menu.lst ) (view diffs)
• grub/stage2_eltorito (moved) (moved from boot/arch/amd64/grub/stage2_eltorito ) (view diffs)
• silo/COPYING (moved) (moved from boot/arch/ppc32/yaboot/COPYING ) (view diffs)
• silo/README (moved) (moved from boot/arch/sparc64/silo/README ) (view diffs)
• silo/a.out/isofs.b (added)
• silo/a.out/second.b (added)
• silo/raw/isofs.b (added)
• silo/raw/second.b (added)
• silo/silo.conf (added)
• silo/silo.patched.tar.gz (moved) (moved from boot/arch/sparc64/silo/silo.patched.tar.gz ) (view diffs)
• silo/silo.tar.gz (moved) (moved from boot/arch/sparc64/silo/silo.tar.gz ) (view diffs)
• tools/pack.py (deleted)
• yaboot/COPYING (moved) (moved from boot/arch/sparc64/silo/COPYING ) (view diffs)
• yaboot/README (moved) (moved from boot/arch/ppc32/yaboot/README ) (view diffs)
• yaboot/bootinfo.txt (moved) (moved from boot/arch/ppc32/yaboot/bootinfo.txt ) (view diffs)
• yaboot/maps (moved) (moved from boot/arch/ppc32/yaboot/maps ) (view diffs)
• yaboot/ofboot.b (moved) (moved from boot/arch/ppc32/yaboot/ofboot.b ) (view diffs)
• yaboot/yaboot (moved) (moved from boot/arch/ppc32/yaboot/yaboot ) (view diffs)
• yaboot/yaboot.conf (moved) (moved from boot/arch/ppc32/yaboot/yaboot.conf ) (view diffs)