diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg index 517ed3b..3e98825 100644 --- a/FunKey/board/funkey/genimage.cfg +++ b/FunKey/board/funkey/genimage.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "uImage", + "zImage", "sun8i-v3s-funkey.dtb", } } @@ -11,7 +11,7 @@ image boot.vfat { image boot_alt.vfat { vfat { files = { - "uImage", + "zImage", "sun8i-v3s-funkey.dtb", } } diff --git a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env index 9a505af..c19fec5 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env +++ b/FunKey/board/funkey/rootfs-overlay/etc/u-boot.env @@ -1,17 +1,17 @@ alt_args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p4 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet -alt_bootcmd=run alt_args_mmc; run alt_loadfdt; run alt_loadimage; bootm ${loadaddr} - ${fdtaddr} +alt_bootcmd=run alt_args_mmc; run alt_loadfdt; run alt_loadimage; bootz ${loadaddr} - ${fdtaddr} alt_loadfdt=load mmc 0:2 ${fdtaddr} sun8i-v3s-funkey.dtb -alt_loadimage=load mmc 0:2 ${loadaddr} uImage +alt_loadimage=load mmc 0:2 ${loadaddr} zImage args_mmc=setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p3 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet baudrate=115200 -bootcmd=run args_mmc; run loadfdt; run loadimage; bootm ${loadaddr} - ${fdtaddr} +bootcmd=run args_mmc; run loadfdt; run loadimage; bootz ${loadaddr} - ${fdtaddr} bootdelay=0 console=ttyS0,115200 fdt_high=0xffffffff fdtaddr=0x41800000 loadaddr=0x41000000 loadfdt=load mmc 0:1 ${fdtaddr} sun8i-v3s-funkey.dtb -loadimage=load mmc 0:1 ${loadaddr} uImage +loadimage=load mmc 0:1 ${loadaddr} zImage stderr=serial@01c28000 stdin=serial@01c28000 stdout=serial@01c28000 diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index ce989cc..522bdcd 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -22,9 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/FunKey-Project/linux" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cda44c146b9b87290bc7c636ffa7d88cbfb03ace" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config" -BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_LZO=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x41000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-funkey" BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config"