diff --git a/FunKey/board/funkey/boot.cmd b/FunKey/board/funkey/boot.cmd index e51f623..57c8347 100644 --- a/FunKey/board/funkey/boot.cmd +++ b/FunKey/board/funkey/boot.cmd @@ -1,4 +1,4 @@ setenv bootargs console=ttyS0,115200 panic=5 console=tty0 rootwait fbcon=map:10 fbcon=font:VGA8x8 root=/dev/mmcblk0p2 earlyprintk rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet -load mmc 0:1 0x41000000 zImage +load mmc 0:1 0x41000000 uImage load mmc 0:1 0x41800000 sun8i-v3s-funkey.dtb -bootz 0x41000000 - 0x41800000 +bootm 0x41000000 - 0x41800000 diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg index 5d35471..a40faa2 100644 --- a/FunKey/board/funkey/genimage.cfg +++ b/FunKey/board/funkey/genimage.cfg @@ -1,7 +1,7 @@ image boot.vfat { vfat { files = { - "zImage", + "uImage", "sun8i-v3s-funkey.dtb", "boot.scr" } diff --git a/FunKey/board/funkey/readme.txt b/FunKey/board/funkey/readme.txt index 74e959d..edef6a0 100644 --- a/FunKey/board/funkey/readme.txt +++ b/FunKey/board/funkey/readme.txt @@ -54,7 +54,7 @@ After building, you should obtain this tree: +-- sun8i-v3s-funkey.dtb +-- u-boot.bin +-- u-boot-sunxi-with-spl.bin - `-- zImage + `-- uImage How to write the SD card ======================== diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index 133c4e5..62c89ef 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -21,7 +21,9 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Lichee-Pi/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"