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

moved kernel and dtb to rootfs

Browse Source 
Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
This commit is contained in:
Michel Stempin 2020-10-14 23:34:04 +02:00
parent fd37e116dd
commit 1e514b2d91
3 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,3 @@
image boot.vfat {
vfat {
files = {
"zImage",
"sun8i-v3s-funkey.dtb",
}
}
size = 8M
}
image boot_alt.vfat {
vfat {
files = {
"zImage",
"sun8i-v3s-funkey.dtb",
}
}
size = 8M
}
image sdcard.img { image sdcard.img {
hdimage { hdimage {
gpt = true gpt = true
@ -58,15 +38,13 @@ image sdcard.img {
partition boot { partition boot {
offset = 1M offset = 1M
partition-type = 0xC partition-type = 0xC
bootable = "true" size = 8M
image = "boot.vfat"
} }
partition boot_alt { partition boot_alt {
offset = 9M offset = 9M
partition-type = 0xC partition-type = 0xC
bootable = "true" size = 8M
image = "boot_alt.vfat"
} }
partition rootfs { partition rootfs {

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

@ -1,7 +1,7 @@
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; bootz ${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:4 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
alt_loadimage=load mmc 0:2 ${loadaddr} zImage alt_loadimage=load mmc 0:4 ${loadaddr} /boot/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; bootz ${loadaddr} - ${fdtaddr} bootcmd=run args_mmc; run loadfdt; run loadimage; bootz ${loadaddr} - ${fdtaddr}
@ -10,8 +10,8 @@ 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:3 ${fdtaddr} /boot/sun8i-v3s-funkey.dtb
loadimage=load mmc 0:1 ${loadaddr} zImage loadimage=load mmc 0:3 ${loadaddr} /boot/zImage
stderr=serial@01c28000 stderr=serial@01c28000
stdin=serial@01c28000 stdin=serial@01c28000
stdout=serial@01c28000 stdout=serial@01c28000

1
FunKey/configs/funkey_defconfig
View File

@ -25,6 +25,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/li
BR2_LINUX_KERNEL_LZO=y BR2_LINUX_KERNEL_LZO=y
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_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config" BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS=y