diff --git a/device/testing/device-odroid-xu4/APKBUILD b/device/testing/device-odroid-xu4/APKBUILD
index 2e52c7203..c94184c66 100644
--- a/device/testing/device-odroid-xu4/APKBUILD
+++ b/device/testing/device-odroid-xu4/APKBUILD
@@ -3,39 +3,26 @@
 
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=0.1
-pkgrel=2
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="linux-postmarketos-exynos5
-	 postmarketos-base
+	 postmarketos-base>=25-r1
 	 u-boot-odroid
-	 u-boot-tools
 	"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo uboot-script.cmd"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
-	mkimage \
-		-A arm \
-		-O linux \
-		-T script \
-		-C none \
-		-a 0 \
-		-e 0 \
-		-n postmarketos \
-		-d "$srcdir"/uboot-script.cmd \
-		"$srcdir"/boot.scr
 }
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/boot.scr \
-		"$pkgdir"/boot/boot.scr
 }
 
 nonfree_firmware() {
@@ -45,6 +32,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-59528a57adafb1510c86a8ae1569243488a0abbe6907543f33a03ff1bdc60780c58ebe409b99e6d81b2bbaea6972965d194924e4117a06c3dfb88fa6b44032a5  deviceinfo
-d6001fde71fb393ddf74838a7c2a29635a540f9f466ba8dfdea0fd053bbe99ffa491cb05a0b510f58ca31c80d8483387b1d019e905ff09b9f44a1033fcda7705  uboot-script.cmd
+dc89cd7b207b84fa8bdd1d26ffc16f89261123c92b3575e4b998cbdffa0752ebcf7fa130ec742cfb13b2066d7ae1bb9fb55621d67840ebfec17ab9fe5064866c  deviceinfo
 "
diff --git a/device/testing/device-odroid-xu4/deviceinfo b/device/testing/device-odroid-xu4/deviceinfo
index 9fa7340de..4724adfe8 100644
--- a/device/testing/device-odroid-xu4/deviceinfo
+++ b/device/testing/device-odroid-xu4/deviceinfo
@@ -11,7 +11,6 @@ deviceinfo_dtb="exynos5422-odroidxu4"
 deviceinfo_append_dtb="false"
 deviceinfo_arch="armv7"
 deviceinfo_no_framebuffer="true"
-deviceinfo_generate_legacy_uboot_initfs="true"
 deviceinfo_getty="ttySAC2;115200"
 deviceinfo_disable_dhcpd="true"
 deviceinfo_modules_initfs="uas usb-storage scsi_mod sd_mod t10_pi"
@@ -27,3 +26,5 @@ deviceinfo_flash_method="none"
 deviceinfo_sd_embed_firmware="u-boot/odroid-xu3/bl1.bin:1,u-boot/odroid-xu3/bl2.bin:31,u-boot/odroid-xu3/u-boot.bin:63,u-boot/odroid-xu3/tzsw.bin:2111"
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_boot_part_start="3072"
+deviceinfo_kernel_cmdline="init=/init.sh rw console=tty0 console=ttySAC2,115200 panic=10 consoleblank=0 loglevel=9 cma=256M PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_generate_extlinux_config="true"
diff --git a/device/testing/device-odroid-xu4/uboot-script.cmd b/device/testing/device-odroid-xu4/uboot-script.cmd
deleted file mode 100644
index 9f180dc55..000000000
--- a/device/testing/device-odroid-xu4/uboot-script.cmd
+++ /dev/null
@@ -1,26 +0,0 @@
-setenv kernel_addr_r "0x40000000"
-setenv initrd_addr_r "0x42000000"
-setenv fdt_addr_r "0x44000000"
-setenv kernel_image "vmlinuz"
-setenv initrd_image "uInitrd"
-setenv dtb_file "exynos5422-odroidxu4.dtb"
-
-printenv
-
-echo Setting bootargs
-setenv bootargs init=/init.sh rw console=tty0 console=ttySAC2,115200 panic=10 consoleblank=0 loglevel=9 cma=256M PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
-
-echo Loading Kernel
-load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} ${kernel_image}
-
-echo Loading Initramfs
-load mmc ${mmcbootdev}:${mmcbootpart} ${initrd_addr_r} ${initrd_image}
-
-echo Loading DTB
-load mmc ${mmcbootdev}:${mmcbootpart} ${fdt_addr_r} ${dtb_file}
-
-echo Resizing FDT
-fdt addr ${fdt_addr_r}
-
-echo Booting kernel
-bootz ${kernel_addr_r} ${initrd_addr_r} ${fdt_addr_r}