aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/compressed
AgeCommit message (Collapse)AuthorFilesLines
2012-04-22Merge tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91 into ↵Arnd Bergmann2-1/+3
next/cleanup Nicolas Ferre <[email protected]> writes: First batch of AT91 cleanup for 3.5 kernel. - The biggest improvement of this series is the ability to compile several AT91 SoCs in one kernel image. For now on it's limited to the DT-enabled boards but we can compile all the core together. - The Kconfig series is stacked before other patches as it is simple and non-intrusive. Its goal is to remove too restrictive dependencies on SoC names. This will allow to add support for newer SoC seamlessly. - Some very "cosmetic" Kconfig changes are also added (entry names, comments, etc.). * tag 'at91-3.5-cleanup' of git://github.com/at91linux/linux-at91: (19 commits) ARM: at91: add defconfig for device tree ARM: at91/dt: do not specify the board any more ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select ARM: at91: pm select memory controler at runtime ARM: at91: move at91_init_leds to board init ARM: at91: do not pin mux the UARTs in init_early ARM: at91: drop at91_set_serial_console ARM: at91: uncompress: autodetect the uart to use ARM: at91: uncompress Store UART address in a variable hwrng: Kconfig: remove dependency for atmel-rng driver Input: Kconfig: remove dependency for atmel_tsadcc driver rtc: Kconfig: remove dependency for AT91 rtc driver ARM: at91/Kconfig: website link for AT91SAM9G20-EK ARM: at91/Kconfig: add AT91SAM9x5 family to AT91_EARLY_DBGU0 entry ARM: at91/Kconfig: add clarifications to AT91SAM9M10G45-EK entry ARM: at91/Kconfig: add comment to at91sam9x5 family entry ARM: at91/Kconfig: change at91sam9g45 entry ARM: at91: change AT91 Kconfig entry comment Also updates the cleanup branch to v3.4-rc3. Signed-off-by: Arnd Bergmann <[email protected]>
2012-04-13ARM: 7380/1: DT: do not add a zero-sized memory propertyMarc Zyngier1-0/+2
Some bootloaders are broken enough to expose an ATAG_MEM with a null size. Converting such tag to a memory node leads to an unbootable system. Skip over zero sized ATAG_MEM to avoid this situation. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-04-13ARM: 7379/1: DT: fix atags_to_fdt() second call siteMarc Zyngier1-1/+1
atags_to_fdt() returns 1 when it fails to find a valid FDT signature. The CONFIG_ARM_ATAG_DTB_COMPAT code is supposed to retry with another location, but only does so when the initial call doesn't fail. Fix this by using the correct condition in the assembly code. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Cc: [email protected] Signed-off-by: Russell King <[email protected]>
2012-04-06ARM: remove ixp23xx and ixp2000 platformsRob Herring1-7/+0
ixp2xxx platforms have had no real changes since ~2006 and the maintainer has said on irc that they can be removed: 13:05 < nico> do you still care about ixp2000? 13:22 < lennert> not really, no 13:58 < nico> do you think we could remove it from the kernel tree? 14:01 < lennert> go for it, and remove ixp23xx too while you're at it Removing will help simplify ARM consolidation in general and PCI re-work specifically. Signed-off-by: Rob Herring <[email protected]> Cc: Randy Dunlap <[email protected]> Acked-by: Lennert Buytenhek <[email protected]>
2012-03-29Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds4-3/+26
Pull more ARM updates from Russell King. This got a fair number of conflicts with the <asm/system.h> split, but also with some other sparse-irq and header file include cleanups. They all looked pretty trivial, though. * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits) ARM: fix Kconfig warning for HAVE_BPF_JIT ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds ARM: 7349/1: integrator: convert to sparse irqs ARM: 7259/3: net: JIT compiler for packet filters ARM: 7334/1: add jump label support ARM: 7333/2: jump label: detect %c support for ARM ARM: 7338/1: add support for early console output via semihosting ARM: use set_current_blocked() and block_sigmask() ARM: exec: remove redundant set_fs(USER_DS) ARM: 7332/1: extract out code patch function from kprobes ARM: 7331/1: extract out insn generation code from ftrace ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format ARM: 7351/1: ftrace: remove useless memory checks ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path ARM: Versatile Express: add NO_IOPORT ARM: get rid of asm/irq.h in asm/prom.h ARM: 7319/1: Print debug info for SIGBUS in user faults ARM: 7318/1: gic: refactor irq_start assignment ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop ARM: 7315/1: perf: add support for the Cortex-A7 PMU ...
2012-03-24ARM: 7001/2: Wire up support for the XZ decompressorImre Kaloz4-3/+26
Wire up support for the XZ decompressor Signed-off-by: Imre Kaloz <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-03-03ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XXKukjin Kim1-1/+1
This patch changes the ARCH name to "ARCH_S3C24XX" for Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, and S3C2450 SoCs so that we can merge the mach-xxx directories and plat-s3c24xx dir. to just one mach-s3c24xx for them. I think this should be sent to upstream via samsung tree because this touches many samsung stuff. Cc: Dmitry Torokhov <[email protected]> Cc: Richard Purdie <[email protected]> Cc: Chris Ball <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Grant Likely <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> [for the gadget part:] Acked-by: Felipe Balbi <[email protected]> [for the framebuffer (video) part:] Acked-by: Florian Tobias Schandinat <[email protected]> [For the watchdog-part:] Acked-by: Wim Van Sebroeck <[email protected]> Cc: Sangbeom Kim <[email protected]> Cc: Liam Girdwood <[email protected]> Cc: Mark Brown <[email protected]> Cc: Russell King <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-01-05Merge branch 'devel-stable' into for-linusRussell King1-0/+1
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c
2012-01-03ARM: 7184/1: fix $(CROSS_COMPILE) prefix missing from size invocationJanusz Krzysztofik1-1/+2
Otherwise, cross compilation may fail with error messages like: ... size: arch/arm/boot/compressed/../../../../vmlinux: File format is ambiguous size: Matching formats: elf32-littlearm elf32-littlearm-symbian elf32-littlearm-vxworks LD arch/arm/boot/compressed/vmlinux arm-angstrom-linux-uclibcgnueabi-ld:--defsym _kernel_bss_size=: syntax error Signed-off-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-12-08ARM: LPAE: add ISBs around MMU enabling codeWill Deacon1-0/+1
Before we enable the MMU, we must ensure that the TTBR registers contain sane values. After the MMU has been enabled, we jump to the *virtual* address of the following function, so we also need to ensure that the SCTLR write has taken effect. This patch adds ISB instructions around the SCTLR write to ensure the visibility of the above. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
2011-10-28Merge branch 'devel-stable' of ↵Linus Torvalds8-52/+396
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
2011-10-24ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large ↵Nicolas Pitre1-1/+2
TEXT_OFFSET If TEXT_OFFSET is too large (e.g. like on MSM) the resulting immediate argument gets wider than 8 bits. Noticed by David Brown <[email protected]> Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-10-17ARM: 7120/1: remove bashism in check for multiple zreladdrsRabin Vincent1-1/+1
Get rid of this complaint from dash: AS arch/arm/boot/compressed/lib1funcs.o /bin/sh: 1: [: y: unexpected operator LD arch/arm/boot/compressed/vmlinux Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Rabin Vincent <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-10-17ARM: 7020/1: Check for multiple zreladdrsSascha Hauer1-0/+8
Without CONFIG_AUTO_ZRELADDR being set the kernel needs a single zreladdr for building zImages. Bail out if we detect multiple zreladdrs without CONFIG_AUTO_ZRELADDR. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-09-16Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King2-2/+2
Conflicts: arch/arm/mach-imx/mach-cpuimx27.c
2011-09-14ARM: zImage: prevent constant copy+rebuild of lib1funcs.SNicolas Pitre1-2/+2
The rule to copy this file doesn't have to be forced. However lib1funcs.[So] have to be listed amongst the targets. This prevents zImage from being recreated needlessly. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-09-14ARM: zImage: allow supplementing appended DTB with traditional ATAG dataNicolas Pitre5-2/+172
Some old bootloaders can't be updated to a device tree capable one, yet they provide ATAGs with memory configuration, the ramdisk address, the kernel cmdline string, etc. To allow a device tree enabled kernel to be used with such bootloaders, it is necessary to convert those ATAGs into FDT properties and fold them into the DTB appended to zImage. Currently the following ATAGs are converted: ATAG_CMDLINE ATAG_MEM ATAG_INITRD2 If the corresponding information already exists in the appended DTB, it is replaced, otherwise the required node is created to hold it. The code looks for ATAGs at the location pointed by the value of r2 upon entry into the zImage code. If no ATAGs are found there, an attempt at finding ATAGs at the typical 0x100 offset from start of RAM is made. Otherwise the DTB is left unchanged. Thisstarted from an older patch from John Bonesio <[email protected]>, with contributions from David Brown <[email protected]>. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-09-14ARM: zImage: gather some string functions into string.cNicolas Pitre3-41/+132
This is a small subset of string functions needed by commits to come. Except for memcpy() which is unchanged from its original location, their implementation is meant to be small, and -Os is enforced to prevent gcc from doing pointless loop unrolling. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-09-14ARM: zImage: make sure appended DTB doesn't get overwritten by kernel .bssNicolas Pitre2-4/+18
The appended DTB gets relocated with the decompressor code to get out of the way of the decompressed kernel. However the kernel's .bss section may be larger than the relocated code and data, and then the DTB gets overwritten. Let's make sure the relocation takes care of moving zImage far enough so no such conflict with .bss occurs. Thanks to Tony Lindgren <[email protected]> for figuring out this issue. While at it, let's clean up the code a bit so that the wont_overwrite symbol is used while determining if a conflict exists, making the above change more precise as well as eliminating some ARM/THUMB alternates. Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-09-14ARM: zImage: Allow the appending of a device tree binaryJohn Bonesio1-3/+67
This patch provides the ability to boot using a device tree that is appended to the raw binary zImage (e.g. cat zImage <filename>.dtb > zImage_w_dtb). Signed-off-by: John Bonesio <[email protected]> [nico: ported to latest zImage changes plus additional cleanups/improvements] Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Grant Likely <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-09-14ARM: zImage: ensure it is always a multiple of 64 bits in sizeNicolas Pitre1-0/+4
This is needed for proper alignment when the DTB appending feature is used. Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Tony Lindgren <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Dave Martin <[email protected]> Tested-by: Thomas Abraham <[email protected]>
2011-08-08mmc: sdhi, mmcif: zboot: Correct clock disable logicSimon Horman2-2/+2
This corrects a logic-error that I made in the original implementation. An alternate patch would be to just remove these lines and leave the clock running as it is reconfigured later on during boot anyway. Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-07-22Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', ↵Russell King8-15/+593
'mmci', 'suspend' and 'vfp' into for-next
2011-07-19ARM: 6999/1: head, zImage: Always Enter the kernel in ARM stateDave Martin1-1/+2
Currently, the documented kernel entry requirements are not explicit about whether the kernel should be entered in ARM or Thumb, leading to an ambiguitity about how to enter Thumb-2 kernels. As a result, the kernel is reliant on the zImage decompressor to enter the kernel proper in the correct instruction set state. This patch changes the boot entry protocol for head.S and Image to be the same as for zImage: in all cases, the kernel is now entered in ARM. Documentation/arm/Booting is updated to reflect this new policy. A different rule will be needed for Cortex-M class CPUs as and when support for those lands in mainline, since these CPUs don't support the ARM instruction set at all: a note is added to the effect that the kernel must be entered in Thumb on such systems. Signed-off-by: Dave Martin <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-07-07ARM: decompressor: use better output sectionsRussell King1-4/+8
Place read-only data in a .rodata output section, and the compressed piggy data in .piggydata. Place the .got.plt section before the .got section as is standard ELF practise. This allows the piggydata to be more easily extracted from the compressed vmlinux file for verification purposes. Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-06-29ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARMSimon Horman6-9/+570
This allows a ROM-able zImage to be written to eSD and for SuperH Mobile ARM to boot directly from the SDHI hardware block. This is achieved by the MaskROM loading the first portion of the image into MERAM and then jumping to it. This portion contains loader code which copies the entire image to SDRAM and jumps to it. From there the zImage boot code proceeds as normal, uncompressing the image into its final location and then jumping to it. Cc: Paul Mundt <[email protected]> Acked-by: Magnus Damm <[email protected]> Acked-by: Paul Mundt <[email protected]> Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-06-21ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entriesDave Martin1-1/+13
It is easy to mis-maintain the proc_types table such that the entries become wrongly-sized and misaligned when the kernel is built in Thumb-2. This patch adds an assembly-time check which will turn most common size/alignment mistakes in this table into build failures, to avoid having to debug the boot-time kernel hang which would happen if the resulting kernel were actually booted. Signed-off-by: Dave Martin <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-06-09ARM: 6954/1: zImage: fix Thumb2 breakageNicolas Pitre1-3/+3
Commit af3e4fd37a "ARM: 6859/1: Add writethrough dcache support for ARM926EJS processor" broke Thumb2 compilation by omitting to maintain the wide encoding for the added branch instructions which made the ARM926EJ-S record smaller than expected, breaking the record walk code. Signed-off-by: Nicolas Pitre <[email protected]> Cc: Mark A. Greer <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-05-23Merge branch 'devel-stable' into for-linusRussell King4-30/+45
Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h
2011-05-23Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' ↵Russell King1-0/+16
and 'spear' into for-linus
2011-05-12ARM: 6859/1: Add writethrough dcache support for ARM926EJS processorMark A. Greer1-0/+16
The ARM kernel supports writethrough data cache via the CONFIG_CPU_DCACHE_WRITETHROUGH option. However, that functionality wasn't implemented in the arch/arm/boot/compressed code. It is now necessary due to a new ARM926EJS processor that has an issue with writeback data cache. Signed-off-by: Mark A. Greer <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-05-07Merge first four commits of 'zImage_fixes' of ↵Russell King3-12/+26
git://git.linaro.org/people/nico/linux into fixes
2011-05-07Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into ↵Russell King5-35/+70
devel-stable
2011-05-07ARM: zImage: make sure no GOTOFF relocs are used with .bss symbolsNicolas Pitre2-4/+17
To be able to relocate the .bss section at run time independently from the rest of the code, we must make sure that no GOTOFF relocations are used with .bss symbols. This usually means that no global variables can be marked static unless they're also const. To enforce this, suffice to fail the build whenever a private symbol is allocated to .bss and list those symbols for convenience. The user_stack and user_stack_end labels in head.S were converted into non exported symbols to remove false positives. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Tony Lindgren <[email protected]>
2011-05-07ARM: zImage: don't ignore error returned from decompress()Nicolas Pitre2-6/+11
If decompress() returns an error without calling error(), we must not attempt to boot the resulting kernel. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Tony Lindgren <[email protected]>
2011-05-07ARM: zImage: simplify decompress_kernel()Nicolas Pitre1-11/+2
The return value for decompress_kernel() is no longer used. Furthermore, this was obtained and stored in a variable called output_ptr which is a complete misnomer for what is actually the size of the decompressed kernel image. Let's get rid of it. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Tony Lindgren <[email protected]>
2011-05-07ARM: zImage: no need to get the decompressed size from the filesystemNicolas Pitre2-4/+16
In commit d239b1dc093d the hardcoded 4x estimate for the decompressed kernel size was replaced by the exact Image file size and passed to the linker as a symbol value. Turns out that this is unneeded as the size is already included at the end of the compressed piggy data. For those compressed formats that don't include this data, the build system already takes care of appending it using size_append in scripts/Makefile.lib. So let's use that instead. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Tested-by: Tony Lindgren <[email protected]>
2011-05-07ARM: zImage: the page table memory must be considered before relocationNicolas Pitre1-1/+2
For correctness, the initial page table located right before the decompressed kernel should be considered when determining if relocation is required. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Acked-by: Tony Lindgren <[email protected]>
2011-05-07ARM: zImage: make sure not to relocate on top of the relocation codeNicolas Pitre1-10/+17
If the zImage load address is slightly below the relocation address, there is a risk for the copied data to overwrite the copy loop or cache flush code that the relocation process requires. Always bump the relocation address by the size of that code to avoid this issue. Noticed by Tony Lindgren <[email protected]>. While at it, let's start the copy from the restart symbol which makes the above code size computation possible by the assembler directly (same sections), given that we don't need to preserve the code before that point anyway. And therefore we don't need to carry the _start pointer in r5 anymore. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Tony Lindgren <[email protected]>
2011-05-06ARM: zImage: Fix bad SP address after relocating kernelTony Lindgren1-0/+5
Otherwise cache_clean_flush can overwrite some of the relocated area depending on where the kernel image gets loaded. This fixes booting on n900 after commit 6d7d0ae51574943bf571d269da3243257a2d15db (ARM: 6750/1: improvements to compressed/head.S). Thanks to Aaro Koskinen <[email protected]> for debugging the address of the relocated area that gets corrupted, and to Nicolas Pitre <[email protected]> for the other uncompress related fixes. Signed-off-by: Tony Lindgren <[email protected]> Signed-off-by: Nicolas Pitre <[email protected]>
2011-05-06ARM: zImage: make sure the stack is 64-bit alignedNicolas Pitre2-1/+2
With ARMv5+ and EABI, the compiler expects a 64-bit aligned stack so instructions like STRD and LDRD can be used. Without this, mysterious boot failures were seen semi randomly with the LZMA decompressor. While at it, let's align .bss as well. Signed-off-by: Nicolas Pitre <[email protected]> Tested-by: Shawn Guo <[email protected]> Acked-by: Tony Lindgren <[email protected]> CC: [email protected]
2011-05-03ARM: PJ4: remove the ARMv6 compatible cache method entriesNicolas Pitre1-6/+0
The Marvell PJ4 is ARMv7 capable, so we don't support it in ARMv6 mode anymore. Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Saeed Bishara <[email protected]> Acked-by: Haojian Zhuang <[email protected]>
2011-03-28ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC supportStephen Boyd2-20/+2
The inline assembly differences for v6 vs. v7 are purely optimizations. On a v7 processor, an mrc with the pc sets the condition codes to the 28-31 bits of the register being read. It just so happens that the TX/RX full bits the DCC support code is testing for are high enough in the register to be put into the condition codes. On a v6 processor, this "feature" isn't implemented and thus we have to do the usual read, mask, test operations to check for TX/RX full. Thus, we can drop the v7 implementation and just use the v6 implementation for both. Cc: Tony Lindgren <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-03-25mmc: Add MMC_PROGRESS_*Simon Horman1-4/+5
This is my second attempt to make this enum generally available. The first attempt added MMCIF_PROGRESS_* to include/linux/mmc/sh_mmcif.h. However this is not sufficiently generic as the enum will be used by SDHI boot code. Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-03-25mmc, ARM: Rename SuperH Mobile ARM zboot helpersSimon Horman1-6/+6
These headers and helpers will also be used for SDHI boot so the mmcif name will start to make a lot less sense. Signed-off-by: Simon Horman <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-03-20Merge branch 'trivial' of ↵Linus Torvalds1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-17arm: change to new flag variablesmatt mooney1-2/+2
Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y. Signed-off-by: matt mooney <[email protected]> Acked-by: WANG Cong <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-03-16Merge branch 'v6v7' into develRussell King2-2/+2
Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/proc-fns.h arch/arm/mm/Kconfig
2011-03-16Merge branch 'misc' into develRussell King3-138/+118
Conflicts: arch/arm/Kconfig
2011-03-16Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', ↵Russell King5-2/+184
'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel
Powered by cgit, Gruvboxed by Blaster4385.