Log Message
remove duplicated defines for the BF561, generalize L2 support (so that it works for BF54x) and mark it executable, add support for reading/executing the Boot ROM sections (since it has data/functions we may need at runtime), and fixup names for each map
Diffstat
arch/blackfin/kernel/cplbinit.c | 42 ++++++++++++++++++------------ include/asm-blackfin/mach-bf527/mem_map.h | 1 include/asm-blackfin/mach-bf533/mem_map.h | 2 - include/asm-blackfin/mach-bf537/mem_map.h | 1 include/asm-blackfin/mach-bf548/mem_map.h | 11 +++++++ include/asm-blackfin/mach-bf561/bf561.h | 19 ------------- include/asm-blackfin/mach-bf561/mem_map.h | 5 +++ 7 files changed, 45 insertions(+), 36 deletions(-)Modified Paths
- trunk/arch/blackfin/kernel/cplbinit.c
- trunk/include/asm-blackfin/mach-bf527/mem_map.h
- trunk/include/asm-blackfin/mach-bf533/mem_map.h
- trunk/include/asm-blackfin/mach-bf537/mem_map.h
- trunk/include/asm-blackfin/mach-bf548/mem_map.h
- trunk/include/asm-blackfin/mach-bf561/bf561.h
- trunk/include/asm-blackfin/mach-bf561/mem_map.h
Diff
Modified: trunk/arch/blackfin/kernel/cplbinit.c (3889 => 3890)
--- trunk/arch/blackfin/kernel/cplbinit.c 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/arch/blackfin/kernel/cplbinit.c 2007-11-18 07:57:07 UTC (rev 3890)
@@ -64,7 +64,7 @@
#else
.valid = 0,
#endif
- .name = "ZERO Pointer Saveguard",
+ .name = "Zero Pointer Guard Page",
},
{
.start = L1_CODE_START,
@@ -95,20 +95,20 @@
.end = 0, /* dynamic */
.psize = 0,
.attr = INITIAL_T | SWITCH_T | I_CPLB | D_CPLB,
- .i_conf = SDRAM_IGENERIC,
- .d_conf = SDRAM_DGENERIC,
+ .i_conf = SDRAM_IGENERIC,
+ .d_conf = SDRAM_DGENERIC,
.valid = 1,
- .name = "SDRAM Kernel",
+ .name = "Kernel Memory",
},
{
.start = 0, /* dynamic */
.end = 0, /* dynamic */
.psize = 0,
.attr = INITIAL_T | SWITCH_T | D_CPLB,
- .i_conf = SDRAM_IGENERIC,
- .d_conf = SDRAM_DNON_CHBL,
+ .i_conf = SDRAM_IGENERIC,
+ .d_conf = SDRAM_DNON_CHBL,
.valid = 1,
- .name = "SDRAM RAM MTD",
+ .name = "uClinux MTD Memory",
},
{
.start = 0, /* dynamic */
@@ -117,7 +117,7 @@
.attr = INITIAL_T | SWITCH_T | D_CPLB,
.d_conf = SDRAM_DNON_CHBL,
.valid = 1,
- .name = "SDRAM Uncached DMA ZONE",
+ .name = "Uncached DMA Zone",
},
{
.start = 0, /* dynamic */
@@ -127,7 +127,7 @@
.i_conf = 0, /* dynamic */
.d_conf = 0, /* dynamic */
.valid = 1,
- .name = "SDRAM Reserved Memory",
+ .name = "Reserved Memory",
},
{
.start = ASYNC_BANK0_BASE,
@@ -136,14 +136,14 @@
.attr = SWITCH_T | D_CPLB,
.d_conf = SDRAM_EBIU,
.valid = 1,
- .name = "ASYNC Memory",
+ .name = "Asynchronous Memory Banks",
},
{
-#if defined(CONFIG_BF561)
- .start = L2_SRAM,
- .end = L2_SRAM_END,
+#ifdef L2_START
+ .start = L2_START,
+ .end = L2_START + L2_LENGTH,
.psize = SIZE_1M,
- .attr = SWITCH_T | D_CPLB,
+ .attr = SWITCH_T | I_CPLB | D_CPLB,
.i_conf = L2_MEMORY,
.d_conf = L2_MEMORY,
.valid = 1,
@@ -151,7 +151,17 @@
.valid = 0,
#endif
.name = "L2 Memory",
- }
+ },
+ {
+ .start = BOOT_ROM_START,
+ .end = BOOT_ROM_START + BOOT_ROM_LENGTH,
+ .psize = SIZE_1M,
+ .attr = SWITCH_T | I_CPLB | D_CPLB,
+ .i_conf = SDRAM_IGENERIC,
+ .d_conf = SDRAM_DGENERIC,
+ .valid = 1,
+ .name = "On-Chip BootROM",
+ },
};
static u16 __init lock_kernel_check(u32 start, u32 end)
@@ -343,7 +353,7 @@
else
cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL;
- for (i = ZERO_P; i <= L2_MEM; i++) {
+ for (i = ZERO_P; i < ARRAY_SIZE(cplb_data); ++i) {
if (!cplb_data[i].valid)
continue;
Modified: trunk/include/asm-blackfin/mach-bf527/mem_map.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf527/mem_map.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf527/mem_map.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -47,6 +47,7 @@
/* Boot ROM Memory */
#define BOOT_ROM_START 0xEF000000
+#define BOOT_ROM_LENGTH 0x8000
/* Level 1 Memory */
Modified: trunk/include/asm-blackfin/mach-bf533/mem_map.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf533/mem_map.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf533/mem_map.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -1,4 +1,3 @@
-
/*
* File: include/asm-blackfin/mach-bf533/mem_map.h
* Based on:
@@ -48,6 +47,7 @@
/* Boot ROM Memory */
#define BOOT_ROM_START 0xEF000000
+#define BOOT_ROM_LENGTH 0x400
/* Level 1 Memory */
Modified: trunk/include/asm-blackfin/mach-bf537/mem_map.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf537/mem_map.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf537/mem_map.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -47,6 +47,7 @@
/* Boot ROM Memory */
#define BOOT_ROM_START 0xEF000000
+#define BOOT_ROM_LENGTH 0x800
/* Level 1 Memory */
Modified: trunk/include/asm-blackfin/mach-bf548/mem_map.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf548/mem_map.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf548/mem_map.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -47,6 +47,7 @@
/* Boot ROM Memory */
#define BOOT_ROM_START 0xEF000000
+#define BOOT_ROM_LENGTH 0x1000
/* Level 1 Memory */
@@ -87,6 +88,16 @@
#define BFIN_DSUPBANKS 0
#endif /*CONFIG_BFIN_DCACHE*/
+/* Level 2 Memory */
+#if !defined(CONFIG_BF542)
+# define L2_START 0xFEB00000
+# if defined(CONFIG_BF544)
+# define L2_LENGTH 0x10000
+# else
+# define L2_LENGTH 0x20000
+# endif
+#endif
+
/* Scratch Pad Memory */
#define L1_SCRATCH_START 0xFFB00000
Modified: trunk/include/asm-blackfin/mach-bf561/bf561.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf561/bf561.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf561/bf561.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -33,25 +33,6 @@
#define SUPPORTED_REVID 0x3
#define OFFSET_(x) ((x) & 0x0000FFFF)
-#define L1_ISRAM 0xFFA00000
-#define L1_ISRAM_END 0xFFA04000
-#define DATA_BANKA_SRAM 0xFF800000
-#define DATA_BANKA_SRAM_END 0xFF804000
-#define DATA_BANKB_SRAM 0xFF900000
-#define DATA_BANKB_SRAM_END 0xFF904000
-#define L1_DSRAMA 0xFF800000
-#define L1_DSRAMA_END 0xFF804000
-#define L1_DSRAMB 0xFF900000
-#define L1_DSRAMB_END 0xFF904000
-#define L2_SRAM 0xFEB00000
-#define L2_SRAM_END 0xFEB20000
-#define AMB_FLASH 0x20000000
-#define AMB_FLASH_END 0x21000000
-#define AMB_FLASH_LENGTH 0x01000000
-#define L1_ISRAM_LENGTH 0x4000
-#define L1_DSRAMA_LENGTH 0x4000
-#define L1_DSRAMB_LENGTH 0x4000
-#define L2_SRAM_LENGTH 0x20000
/*some misc defines*/
#define IMASK_IVG15 0x8000
Modified: trunk/include/asm-blackfin/mach-bf561/mem_map.h (3889 => 3890)
--- trunk/include/asm-blackfin/mach-bf561/mem_map.h 2007-11-18 07:44:44 UTC (rev 3889)
+++ trunk/include/asm-blackfin/mach-bf561/mem_map.h 2007-11-18 07:57:07 UTC (rev 3890)
@@ -19,6 +19,11 @@
#define ASYNC_BANK0_BASE 0x20000000 /* Async Bank 0 */
#define ASYNC_BANK0_SIZE 0x04000000 /* 64M */
+/* Boot ROM Memory */
+
+#define BOOT_ROM_START 0xEF000000
+#define BOOT_ROM_LENGTH 0x800
+
/* Level 1 Memory */
#ifdef CONFIG_BFIN_ICACHE
_______________________________________________ Linux-kernel-commits mailing list [email protected] http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
