-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/g…
…it/cooloney/blackfin-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: update boards files Blackfin arch: dma add some API and cleanup bf54x DMA definition Blackfin arch: cleanup and promote the general purpose timers api to a core blackfin component Blackfin arch: add a cheesy install target Blackfin arch: add functions for converting between sclks and usecs Blackfin arch: add assembly function for doing 64bit unsigned division Blackfin arch: -mno-fdpic works Blackfin arch: use "char bfin_board_name[]" rather than "char *bfin_board_name" per discussion on lkml as the former uses less storage Blackfin arch: Fixing Bug: balance calls to get_task_mm with corresponding mmput calls Blackfin serial driver Kconfig: depend on DMA not being enabled rather than a specific DMA size Blackfin arch: Fix bug: missing CHIPID register field definition of BF54x Blackfin arch: Fix up /proc/cpuinfo so it is like everyone else Blackfin arch: Optimization - no need to make additional math here Blackfin arch: force irq_flags into the .data section Blackfin arch BF548 defconfig: enable watchdog by default Blackfin arch: add new processor ADSP-BF52x arch/mach support
- Loading branch information
Showing
61 changed files
with
5,669 additions
and
317 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| #!/bin/sh | ||
| # | ||
| # arch/blackfin/boot/install.sh | ||
| # | ||
| # This file is subject to the terms and conditions of the GNU General Public | ||
| # License. See the file "COPYING" in the main directory of this archive | ||
| # for more details. | ||
| # | ||
| # Copyright (C) 1995 by Linus Torvalds | ||
| # | ||
| # Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin | ||
| # Adapted from code in arch/i386/boot/install.sh by Mike Frysinger | ||
| # | ||
| # "make install" script for Blackfin architecture | ||
| # | ||
| # Arguments: | ||
| # $1 - kernel version | ||
| # $2 - kernel image file | ||
| # $3 - kernel map file | ||
| # $4 - default install path (blank if root directory) | ||
| # | ||
|
|
||
| verify () { | ||
| if [ ! -f "$1" ]; then | ||
| echo "" 1>&2 | ||
| echo " *** Missing file: $1" 1>&2 | ||
| echo ' *** You need to run "make" before "make install".' 1>&2 | ||
| echo "" 1>&2 | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| # Make sure the files actually exist | ||
| verify "$2" | ||
| verify "$3" | ||
|
|
||
| # User may have a custom install script | ||
|
|
||
| if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi | ||
| if which ${CROSS_COMPILE}installkernel >/dev/null 2>&1; then | ||
| exec ${CROSS_COMPILE}installkernel "$@" | ||
| fi | ||
|
|
||
| # Default install - same as make zlilo | ||
|
|
||
| back_it_up() { | ||
| local file=$1 | ||
| [ -f ${file} ] || return 0 | ||
| local stamp=$(stat -c %Y ${file} 2>/dev/null) | ||
| mv ${file} ${file}.${stamp:-old} | ||
| } | ||
|
|
||
| back_it_up $4/uImage | ||
| back_it_up $4/System.map | ||
|
|
||
| cat $2 > $4/uImage | ||
| cp $3 $4/System.map |
Oops, something went wrong.