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

removed boot partitions

Browse Source 
Signed-off-by: Michel Stempin <michel.stempin@wanadoo.fr>
This commit is contained in:
Michel Stempin 2020-10-14 23:44:39 +02:00
parent 1e514b2d91
commit 32b078701f
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,34 +35,22 @@ image sdcard.img {
# size = 16K # size = 16K
# } # }
partition boot {
offset = 1M
partition-type = 0xC
size = 8M
}
partition boot_alt {
offset = 9M
partition-type = 0xC
size = 8M
}
partition rootfs { partition rootfs {
offset = 17M offset = 1M
partition-type = 0x83 partition-type = 0x83
image = "rootfs.ext4" image = "rootfs.ext4"
size = 111M size = 100M
} }
partition rootfs_alt { partition rootfs_alt {
offset = 128M offset = 101M
partition-type = 0x83 partition-type = 0x83
image = "rootfs.ext4" image = "rootfs.ext4"
size = 128M size = 100M
} }
# partition share { # partition share {
# offset = 256M # offset = 201M
# partition-type = 0xC # partition-type = 0xC
# bootable = "false" # bootable = "false"
# size = 0 # size = 0

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

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