mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-04-07 07:01:14 +02:00
Feature/rpi3 (#98)
* Add rpi3-64 defconfig file * Work on getting RPI3 into shape * Merge latest rpi3 changes into rpi4 config
This commit is contained in:
parent
85d7c15c03
commit
b074f08076
5
Makefile
5
Makefile
@ -23,9 +23,10 @@ $(TARGETS_CONFIG): %-config:
|
||||
$(TARGETS): %: $(RELEASE_DIR) %-config
|
||||
@echo "build $@"
|
||||
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) 2>&1 | tee logs/buildroot_$@_output.txt
|
||||
cp -f $(BUILDROOT)/output/images/sdcard.img $(RELEASE_DIR)/OpenVoiceOS_$@.img
|
||||
#cp -f $(BUILDROOT)/output/images/sdcard.img $(RELEASE_DIR)/OpenVoiceOS_$@.img
|
||||
rsync -ah --progress $(BUILDROOT)/output/images/sdcard.img $(RELEASE_DIR)/OpenVoiceOS_$@.img
|
||||
rm $(RELEASE_DIR)/OpenVoiceOS_$@.img.xz
|
||||
xz -3 -T0 $(RELEASE_DIR)/OpenVoiceOS_$@.img
|
||||
xz -3 -T0 -v $(RELEASE_DIR)/OpenVoiceOS_$@.img
|
||||
|
||||
# Do not clean when building for one target
|
||||
ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
|
||||
|
@ -156,6 +156,7 @@ menu "Additional external python modules"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-num2words/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-oauth2client/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-olefile/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio-plugin-simple/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-plugin-manager/Config.in"
|
||||
@ -228,6 +229,7 @@ menu "Additional external python modules"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-yagmail/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-youtube-dl/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-youtube-searcher/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-yt-dlp/Config.in"
|
||||
source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ytmusicapi/Config.in"
|
||||
endmenu
|
||||
menu "Mycroft A.I. Personal Assistant"
|
||||
|
@ -1 +1 @@
|
||||
dwc_otg.lpm_enable=0 root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rootfstype=ext4 fsck.repair=yes zram.enabled=1 zram.num_devices=4 console=ttyAMA0,115200 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo systemd.show_status=0 rootwait quiet splash
|
||||
dwc_otg.lpm_enable=0 root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rootfstype=ext4 fsck.repair=yes zram.enabled=1 zram.num_devices=4 console=tty1 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo systemd.show_status=0 rootwait quiet splash
|
||||
|
@ -8,7 +8,7 @@
|
||||
start_file=start.elf
|
||||
fixup_file=fixup.dat
|
||||
|
||||
kernel=zImage
|
||||
kernel=Image
|
||||
|
||||
# To use an external initramfs file
|
||||
# initramfs rootfs.cpio.gz
|
||||
@ -46,10 +46,12 @@ dtparam=i2s=on
|
||||
dtparam=spi=on
|
||||
|
||||
# Disable GPIO IRQ
|
||||
# dtoverlay=gpio-no-irq
|
||||
dtoverlay=gpio-no-irq
|
||||
|
||||
#[pi3]
|
||||
#dtoverlay=vc4-kms-v3d
|
||||
|
||||
#[pi4]
|
||||
#dtoverlay=vc4-kms-v3d-pi4
|
||||
|
||||
#dtoverlay=disable-wifi
|
||||
|
@ -13,21 +13,26 @@ image boot.vfat {
|
||||
"Image"
|
||||
}
|
||||
}
|
||||
size = 32M
|
||||
size = 96M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
disk-signature = 0xOVOS
|
||||
gpt = "true"
|
||||
}
|
||||
|
||||
partition boot {
|
||||
partition boot1 {
|
||||
partition-type = 0xC
|
||||
partition-uuid = 9262aee5-2d23-4e09-baac-280591e2e834
|
||||
partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
|
||||
bootable = "true"
|
||||
image = "boot.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
partition rootfs1 {
|
||||
partition-uuid = c0932a41-44cf-463b-8152-d43188553ed4
|
||||
partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
|
||||
image = "rootfs.ext4"
|
||||
}
|
||||
}
|
||||
|
@ -5,12 +5,29 @@ set -e
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
|
||||
# Add a console on tty1
|
||||
#if [ -e ${TARGET_DIR}/etc/inittab ]; then
|
||||
# grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
|
||||
# sed -i '/GENERIC_SERIAL/a\
|
||||
#tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab
|
||||
#fi
|
||||
. "${BR2_EXTERNAL_OPENVOICEOS_PATH}/meta"
|
||||
. "${BOARD_DIR}/meta"
|
||||
|
||||
# Write os-release
|
||||
{
|
||||
echo "NAME=\"${OVOS_NAME}\""
|
||||
echo "VERSION=\"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
||||
echo "ID=${OVOS_ID}"
|
||||
echo "VERSION_ID=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
|
||||
echo "PRETTY_NAME=\"${OVOS_NAME} ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} ${BOARD_NAME}\""
|
||||
echo "CPE_NAME=cpe:2.3:o:openvoiceos:${OVOS_ID}:${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}:*:${DEPLOYMENT}:*:*:*:${BOARD_ID}:*"
|
||||
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
|
||||
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
|
||||
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
|
||||
echo "VARIANT=\"${OVOS_NAME} - Mycroft Edition\""
|
||||
echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-mycroft"
|
||||
} > "${TARGET_DIR}/usr/lib/os-release"
|
||||
|
||||
# Write machine-info
|
||||
{
|
||||
echo "CHASSIS=${CHASSIS}"
|
||||
echo "DEPLOYMENT=${DEPLOYMENT}"
|
||||
} > "${TARGET_DIR}/etc/machine-info"
|
||||
|
||||
cp -f ../buildroot-external/board/raspberrypi/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt
|
||||
cp -f ../buildroot-external/board/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt
|
||||
|
File diff suppressed because it is too large
Load Diff
3
buildroot-external/board/raspberrypi3-64/meta
Normal file
3
buildroot-external/board/raspberrypi3-64/meta
Normal file
@ -0,0 +1,3 @@
|
||||
BOARD_ID=rpi3-64
|
||||
BOARD_NAME="RaspberryPi 3 64bit"
|
||||
CHASSIS=embedded
|
Binary file not shown.
@ -0,0 +1 @@
|
||||
{"window_t": 0.1, "hop_t": 0.05, "buffer_t": 1.5, "sample_rate": 16000, "sample_depth": 2, "n_mfcc": 13, "n_filt": 20, "n_fft": 512}
|
Binary file not shown.
@ -0,0 +1 @@
|
||||
{"window_t": 0.1, "hop_t": 0.05, "buffer_t": 1.5, "sample_rate": 16000, "sample_depth": 2, "n_mfcc": 13, "n_filt": 20, "n_fft": 512, "use_delta": false}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user