Changes in boot/arch/arm64/meson.build [d39ce97d:fdfb24e] in mainline

File:

• boot/arch/arm64/meson.build (modified) (2 diffs)

boot/arch/arm64/meson.build

@@ -29 +29 @@
 BUILD = true
 
-POST_OUTPUT = 'image.iso'
-POSTBUILD = 'grub'
-GRUB_LOADER = 'chainloader'
+if MACHINE == 'virt'
+        POST_OUTPUT = 'image.iso'
+        POSTBUILD = 'grub'
+        GRUB_LOADER = 'chainloader'
+endif
+
+if MACHINE == 'hikey960'
+        POSTBUILD = 'raw'
+        POST_OUTPUT = 'image.boot'
+endif
 
 # Request binary output. The ARM64 port manually prepares the .text
@@ -41 +48 @@
         'src/main.c',
         'src/relocate.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/efi.c',
         '../../generic/src/gzip.c',
         '../../generic/src/inflate.c',
         '../../generic/src/kernel.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/payload.c',
         '../../generic/src/printf.c',
         '../../generic/src/printf_core.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/tar.c',
         '../../generic/src/version.c',