diff --git a/boards/raspberrypi/rpi_4b/CMakeLists.txt b/boards/raspberry_pi/rpi_4b/CMakeLists.txt
similarity index 100%
rename from boards/raspberrypi/rpi_4b/CMakeLists.txt
rename to boards/raspberry_pi/rpi_4b/CMakeLists.txt
diff --git a/boards/raspberrypi/rpi_4b/Kconfig.defconfig b/boards/raspberry_pi/rpi_4b/Kconfig.defconfig
similarity index 100%
rename from boards/raspberrypi/rpi_4b/Kconfig.defconfig
rename to boards/raspberry_pi/rpi_4b/Kconfig.defconfig
diff --git a/boards/raspberrypi/rpi_4b/Kconfig.rpi_4b b/boards/raspberry_pi/rpi_4b/Kconfig.rpi_4b
similarity index 100%
rename from boards/raspberrypi/rpi_4b/Kconfig.rpi_4b
rename to boards/raspberry_pi/rpi_4b/Kconfig.rpi_4b
diff --git a/boards/raspberrypi/rpi_4b/board.cmake b/boards/raspberry_pi/rpi_4b/board.cmake
similarity index 100%
rename from boards/raspberrypi/rpi_4b/board.cmake
rename to boards/raspberry_pi/rpi_4b/board.cmake
diff --git a/boards/raspberrypi/rpi_4b/board.yml b/boards/raspberry_pi/rpi_4b/board.yml
similarity index 100%
rename from boards/raspberrypi/rpi_4b/board.yml
rename to boards/raspberry_pi/rpi_4b/board.yml
diff --git a/boards/raspberrypi/rpi_4b/doc/index.rst b/boards/raspberry_pi/rpi_4b/doc/index.rst
similarity index 100%
rename from boards/raspberrypi/rpi_4b/doc/index.rst
rename to boards/raspberry_pi/rpi_4b/doc/index.rst
diff --git a/boards/raspberrypi/rpi_4b/rpi_4b.dts b/boards/raspberry_pi/rpi_4b/rpi_4b.dts
similarity index 100%
rename from boards/raspberrypi/rpi_4b/rpi_4b.dts
rename to boards/raspberry_pi/rpi_4b/rpi_4b.dts
diff --git a/boards/raspberrypi/rpi_4b/rpi_4b.yaml b/boards/raspberry_pi/rpi_4b/rpi_4b.yaml
similarity index 100%
rename from boards/raspberrypi/rpi_4b/rpi_4b.yaml
rename to boards/raspberry_pi/rpi_4b/rpi_4b.yaml
diff --git a/boards/raspberrypi/rpi_4b/rpi_4b_defconfig b/boards/raspberry_pi/rpi_4b/rpi_4b_defconfig
similarity index 100%
rename from boards/raspberrypi/rpi_4b/rpi_4b_defconfig
rename to boards/raspberry_pi/rpi_4b/rpi_4b_defconfig
diff --git a/boards/xen/xenvm/Kconfig.defconfig b/boards/xen/xenvm/Kconfig.defconfig
new file mode 100644
index 00000000000..279d9b8114d
--- /dev/null
+++ b/boards/xen/xenvm/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 EPAM Systems
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_XENVM
+
+config BUILD_OUTPUT_BIN
+	default y
+
+endif # BOARD_XENVM