From 72cfce2d9435039e2afdf0716d5efaf3969715be Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 30 Jun 2022 22:30:27 +0800 Subject: [PATCH] Update config-xxx.txt --- bsp/images/boot/config-nolcd.txt | 15 ++++++++------- bsp/images/boot/config-lcd.txt | 13 +++++++------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/bsp/images/boot/config-lcd.txt b/bsp/images/boot/config-lcd.txt index 802f335..352ae27 100644 --- a/bsp/images/boot/config-lcd.txt +++ b/bsp/images/boot/config-lcd.txt @@ -7,17 +7,18 @@ # Enable I2C overlay dtoverlay_i2c1=yes -# Can not enable SPI overlay here for conflict with LCD -#dtoverlay_spi1=no +# Enable SPI overlay, SPI1 conflict with UART8(NB-IoT/4G module) +dtoverlay_spi1=yes -# Can not enable UART7 overlays here for conflict with LCD -dtoverlay_uart=2 3 4 +# Enable UART overlay +dtoverlay_uart=2 3 4 7 # Enable CAN overlays dtoverlay_can=1 2 -# Enable PWM overlays +# Enable PWM overlays, PWM8 conflict with UART8(NB-IoT/4G module) dtoverlay_pwm=7 8 # Extra overlays -#dtoverlay_extra=cam +#dtoverlay_extra=nbiot-4g + diff --git a/bsp/images/boot/config-nolcd.txt b/bsp/images/boot/config-nolcd.txt index 93b2117..cf5e848 100644 --- a/bsp/images/boot/config-nolcd.txt +++ b/bsp/images/boot/config-nolcd.txt @@ -2,22 +2,23 @@ #dtoverlay_lcd=no # Enable Camera overlay -#dtoverlay_cam=yes +#dtoverlay_cam=no # Enable I2C overlay dtoverlay_i2c1=yes -# Enable SPI overlay, SPI1 conflict with LCD -dtoverlay_spi1=yes +# Enable SPI overlay, SPI1 conflict with UART8(NB-IoT/4G module) +#dtoverlay_spi1=no -# Enable UART overlays, UART7 conflict with LCD +# Enable UART overlays dtoverlay_uart=2 3 4 7 # Enable CAN overlays dtoverlay_can=1 2 -# Enable PWM overlays -dtoverlay_pwm=7 8 +# Enable PWM overlays, PWM8 conflict with UART8(NB-IoT/4G module) +dtoverlay_pwm=7 # Enable extra overlays -#dtoverlay_extra=cam +dtoverlay_extra=nbiot-4g + -- Gitblit v1.9.1