Browse Source

rpi4: fix serial console output

Waldemar Brodkorb 1 year ago
parent
commit
1e8364a5ba
2 changed files with 12 additions and 1 deletions
  1. 12 0
      package/bcm28xx-bootloader/Makefile
  2. 0 1
      target/config/Config.in.runtime

+ 12 - 0
package/bcm28xx-bootloader/Makefile

@@ -38,6 +38,14 @@ INSTALL_STYLE:=         manual
 do-install:
 	$(INSTALL_DIR) $(IDIR_BCM28XX_BOOTLOADER)/boot
 	$(CP) $(WRKBUILD)/boot/bootcode.bin $(IDIR_BCM28XX_BOOTLOADER)/boot/
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_SERIAL_ONLY),y)
+	printf "console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \
+			$(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
+ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y)
+	printf "console=tty0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" > \
+			$(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt
+endif
 	printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 	printf "dtparam=audio,i2s,spi,i2c\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
@@ -104,6 +112,10 @@ ifeq ($(ADK_TARGET_HARDWARE_RPI3_SERIAL),y)
 	printf "enable_uart=1\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
 endif
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4),y)
+	printf "enable_uart=1\n" >> \
+		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
+endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3_64)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y)
 	printf "arm_control=0x200\n" >> \
 		$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt

+ 0 - 1
target/config/Config.in.runtime

@@ -363,7 +363,6 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3
-	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI4
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64
 	default "ttyDA1" if ADK_TARGET_SYSTEM_QEMU_METAG