Index: boot/Makefile.grub =================================================================== --- boot/Makefile.grub (revision 3706d93bc2f33da70a4c42cad5f98ed4784868f6) +++ (revision ) @@ -1,31 +1,0 @@ -# -# Copyright (c) 2006 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.PHONY: all -all: - Index: boot/Makefile.uboot =================================================================== --- boot/Makefile.uboot (revision 3706d93bc2f33da70a4c42cad5f98ed4784868f6) +++ (revision ) @@ -1,45 +1,0 @@ -# -# Copyright (c) 2010 Jiri Svoboda -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.PHONY: all clean - -include Makefile.common - -IMAGE_NAME = HelenOS-$(RELEASE) -BIN_OUTPUT = image.bin - -all: $(POST_OUTPUT) - -$(BIN_OUTPUT): $(BOOT_OUTPUT) - $(OBJCOPY) -O binary $< $@ - -$(POST_OUTPUT): $(BIN_OUTPUT) - $(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr $(LADDR) -saddr $(SADDR) -ostype $(UIMAGE_OS) $< $@ - -clean: - rm -f $(BIN_OUTPUT) Index: boot/arch/ia64/Makefile.inc =================================================================== --- boot/arch/ia64/Makefile.inc (revision 3706d93bc2f33da70a4c42cad5f98ed4784868f6) +++ boot/arch/ia64/Makefile.inc (revision 318af1a751156b8098ee4096f241a4b1fb6b77f3) @@ -27,38 +27,4 @@ # -BFD_NAME = elf64-ia64-little -BFD_OUTPUT = $(BFD_NAME) - -BITS = 64 -ENDIANESS = LE -EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata - -SOURCES = \ - arch/$(BARCH)/src/boot.S \ - arch/$(BARCH)/src/asm.S \ - arch/$(BARCH)/src/main.c \ - arch/$(BARCH)/src/sal.c \ - arch/$(BARCH)/src/sal_asm.S \ - arch/$(BARCH)/src/pal.c \ - arch/$(BARCH)/src/pal_asm.S \ - arch/$(BARCH)/src/putchar.c \ - $(COMPS).o \ - genarch/src/efi.c \ - genarch/src/division.c \ - generic/src/balloc.c \ - generic/src/memstr.c \ - generic/src/printf_core.c \ - generic/src/vprintf.c \ - generic/src/printf.c \ - generic/src/str.c \ - generic/src/version.c \ - generic/src/inflate.c \ - generic/src/tar.c \ - generic/src/gzip.c \ - generic/src/kernel.c \ - generic/src/payload.c - -ifeq ($(MACHINE),ski) -SOURCES += \ - arch/$(BARCH)/src/ski.c -endif +BUILD = Makefile.empty +POSTBUILD = Makefile.empty Index: boot/arch/ia64/_link.ld.in =================================================================== --- boot/arch/ia64/_link.ld.in (revision 3706d93bc2f33da70a4c42cad5f98ed4784868f6) +++ boot/arch/ia64/_link.ld.in (revision 318af1a751156b8098ee4096f241a4b1fb6b77f3) @@ -7,4 +7,5 @@ *(BOOTSTRAP); *(.text); + *(.text.*); *(.sdata); *(.sdata2); Index: boot/arch/ia64/meson.build =================================================================== --- boot/arch/ia64/meson.build (revision 318af1a751156b8098ee4096f241a4b1fb6b77f3) +++ boot/arch/ia64/meson.build (revision 318af1a751156b8098ee4096f241a4b1fb6b77f3) @@ -0,0 +1,33 @@ +BUILD = true +POSTBUILD = 'raw' +boot_image_format = 'elf' +POST_OUTPUT = 'image.boot' + +boot_src = files( + 'src/boot.S', + 'src/asm.S', + 'src/main.c', + 'src/sal.c', + 'src/sal_asm.S', + 'src/pal.c', + 'src/pal_asm.S', + 'src/putchar.c', + '../../genarch/src/efi.c', + '../../genarch/src/division.c', + '../../generic/src/balloc.c', + '../../generic/src/memstr.c', + '../../generic/src/printf_core.c', + '../../generic/src/vprintf.c', + '../../generic/src/printf.c', + '../../generic/src/str.c', + '../../generic/src/version.c', + '../../generic/src/inflate.c', + '../../generic/src/tar.c', + '../../generic/src/gzip.c', + '../../generic/src/kernel.c', + '../../generic/src/payload.c', +) + +if MACHINE == 'ski' + boot_src += files('src/ski.c') +endif