diff --git a/Documentation/development.md b/Documentation/development.md
new file mode 100644
index 000000000..6a165eef0
--- /dev/null
+++ b/Documentation/development.md
@@ -0,0 +1,24 @@
+# Development
+
+## Boot system
+
+`BOOT_SYS`:
+- efi
+- hyprid
+- spl
+- mbr
+
+HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
+boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
+
+Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
+
+`BOOTLOADER`:
+- uboot
+- barebox
+
+We support mainly uboot but for uefi system we can also use barebox. In future we hope to remove barebox with uboot also on uefi.
+
+`DISK_SIZE`:
+Default 2. That is the size of end image in GB.
+
diff --git a/Documentation/kernel.md b/Documentation/kernel.md
index e3b4b955a..30e7a6535 100644
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -5,3 +5,4 @@
 |-------|---------|
 | Open Virtual Applicance | 4.14.59 |
 | Raspberry Pi | 4.14.58 |
+
diff --git a/buildroot-external/board/tinker/post-image.sh b/buildroot-external/board/asus/post-image.sh
similarity index 93%
rename from buildroot-external/board/tinker/post-image.sh
rename to buildroot-external/board/asus/post-image.sh
index 369ec6c10..5de26a466 100755
--- a/buildroot-external/board/tinker/post-image.sh
+++ b/buildroot-external/board/asus/post-image.sh
@@ -5,11 +5,12 @@ SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
 BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
+. ${BR2_EXTERNAL_HASSOS_PATH}/meta
+. ${BOARD_DIR}/meta
+
 . ${SCRIPT_DIR}/hdd-image.sh
 . ${SCRIPT_DIR}/name.sh
 . ${SCRIPT_DIR}/ota.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
 
 # Init boot data
 rm -rf ${BOOT_DATA}
diff --git a/buildroot-external/board/tinker/kernel.config b/buildroot-external/board/asus/tinker/kernel.config
similarity index 100%
rename from buildroot-external/board/tinker/kernel.config
rename to buildroot-external/board/asus/tinker/kernel.config
diff --git a/buildroot-external/board/tinker/info b/buildroot-external/board/asus/tinker/meta
similarity index 77%
rename from buildroot-external/board/tinker/info
rename to buildroot-external/board/asus/tinker/meta
index 42e105713..55c3992b7 100644
--- a/buildroot-external/board/tinker/info
+++ b/buildroot-external/board/asus/tinker/meta
@@ -1,5 +1,5 @@
 BOARD_ID=tinker
