jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

raspberrypi3: fix serial console (load pi3-miniuart-bt overlay)

Browse Source 
- enable BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS in raspberrypi3_defconfig
- add copy of rpi-firmware/overlays directory to boot partition in genimage-raspberrypi3.cfg
- enhance post-image.sh script to add 'dtoverlay=pi3-miniuart-bt' on request
- add BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" in raspberrypi3_defconfig

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Peter Seiderer 2016-05-02 22:25:44 +02:00 committed by Thomas Petazzoni
parent a2f8d49727
commit 1e03cc2290
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/raspberrypi/genimage-raspberrypi3.cfg
View File

@ -7,6 +7,7 @@ image boot.vfat {
"rpi-firmware/config.txt", "rpi-firmware/config.txt",
"rpi-firmware/fixup.dat", "rpi-firmware/fixup.dat",
"rpi-firmware/start.elf", "rpi-firmware/start.elf",
"rpi-firmware/overlays",
"kernel-marked/zImage" "kernel-marked/zImage"
} }
} }

13
board/raspberrypi/post-image.sh
View File

@ -5,6 +5,19 @@ BOARD_NAME="$(basename ${BOARD_DIR})"
GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
case "${2}" in
--add-pi3-miniuart-bt-overlay)
if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
# fixes rpi3 ttyAMA0 serial console
dtoverlay=pi3-miniuart-bt
__EOF__
fi
;;
esac
# Mark the kernel as DT-enabled # Mark the kernel as DT-enabled
mkdir -p "${BINARIES_DIR}/kernel-marked" mkdir -p "${BINARIES_DIR}/kernel-marked"
${HOST_DIR}/usr/bin/mkknlimg "${BINARIES_DIR}/zImage" \ ${HOST_DIR}/usr/bin/mkknlimg "${BINARIES_DIR}/zImage" \

8
board/raspberrypi/readme.txt
View File

@ -60,7 +60,8 @@ After building, you should obtain this tree:
| +-- cmdline.txt | +-- cmdline.txt
| +-- config.txt | +-- config.txt
| +-- fixup.dat | +-- fixup.dat
| `-- start.elf | +-- start.elf
| `-- overlays/ [3]
+-- sdcard.img +-- sdcard.img
`-- zImage `-- zImage
@ -69,6 +70,11 @@ After building, you should obtain this tree:
[2] This is the mkknlimg DT-marked kernel. [2] This is the mkknlimg DT-marked kernel.
[3] Only for the Raspberry Pi 3 Model (overlay pi3-miniuart-bt is needed
to enable the RPi3 serial console otherwise occupied by the bluetooth
chip). Alternative would be to disable the serial console in cmdline.txt
and /etc/inittab.
How to write the SD card How to write the SD card
======================== ========================

3
configs/raspberrypi3_defconfig
View File

@ -21,7 +21,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b" BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y
# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
# Required tools to create the SD image # Required tools to create the SD image
BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y
@ -34,3 +34,4 @@ BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set # BR2_TARGET_ROOTFS_TAR is not set
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"