diff options
author | Wolfgang Denk <wd@denx.de> | 2009-09-24 23:40:25 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-09-24 23:40:25 +0200 |
commit | 5e498dfab87c5b9bd1ad7b9a35f38b9e5dcd2244 (patch) | |
tree | 95fda77d5070e3c2e4da9b334fa4b36d5a229300 /include/asm-ppc/mmu.h | |
parent | 55f786d8ba8ce58a81428536da34a2192b9bad9f (diff) | |
parent | 39aaca1f66a0e5b1204b0789f6c0097938c00ad1 (diff) |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/asm-ppc/mmu.h')
-rw-r--r-- | include/asm-ppc/mmu.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index a019d0b390b..d516d91403d 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -504,13 +504,7 @@ extern int num_tlb_entries; #endif #endif -#if defined(CONFIG_MPC86xx) -#define LAWBAR_BASE_ADDR 0x00FFFFFF -#define LAWAR_TRGT_IF 0x01F00000 -#else -#define LAWBAR_BASE_ADDR 0x000FFFFF -#define LAWAR_TRGT_IF 0x00F00000 -#endif +#ifdef CONFIG_MPC83xx #define LAWAR_EN 0x80000000 #define LAWAR_SIZE 0x0000003F @@ -554,6 +548,7 @@ extern int num_tlb_entries; #define LAWAR_SIZE_8G (LAWAR_SIZE_BASE+22) #define LAWAR_SIZE_16G (LAWAR_SIZE_BASE+23) #define LAWAR_SIZE_32G (LAWAR_SIZE_BASE+24) +#endif #ifdef CONFIG_440 /* General */ |