-BOARD_NAME="Tinker Board"
+BOARD_NAME="Asus TinkerBoard"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
diff --git a/buildroot-external/board/tinker/patches/linux/0000-mali-r19p0-01rel0.patch b/buildroot-external/board/asus/tinker/patches/linux/0000-mali-r19p0-01rel0.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0000-mali-r19p0-01rel0.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0000-mali-r19p0-01rel0.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0001-Mali-midgard-r19p0-fixes-for-4.13-kernels.patch b/buildroot-external/board/asus/tinker/patches/linux/0001-Mali-midgard-r19p0-fixes-for-4.13-kernels.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0001-Mali-midgard-r19p0-fixes-for-4.13-kernels.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0001-Mali-midgard-r19p0-fixes-for-4.13-kernels.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch b/buildroot-external/board/asus/tinker/patches/linux/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch b/buildroot-external/board/asus/tinker/patches/linux/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch b/buildroot-external/board/asus/tinker/patches/linux/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch b/buildroot-external/board/asus/tinker/patches/linux/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch
diff --git a/buildroot-external/board/tinker/patches/linux/0009-GPU-ARM-Midgard-Adapt-to-the-new-mmap-call-checks.patch b/buildroot-external/board/asus/tinker/patches/linux/0009-GPU-ARM-Midgard-Adapt-to-the-new-mmap-call-checks.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/0009-GPU-ARM-Midgard-Adapt-to-the-new-mmap-call-checks.patch
rename to buildroot-external/board/asus/tinker/patches/linux/0009-GPU-ARM-Midgard-Adapt-to-the-new-mmap-call-checks.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1001-Integrating-the-Mali-drivers.patch b/buildroot-external/board/asus/tinker/patches/linux/1001-Integrating-the-Mali-drivers.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1001-Integrating-the-Mali-drivers.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1001-Integrating-the-Mali-drivers.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1002-clk-rockchip-add-all-known-operating-points-to-the-a.patch b/buildroot-external/board/asus/tinker/patches/linux/1002-clk-rockchip-add-all-known-operating-points-to-the-a.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1002-clk-rockchip-add-all-known-operating-points-to-the-a.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1002-clk-rockchip-add-all-known-operating-points-to-the-a.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch b/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch b/buildroot-external/board/asus/tinker/patches/linux/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1005-Reboot-patch-2-The-Return.patch b/buildroot-external/board/asus/tinker/patches/linux/1005-Reboot-patch-2-The-Return.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1005-Reboot-patch-2-The-Return.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1005-Reboot-patch-2-The-Return.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1006-rockchip-rga-v4l2-m2m-support.patch b/buildroot-external/board/asus/tinker/patches/linux/1006-rockchip-rga-v4l2-m2m-support.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1006-rockchip-rga-v4l2-m2m-support.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1006-rockchip-rga-v4l2-m2m-support.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1007-dt-bindings-Document-the-Rockchip-RGA-bindings.patch b/buildroot-external/board/asus/tinker/patches/linux/1007-dt-bindings-Document-the-Rockchip-RGA-bindings.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1007-dt-bindings-Document-the-Rockchip-RGA-bindings.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1007-dt-bindings-Document-the-Rockchip-RGA-bindings.patch
diff --git a/buildroot-external/board/tinker/patches/linux/1008-dwc2-avoid_nak_for_csplit.patch b/buildroot-external/board/asus/tinker/patches/linux/1008-dwc2-avoid_nak_for_csplit.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/1008-dwc2-avoid_nak_for_csplit.patch
rename to buildroot-external/board/asus/tinker/patches/linux/1008-dwc2-avoid_nak_for_csplit.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch b/buildroot-external/board/asus/tinker/patches/linux/2001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2001-dts-rk3288-miqi-Enabling-the-Mali-GPU-node.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch b/buildroot-external/board/asus/tinker/patches/linux/2002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2002-ARM-dts-rockchip-fix-the-regulator-s-voltage-range-o.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch b/buildroot-external/board/asus/tinker/patches/linux/2003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2003-ARM-dts-rockchip-add-the-MiQi-board-s-fan-definition.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch b/buildroot-external/board/asus/tinker/patches/linux/2004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2004-ARM-dts-rockchip-add-support-for-1800-MHz-operation-.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2005-Readapt-ARM-dts-rockchip-miqi-add-turbo-mode-operati.patch b/buildroot-external/board/asus/tinker/patches/linux/2005-Readapt-ARM-dts-rockchip-miqi-add-turbo-mode-operati.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2005-Readapt-ARM-dts-rockchip-miqi-add-turbo-mode-operati.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2005-Readapt-ARM-dts-rockchip-miqi-add-turbo-mode-operati.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2006-ARM-DTSI-rk3288-Missing-GRF-handles.patch b/buildroot-external/board/asus/tinker/patches/linux/2006-ARM-DTSI-rk3288-Missing-GRF-handles.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2006-ARM-DTSI-rk3288-Missing-GRF-handles.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2006-ARM-DTSI-rk3288-Missing-GRF-handles.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2007-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch b/buildroot-external/board/asus/tinker/patches/linux/2007-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2007-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2007-RK3288-DTSI-rk3288-Add-missing-SPI2-pinctrl.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2008-Added-support-for-Tinkerboard-s-SPI-interface.patch b/buildroot-external/board/asus/tinker/patches/linux/2008-Added-support-for-Tinkerboard-s-SPI-interface.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2008-Added-support-for-Tinkerboard-s-SPI-interface.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2008-Added-support-for-Tinkerboard-s-SPI-interface.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2010-ARM-DTSI-rk3288-Adding-cells-addresses-and-size.patch b/buildroot-external/board/asus/tinker/patches/linux/2010-ARM-DTSI-rk3288-Adding-cells-addresses-and-size.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2010-ARM-DTSI-rk3288-Adding-cells-addresses-and-size.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2010-ARM-DTSI-rk3288-Adding-cells-addresses-and-size.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2011-ARM-DTSI-rk3288-Adding-missing-EDP-power-domain.patch b/buildroot-external/board/asus/tinker/patches/linux/2011-ARM-DTSI-rk3288-Adding-missing-EDP-power-domain.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2011-ARM-DTSI-rk3288-Adding-missing-EDP-power-domain.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2011-ARM-DTSI-rk3288-Adding-missing-EDP-power-domain.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch b/buildroot-external/board/asus/tinker/patches/linux/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2013-ARM-DTSI-rk3288-Adding-missing-VOPB-registers.patch b/buildroot-external/board/asus/tinker/patches/linux/2013-ARM-DTSI-rk3288-Adding-missing-VOPB-registers.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2013-ARM-DTSI-rk3288-Adding-missing-VOPB-registers.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2013-ARM-DTSI-rk3288-Adding-missing-VOPB-registers.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2014-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch b/buildroot-external/board/asus/tinker/patches/linux/2014-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2014-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2014-ARM-DTSI-rk3288-Fixed-the-SPDIF-node-address.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Enabling-SDIO-Wireless-and.patch b/buildroot-external/board/asus/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Enabling-SDIO-Wireless-and.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Enabling-SDIO-Wireless-and.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2015-ARM-DTS-rk3288-tinker-Enabling-SDIO-Wireless-and.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2017-ARM-DTS-rk3288-tinker-Setting-up-the-SD-regulato.patch b/buildroot-external/board/asus/tinker/patches/linux/2017-ARM-DTS-rk3288-tinker-Setting-up-the-SD-regulato.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2017-ARM-DTS-rk3288-tinker-Setting-up-the-SD-regulato.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2017-ARM-DTS-rk3288-tinker-Setting-up-the-SD-regulato.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2018-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch b/buildroot-external/board/asus/tinker/patches/linux/2018-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2018-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2018-ARM-DTS-rk3288-tinker-Defined-the-I2C-interfaces.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch b/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2020-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch b/buildroot-external/board/asus/tinker/patches/linux/2020-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2020-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2020-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2021-ARM-DTS-rk3288-tinker-Defining-SDMMC-properties.patch b/buildroot-external/board/asus/tinker/patches/linux/2021-ARM-DTS-rk3288-tinker-Defining-SDMMC-properties.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2021-ARM-DTS-rk3288-tinker-Defining-SDMMC-properties.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2021-ARM-DTS-rk3288-tinker-Defining-SDMMC-properties.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2022-ARM-DTSI-rk3288-Define-the-VPU-services.patch b/buildroot-external/board/asus/tinker/patches/linux/2022-ARM-DTSI-rk3288-Define-the-VPU-services.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2022-ARM-DTSI-rk3288-Define-the-VPU-services.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2022-ARM-DTSI-rk3288-Define-the-VPU-services.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2023-ARM-DTS-rk3288-miqi-Enable-the-Video-encoding-MM.patch b/buildroot-external/board/asus/tinker/patches/linux/2023-ARM-DTS-rk3288-miqi-Enable-the-Video-encoding-MM.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2023-ARM-DTS-rk3288-miqi-Enable-the-Video-encoding-MM.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2023-ARM-DTS-rk3288-miqi-Enable-the-Video-encoding-MM.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2024-ARM-DTS-rk3288-tinker-Enable-the-Video-encoding-MMU-.patch b/buildroot-external/board/asus/tinker/patches/linux/2024-ARM-DTS-rk3288-tinker-Enable-the-Video-encoding-MMU-.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2024-ARM-DTS-rk3288-tinker-Enable-the-Video-encoding-MMU-.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2024-ARM-DTS-rk3288-tinker-Enable-the-Video-encoding-MMU-.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2025-ARM-DTSI-rk3288-firefly-Enable-the-Video-encoding-MM.patch b/buildroot-external/board/asus/tinker/patches/linux/2025-ARM-DTSI-rk3288-firefly-Enable-the-Video-encoding-MM.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2025-ARM-DTSI-rk3288-firefly-Enable-the-Video-encoding-MM.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2025-ARM-DTSI-rk3288-firefly-Enable-the-Video-encoding-MM.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2026-ARM-DTSI-rk3288-veyron-Enable-the-Video-encoding-MMU.patch b/buildroot-external/board/asus/tinker/patches/linux/2026-ARM-DTSI-rk3288-veyron-Enable-the-Video-encoding-MMU.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2026-ARM-DTSI-rk3288-veyron-Enable-the-Video-encoding-MMU.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2026-ARM-DTSI-rk3288-veyron-Enable-the-Video-encoding-MMU.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2027_Tinkerboard-Next-audio.patch b/buildroot-external/board/asus/tinker/patches/linux/2027_Tinkerboard-Next-audio.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2027_Tinkerboard-Next-audio.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2027_Tinkerboard-Next-audio.patch
diff --git a/buildroot-external/board/tinker/patches/linux/2028-Tinker-Bluetooth.patch b/buildroot-external/board/asus/tinker/patches/linux/2028-Tinker-Bluetooth.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/2028-Tinker-Bluetooth.patch
rename to buildroot-external/board/asus/tinker/patches/linux/2028-Tinker-Bluetooth.patch
diff --git a/buildroot-external/board/tinker/patches/linux/260_DTS_gpiomem_node.patch b/buildroot-external/board/asus/tinker/patches/linux/260_DTS_gpiomem_node.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/260_DTS_gpiomem_node.patch
rename to buildroot-external/board/asus/tinker/patches/linux/260_DTS_gpiomem_node.patch
diff --git a/buildroot-external/board/tinker/patches/linux/261_gpiomem_driver.patch b/buildroot-external/board/asus/tinker/patches/linux/261_gpiomem_driver.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/261_gpiomem_driver.patch
rename to buildroot-external/board/asus/tinker/patches/linux/261_gpiomem_driver.patch
diff --git a/buildroot-external/board/tinker/patches/linux/3000_DTS_rearrange_thermal_zones.patch b/buildroot-external/board/asus/tinker/patches/linux/3000_DTS_rearrange_thermal_zones.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/3000_DTS_rearrange_thermal_zones.patch
rename to buildroot-external/board/asus/tinker/patches/linux/3000_DTS_rearrange_thermal_zones.patch
diff --git a/buildroot-external/board/tinker/patches/linux/3004-Tinkerboard-overclocking-operation.patch b/buildroot-external/board/asus/tinker/patches/linux/3004-Tinkerboard-overclocking-operation.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/3004-Tinkerboard-overclocking-operation.patch
rename to buildroot-external/board/asus/tinker/patches/linux/3004-Tinkerboard-overclocking-operation.patch
diff --git a/buildroot-external/board/tinker/patches/linux/4001-rockchip-Fix-dai_name-for-HDMI-codec-to-the-asoc-tree.patch b/buildroot-external/board/asus/tinker/patches/linux/4001-rockchip-Fix-dai_name-for-HDMI-codec-to-the-asoc-tree.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/4001-rockchip-Fix-dai_name-for-HDMI-codec-to-the-asoc-tree.patch
rename to buildroot-external/board/asus/tinker/patches/linux/4001-rockchip-Fix-dai_name-for-HDMI-codec-to-the-asoc-tree.patch
diff --git a/buildroot-external/board/tinker/patches/linux/5000-add-link-for-miniarm-dtb-file.patch b/buildroot-external/board/asus/tinker/patches/linux/5000-add-link-for-miniarm-dtb-file.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/5000-add-link-for-miniarm-dtb-file.patch
rename to buildroot-external/board/asus/tinker/patches/linux/5000-add-link-for-miniarm-dtb-file.patch
diff --git a/buildroot-external/board/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch b/buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch
rename to buildroot-external/board/asus/tinker/patches/linux/board-tinkerboard-enable-emmc-support.patch
diff --git a/buildroot-external/board/tinker/patches/linux/increasing_DMA_block_memory_allocation_to_2048.patch b/buildroot-external/board/asus/tinker/patches/linux/increasing_DMA_block_memory_allocation_to_2048.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/increasing_DMA_block_memory_allocation_to_2048.patch
rename to buildroot-external/board/asus/tinker/patches/linux/increasing_DMA_block_memory_allocation_to_2048.patch
diff --git a/buildroot-external/board/tinker/patches/linux/memolry-leak-fix-r8723bs.patch b/buildroot-external/board/asus/tinker/patches/linux/memolry-leak-fix-r8723bs.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/memolry-leak-fix-r8723bs.patch
rename to buildroot-external/board/asus/tinker/patches/linux/memolry-leak-fix-r8723bs.patch
diff --git a/buildroot-external/board/tinker/patches/linux/staging-rtl8723bs-hide-nolinked-power-save-info-when-not-debugging.patch b/buildroot-external/board/asus/tinker/patches/linux/staging-rtl8723bs-hide-nolinked-power-save-info-when-not-debugging.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/staging-rtl8723bs-hide-nolinked-power-save-info-when-not-debugging.patch
rename to buildroot-external/board/asus/tinker/patches/linux/staging-rtl8723bs-hide-nolinked-power-save-info-when-not-debugging.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-0001-realtek-wifi-881xAU-605ecfa.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-0001-realtek-wifi-881xAU-605ecfa.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-0001-realtek-wifi-881xAU-605ecfa.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-0001-realtek-wifi-881xAU-605ecfa.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-0002-realtek-wifi-881xAU-adding-kernel-4.14.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-0002-realtek-wifi-881xAU-adding-kernel-4.14.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-0002-realtek-wifi-881xAU-adding-kernel-4.14.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-0002-realtek-wifi-881xAU-adding-kernel-4.14.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-0003-realtek-wifi-881xAU-enable-8814au.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-0003-realtek-wifi-881xAU-enable-8814au.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-0003-realtek-wifi-881xAU-enable-8814au.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-0003-realtek-wifi-881xAU-enable-8814au.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-0005-realtek-wifi-881xAU-update-to-5a5d0f.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-0005-realtek-wifi-881xAU-update-to-5a5d0f.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-0005-realtek-wifi-881xAU-update-to-5a5d0f.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-0005-realtek-wifi-881xAU-update-to-5a5d0f.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-2001-01-rtl8188eu-kconfig-makefile.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-2001-01-rtl8188eu-kconfig-makefile.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-2001-01-rtl8188eu-kconfig-makefile.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-2001-01-rtl8188eu-kconfig-makefile.patch
diff --git a/buildroot-external/board/tinker/patches/linux/wifi-2002-02-rtl8188eu.patch b/buildroot-external/board/asus/tinker/patches/linux/wifi-2002-02-rtl8188eu.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/linux/wifi-2002-02-rtl8188eu.patch
rename to buildroot-external/board/asus/tinker/patches/linux/wifi-2002-02-rtl8188eu.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0001-Support-HassOS-bootstate-partition.patch b/buildroot-external/board/asus/tinker/patches/uboot/0001-Support-HassOS-bootstate-partition.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0001-Support-HassOS-bootstate-partition.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0001-Support-HassOS-bootstate-partition.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0017-Fix-HDMI-some-issues.patch b/buildroot-external/board/asus/tinker/patches/uboot/0017-Fix-HDMI-some-issues.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0017-Fix-HDMI-some-issues.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0017-Fix-HDMI-some-issues.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0018-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch b/buildroot-external/board/asus/tinker/patches/uboot/0018-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0018-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0018-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch b/buildroot-external/board/asus/tinker/patches/uboot/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0037-add-10ms-delay-after-re-enable-EMMC.patch b/buildroot-external/board/asus/tinker/patches/uboot/0037-add-10ms-delay-after-re-enable-EMMC.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0037-add-10ms-delay-after-re-enable-EMMC.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0037-add-10ms-delay-after-re-enable-EMMC.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0039-fixed-enter-ums-mode-fail-sometimes.patch b/buildroot-external/board/asus/tinker/patches/uboot/0039-fixed-enter-ums-mode-fail-sometimes.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0039-fixed-enter-ums-mode-fail-sometimes.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0039-fixed-enter-ums-mode-fail-sometimes.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0045-modify-UMS-name-of-uboot.patch b/buildroot-external/board/asus/tinker/patches/uboot/0045-modify-UMS-name-of-uboot.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0045-modify-UMS-name-of-uboot.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0045-modify-UMS-name-of-uboot.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0049-added-timeout-when-force-entering-UMS-mode.patch b/buildroot-external/board/asus/tinker/patches/uboot/0049-added-timeout-when-force-entering-UMS-mode.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0049-added-timeout-when-force-entering-UMS-mode.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0049-added-timeout-when-force-entering-UMS-mode.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/0050-USB-VID-PID.patch b/buildroot-external/board/asus/tinker/patches/uboot/0050-USB-VID-PID.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/0050-USB-VID-PID.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/0050-USB-VID-PID.patch
diff --git a/buildroot-external/board/tinker/patches/uboot/100-tinker-s-eMMC-bootable.patch b/buildroot-external/board/asus/tinker/patches/uboot/100-tinker-s-eMMC-bootable.patch
similarity index 100%
rename from buildroot-external/board/tinker/patches/uboot/100-tinker-s-eMMC-bootable.patch
rename to buildroot-external/board/asus/tinker/patches/uboot/100-tinker-s-eMMC-bootable.patch
diff --git a/buildroot-external/board/tinker/uboot-boot.sh b/buildroot-external/board/asus/tinker/uboot-boot.sh
similarity index 100%
rename from buildroot-external/board/tinker/uboot-boot.sh
rename to buildroot-external/board/asus/tinker/uboot-boot.sh
diff --git a/buildroot-external/board/tinker/uboot.config b/buildroot-external/board/asus/tinker/uboot.config
similarity index 100%
rename from buildroot-external/board/tinker/uboot.config
rename to buildroot-external/board/asus/tinker/uboot.config
diff --git a/buildroot-external/board/hardkernel/odroid-c2/info b/buildroot-external/board/hardkernel/odroid-c2/info
deleted file mode 100644
index e976d169d..000000000
--- a/buildroot-external/board/hardkernel/odroid-c2/info
+++ /dev/null
@@ -1,13 +0,0 @@
-BOARD_ID=odroid-c2
-BOARD_NAME="Hardkernel Odroid-C2"
-CHASSIS=embedded
-BOOTLOADER=uboot
-KERNEL_FILE=Image
-BOOT_ENV=/dev/disk/by-partuuid/0d3e0000-09
-BOOT_ENV_OFF=0x0000
-BOOT_ENV_SIZE=0x2000
-PART_BOOT=/dev/disk/by-partuuid/0d3e0000-01
-PART_KERNEL_0=/dev/disk/by-partuuid/0d3e0000-05
-PART_KERNEL_1=/dev/disk/by-partuuid/0d3e0000-07
-PART_SYSTEM_0=/dev/disk/by-partuuid/0d3e0000-06
-PART_SYSTEM_1=/dev/disk/by-partuuid/0d3e0000-08
diff --git a/buildroot-external/board/hardkernel/odroid-c2/meta b/buildroot-external/board/hardkernel/odroid-c2/meta
new file mode 100644
index 000000000..ccb76c12b
--- /dev/null
+++ b/buildroot-external/board/hardkernel/odroid-c2/meta
@@ -0,0 +1,7 @@
+BOARD_ID=odroid-c2
+BOARD_NAME="Hardkernel Odroid-C2"
+CHASSIS=embedded
+BOOTLOADER=uboot
+KERNEL_FILE=Image
+BOOT_SYS=mbr
+BOOT_ENV_SIZE=0x2000
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0001-ARM64-dts-meson-gxm-Add-support-for-Khadas-VIM2.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0001-ARM64-dts-meson-gxm-Add-support-for-Khadas-VIM2.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0001-ARM64-dts-meson-gxm-Add-support-for-Khadas-VIM2.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0001-ARM64-dts-meson-gxm-Add-support-for-Khadas-VIM2.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0002-ARM64-dts-meson-gxbb-allow-child-devices-on-the-USB-.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0002-ARM64-dts-meson-gxbb-allow-child-devices-on-the-USB-.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0002-ARM64-dts-meson-gxbb-allow-child-devices-on-the-USB-.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0002-ARM64-dts-meson-gxbb-allow-child-devices-on-the-USB-.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0003-ARM64-dts-meson-gxbb-odroidc2-take-USB-hub-out-of-re.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0003-ARM64-dts-meson-gxbb-odroidc2-take-USB-hub-out-of-re.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0003-ARM64-dts-meson-gxbb-odroidc2-take-USB-hub-out-of-re.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0003-ARM64-dts-meson-gxbb-odroidc2-take-USB-hub-out-of-re.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0004-phy-meson-add-USB3-PHY-support-for-Meson-GXL.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0004-phy-meson-add-USB3-PHY-support-for-Meson-GXL.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0004-phy-meson-add-USB3-PHY-support-for-Meson-GXL.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0004-phy-meson-add-USB3-PHY-support-for-Meson-GXL.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0005-usb-host-add-a-generic-platform-USB-roothub-driver.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0005-usb-host-add-a-generic-platform-USB-roothub-driver.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0005-usb-host-add-a-generic-platform-USB-roothub-driver.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0005-usb-host-add-a-generic-platform-USB-roothub-driver.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0006-usb-host-xhci-plat-integrate-the-platform-roothub.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0006-usb-host-xhci-plat-integrate-the-platform-roothub.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0006-usb-host-xhci-plat-integrate-the-platform-roothub.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0006-usb-host-xhci-plat-integrate-the-platform-roothub.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0007-ARM64-dts-meson-gxl-add-USB-host-support.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0008-ARM64-dts-meson-gxm-add-GXM-specific-USB-host-config.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0008-ARM64-dts-meson-gxm-add-GXM-specific-USB-host-config.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0008-ARM64-dts-meson-gxm-add-GXM-specific-USB-host-config.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0008-ARM64-dts-meson-gxm-add-GXM-specific-USB-host-config.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0009-ARM64-dts-meson-gx-Enable-USB-on-GXL-and-GXM-boards.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0009-ARM64-dts-meson-gx-Enable-USB-on-GXL-and-GXM-boards.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0009-ARM64-dts-meson-gx-Enable-USB-on-GXL-and-GXM-boards.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0009-ARM64-dts-meson-gx-Enable-USB-on-GXL-and-GXM-boards.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0010-ARM64-defconfig-add-CONFIG_MESON_EFUSE.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0010-ARM64-defconfig-add-CONFIG_MESON_EFUSE.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0010-ARM64-defconfig-add-CONFIG_MESON_EFUSE.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0010-ARM64-defconfig-add-CONFIG_MESON_EFUSE.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0011-ARM64-defconfig-enable-CEC-support.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0011-ARM64-defconfig-enable-CEC-support.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0011-ARM64-defconfig-enable-CEC-support.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0011-ARM64-defconfig-enable-CEC-support.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0012-ARM64-defconfig-enable-CONFIG_VIDEO_MESON_AO_CEC.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0012-ARM64-defconfig-enable-CONFIG_VIDEO_MESON_AO_CEC.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0012-ARM64-defconfig-enable-CONFIG_VIDEO_MESON_AO_CEC.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0012-ARM64-defconfig-enable-CONFIG_VIDEO_MESON_AO_CEC.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0013-ARM64-defconfig-enable-CONFIG_DRM_DW_HDMI_CEC.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0013-ARM64-defconfig-enable-CONFIG_DRM_DW_HDMI_CEC.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0013-ARM64-defconfig-enable-CONFIG_DRM_DW_HDMI_CEC.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0013-ARM64-defconfig-enable-CONFIG_DRM_DW_HDMI_CEC.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0014-clk-meson-gxbb-Add-VPU-and-VAPB-clockids.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0014-clk-meson-gxbb-Add-VPU-and-VAPB-clockids.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0014-clk-meson-gxbb-Add-VPU-and-VAPB-clockids.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0014-clk-meson-gxbb-Add-VPU-and-VAPB-clockids.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0015-clk-meson-gxbb-Add-VPU-and-VAPB-clocks-data.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0015-clk-meson-gxbb-Add-VPU-and-VAPB-clocks-data.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0015-clk-meson-gxbb-Add-VPU-and-VAPB-clocks-data.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0015-clk-meson-gxbb-Add-VPU-and-VAPB-clocks-data.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0016-drm-meson-dw_hdmi-Add-support-for-an-optional-extern.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0016-drm-meson-dw_hdmi-Add-support-for-an-optional-extern.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0016-drm-meson-dw_hdmi-Add-support-for-an-optional-extern.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0016-drm-meson-dw_hdmi-Add-support-for-an-optional-extern.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0017-drm-meson-Add-missing-VPU-init.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0017-drm-meson-Add-missing-VPU-init.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0017-drm-meson-Add-missing-VPU-init.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0017-drm-meson-Add-missing-VPU-init.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0018-reset-meson-add-level-reset-support-for-GX-SoC-famil.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0018-reset-meson-add-level-reset-support-for-GX-SoC-famil.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0018-reset-meson-add-level-reset-support-for-GX-SoC-famil.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0018-reset-meson-add-level-reset-support-for-GX-SoC-famil.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0019-soc-amlogic-add-Meson-GX-VPU-Domains-driver.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0019-soc-amlogic-add-Meson-GX-VPU-Domains-driver.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0019-soc-amlogic-add-Meson-GX-VPU-Domains-driver.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0019-soc-amlogic-add-Meson-GX-VPU-Domains-driver.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0020-soc-amlogic-meson-gx-pwrc-vpu-fix-power-off-when-pow.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0020-soc-amlogic-meson-gx-pwrc-vpu-fix-power-off-when-pow.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0020-soc-amlogic-meson-gx-pwrc-vpu-fix-power-off-when-pow.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0020-soc-amlogic-meson-gx-pwrc-vpu-fix-power-off-when-pow.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0021-ASoC-meson-add-meson-audio-core-driver.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0021-ASoC-meson-add-meson-audio-core-driver.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0021-ASoC-meson-add-meson-audio-core-driver.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0021-ASoC-meson-add-meson-audio-core-driver.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0022-ASoC-meson-add-register-definitions.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0022-ASoC-meson-add-register-definitions.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0022-ASoC-meson-add-register-definitions.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0022-ASoC-meson-add-register-definitions.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0023-ASoC-meson-add-aiu-i2s-dma-support.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0023-ASoC-meson-add-aiu-i2s-dma-support.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0023-ASoC-meson-add-aiu-i2s-dma-support.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0023-ASoC-meson-add-aiu-i2s-dma-support.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0024-ASoC-meson-add-initial-i2s-dai-support.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0024-ASoC-meson-add-initial-i2s-dai-support.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0024-ASoC-meson-add-initial-i2s-dai-support.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0024-ASoC-meson-add-initial-i2s-dai-support.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0025-snd-meson-activate-HDMI-audio-path.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0025-snd-meson-activate-HDMI-audio-path.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0025-snd-meson-activate-HDMI-audio-path.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0025-snd-meson-activate-HDMI-audio-path.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0026-drm-meson-select-dw-hdmi-i2s-audio-for-meson-hdmi.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0026-drm-meson-select-dw-hdmi-i2s-audio-for-meson-hdmi.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0026-drm-meson-select-dw-hdmi-i2s-audio-for-meson-hdmi.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0026-drm-meson-select-dw-hdmi-i2s-audio-for-meson-hdmi.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0027-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0027-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0027-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0027-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0028-ARM64-dts-meson-gx-add-audio-controller-nodes.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0028-ARM64-dts-meson-gx-add-audio-controller-nodes.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0028-ARM64-dts-meson-gx-add-audio-controller-nodes.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0028-ARM64-dts-meson-gx-add-audio-controller-nodes.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0029-ARM64-dts-meson-gxl-add-sound-dai-cells-to-HDMI-node.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0029-ARM64-dts-meson-gxl-add-sound-dai-cells-to-HDMI-node.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0029-ARM64-dts-meson-gxl-add-sound-dai-cells-to-HDMI-node.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0029-ARM64-dts-meson-gxl-add-sound-dai-cells-to-HDMI-node.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0030-ARM64-dts-meson-gxl-Take-eMMC-data-strobe-out-of-eMM.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0030-ARM64-dts-meson-gxl-Take-eMMC-data-strobe-out-of-eMM.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0030-ARM64-dts-meson-gxl-Take-eMMC-data-strobe-out-of-eMM.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0030-ARM64-dts-meson-gxl-Take-eMMC-data-strobe-out-of-eMM.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0031-ARM64-dts-meson-gx-add-VPU-power-domain.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0031-ARM64-dts-meson-gx-add-VPU-power-domain.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0031-ARM64-dts-meson-gx-add-VPU-power-domain.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0031-ARM64-dts-meson-gx-add-VPU-power-domain.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0032-ARM64-dts-meson-gx-Add-HDMI_5V-regulator-on-selected.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0032-ARM64-dts-meson-gx-Add-HDMI_5V-regulator-on-selected.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0032-ARM64-dts-meson-gx-Add-HDMI_5V-regulator-on-selected.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0032-ARM64-dts-meson-gx-Add-HDMI_5V-regulator-on-selected.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0033-ARM64-dts-meson-gx-grow-reset-controller-memory-zone.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0033-ARM64-dts-meson-gx-grow-reset-controller-memory-zone.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0033-ARM64-dts-meson-gx-grow-reset-controller-memory-zone.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0033-ARM64-dts-meson-gx-grow-reset-controller-memory-zone.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0034-ARM64-dts-odroid-c2-Add-HDMI-and-CEC-Nodes.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0034-ARM64-dts-odroid-c2-Add-HDMI-and-CEC-Nodes.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0034-ARM64-dts-odroid-c2-Add-HDMI-and-CEC-Nodes.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0034-ARM64-dts-odroid-c2-Add-HDMI-and-CEC-Nodes.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0035-ARM64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0035-ARM64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0035-ARM64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0035-ARM64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0036-net-phy-meson-gxl-detect-LPA-corruption.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0036-net-phy-meson-gxl-detect-LPA-corruption.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0036-net-phy-meson-gxl-detect-LPA-corruption.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0036-net-phy-meson-gxl-detect-LPA-corruption.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0037-drm-meson-fix-vsync-buffer-update.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0037-drm-meson-fix-vsync-buffer-update.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0037-drm-meson-fix-vsync-buffer-update.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0037-drm-meson-fix-vsync-buffer-update.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0038-Add-3.5-Touchscreen-sx865x-driver.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0038-Add-3.5-Touchscreen-sx865x-driver.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0038-Add-3.5-Touchscreen-sx865x-driver.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0038-Add-3.5-Touchscreen-sx865x-driver.patch
diff --git a/buildroot-external/board/hardkernel/patches/linux-4_14/0039-dts-add-ODROID-3.5-Inch-touchscreen-driver-sx8650.patch b/buildroot-external/board/hardkernel/odroid-c2/patches/linux/0039-dts-add-ODROID-3.5-Inch-touchscreen-driver-sx8650.patch
similarity index 100%
rename from buildroot-external/board/hardkernel/patches/linux-4_14/0039-dts-add-ODROID-3.5-Inch-touchscreen-driver-sx8650.patch
rename to buildroot-external/board/hardkernel/odroid-c2/patches/linux/0039-dts-add-ODROID-3.5-Inch-touchscreen-driver-sx8650.patch
diff --git a/buildroot-external/board/hardkernel/odroid-c2/post-image.sh b/buildroot-external/board/hardkernel/post-image.sh
similarity index 92%
rename from buildroot-external/board/hardkernel/odroid-c2/post-image.sh
rename to buildroot-external/board/hardkernel/post-image.sh
index 94d839af9..23ad1cfc4 100755
--- a/buildroot-external/board/hardkernel/odroid-c2/post-image.sh
+++ b/buildroot-external/board/hardkernel/post-image.sh
@@ -2,14 +2,15 @@
 set -e
 
 SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
