mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 11:46:30 +00:00
Merge remote-tracking branch 'thingos/dev' into dev
This commit is contained in:
Calin Crisan
commit
77c692b819
@ -22,7 +22,7 @@ ODROIDC2-UBOOT-CONFIG
|
||||
|
||||
# 1080 Lines (1920x1080)
|
||||
# setenv m "1080i60hz" # Interlaced 60Hz
|
||||
#setenv m "1080p60hz" # Progressive 60Hz
|
||||
setenv m "1080p60hz" # Progressive 60Hz
|
||||
# setenv m "1080i50hz" # Interlaced 50Hz
|
||||
# setenv m "1080p50hz" # Progressive 50Hz
|
||||
# setenv m "1080p24hz" # Progressive 24Hz
|
||||
@ -40,9 +40,10 @@ ODROIDC2-UBOOT-CONFIG
|
||||
### VESA modes ###
|
||||
# setenv m "640x480p60hz"
|
||||
# setenv m "800x480p60hz"
|
||||
# setenv m "480x800p60hz"
|
||||
# setenv m "800x600p60hz"
|
||||
# setenv m "1024x600p60hz"
|
||||
setenv m "1024x768p60hz"
|
||||
# setenv m "1024x768p60hz"
|
||||
# setenv m "1280x800p60hz"
|
||||
# setenv m "1280x1024p60hz"
|
||||
# setenv m "1360x768p60hz"
|
||||
@ -62,9 +63,9 @@ setenv m_bpp "32"
|
||||
# setenv m_bpp "16"
|
||||
|
||||
# HDMI DVI/VGA modes
|
||||
# Uncomment only a single Line! The line with setenv written.
|
||||
# At least one mode must be selected.
|
||||
# setenv vout "dvi"
|
||||
# By default its set to HDMI, if needed change below.
|
||||
# Uncomment only a single Line.
|
||||
setenv vout "dvi"
|
||||
# setenv vout "vga"
|
||||
|
||||
# HDMI HotPlug Detection control
|
||||
@ -72,24 +73,54 @@ setenv m_bpp "32"
|
||||
# true = HDMI will believe that cable is always connected
|
||||
# false = will let board/monitor negotiate the connection status
|
||||
setenv hpd "true"
|
||||
# setenv hpd "false"
|
||||
|
||||
# Meson Timer
|
||||
# 1 - Meson Timer
|
||||
# 0 - Arch Timer
|
||||
# Using meson_timer improves the video playback whoever it breaks KVM (virtualization).
|
||||
# Using meson_timer improves the video playback however it breaks KVM (virtualization).
|
||||
# Using arch timer allows KVM/Virtualization to work however you'll experience poor video
|
||||
setenv mesontimer "1"
|
||||
|
||||
# Server Mode (aka. No Graphics)
|
||||
# Setting nographics to 1 will disable all video subsystem
|
||||
# This mode is ideal of server type usage. (Saves ~300Mb of RAM)
|
||||
setenv nographics "0"
|
||||
# UHS (Ultra High Speed) MicroSD mode enable/disable
|
||||
setenv disableuhs "false"
|
||||
|
||||
# MicroSD Card Detection enable/disable
|
||||
# Force the MMC controlled to believe that a card is connected.
|
||||
setenv mmc_removable "true"
|
||||
|
||||
# USB Multi WebCam tweak
|
||||
# Only enable this if you use it.
|
||||
setenv usbmulticam "false"
|
||||
|
||||
# CPU Frequency / Cores control
|
||||
###########################################
|
||||
### WARNING!!! WARNING!!! WARNING!!!
|
||||
# Before changing anything here please read the wiki entry:
|
||||
# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq
|
||||
#
|
||||
# MAX CPU's
|
||||
# setenv maxcpus "1"
|
||||
# setenv maxcpus "2"
|
||||
# setenv maxcpus "3"
|
||||
setenv maxcpus "4"
|
||||
|
||||
# MAX Frequency
|
||||
# setenv max_freq "2016" # 2.016GHz
|
||||
# setenv max_freq "1944" # 1.944GHz
|
||||
# setenv max_freq "1944" # 1.944GHz
|
||||
# setenv max_freq "1920" # 1.920GHz
|
||||
# setenv max_freq "1896" # 1.896GHz
|
||||
# setenv max_freq "1752" # 1.752GHz
|
||||
# setenv max_freq "1680" # 1.680GHz
|
||||
# setenv max_freq "1656" # 1.656GHz
|
||||
setenv max_freq "1536" # 1.536GHz
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
# Boot Arguments
|
||||
setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1 hdmimode=${m} m_bpp=${m_bpp} vout=${vout} net.ifnames=0 elevator=noop disablehpd=${hpd}"
|
||||
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}"
|
||||
|
||||
# Booting
|
||||
|
||||
|
||||
@ -7,10 +7,8 @@ export BOARD=$(basename ${BOARD_DIR})
|
||||
export IMG_DIR=${BOARD_DIR}/../../output/${BOARD}/images/
|
||||
export UBOOT_BIN=${IMG_DIR}/u-boot.bin
|
||||
export UBOOT_SEEK=97
|
||||
BL1=${IMG_DIR}/bl1.bin.hardkernel
|
||||
|
||||
source ${COMMON_DIR}/mkimage.sh
|
||||
|
||||
dd conv=notrunc if=${BL1} of=${DISK_IMG} bs=1 count=442
|
||||
dd conv=notrunc if=${BL1} of=${DISK_IMG} bs=512 skip=1 seek=1
|
||||
|
||||
dd conv=notrunc if=${UBOOT_BIN} of=${DISK_IMG} bs=1 count=442
|
||||
dd conv=notrunc if=${UBOOT_BIN} of=${DISK_IMG} bs=512 skip=1 seek=1
|
||||
|
||||
Binary file not shown.
@ -10,7 +10,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay"
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/2457e39a1b4a270ad51031a5c9d3abf1303dd7d7.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/d76f4018945d768cfaed56d40a0e66b89bdb437a.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson64_odroidc2"
|
||||
|
||||
@ -49,9 +49,11 @@ SKELETON_INIT_COMMON_HOSTS_LINE += $(SKELETON_INIT_COMMON_SHORT_HOSTNAME)
|
||||
endif
|
||||
define SKELETON_INIT_COMMON_SET_HOSTNAME
|
||||
mkdir -p $(TARGET_DIR)/etc
|
||||
echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
|
||||
$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTS_LINE)' \
|
||||
-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
|
||||
test -f $(TARGET_DIR)/etc/hostname && \
|
||||
echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname || true
|
||||
test -f $(TARGET_DIR)/etc/hosts && \
|
||||
$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTS_LINE)' \
|
||||
-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts || true
|
||||
endef
|
||||
SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME
|
||||
endif
|
||||
@ -59,7 +61,8 @@ endif
|
||||
ifneq ($(SKELETON_INIT_COMMON_ISSUE),)
|
||||
define SKELETON_INIT_COMMON_SET_ISSUE
|
||||
mkdir -p $(TARGET_DIR)/etc
|
||||
echo "$(SKELETON_INIT_COMMON_ISSUE)" > $(TARGET_DIR)/etc/issue
|
||||
test -f $(TARGET_DIR)/etc/issue && \
|
||||
echo "$(SKELETON_INIT_COMMON_ISSUE)" > $(TARGET_DIR)/etc/issue || true
|
||||
endef
|
||||
SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ISSUE
|
||||
endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user