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

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-12-15 13:11:46 +02:00
commit 2530469910
27 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/bananapim1/boot-fwupdater.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra} setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ${extra}
setenv fdt_high ffffffff setenv fdt_high ffffffff
setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1 setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
fatload mmc 0 0x41000000 uImage fatload mmc 0 0x41000000 uImage

2
board/bananapim1/boot.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 ${extra} setenv bootargs console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ${extra}
setenv fdt_high ffffffff setenv fdt_high ffffffff
setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1 setenv video-mode sunxi:1024x768-24@60,monitor=hdmi,hpd=1,edid=1
fatload mmc 0 0x41000000 uImage fatload mmc 0 0x41000000 uImage

1
board/common/cleanups.sh
View File

@ -19,6 +19,7 @@ rm -rf ${TARGET}/etc/ssl/man
rm -rf ${TARGET}/etc/ssl/misc rm -rf ${TARGET}/etc/ssl/misc
rm -rf ${TARGET}/etc/ssl/private rm -rf ${TARGET}/etc/ssl/private
rm -rf ${TARGET}/etc/logrotate.d rm -rf ${TARGET}/etc/logrotate.d
rm -rf ${TARGET}/etc/fstab
rm -f ${TARGET}/etc/rc_maps.cfg rm -f ${TARGET}/etc/rc_maps.cfg
rm -f ${TARGET}/etc/udev/hwdb.d/20-pci-vendor-model.hwdb rm -f ${TARGET}/etc/udev/hwdb.d/20-pci-vendor-model.hwdb

1
board/common/overlay/etc/fstab.disk
View File

@ -1,4 +1,3 @@
# <file system> <mount pt> <type> <options> <dump> <pass> # <file system> <mount pt> <type> <options> <dump> <pass>
/dev/mmcblk0p1 /boot vfat ro,defaults 0 0 /dev/mmcblk0p1 /boot vfat ro,defaults 0 0
/dev/mmcblk0p3 /data ext4 defaults,noatime 0 0 /dev/mmcblk0p3 /data ext4 defaults,noatime 0 0

2
board/common/overlay/etc/fstab.overlay Normal file
View File

@ -0,0 +1,2 @@
# <file system> <mount pt> <type> <options> <dump> <pass>
overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay-usr 0 0

1
board/common/overlay/etc/fstab.sys
View File

@ -4,4 +4,3 @@ devpts /dev/pts devpts gid=5,mode=620 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /tmp tmpfs mode=1777 0 0 tmpfs /tmp tmpfs mode=1777 0 0
sysfs /sys sysfs defaults 0 0 sysfs /sys sysfs defaults 0 0

11
board/common/overlay/etc/init.d/S01mountall
View File

@ -11,6 +11,16 @@ mount_fs() {
test $? == 0 && msg_done || msg_fail test $? == 0 && msg_done || msg_fail
} }
mount_overlay() {
modprobe overlay &>/dev/null
grep -qw overlay /proc/filesystems || return
msg_begin "Mounting overlay filesystems"
grep -oE '/data/.overlay-[^ ]+' /etc/fstab.overlay | xargs mkdir -p
/bin/mount -T /etc/fstab.overlay -a
test $? == 0 && msg_done || msg_fail
}
remount_rw() { remount_rw() {
msg_begin "Remounting boot partition read-write" msg_begin "Remounting boot partition read-write"
mount -o remount,rw /boot mount -o remount,rw /boot
@ -29,6 +39,7 @@ mk_tty_login() {
case "$1" in case "$1" in
start) start)
mount_fs mount_fs
mount_overlay
# we need to source conf again, now that /data is available # we need to source conf again, now that /data is available
source /etc/init.d/os_conf source /etc/init.d/os_conf

2
board/common/overlay/etc/profile
View File

@ -27,6 +27,8 @@ if [ "$PS1" ]; then
export TERM=linux export TERM=linux
fi; fi;
export HISTFILE=/data/.bash_history
# custom local profile # custom local profile
test -f /data/etc/profile && source /data/etc/profile test -f /data/etc/profile && source /data/etc/profile

0
board/common/overlay/usr/share/dataskel/usr/.empty Normal file
View File

2
board/nanopineo/boot-fwupdater.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 0x46000000 zImage fatload mmc 0 0x46000000 zImage
fatload mmc 0 0x47000000 rootfs.cpio.uboot fatload mmc 0 0x47000000 rootfs.cpio.uboot

2
board/nanopineo/boot.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 0x46000000 zImage fatload mmc 0 0x46000000 zImage
fatload mmc 0 0x48000000 sun8i-h3-nanopi-neo.dtb fatload mmc 0 0x48000000 sun8i-h3-nanopi-neo.dtb

2
board/nanopineo2/boot-fwupdater.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 0x46000000 Image fatload mmc 0 0x46000000 Image
fatload mmc 0 0x47000000 rootfs.cpio.uboot fatload mmc 0 0x47000000 rootfs.cpio.uboot

2
board/nanopineo2/boot.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 0x46000000 Image fatload mmc 0 0x46000000 Image
fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb

2
board/odroidc1/boot.ini
View File

@ -47,7 +47,7 @@ setenv vpu "0"
setenv hdmioutput "0" setenv hdmioutput "0"
# Boot Arguments # Boot Arguments
setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}" setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}"
# Booting # Booting
fatload mmc 0:1 0x21000000 uImage fatload mmc 0:1 0x21000000 uImage