-BOARD_DIR="$(dirname $0)"
+BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
+. ${BR2_EXTERNAL_HASSOS_PATH}/meta
+. ${BOARD_DIR}/meta
+
 . ${SCRIPT_DIR}/hdd-image.sh
 . ${SCRIPT_DIR}/name.sh
 . ${SCRIPT_DIR}/ota.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
 
 # Init boot data
 rm -rf ${BOOT_DATA}
diff --git a/buildroot-external/board/ova/info b/buildroot-external/board/ova/meta
similarity index 79%
rename from buildroot-external/board/ova/info
rename to buildroot-external/board/ova/meta
index 1cdc425f6..a05605489 100644
--- a/buildroot-external/board/ova/info
+++ b/buildroot-external/board/ova/meta
@@ -3,4 +3,5 @@ BOARD_NAME="Open Virtual Appliance"
 CHASSIS=vm
 BOOTLOADER=barebox
 KERNEL_FILE=bzImage
-BOOT_SYS=gpt
+BOOT_SYS=efi
+DISK_SIZE=6
diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh
index 8d6515ccf..7312a5157 100755
--- a/buildroot-external/board/ova/post-image.sh
+++ b/buildroot-external/board/ova/post-image.sh
@@ -5,11 +5,12 @@ SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
 BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
