funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2025-12-16 09:38:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

use zImage instead of uImage

Browse Source 
Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
This commit is contained in:
Michel Stempin 2020-10-14 22:44:45 +02:00
parent d42f1c1d0f
commit fd37e116dd
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FunKey/board/funkey/genimage.cfg
View File

@ -1,7 +1,7 @@
image boot.vfat { image boot.vfat {
vfat { vfat {
files = { files = {
"uImage", "zImage",
"sun8i-v3s-funkey.dtb", "sun8i-v3s-funkey.dtb",
} }
} }
@ -11,7 +11,7 @@ image boot.vfat {
image boot_alt.vfat { image boot_alt.vfat {
vfat { vfat {
files = { files = {
"uImage", "zImage",
"sun8i-v3s-funkey.dtb", "sun8i-v3s-funkey.dtb",
} }
} }

8
FunKey/board/funkey/rootfs-overlay/etc/u-boot.env
View File

@ -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_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_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 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 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 bootdelay=0
console=ttyS0,115200 console=ttyS0,115200
fdt_high=0xffffffff fdt_high=0xffffffff
fdtaddr=0x41800000 fdtaddr=0x41800000
loadaddr=0x41000000 loadaddr=0x41000000
loadfdt=load mmc 0:1 ${fdtaddr} sun8i-v3s-funkey.dtb 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 stderr=serial@01c28000
stdin=serial@01c28000 stdin=serial@01c28000
stdout=serial@01c28000 stdout=serial@01c28000

2
FunKey/configs/funkey_defconfig
View File

@ -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_CUSTOM_REPO_VERSION="cda44c146b9b87290bc7c636ffa7d88cbfb03ace"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/linux.config" 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_LZO=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x41000000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-funkey" BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-funkey"
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config" BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config"