$ git diff
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 35b887f456..1f5859c712 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -262,9 +262,8 @@ rule KernelArchitectureSetup architecture
                            test -e mmc 0 uEnv.txt && fatload mmc 0 ${scriptaddr} uEnv.txt && env import -t ${scriptaddr} ${filesize} \
                            fatload mmc 0 ${kernel_addr_r} haiku_loader.ub \
                            fatload mmc 0 ${ramdisk_addr_r} haiku_floppyboot.ub \
-                           fatload mmc 0 ${fdt_addr_r} ${dtb} \
-                           fdt addr ${fdt_addr_r} \
-                           bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}" ;
+                           fdt addr ${$fdtcontroladdr} \
+                           bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdtcontroladdr}" ;

                case arm64 :
                        HAIKU_KERNEL_PLATFORM ?= efi ;
diff --git a/src/add-ons/kernel/bus_managers/fdt/fdt_serial.cpp b/src/add-ons/kernel/bus_managers/fdt/fdt_serial.cpp
index a2ba64832d..5b9e74d581 100644
--- a/src/add-ons/kernel/bus_managers/fdt/fdt_serial.cpp
+++ b/src/add-ons/kernel/bus_managers/fdt/fdt_serial.cpp
@@ -30,7 +30,7 @@ extern "C" {
 #include "fdt_support.h"


-//#define TRACE_SERIAL
+#define TRACE_SERIAL
 #ifdef TRACE_SERIAL
 #      define TRACE(x...) dprintf("INIT: " x)
 #else
@@ -61,8 +61,7 @@ debug_uart_from_node(const void *fdt, int node)
                return NULL;
        }

-       TRACE("serial: checking '%s', node %d @ %" B_PRIxPHYSADDR "\n",
-               name, node, regs);
+       TRACE("serial: checking node %d @ %" B_PRIxPHYSADDR "\n", node, regs);

        // get the UART clock rate
        prop = fdt_getprop(fdt, node, "clock-frequency", &len);
@@ -107,6 +106,8 @@ debug_uart_from_node(const void *fdt, int node)
 DebugUART*
 debug_uart_from_fdt(const void *fdt)
 {
+       return arch_get_uart_pl011(0x3f201000, 48000000);
+
        int chosen_node;
        int node;
        int len;