+. ${BR2_EXTERNAL_HASSOS_PATH}/meta
+. ${BOARD_DIR}/meta
+
 . ${SCRIPT_DIR}/hdd-image.sh
 . ${SCRIPT_DIR}/name.sh
 . ${SCRIPT_DIR}/ota.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
 
 # Init boot data
 rm -rf ${BOOT_DATA}
diff --git a/buildroot-external/board/raspberrypi/post-image.sh b/buildroot-external/board/raspberrypi/post-image.sh
index 893a6517c..ff6f5b082 100755
--- a/buildroot-external/board/raspberrypi/post-image.sh
+++ b/buildroot-external/board/raspberrypi/post-image.sh
@@ -5,11 +5,12 @@ SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
 BOARD_DIR=${2}
 BOOT_DATA=${BINARIES_DIR}/boot
 
+. ${BR2_EXTERNAL_HASSOS_PATH}/meta
+. ${BOARD_DIR}/meta
+
 . ${SCRIPT_DIR}/hdd-image.sh
 . ${SCRIPT_DIR}/name.sh
 . ${SCRIPT_DIR}/ota.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
 
 # Init boot data
 rm -rf ${BOOT_DATA}
diff --git a/buildroot-external/board/raspberrypi/rpi/info b/buildroot-external/board/raspberrypi/rpi/meta
similarity index 87%
rename from buildroot-external/board/raspberrypi/rpi/info
rename to buildroot-external/board/raspberrypi/rpi/meta
index 8475fa254..4e0cc9368 100644
--- a/buildroot-external/board/raspberrypi/rpi/info
+++ b/buildroot-external/board/raspberrypi/rpi/meta
@@ -3,5 +3,5 @@ BOARD_NAME="RaspberryPi"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=mbr
+BOOT_SYS=hyprid
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi0-w/info b/buildroot-external/board/raspberrypi/rpi0-w/meta
similarity index 88%
rename from buildroot-external/board/raspberrypi/rpi0-w/info
rename to buildroot-external/board/raspberrypi/rpi0-w/meta
index 80dd3ee2a..056946a6d 100644
--- a/buildroot-external/board/raspberrypi/rpi0-w/info
+++ b/buildroot-external/board/raspberrypi/rpi0-w/meta
@@ -3,5 +3,5 @@ BOARD_NAME="RaspberryPi Zero-W"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=mbr
+BOOT_SYS=hyprid
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi2/info b/buildroot-external/board/raspberrypi/rpi2/meta
similarity index 87%
rename from buildroot-external/board/raspberrypi/rpi2/info
rename to buildroot-external/board/raspberrypi/rpi2/meta
index df9e10c43..d24ec65c4 100644
--- a/buildroot-external/board/raspberrypi/rpi2/info
+++ b/buildroot-external/board/raspberrypi/rpi2/meta
@@ -3,5 +3,5 @@ BOARD_NAME="RaspberryPi 2"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=mbr
+BOOT_SYS=hyprid
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi3-64/info b/buildroot-external/board/raspberrypi/rpi3-64/meta
similarity index 88%
rename from buildroot-external/board/raspberrypi/rpi3-64/info
rename to buildroot-external/board/raspberrypi/rpi3-64/meta
index 51a01e899..b6dd5c2e4 100644
--- a/buildroot-external/board/raspberrypi/rpi3-64/info
+++ b/buildroot-external/board/raspberrypi/rpi3-64/meta
@@ -3,5 +3,5 @@ BOARD_NAME="RaspberryPi 3 64bit"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=Image
-BOOT_SYS=mbr
+BOOT_SYS=hyprid
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/board/raspberrypi/rpi3/info b/buildroot-external/board/raspberrypi/rpi3/meta
similarity index 87%
rename from buildroot-external/board/raspberrypi/rpi3/info
rename to buildroot-external/board/raspberrypi/rpi3/meta
index 2e5083119..0f8810ab5 100644
--- a/buildroot-external/board/raspberrypi/rpi3/info
+++ b/buildroot-external/board/raspberrypi/rpi3/meta
@@ -3,5 +3,5 @@ BOARD_NAME="RaspberryPi 3"
 CHASSIS=embedded
 BOOTLOADER=uboot
 KERNEL_FILE=zImage
