Changeset 8a9a41e in mainline for kernel/arch/arm64/meson.build

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

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

kernel/arch/arm64/meson.build

@@ -44 +44 @@
         'src/mm/page.c',
         'src/mm/tlb.c',
-        'src/smc.c',
         'src/smp/ipi.c',
         'src/smp/smp.c',
@@ -52 +51 @@
 if MACHINE == 'virt'
         arch_src += files('src/mach/virt/virt.c')
+endif
+
+if MACHINE == 'hikey960'
+        arch_src += files('src/mach/hikey960/hikey960.c')
 endif