mbv: move a few things around

mbv/configure

@@ -25,9 +25,9 @@ class Config:
     hostlibs = "-lgtest -lgmock -lgtest_main"
     hostldflags = "-fprofile-instr-generate -fcoverage-mapping"
     include_dirs = [
-        "hal",
+        ".",
         "hal/uart",
-        "hal/lib/common",
+        "hal/xilinx",
     ]
     common_flags = [
         "-g",
@@ -269,10 +269,15 @@ hal = source_set("hal", [
         "hal/intc.cc",
         "hal/interrupts.cc",
         "hal/start.cc",
-        "hal/lib/common/xil_assert.c",
         "hal/uart/xuartlite.c",
-        "hal/uart/xuartlite_stats.c",
         "hal/uart/xuartlite_intr.c",
+        "hal/uart/xuartlite_stats.c",
+        "hal/xilinx/xil_assert.c",
+        ])
+
+lib = source_set("lib", [
+        "lib/async.cc",
+        "lib/lock.cc",
         ])
 
 bootloader = source_set("bootloader", glob.glob("./bootloader/**/*.cc", recursive=True))
@@ -289,23 +294,21 @@ def app_image(app, sources=None):
     return build_image(
             source_set(app, sources),
             linker_script="apps/app.ld",
-            dependencies=[hal],
+            dependencies=[hal, lib],
             elf_out=f"{app}.elf",
             bin_out=f"{app}.bin",
     )
 
 all = [
         build_source_set(hal),
+        build_source_set(lib),
         bootloader_image,
 
         app_image("helloworld"),
         app_image("timer"),
         app_image("uart"),
         app_image("async", sources=[
-            "apps/async/async.cc",
-            "apps/async/lock.cc",
             "apps/async/main.cc",
-            "apps/async/trace.cc",
             "apps/async/uart.cc",
             ]),
 ]