diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-18 14:35:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-01-19 14:28:44 +0100 |
| commit | 1e8364a5ba7d9a5f5ef40b862c342b18d6c1d310 (patch) | |
| tree | 3233835c678d9c5175454659f2500d79e6ff3d6d | |
| parent | 5ee29b88a01fda7482280f5bd370d491f56a8093 (diff) | |
rpi4: fix serial console output
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 12 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 2a2b83b4f..da3d8622f 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/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 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index db9226b3f..e8468956f 100644 --- a/target/config/Config.in.runtime +++ b/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 |