-BOOT_SYS=mbr
+BOOT_SYS=hyprid
 BOOT_ENV_SIZE=0x4000
diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig
index 128d36f56..4da95de71 100644
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_KERNEL_HEADERS_4_14=y
 BR2_GCC_VERSION_7_X=y
@@ -14,12 +14,11 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
-BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches/linux-4_14"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos-4_14.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig
index f52564ec1..9cf34fe02 100644
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/tinker/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
@@ -16,13 +16,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/tinker/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/tinker"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.59"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/tinker/kernel.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos-4_14.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -75,13 +75,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/tinker/uboot.config"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config"
 BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/tinker/uboot-boot.sh"
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.sh"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
diff --git a/buildroot-external/info b/buildroot-external/meta
similarity index 100%
rename from buildroot-external/info
rename to buildroot-external/meta
diff --git a/buildroot-external/misc/mbr-part.rules b/buildroot-external/misc/mbr-part.rules
new file mode 100644
index 000000000..c8be3b15f
--- /dev/null
+++ b/buildroot-external/misc/mbr-part.rules
@@ -0,0 +1,6 @@
+ENV{ID_PART_ENTRY_UUID}=="48617373-01", SYMLINK+="disk/by-partlabel/hassos-boot"
+ENV{ID_PART_ENTRY_UUID}=="48617373-05", SYMLINK+="disk/by-partlabel/hassos-kernel0"
+ENV{ID_PART_ENTRY_UUID}=="48617373-06", SYMLINK+="disk/by-partlabel/hassos-system0"
+ENV{ID_PART_ENTRY_UUID}=="48617373-07", SYMLINK+="disk/by-partlabel/hassos-kernel1"
+ENV{ID_PART_ENTRY_UUID}=="48617373-08", SYMLINK+="disk/by-partlabel/hassos-system1"
+ENV{ID_PART_ENTRY_UUID}=="48617373-09", SYMLINK+="disk/by-partlabel/hassos-bootstate"
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index ceb50afb0..d864eea8d 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -219,7 +219,7 @@ function create_disk_mbr() {
     # Update disk layout
     (
         echo "label: dos"
-        echo "label-id: 0x0d3e0000"
+        echo "label-id: 0x48617373"
         echo "unit: sectors"
         echo "hassos-boot      : start= ${boot_start},      size=  ${boot_size},      type=c, bootable"   #create the boot partition
         echo "hassos-extended  : start= ${extended_start},  size=  ${extended_size},  type=5"             #Make an extended partition
diff --git a/buildroot-external/scripts/post-build.sh b/buildroot-external/scripts/post-build.sh
index eeb964c2f..d840ce69f 100755
--- a/buildroot-external/scripts/post-build.sh
+++ b/buildroot-external/scripts/post-build.sh
@@ -4,9 +4,10 @@ set -e
 SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
 BOARD_DIR=${2}
 
+. ${BR2_EXTERNAL_HASSOS_PATH}/meta
+. ${BOARD_DIR}/meta
+
 . ${SCRIPT_DIR}/rootfs-layer.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
 . ${SCRIPT_DIR}/name.sh
 . ${SCRIPT_DIR}/rauc.sh
 
@@ -35,7 +36,7 @@ install_hassos_cli
 ) > ${TARGET_DIR}/etc/machine-info
 
 
-# Setup rauc
+# Setup RAUC
 write_rauc_config
 install_rauc_certs
 install_bootloader_config
diff --git a/buildroot-external/scripts/rauc.sh b/buildroot-external/scripts/rauc.sh
index 7d4101f24..a7376c582 100755
--- a/buildroot-external/scripts/rauc.sh
+++ b/buildroot-external/scripts/rauc.sh
@@ -23,36 +23,35 @@ function _write_rauc_boot() {
     local boot_device=${1}
     (
         echo "[slot.boot.0]"
-        echo "device=${boot_device}"
+        echo "device=/dev/disk/by-partlabel/hassos-boot"
         echo "type=vfat"
     ) >> ${TARGET_DIR}/etc/rauc/system.conf
 
-    if [ "${BOOT_SYS}" != "spl" ]; then
+    # SPL
+    if ! [[ "${BOOT_SYS}" =~ (spl|mbr) ]]; then
         return 0
     fi
 
     (
         echo "[slot.spl.0]"
-        echo "device=${boot_device}"
+        echo "device=/dev/disk/by-partlabel/hassos-boot"
         echo "type=raw"
     ) >> ${TARGET_DIR}/etc/rauc/system.conf
 }
 
 
 function _write_rauc_system() {
-    local kernel_device=${1}
-    local system_device=${2}
-    local slot_num=${3}
-    local slot_name=${4}
+    local slot_num=${1}
+    local slot_name=${2}
 
     (
         echo "[slot.kernel.${slot_num}]"
-        echo "device=${kernel_device}"
+        echo "device=/dev/disk/by-partlabel/hassos-kernel${slot_num}"
         echo "type=ext4"
         echo "bootname=${slot_name}"
 
         echo "[slot.rootfs.${slot_num}]"
-        echo "device=${system_device}"
+        echo "device=/dev/disk/by-partlabel/hassos-system${slot_num}"
         echo "type=raw"
         echo "parent=kernel.${slot_num}"
     ) >> ${TARGET_DIR}/etc/rauc/system.conf
@@ -60,18 +59,12 @@ function _write_rauc_system() {
 
 
 function write_rauc_config() {
-    local boot_d="${PART_BOOT:-/dev/disk/by-partlabel/hassos-boot}"
-    local kernel_d0="${PART_KERNEL_0:-/dev/disk/by-partlabel/hassos-kernel0}"
-    local system_d0="${PART_SYSTEM_0:-/dev/disk/by-partlabel/hassos-system0}"
-    local kernel_d1="${PART_KERNEL_1:-/dev/disk/by-partlabel/hassos-kernel1}"
-    local system_d1="${PART_SYSTEM_1:-/dev/disk/by-partlabel/hassos-system1}"
-
     mkdir -p ${TARGET_DIR}/etc/rauc
 
     _create_rauc_header
-    _write_rauc_boot "${boot_d}"
-    _write_rauc_system "${kernel_d0}" "${system_d0}" 0 A
-    _write_rauc_system "${kernel_d1}" "${system_d1}" 1 B
+    _write_rauc_boot
+    _write_rauc_system 0 A
+    _write_rauc_system 1 B
 }
 
 
@@ -85,11 +78,15 @@ function install_rauc_certs() {
 
 
 function install_bootloader_config() {
-    local boot_env="${BOOT_ENV:-/dev/disk/by-partlabel/hassos-bootstate}"
-    local boot_env_off="${BOOT_ENV_OFF:-0x0000}"
     if [ "${BOOTLOADER}" == "uboot" ]; then
-        echo -e "${boot_env}\t${boot_env_off}\t${BOOT_ENV_SIZE}" > ${TARGET_DIR}/etc/fw_env.config
+        echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > ${TARGET_DIR}/etc/fw_env.config
     else
-        cp ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${TARGET_DIR}/etc/barebox-state.dtb
+        cp -f ${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb ${TARGET_DIR}/etc/barebox-state.dtb
+    fi
+
+    # Fix MBR
+    if [ "${BOOT_SYS}" == "mbr" ]; then
+        mkdir -p ${TARGET_DIR}/etc/udev/rules.d
+	cp -f ${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-fix.rules ${TARGET_DIR}/etc/udev/rules.d/
     fi
 }