diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-01-28 08:21:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 08:21:30 -0500 |
| commit | c00d4ffdbace1bdc9fdd888e4ba6d207ffa3b679 (patch) | |
| tree | 2c9ddd5ae9cd899758b0785d4c7eb4bc200d66df /arch/arm/boot | |
| parent | d0d42df2a440003d96c8bf29991c2afb691ef720 (diff) | |
| parent | 8f86dda3ed8f05748f2351ae967926227a91ca2a (diff) | |
Merge branch 'orion' into devel
* orion: (26 commits)
[ARM] Orion: implement power-off method for QNAP TS-109/209
[ARM] Orion: add support for QNAP TS-109/TS-209
[ARM] Orion: I2C support
[I2C] i2c-mv64xxx: Don't set i2c_adapter.retries
[I2C] Split mv643xx I2C platform support
[ARM] Orion: enable CONFIG_RTC_DRV_M41T80 for D-Link DNS-323
[ARM] Orion defconfig
[ARM] Orion: add support for Orion/MV88F5181 based D-Link DNS-323
[ARM] Orion: MV88F5181 support bits
[ARM] Orion: Buffalo/Revogear Kurobox Pro support
[ARM] OrionNAS RD board support
[ARM] Orion: support for Marvell Orion-2 (88F5281) Development Board
[ARM] Orion: common platform setup for Gigabit Ethernet port
[ARM] Orion: platform device registration for UART, USB and NAND
[ARM] Orion: system timer support
[ARM] Orion edge GPIO IRQ support
[ARM] Orion: IRQ support
[ARM] Orion: provide GPIO method for enabling hardware assisted blinking
[ARM] Orion: GPIO support
[ARM] Orion: programable address map support
...
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 5cac46a19bb7..3c2c8f2a1dc4 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -623,6 +623,12 @@ proc_types: | |||
| 623 | b __armv4_mmu_cache_off | 623 | b __armv4_mmu_cache_off |
| 624 | b __armv4_mmu_cache_flush | 624 | b __armv4_mmu_cache_flush |
| 625 | 625 | ||
| 626 | .word 0x56055310 @ Feroceon | ||
| 627 | .word 0xfffffff0 | ||
| 628 | b __armv4_mmu_cache_on | ||
| 629 | b __armv4_mmu_cache_off | ||
| 630 | b __armv5tej_mmu_cache_flush | ||
| 631 | |||
| 626 | @ These match on the architecture ID | 632 | @ These match on the architecture ID |
| 627 | 633 | ||
| 628 | .word 0x00020000 @ ARMv4T | 634 | .word 0x00020000 @ ARMv4T |
| @@ -641,7 +647,7 @@ proc_types: | |||
| 641 | .word 0x000f0000 | 647 | .word 0x000f0000 |
| 642 | b __armv4_mmu_cache_on | 648 | b __armv4_mmu_cache_on |
| 643 | b __armv4_mmu_cache_off | 649 | b __armv4_mmu_cache_off |
| 644 | b __armv4_mmu_cache_flush | 650 | b __armv5tej_mmu_cache_flush |
| 645 | 651 | ||
| 646 | .word 0x0007b000 @ ARMv6 | 652 | .word 0x0007b000 @ ARMv6 |
| 647 | .word 0x000ff000 | 653 | .word 0x000ff000 |
| @@ -821,6 +827,13 @@ iflush: | |||
| 821 | mcr p15, 0, r10, c7, c10, 4 @ drain WB | 827 | mcr p15, 0, r10, c7, c10, 4 @ drain WB |
| 822 | mov pc, lr | 828 | mov pc, lr |
| 823 | 829 | ||
| 830 | __armv5tej_mmu_cache_flush: | ||
| 831 | 1: mrc p15, 0, r15, c7, c14, 3 @ test,clean,invalidate D cache | ||
| 832 | bne 1b | ||
| 833 | mcr p15, 0, r0, c7, c5, 0 @ flush I cache | ||
| 834 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | ||
| 835 | mov pc, lr | ||
| 836 | |||
| 824 | __armv4_mmu_cache_flush: | 837 | __armv4_mmu_cache_flush: |
| 825 | mov r2, #64*1024 @ default: 32K dcache size (*2) | 838 | mov r2, #64*1024 @ default: 32K dcache size (*2) |
| 826 | mov r11, #32 @ default: 32 byte line size | 839 | mov r11, #32 @ default: 32 byte line size |