Commit 5c9f5703 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

1. updated linux-xlnx hash - where bitstream loading is fixed in xdev_cfg

2. updated udev in initramfs init script
parent e313fc04
...@@ -83,8 +83,14 @@ read_args() { ...@@ -83,8 +83,14 @@ read_args() {
} }
boot_live_root() { boot_live_root() {
if [ "$DEBUG" = true ];then
echo " settle and kill udev"
fi
# Watches the udev event queue, and exits if all current events are handled # Watches the udev event queue, and exits if all current events are handled
udevadm settle --timeout=3 --quiet #udevadm settle --timeout=3 --quiet
# --quiet not supported anymore ?!
udevadm settle --timeout=3
killall "${_UDEV_DAEMON##*/}" 2>/dev/null killall "${_UDEV_DAEMON##*/}" 2>/dev/null
# # Allow for identification of the real root even after boot # # Allow for identification of the real root even after boot
...@@ -104,6 +110,7 @@ boot_live_root() { ...@@ -104,6 +110,7 @@ boot_live_root() {
cd $ROOT_MOUNT cd $ROOT_MOUNT
echo "INITRAMFS: switching root"
# busybox switch_root supports -c option # busybox switch_root supports -c option
exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init $CMDLINE || exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init $CMDLINE ||
fatal "Couldn't switch_root, dropping to shell" fatal "Couldn't switch_root, dropping to shell"
......
...@@ -169,3 +169,9 @@ CONFIG_XILINX_AXI_EMAC=n ...@@ -169,3 +169,9 @@ CONFIG_XILINX_AXI_EMAC=n
# CONFIG_MACB # CONFIG_MACB
# CONFIG_NETDEVICES # CONFIG_NETDEVICES
# CONFIG_HAS_DMA # CONFIG_HAS_DMA
# it is off for zynq in rocko for some reason
#CONFIG_I2C_XILINX=y
# clock from MicroZed
# CONFIG_COMMON_CLK_SI570=n
...@@ -19,6 +19,9 @@ linux-elphel_label= "https://${ELPHELGITHOST}/Elphel/linux-elphel.git" ...@@ -19,6 +19,9 @@ linux-elphel_label= "https://${ELPHELGITHOST}/Elphel/linux-elphel.git"
linux-elphel_branch= "master" linux-elphel_branch= "master"
linux-elphel_gitdir= "${WORKDIR}/linux-elphel" linux-elphel_gitdir= "${WORKDIR}/linux-elphel"
# linux xilinx hash
SRCREV = "9c2e29b2c81dbb1efb7ee4944b18e12226b97513"
# To use the latest leave: "" - (=empty) # To use the latest leave: "" - (=empty)
linux-elphel_srcrev= "" linux-elphel_srcrev= ""
#linux-elphel_srcrev= "0ca36687a400fd9a5c4510295ae5be88aac77fa4" #linux-elphel_srcrev= "0ca36687a400fd9a5c4510295ae5be88aac77fa4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment