Merge pull request #7449 from HiassofT/le11-distroconfig-composite

RPi: add support for composite video output, increase CMA on RPi2

packages/tools/bcm2835-bootloader/files/config.txt

@@ -17,15 +17,21 @@ gpu_mem=76
 # rebooting.
 hdmi_ignore_cec_init=1
 
-################################################################################
-# Include distribution specific config file if it exists.
-################################################################################
 [all]
+################################################################################
+# Use distroconfig-composite.txt instead of distroconfig.txt to enable
+# composite video output.
+# The composite video mode needs to be configured in cmdline.txt:
+# For PAL add: video=Composite-1:720x576@50ie
+# For NTSC add: video=Composite-1:720x480@60ie
+################################################################################
 include distroconfig.txt
-
-# uncomment to enable infrared remote recevier connected to GPIO 18
-#dtoverlay=gpio-ir,gpio_pin=18
+#include distroconfig-composite.txt
 
 # uncomment to enable analog audio output
 #dtparam=audio=on
 #audio_pwm_mode=1
+
+# uncomment to enable infrared remote receiver connected to GPIO 18
+#dtoverlay=gpio-ir,gpio_pin=18
+

packages/tools/bcm2835-bootloader/files/distroconfig-composite.txt

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
+display_auto_detect=1
+dtoverlay=vc4-kms-v3d,composite=1
+dtoverlay=
+disable_overscan=1
+disable_fw_kms_setup=1

packages/tools/bcm2835-bootloader/files/update.sh

@@ -47,10 +47,12 @@ else
   fi
 fi
 
-# Add distro config file
-if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then
-  cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT
-fi
+# Add distro config files
+for distro in "$SYSTEM_ROOT/usr/share/bootloader/distroconfig"*.txt ; do
+  if [ -f "${distro}" ]; then
+    cp -p "${distro}" $BOOT_ROOT
+  fi
+done
 
 # mount $BOOT_ROOT r/o
 sync

packages/tools/bcm2835-bootloader/package.mk

@@ -29,5 +29,6 @@ makeinstall_target() {
     find_file_path bootloader/canupdate.sh && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader
 
     find_file_path config/distroconfig.txt ${PKG_DIR}/files/distroconfig.txt && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader
+    find_file_path config/distroconfig-composite.txt ${PKG_DIR}/files/distroconfig-composite.txt && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader
     find_file_path config/config.txt ${PKG_DIR}/files/config.txt && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader
 }

packages/tools/bcm2835-bootloader/release

@@ -15,6 +15,8 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader
   if [ -f $INSTALL/usr/share/bootloader/config.txt ]; then
     cp -PR $INSTALL/usr/share/bootloader/config.txt $RELEASE_DIR/3rdparty/bootloader/
   fi
-  if [ -f $INSTALL/usr/share/bootloader/distroconfig.txt ]; then
-    cp -PR $INSTALL/usr/share/bootloader/distroconfig.txt $RELEASE_DIR/3rdparty/bootloader/
-  fi
+  for distro in "$INSTALL/usr/share/bootloader/distroconfig"*.txt ; do
+    if [ -f "${distro}" ]; then
+      cp -PR "${distro}" $RELEASE_DIR/3rdparty/bootloader/
+    fi
+  done

projects/RPi/devices/RPi2/config/distroconfig-composite.txt

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
+display_auto_detect=1
+dtoverlay=vc4-kms-v3d,cma-384,composite=1
+dtoverlay=
+disable_overscan=1
+disable_fw_kms_setup=1

projects/RPi/devices/RPi2/config/distroconfig.txt

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
+display_auto_detect=1
+dtoverlay=vc4-kms-v3d,cma-384
+dtoverlay=
+disable_overscan=1
+disable_fw_kms_setup=1

projects/RPi/devices/RPi4/config/distroconfig-composite.txt

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
+arm_boost=1
+arm_64bit=1
+kernel=kernel.img
+display_auto_detect=1
+enable_tvout=1
+dtoverlay=vc4-kms-v3d,cma-512,composite=1
+dtoverlay=
+disable_overscan=1
+disable_fw_kms_setup=1

scripts/image

@@ -411,7 +411,11 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
 
     # Copy Bootloader
     cp -PR ${INSTALL}/usr/share/bootloader/config.txt ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
-    cp -PR ${INSTALL}/usr/share/bootloader/distroconfig.txt ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
+    for distro in "${INSTALL}/usr/share/bootloader/distroconfig"*.txt ; do
+      if [ -f "${distro}" ]; then
+        cp -PR "${distro}" ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
+      fi
+    done
     cp -PR ${INSTALL}/usr/share/bootloader/LICENCE* ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
     cp -PR ${INSTALL}/usr/share/bootloader/bootcode.bin ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
     cp -PR ${INSTALL}/usr/share/bootloader/fixup.dat ${RELEASE_DIR}/${NOOBS_DISTRO}/System/

scripts/mkimage

@@ -221,7 +221,11 @@ EOF
   mcopy "${RELEASE_DIR}/3rdparty/bootloader/fixup.dat" :: >"${SAVE_ERROR}" 2>&1 || show_error
   mcopy "${RELEASE_DIR}/3rdparty/bootloader/start.elf" :: >"${SAVE_ERROR}" 2>&1 || show_error
   mcopy "${RELEASE_DIR}/3rdparty/bootloader/config.txt" :: >"${SAVE_ERROR}" 2>&1 || show_error
-  mcopy "${RELEASE_DIR}/3rdparty/bootloader/distroconfig.txt" :: >"${SAVE_ERROR}" 2>&1 || show_error
+  for distro in "${RELEASE_DIR}/3rdparty/bootloader/distroconfig"*.txt ; do
+    if [ -f "${distro}" ]; then
+      mcopy "${distro}" ::/"${distro##*/}" >"${SAVE_ERROR}" 2>&1 || show_error
+    fi
+  done
 
   for dtb in "${RELEASE_DIR}/3rdparty/bootloader/"*.dtb ; do
     if [ -f "${dtb}" ]; then