Skip to content

Added arm definitions in buildtar #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlinaNova21 wants to merge 4 commits into
base: imx_3.0.35_4.1.0-udoo
Choose a base branch
from
Open

Added arm definitions in buildtar #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f24766a
Added arm definitions in buildtar
AlinaNova21 Nov 11, 2013
ec8d869
Merge remote-tracking branch 'upstream/imx_3.0.35_4.1.0-udoo' into im…
Nov 12, 2013
5b9e499
MXC IPU: Replace wait_event with wait_event_interruptible
projectgus Apr 27, 2013
a9e28fb
Merged Upstream
Jan 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions drivers/mxc/ipu3/ipu_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3138,7 +3138,12 @@ static int ipu_task_thread(void *argv)
int split_parent;
int split_child;

<<<<<<< HEAD
if(wait_event_interruptible(thread_waitq, find_task(&tsk, curr_thread_id)))
break;
=======
wait_event_interruptible(thread_waitq, find_task(&tsk, curr_thread_id));
>>>>>>> cab446d7433162c4ee2788b05b5e32708f124bf6

if (!tsk) {
pr_err("thread:%d can not find task.\n",
Expand Down
3 changes: 3 additions & 0 deletions scripts/package/buildtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ case "${ARCH}" in
x86|i386|x86_64)
[ -f "${objtree}/arch/x86/boot/bzImage" ] && cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;;
arm|armel|armhf)
[ -f "${objtree}/arch/arm/boot/uImage" ] && cp -v -- "${objtree}/arch/arm/boot/uImage" "${tmpdir}/boot/uImage-${KERNELRELEASE}"
;;
alpha)
[ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;;
Expand Down