Merge pull request #11 from brain-hackers/fix-font

sharp: specify 6x11
brain-hackers · Mar 22, 2021 · 6390f0e · 6390f0e
2 parents 320491a + 474bdfb
commit 6390f0e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/include/configs/pwg5300.h b/include/configs/pwg5300.h
@@ -60,7 +60,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh1.h b/include/configs/pwsh1.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh2.h b/include/configs/pwsh2.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh3.h b/include/configs/pwsh3.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh4.h b/include/configs/pwsh4.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh5.h b/include/configs/pwsh5.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh6.h b/include/configs/pwsh6.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \

diff --git a/include/configs/pwsh7.h b/include/configs/pwsh7.h
@@ -74,7 +74,7 @@
 	"mmcpart=1\0" \
 	"mmcroot=/dev/mmcblk1p2 rw rootwait\0" \
 	"mmcargs=setenv bootargs console=${console_mainline},${baudrate} console=tty1 " \
-		"root=${mmcroot}\0" \
+		"root=${mmcroot} fbcon=font:ProFont6x11\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \