Skip to content

Commit 321c263

Browse files
committed
[RPI] move cma configuration to config.txt (resolve issue 1)
1 parent 4595359 commit 321c263

File tree

4 files changed

+34
-24
lines changed

4 files changed

+34
-24
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cma=384M mitigations=off snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_compat_alsa=0 dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u
1+
mitigations=off snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_compat_alsa=0 dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u,0bda:9210:u

buildroot-external/board/ovos/raspberrypi/rpi3/config.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Raspberry Pi 3 Configuration
22

3+
# Basic setting
4+
arm_64bit=1
5+
36
# Disable command line tags.
47
disable_commandline_tags=2
58

@@ -8,6 +11,7 @@ armstub=RPI_EFI.fd
811

912
# Enable UART for serial communication.
1013
enable_uart=1
14+
uart_2ndstage=1
1115

1216
# Set device tree memory address range.
1317
device_tree_address=0x1f0000
@@ -23,8 +27,8 @@ disable_overscan=1
2327
# Auto-detect DSI displays and load overlays.
2428
display_auto_detect=1
2529

26-
# Enable DRM VC4 V3D driver for graphics acceleration.
27-
dtoverlay=vc4-fkms-v3d
30+
# Graphics acceleration with VC4 V3D driver, uses 384MB CMA limited to 2 framebuffer.
31+
dtoverlay=vc4-fkms-v3d,cma-384
2832
max_framebuffers=2
2933

3034
# Uncomment for HDMI safe mode.
@@ -34,9 +38,6 @@ max_framebuffers=2
3438
# 256, 512 or 1024 MB total memory
3539
gpu_mem=256
3640

37-
# Fixes for serial console on certain Pi models.
38-
dtoverlay=miniuart-bt
39-
4041
# Enable Bluetooth driver autoprobing.
4142
dtparam=krnbt=on
4243

@@ -54,8 +55,11 @@ dtparam=random=on
5455
# Disable rainbow splash screen on boot.
5556
disable_splash=1
5657

57-
# Enable I2C, I2S and SPI for peripheral communication.
58-
dtparam=i2c=on,i2s=on,spi=on
58+
# Enable I2C, I2S, and SPI interfaces for peripheral communication.
59+
dtparam=i2c=on
60+
dtparam=i2c_arm=on
61+
dtparam=spi=on
62+
dtparam=i2s=on
5963

6064
# Use DWC2 instead of XHCI on the rpi3 to prevent issues with te RealTime kernel
6165
dtoverlay=dwc2

buildroot-external/board/ovos/raspberrypi/rpi4/config.txt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Raspberry Pi 4 Configuration
22

3+
# Basic setting
4+
arm_64bit=1
5+
36
# Specify UEFI firmware file.
47
armstub=RPI_EFI.fd
58

69
# Enable UART for serial communication.
710
enable_uart=1
11+
uart_2ndstage=1
812

913
# Enable GIC (Generic Interrupt Controller).
1014
enable_gic=1
@@ -26,10 +30,8 @@ disable_overscan=1
2630
# Auto-detect DSI displays and load overlays.
2731
display_auto_detect=1
2832

29-
# Enable DRM VC4 V3D driver for graphics acceleration.
30-
dtoverlay=vc4-fkms-v3d
31-
# Optional: Uncomment for Pi 4 specific settings
32-
# dtoverlay=vc4-kms-v3d-pi4
33+
# Graphics acceleration with VC4 V3D driver, uses 384MB CMA limited to 2 framebuffer.
34+
dtoverlay=vc4-fkms-v3d,cma-384
3335
max_framebuffers=2
3436

3537
# Uncomment for HDMI safe mode.
@@ -39,9 +41,6 @@ max_framebuffers=2
3941
# 256, 512 or 1024 MB total memory
4042
gpu_mem=256
4143

42-
# Fixes for serial console on certain Pi models.
43-
dtoverlay=miniuart-bt
44-
4544
# Enable Bluetooth driver autoprobing.
4645
dtparam=krnbt=on
4746

@@ -59,8 +58,11 @@ dtparam=random=on
5958
# Disable rainbow splash screen on boot.
6059
disable_splash=1
6160

62-
# Enable I2C, I2S and SPI for peripheral communication.
63-
dtparam=i2c=on,i2s=on,spi=on
61+
# Enable I2C, I2S, and SPI interfaces for peripheral communication.
62+
dtparam=i2c=on
63+
dtparam=i2c_arm=on
64+
dtparam=spi=on
65+
dtparam=i2s=on
6466

6567
# Enable CPU frequency boost on compatible models.
6668
arm_boost=1

buildroot-external/board/ovos/raspberrypi/rpi5/config.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Raspberry Pi 5 Configuration
22

3+
# Basic setting
4+
arm_64bit=1
5+
36
# Specify UEFI firmware file for booting in UEFI mode.
47
armstub=RPI_EFI.fd
58

69
# Enable UART for serial communication.
710
enable_uart=1
11+
uart_2ndstage=1
812

913
# Enable ttyAMA0 serial console.
1014
dtoverlay=uart0-pi5
@@ -47,15 +51,15 @@ disable_overscan=1
4751
# Automatic display detection for optimal settings.
4852
display_auto_detect=1
4953

50-
# Graphics acceleration with VC4 V3D driver, limited to 2 framebuffer.
51-
dtoverlay=vc4-fkms-v3d
54+
# Graphics acceleration with VC4 V3D driver, uses 512MB CMA limited to 2 framebuffer.
55+
dtoverlay=vc4-fkms-v3d,cma-512
5256
max_framebuffers=2
5357

54-
# Enable I2C, I2S and SPI for peripheral communication.
55-
dtparam=i2c=on,i2s=on,spi=on
56-
57-
# Bluetooth over mini UART, balancing UART use.
58-
dtoverlay=miniuart-bt
58+
# Enable I2C, I2S, and SPI interfaces for peripheral communication.
59+
dtparam=i2c=on
60+
dtparam=i2c_arm=on
61+
dtparam=spi=on
62+
dtparam=i2s=on
5963

6064
# Uncomment to disable Bluetooth.
6165
#dtoverlay=disable-bt

0 commit comments

Comments
 (0)