mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-06-05 22:19:21 +02:00
Merge branch 'feature/rpi4_64' into develop
This commit is contained in:
@ -0,0 +1,30 @@
|
||||
image boot.vfat {
|
||||
vfat {
|
||||
files = {
|
||||
"bcm2711-rpi-4-b.dtb",
|
||||
"rpi-firmware/cmdline.txt",
|
||||
"rpi-firmware/config.txt",
|
||||
"rpi-firmware/fixup4.dat",
|
||||
"rpi-firmware/start4.elf",
|
||||
"rpi-firmware/overlays",
|
||||
"Image"
|
||||
}
|
||||
}
|
||||
size = 32M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
}
|
||||
|
||||
partition boot {
|
||||
partition-type = 0xC
|
||||
bootable = "true"
|
||||
image = "boot.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
image = "rootfs.ext4"
|
||||
}
|
||||
}
|
@ -10,13 +10,13 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
for arg in "$@"
|
||||
do
|
||||
case "${arg}" in
|
||||
--add-pi3-miniuart-bt-overlay)
|
||||
--add-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)."
|
||||
echo "Adding 'dtoverlay=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
|
||||
# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
|
||||
dtoverlay=miniuart-bt
|
||||
__EOF__
|
||||
fi
|
||||
;;
|
||||
@ -28,15 +28,6 @@ __EOF__
|
||||
|
||||
# enable 64bits support
|
||||
arm_64bit=1
|
||||
__EOF__
|
||||
fi
|
||||
|
||||
# Enable uart console
|
||||
if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
|
||||
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
|
||||
|
||||
# enable rpi3 ttyS0 serial console
|
||||
enable_uart=1
|
||||
__EOF__
|
||||
fi
|
||||
;;
|
||||
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 122 KiB |
@ -1 +0,0 @@
|
||||
raspberrypi
|
1
buildroot-external/board/raspberrypi3/cmdline.txt
Symbolic link
1
buildroot-external/board/raspberrypi3/cmdline.txt
Symbolic link
@ -0,0 +1 @@
|
||||
../raspberrypi/cmdline.txt
|
1
buildroot-external/board/raspberrypi3/config.txt
Symbolic link
1
buildroot-external/board/raspberrypi3/config.txt
Symbolic link
@ -0,0 +1 @@
|
||||
../raspberrypi/config.txt
|
1
buildroot-external/board/raspberrypi3/genimage-raspberrypi3.cfg
Symbolic link
1
buildroot-external/board/raspberrypi3/genimage-raspberrypi3.cfg
Symbolic link
@ -0,0 +1 @@
|
||||
../raspberrypi/genimage-raspberrypi3.cfg
|
1
buildroot-external/board/raspberrypi3/post-build.sh
Symbolic link
1
buildroot-external/board/raspberrypi3/post-build.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../raspberrypi/post-build.sh
|
1
buildroot-external/board/raspberrypi3/post-image.sh
Symbolic link
1
buildroot-external/board/raspberrypi3/post-image.sh
Symbolic link
@ -0,0 +1 @@
|
||||
../raspberrypi/post-image.sh
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user