Skip to content
Snippets Groups Projects
Commit 0286b839 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'split_fbbootlogd' into 'master'

Split fbbootlogd

See merge request !431
parents 12d79730 229c5ecc
No related branches found
No related tags found
1 merge request!431Split fbbootlogd
...@@ -6,6 +6,7 @@ template = "custom" ...@@ -6,6 +6,7 @@ template = "custom"
script = """ script = """
BINS=( BINS=(
acpid acpid
fbbootlogd
fbcond fbcond
inputd inputd
lived lived
...@@ -61,7 +62,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort ...@@ -61,7 +62,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
for bin in "${BINS[@]}" for bin in "${BINS[@]}"
do do
case "${bin}" in case "${bin}" in
pcid | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid) pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin" cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
;; ;;
*) *)
......
...@@ -7,8 +7,9 @@ inputd ...@@ -7,8 +7,9 @@ inputd
vesad G G G vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond? #TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2 fbbootlogd
logd /scheme/debug /scheme/fbcon/1 fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log stdio /scheme/log
ramfs logging ramfs logging
acpid acpid
......
...@@ -7,8 +7,9 @@ inputd ...@@ -7,8 +7,9 @@ inputd
vesad G G G vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond? #TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2 fbbootlogd
logd /scheme/debug /scheme/fbcon/1 fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log stdio /scheme/log
ramfs logging ramfs logging
lived lived
......
...@@ -7,8 +7,9 @@ inputd ...@@ -7,8 +7,9 @@ inputd
vesad G G G vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond? #TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2 fbbootlogd
logd /scheme/debug /scheme/fbcon/1 fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log stdio /scheme/log
ramfs logging ramfs logging
ps2d us ps2d us
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment