diff --git a/Documentation/boards/raspberrypi.md b/Documentation/boards/raspberrypi.md
index d3e151710..6d783b982 100644
--- a/Documentation/boards/raspberrypi.md
+++ b/Documentation/boards/raspberrypi.md
@@ -2,4 +2,4 @@
 
 ## Serial console
 
-For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt`.
+For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1` into `config.txt`.
diff --git a/buildroot-external/barebox.config b/buildroot-external/barebox.config
index 3fce53aee..09b149269 100644
--- a/buildroot-external/barebox.config
+++ b/buildroot-external/barebox.config
@@ -9,6 +9,7 @@ CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_OFTREE=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_DEFAULT_COMPRESSION_LZ4=y
 
 # CONFIG_PARTITION_DISK_DOS is not set
 CONFIG_PARTITION_DISK_EFI=y
diff --git a/buildroot-external/board/raspberrypi/barebox-env/init/rpi_devicetree b/buildroot-external/board/raspberrypi/barebox-env/init/rpi_devicetree
index fcaa31645..3359638cc 100644
--- a/buildroot-external/board/raspberrypi/barebox-env/init/rpi_devicetree
+++ b/buildroot-external/board/raspberrypi/barebox-env/init/rpi_devicetree
@@ -2,5 +2,5 @@
 
 memcpy -d /tmp/rpi.dtb 0x02008000 0 0x8000
 oftree -f -l /tmp/rpi.dtb
-of_overlay /data/barebox-state-rpi.dtbo
+of_overlay /env/data/barebox-state-rpi.dtbo
 fix_bootargs
diff --git a/buildroot-external/board/raspberrypi/barebox.config b/buildroot-external/board/raspberrypi/barebox.config
index d4782c572..0768dca83 100644
--- a/buildroot-external/board/raspberrypi/barebox.config
+++ b/buildroot-external/board/raspberrypi/barebox.config
@@ -5,6 +5,7 @@ CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
+CONFIG_IMAGE_COMPRESSION_NONE=y
 CONFIG_CMD_OF_OVERLAY=y
 CONFIG_CMD_FIX_BOOTARGS=y
 # CONFIG_SPI is not set
diff --git a/buildroot-external/board/raspberrypi/post-image.sh b/buildroot-external/board/raspberrypi/post-image.sh
index f10701478..74db9354c 100755
--- a/buildroot-external/board/raspberrypi/post-image.sh
+++ b/buildroot-external/board/raspberrypi/post-image.sh
@@ -33,7 +33,7 @@ cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
     echo "dtparam=audio=on"
 ) > ${BOOT_DATA}/config.txt
 
-echo "dwc_otg.lpm_enable=0 console=tty1 console=ttyAMA0,115200" > ${BOOT_DATA}/cmdline.txt
+echo "dwc_otg.lpm_enable=0 console=tty1" > ${BOOT_DATA}/cmdline.txt
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}