diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2008-11-18 04:48:22 -0500 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
| commit | cb15e57cc7d68e524f709c9a541b4900df80df16 (patch) | |
| tree | 1562f9bc1d2df008ffbb230f315fb2677154d022 /arch/blackfin/kernel/cplb-nompu | |
| parent | 05a717fbc893c777165b00821b9dcde968a95bcc (diff) | |
Blackfin arch: noMMU CPLB lookup tables can be in L1 SRAM
- unify duplicate page_size_table definitions
- make sure it is placed alongside the other cplb switching code
Pointed-out-by: Michael McTernan <mmcternan@airvana.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/cplb-nompu')
| -rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbmgr.S | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbmgr.S b/arch/blackfin/kernel/cplb-nompu/cplbmgr.S index 985f3fc793f6..f4ca76c72394 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbmgr.S +++ b/arch/blackfin/kernel/cplb-nompu/cplbmgr.S | |||
| @@ -629,15 +629,20 @@ ENTRY(_cplb_mgr) | |||
| 629 | RTS; | 629 | RTS; |
| 630 | ENDPROC(_cplb_mgr) | 630 | ENDPROC(_cplb_mgr) |
| 631 | 631 | ||
| 632 | #ifdef CONFIG_CPLB_SWITCH_TAB_L1 | ||
| 633 | .section .l1.data | ||
| 634 | #else | ||
| 632 | .data | 635 | .data |
| 633 | .align 4; | 636 | #endif |
| 634 | _page_size_table: | 637 | |
| 638 | ENTRY(_page_size_table) | ||
| 635 | .byte4 0x00000400; /* 1K */ | 639 | .byte4 0x00000400; /* 1K */ |
| 636 | .byte4 0x00001000; /* 4K */ | 640 | .byte4 0x00001000; /* 4K */ |
| 637 | .byte4 0x00100000; /* 1M */ | 641 | .byte4 0x00100000; /* 1M */ |
| 638 | .byte4 0x00400000; /* 4M */ | 642 | .byte4 0x00400000; /* 4M */ |
| 643 | END(_page_size_table) | ||
| 639 | 644 | ||
| 640 | .align 4; | 645 | ENTRY(_dcplb_preference) |
| 641 | _dcplb_preference: | ||
| 642 | .byte4 0x00000001; /* valid bit */ | 646 | .byte4 0x00000001; /* valid bit */ |
| 643 | .byte4 0x00000002; /* lock bit */ | 647 | .byte4 0x00000002; /* lock bit */ |
| 648 | END(_dcplb_preference) | ||