Skip to content

Commit 823ddcf

Browse files
committed
allwinner/nezha: update boot script
Signed-off-by: Christian Stewart <[email protected]>
1 parent d2bb758 commit 823ddcf

File tree

2 files changed

+7
-11
lines changed
  • configs/allwinner

2 files changed

+7
-11
lines changed

configs/allwinner/licheerv/resources/boot-scripts/boot.txt

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ echo "SkiffOS U-Boot for Allwinner LicheeRV loaded from ${devtype} ${devnum}"
44
setenv verify 0
55
setenv bootlogo "false"
66

7-
setenv condev "earlycon=sbi console=ttyS0,115200n8 loglevel=8"
7+
# earlyprintk=sunxi-uart,0x02500000
8+
setenv condev "earlycon=sbi console=ttyS0,115200n8 loglevel=7"
89

910
# use /init script to deferred mount /
1011
setenv bootmem "root=/dev/mmcblk0p1 rootwait rw init=/boot/skiff-init/skiff-init-squashfs"
1112

1213
# base kernel config options
1314
setenv baseconfig "fsck.repair=yes net.ifnames=0 cma=96M"
1415

15-
# setenv videoconfig "video=HDMI-A-1:D fbcon=map:0"
16-
1716
# final boot args
18-
setenv bootargs "${bootmem} ${condev} ${baseconfig} ${videoconfig}"
17+
setenv bootargs "${bootmem} ${condev} ${baseconfig}"
1918

2019
# Load kernel and dtb
2120
echo "Loading Image..."
@@ -24,10 +23,6 @@ ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} /boot/Image
2423
# echo "Loading sun20i-d1-lichee-rv-dock.dtb..."
2524
# ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} /boot/sun20i-d1-lichee-rv-dock.dtb
2625

27-
# fdt adjustments
28-
# fdt addr ${fdt_addr_r}
29-
# fdt resize
30-
3126
# Boot the board
3227
# booti ${kernel_addr_r} - ${fdt_addr_r}
3328
booti ${kernel_addr_r} - ${fdtcontroladdr}

configs/allwinner/nezha/resources/boot-scripts/boot.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ echo "SkiffOS U-Boot for Allwinner Nezha loaded from ${devtype} ${devnum}"
44
setenv verify 0
55
setenv bootlogo "false"
66

7-
setenv condev "earlyprintk=sunxi-uart,0x02500000 earlycon=sbi console=ttyS0,115200 loglevel=8"
7+
# earlyprintk=sunxi-uart,0x02500000
8+
setenv condev "earlycon=sbi console=ttyS0,115200n8 loglevel=7"
89

910
# use /init script to deferred mount /
1011
setenv bootmem "root=/dev/mmcblk0p1 rootwait rw init=/boot/skiff-init/skiff-init-squashfs"
@@ -21,7 +22,7 @@ ext4load ${devtype} ${devnum}:1 ${kernel_addr_r} /boot/Image
2122

2223
# echo "Loading sun20i-d1-nezha.dtb..."
2324
# ext4load ${devtype} ${devnum}:1 ${fdt_addr_r} /boot/sun20i-d1-nezha.dtb
24-
# booti ${kernel_addr_r} - ${fdt_addr_r}
2525

26-
# Boot the board, re-using the u-boot fdt
26+
# Boot the board
27+
# booti ${kernel_addr_r} - ${fdt_addr_r}
2728
booti ${kernel_addr_r} - ${fdtcontroladdr}

0 commit comments

Comments
 (0)