summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/boot
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2008-10-174-2/+2
|\ | | | | | | | | | | * 'for-linus' of git://www.jni.nu/cris: CRIS: proper defconfig setup [CRIS] Rename boot-linkscripts and fix the path to them.
| * [CRIS] Rename boot-linkscripts and fix the path to them.Jesper Nilsson2008-07-144-2/+2
| | | | | | | | | | | | | | This makes the CRIS-port directories follow the same naming convention as the rest of the kernel. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* | inflate: refactor inflate malloc codeThomas Petazzoni2008-07-251-36/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inflate requires some dynamic memory allocation very early in the boot process and this is provided with a set of four functions: malloc/free/gzip_mark/gzip_release. The old inflate code used a mark/release strategy rather than implement free. This new version instead keeps a count on the number of outstanding allocations and when it hits zero, it resets the malloc arena. This allows removing all the mark and release implementations and unifying all the malloc/free implementations. The architecture-dependent code must define two addresses: - free_mem_ptr, the address of the beginning of the area in which allocations should be made - free_mem_end_ptr, the address of the end of the area in which allocations should be made. If set to 0, then no check is made on the number of allocations, it just grows as much as needed The architecture-dependent code can also provide an arch_decomp_wdog() function call. This function will be called several times during the decompression process, and allow to notify the watchdog that the system is still running. If an architecture provides such a call, then it must define ARCH_HAS_DECOMP_WDOG so that the generic inflate code calls arch_decomp_wdog(). Work initially done by Matt Mackall, updated to a recent version of the kernel and improved by me. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Matt Mackall <mpm@selenic.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Mikael Starvik <mikael.starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: David Howells <dhowells@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andi Kleen <andi@firstfloor.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* [CRIS] Correct image makefiles to allow using a separate OBJ-directory.Jesper Nilsson2008-06-302-2/+2
| | | | | | | Make compile succeed when building with O= (srctree != objtree). Signed-off-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* [CRIS] Build fixes for compressed and rescue images for v10 and v32:Jesper Nilsson2008-06-293-6/+0
| | | | | | | | | | | | | | | | | | | | | | - Use the normal cross gcc instead of using an elf specific cris toolchain. This removes the dependency of this second toolchain. - Use the normal cross objcopy instead of overriding it to use elf-toolchain. This allows compiling using "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu-" instead of just "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu/bin/" - Remove redundant rules for compiling, the implicit rules are sufficient. - Convert the arch/cris/arch-v10/boot/compressed/head.S to format accepted by the cris-axis-linux-gnu-gcc (registers must be prefixed with '$', remove explicit underscore on exported symbols) - Remove a number of unused (and duplicated) prototypes from arch/cris/arch-v10/boot/compressed/misc.c. - Correct memcpy and memset return values (actually return them!) Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* CRIS v32: Update boot/rescue/rescue.ldJesper Nilsson2008-02-081-7/+30
| | | | - Update to work for ETRAX FS and ARTPEC-3
* CRIS v32: Replace build flags in boot/rescue/MakefileJesper Nilsson2008-02-081-4/+4
| | | | | - Change AFLAGS to asflags-y, LDFLAGS to ldflags-y and EXTRA_CFLAGS to ccflags-y. We only need the flags in this Makefile.
* CRIS v32: Replace build flags in boot/compressed/MakefileJesper Nilsson2008-02-081-3/+3
| | | | | - Change AFLAGS to asflags-y, LDFLAGS to ldflags-y and KBUILD_CFLAGS to ccflags-y. We only need the flags in this Makefile.
* CRIS v32: Remove useless CVS id tag from boot/compressed/READMEJesper Nilsson2008-02-081-1/+0
|
* CRIS v32: Update boot/rescue/head.S code.Jesper Nilsson2008-02-081-27/+15
| | | | | | - Add ifdef for ETRAX_AXISFLASHMAP to avoid compiling file unless it is set. - Use assembler macros for setting up clocks. - Don't copy image, just jump to it (only works for NOR flash)
* CRIS v32: Update boot/compressed/misc.cJesper Nilsson2008-02-081-19/+53
| | | | | | | | | | - Shorten include paths to machine specific headers. - Remove fill_inbuf, not defined here. - Return __dest as value from memcpy. - Enable serial port hardware transmitter and receiver in serial_setup. - Correct baudrate divisor calculation, changed from 4800 to 115200. - Add support for Artpec-3 specific serial port setup. - Initialize pinmux for the correct serial port.
* CRIS v32: Update compressed head.SJesper Nilsson2008-02-081-98/+39
| | | | | | - Fixes for NAND and NOR flash booting. - Use assembler macros for common tasks (clocks, general io etc) - Use (EtraxFS or Artpec-3) machine specific include for dram and hardware init.
* CRIS v32: Update boot rescue Kbuild makefile.Jesper Nilsson2008-02-081-25/+16
| | | | | | - Remove old specific targets, use more generic ones instead. - Use if_changed to avoid creating new images when no change. - Use EXTRA_CFLAGS instead of CFLAGS.
* CRIS v32: Update boot compressed Kbuild makefile.Jesper Nilsson2008-02-081-28/+17
| | | | | | - Remove old specific targets, use more generic ones instead. - Use if_changed to avoid creating new images when no change. - Use KBUILD_CFLAGS instead of CFLAGS.
* CRIS v32: Update boot Kbuild makefile.Jesper Nilsson2008-02-081-8/+15
| | | | | - Remove old specific targets, use more generic ones instead. - Use if_changed to avoid creating new images when no change.
* CRIS: Remove 'TOPDIR' from MakefilesWANG Cong2008-01-281-1/+1
| | | | | | | | | | | This patch removes TOPDIR from Cris Makefiles. Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Andreas Schwab <schwab@suse.de> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
* spelling fixes: arch/cris/Simon Arlott2007-10-201-3/+3
| | | | | | | Spelling fixes in arch/cris/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
* Remove obsolete #include <linux/config.h>Jörn Engel2006-06-303-3/+0
| | | | | Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* [PATCH] CRIS update: new subarchitecture v32Mikael Starvik2005-07-279-0/+716
New CRIS sub architecture named v32. From: Dave Jones <davej@redhat.com> Fix swapped kmalloc args Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>