Changeset 5631c9c in mainline

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

3582362

Parents:

356e17e0

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-29 13:33:25)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

sparc64 boot

Files:

• boot/arch/sparc64/Makefile.inc (modified) (1 diff)
• boot/arch/sparc64/_link.ld.in (modified) (1 diff)
• boot/arch/sparc64/meson.build (added)
• boot/meson.build (modified) (2 diffs)
• boot/silo/build_dist.sh (added)
• boot/silo/meson.build (added)
• boot/yaboot/meson.build (modified) (2 diffs)
• meson/arch/sparc64/meson.build (modified) (2 diffs)
• tools/ew.py (modified) (1 diff)

boot/arch/sparc64/Makefile.inc

@@ -27 +27 @@
 #
 
-BOOT_OUTPUT = image.boot
-POST_OUTPUT = $(ROOT_PATH)/image.iso
-POSTBUILD = Makefile.silo
+BUILD = Makefile.empty
+POSTBUILD = Makefile.empty
 
-BFD_NAME = elf64-sparc
-BFD_OUTPUT = $(BFD_NAME)
-
-BITS = 64
-ENDIANESS = BE
-EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
-
-SOURCES = \
-        arch/$(BARCH)/src/asm.S \
-        arch/$(BARCH)/src/main.c \
-        arch/$(BARCH)/src/ofw.c \
-        $(COMPS).o \
-        genarch/src/ofw.c \
-        genarch/src/ofw_tree.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/gzip.c \
-        generic/src/tar.c \
-        generic/src/kernel.c \
-        generic/src/payload.c

boot/arch/sparc64/_link.ld.in

@@ -6 +6 @@
                 loader_start = .;
                 *(BOOTSTRAP);
-                *(.text);
+                *(.text.*);
 
                 *(.data);       /* initialized data */

boot/meson.build

@@ -1 +1 @@
 subdir('arch' / BARCH)
 
-if POSTBUILD == 'uimage'
+if POSTBUILD == 'uboot'
         boot_image_format = 'binary'
 endif
@@ -172 +172 @@
 endif
 
+if POSTBUILD == 'silo'
+        subdir('silo')
+endif
+
 if POSTBUILD == 'uboot'
         IMAGE_NAME = 'HelenOS-' + HELENOS_RELEASE

boot/yaboot/meson.build

@@ -1 @@
-
-yaboot_distdir = custom_target('yaboot_dist',
-        output: 'yaboot_dist',
+distdir = custom_target('distdir',
+        output: 'distdir',
         input: [
                 'build_dist.sh',
@@ -15 +14 @@
 image_iso = custom_target('image.iso',
         output: 'image.iso',
-        input: [ yaboot_distdir, 'maps' ],
+        input: [ distdir, 'maps' ],
         command: [
                 genisoimage,

meson/arch/sparc64/meson.build

@@ -17 +17 @@
 
 arch_kernel_c_args = [ '-D__BE__', '-m64', '-mcmodel=medlow', '-mcpu=ultrasparc', '-mno-fpu' ]
+arch_boot_c_args = arch_kernel_c_args
 
 if PROCESSOR == 'us'
@@ -36 +37 @@
 endif
 
-
+arch_boot_link_args = []
 arch_kernel_link_args = [ '-nostdlib', '-Wl,-no-check-sections' ]
 arch_uspace_link_args = [ '-nostdlib', '-lgcc' ]

tools/ew.py

@@ -381 +381 @@
                         'sun4v' : {
                                 'run' : qemu_run,
-                                'image' : '-drive if=pflash,readonly=on,file=image.iso',
+                                'image' : '-drive if=pflash,readonly=on,file=build/image.iso',
                                 'audio' : False,
                                 'console' : True,