Skip to content

Commit

Permalink
sh: Disable MMUCR_AT for SH-4 nommu.
Browse files Browse the repository at this point in the history
Presently address translation is default-enabled regardless of whether
CONFIG_MMU is set or not in the SH-4 case, this fixes it up, and also
makes the control init word a bit more readable in the process.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Apr 7, 2010
1 parent 94a46d3 commit 99dc5c0
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions arch/sh/include/cpu-sh4/cpu/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@
#define MMU_UTLB_DATA_ARRAY2 0xF7800000
#define MMU_PAGE_ASSOC_BIT 0x80

#define MMUCR_TI (1<<2)
#ifdef CONFIG_MMU
#define MMUCR_AT (1 << 0)
#else
#define MMUCR_AT (0)
#endif

#define MMUCR_TI (1 << 2)

#define MMUCR_URB 0x00FC0000
#define MMUCR_URB_SHIFT 18
Expand Down Expand Up @@ -65,7 +71,8 @@
#endif

#define MMU_NTLB_ENTRIES 64
#define MMU_CONTROL_INIT (0x05|MMUCR_SQMD|MMUCR_ME|MMUCR_SE|MMUCR_AEX)
#define MMU_CONTROL_INIT (MMUCR_AT | MMUCR_TI | MMUCR_SQMD | \
MMUCR_ME | MMUCR_SE | MMUCR_AEX)

#define TRA 0xff000020
#define EXPEVT 0xff000024
Expand Down

0 comments on commit 99dc5c0

Please sign in to comment.