2
board/odroidc2/boot.ini
View File

@ -120,7 +120,7 @@ setenv max_freq "1536" # 1.536GHz
########################################### ###########################################
# Boot Arguments # Boot Arguments
setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 net.ifnames=0 elevator=noop hdmimode=${m} m_bpp=${m_bpp} vout=${vout} disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}" setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 net.ifnames=0 elevator=noop hdmimode=${m} m_bpp=${m_bpp} vout=${vout} disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}"
# Booting # Booting

2
board/odroidxu4/boot.ini
View File

@ -2,6 +2,6 @@ ODROIDXU-UBOOT-CONFIG
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu4.dtb; bootz 0x40008000 - 0x44000000" setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu4.dtb; bootz 0x40008000 - 0x44000000"
setenv bootargs "console=tty1 root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1" setenv bootargs "console=tty1 root=/dev/mmcblk1p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1"
boot boot

2
board/orangepione/boot-fwupdater.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $ramdisk_addr_r uInitrd fatload mmc 0 $ramdisk_addr_r uInitrd

2
board/orangepione/boot.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs earlyprintk console=tty1 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb

2
board/orangepizero/boot-fwupdater.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $ramdisk_addr_r uInitrd fatload mmc 0 $ramdisk_addr_r uInitrd

2
board/orangepizero/boot.cmd
View File

@ -1,4 +1,4 @@
setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 setenv bootargs earlyprintk console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1
fatload mmc 0 $kernel_addr_r zImage fatload mmc 0 $kernel_addr_r zImage
fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb

2
board/pine64/uEnv.txt
View File

@ -1,7 +1,7 @@
console=tty1 console=tty1
selinux=permissive selinux=permissive
enforcing=0 enforcing=0
optargs=no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 optargs=no_console_suspend panic=10 quiet loglevel=1
kernel_filename=kernel.img kernel_filename=kernel.img
#initrd_filename=ramdisk.img #initrd_filename=ramdisk.img
#recovery_initrd_filename=ramdisk-recovery.img #recovery_initrd_filename=ramdisk-recovery.img

2
board/raspberrypi/cmdline.txt
View File

@ -1 +1 @@
dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1

2
board/raspberrypi2/cmdline.txt
View File

@ -1 +1 @@
dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1

2
board/raspberrypi3/cmdline.txt
View File

@ -1 +1 @@
dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1

2
board/raspberrypi4/cmdline.txt
View File

@ -1 +1 @@
dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1 ipv6.disable=1 dwc_otg.fiq_fix_enable=1 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait ro rootflags=noload panic=10 quiet loglevel=1

2
board/tinkerboard/extlinux/extlinux.conf
View File

@ -1,4 +1,4 @@
label kernel-4.4 label kernel-4.4
kernel /zImage kernel /zImage
fdt /rk3288-miniarm.dtb fdt /rk3288-miniarm.dtb
append console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1 ipv6.disable=1 append console=tty1 root=/dev/mmcblk0p2 rootwait panic=10 earlyprintk quiet loglevel=1

2
configs/odroidc2_defconfig
View File

@ -10,7 +10,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/d76f4018945d768cfaed56d40a0e66b89bdb437a.tar.gz" BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/6b8c51b738ad6c03baed36bb44e56172959ca265.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="odroidc2" BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2" BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2"