diff options
author | Robin Getz <rgetz@blackfin.uclinux.org> | 2008-08-05 05:47:29 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-08-05 05:47:29 -0400 |
commit | aa5829776347dbd9eeb461f650c1d085cf463a83 (patch) | |
tree | 43ba57fe3eb7b644e08316e78304e57c3a6c838d | |
parent | 4a88d0ce494034fbb8dd0076d80e71b38abf5748 (diff) |
Blackfin arch: be consistant with parition names, and ensure the bus is identified
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 18 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 14 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 6 |
15 files changed, 67 insertions, 67 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 0b26ae2de5ee..749f4a806b5f 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -160,15 +160,15 @@ static struct platform_device musb_device = { | |||
160 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 160 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
161 | static struct mtd_partition ezkit_partitions[] = { | 161 | static struct mtd_partition ezkit_partitions[] = { |
162 | { | 162 | { |
163 | .name = "Bootloader", | 163 | .name = "bootloader(nor)", |
164 | .size = 0x40000, | 164 | .size = 0x40000, |
165 | .offset = 0, | 165 | .offset = 0, |
166 | }, { | 166 | }, { |
167 | .name = "Kernel", | 167 | .name = "linux kernel(nor)", |
168 | .size = 0x1C0000, | 168 | .size = 0x1C0000, |
169 | .offset = MTDPART_OFS_APPEND, | 169 | .offset = MTDPART_OFS_APPEND, |
170 | }, { | 170 | }, { |
171 | .name = "RootFS", | 171 | .name = "file system(nor)", |
172 | .size = MTDPART_SIZ_FULL, | 172 | .size = MTDPART_SIZ_FULL, |
173 | .offset = MTDPART_OFS_APPEND, | 173 | .offset = MTDPART_OFS_APPEND, |
174 | } | 174 | } |
@@ -200,12 +200,12 @@ static struct platform_device ezkit_flash_device = { | |||
200 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 200 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
201 | static struct mtd_partition partition_info[] = { | 201 | static struct mtd_partition partition_info[] = { |
202 | { | 202 | { |
203 | .name = "Linux Kernel", | 203 | .name = "linux kernel(nand)", |
204 | .offset = 0, | 204 | .offset = 0, |
205 | .size = 4 * SIZE_1M, | 205 | .size = 4 * SIZE_1M, |
206 | }, | 206 | }, |
207 | { | 207 | { |
208 | .name = "File System", | 208 | .name = "file system(nand)", |
209 | .offset = MTDPART_OFS_APPEND, | 209 | .offset = MTDPART_OFS_APPEND, |
210 | .size = MTDPART_SIZ_FULL, | 210 | .size = MTDPART_SIZ_FULL, |
211 | }, | 211 | }, |
@@ -438,12 +438,12 @@ static struct platform_device net2272_bfin_device = { | |||
438 | || defined(CONFIG_MTD_M25P80_MODULE) | 438 | || defined(CONFIG_MTD_M25P80_MODULE) |
439 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 439 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
440 | { | 440 | { |
441 | .name = "bootloader", | 441 | .name = "bootloader(spi)", |
442 | .size = 0x00040000, | 442 | .size = 0x00040000, |
443 | .offset = 0, | 443 | .offset = 0, |
444 | .mask_flags = MTD_CAP_ROM | 444 | .mask_flags = MTD_CAP_ROM |
445 | }, { | 445 | }, { |
446 | .name = "linux kernel", | 446 | .name = "linux kernel(spi)", |
447 | .size = MTDPART_SIZ_FULL, | 447 | .size = MTDPART_SIZ_FULL, |
448 | .offset = MTDPART_OFS_APPEND, | 448 | .offset = MTDPART_OFS_APPEND, |
449 | } | 449 | } |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 689b69c98ee4..cbd47bce6893 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -177,15 +177,15 @@ static struct platform_device bf52x_t350mcqb_device = { | |||
177 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 177 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
178 | static struct mtd_partition ezkit_partitions[] = { | 178 | static struct mtd_partition ezkit_partitions[] = { |
179 | { | 179 | { |
180 | .name = "Bootloader", | 180 | .name = "bootloader(nor)", |
181 | .size = 0x40000, | 181 | .size = 0x40000, |
182 | .offset = 0, | 182 | .offset = 0, |
183 | }, { | 183 | }, { |
184 | .name = "Kernel", | 184 | .name = "linux kernel(nor)", |
185 | .size = 0x1C0000, | 185 | .size = 0x1C0000, |
186 | .offset = MTDPART_OFS_APPEND, | 186 | .offset = MTDPART_OFS_APPEND, |
187 | }, { | 187 | }, { |
188 | .name = "RootFS", | 188 | .name = "file system(nor)", |
189 | .size = MTDPART_SIZ_FULL, | 189 | .size = MTDPART_SIZ_FULL, |
190 | .offset = MTDPART_OFS_APPEND, | 190 | .offset = MTDPART_OFS_APPEND, |
191 | } | 191 | } |
@@ -217,12 +217,12 @@ static struct platform_device ezkit_flash_device = { | |||
217 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 217 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
218 | static struct mtd_partition partition_info[] = { | 218 | static struct mtd_partition partition_info[] = { |
219 | { | 219 | { |
220 | .name = "Linux Kernel", | 220 | .name = "linux kernel(nand)", |
221 | .offset = 0, | 221 | .offset = 0, |
222 | .size = 4 * SIZE_1M, | 222 | .size = 4 * SIZE_1M, |
223 | }, | 223 | }, |
224 | { | 224 | { |
225 | .name = "File System", | 225 | .name = "file system(nand)", |
226 | .offset = MTDPART_OFS_APPEND, | 226 | .offset = MTDPART_OFS_APPEND, |
227 | .size = MTDPART_SIZ_FULL, | 227 | .size = MTDPART_SIZ_FULL, |
228 | }, | 228 | }, |
@@ -460,12 +460,12 @@ static struct platform_device net2272_bfin_device = { | |||
460 | || defined(CONFIG_MTD_M25P80_MODULE) | 460 | || defined(CONFIG_MTD_M25P80_MODULE) |
461 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 461 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
462 | { | 462 | { |
463 | .name = "bootloader", | 463 | .name = "bootloader(spi)", |
464 | .size = 0x00040000, | 464 | .size = 0x00040000, |
465 | .offset = 0, | 465 | .offset = 0, |
466 | .mask_flags = MTD_CAP_ROM | 466 | .mask_flags = MTD_CAP_ROM |
467 | }, { | 467 | }, { |
468 | .name = "linux kernel", | 468 | .name = "linux kernel(spi)", |
469 | .size = MTDPART_SIZ_FULL, | 469 | .size = MTDPART_SIZ_FULL, |
470 | .offset = MTDPART_OFS_APPEND, | 470 | .offset = MTDPART_OFS_APPEND, |
471 | } | 471 | } |
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index 4103a97c1a70..cecbc624e3df 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
@@ -141,16 +141,16 @@ static struct platform_device net2272_bfin_device = { | |||
141 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 141 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
142 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 142 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
143 | { | 143 | { |
144 | .name = "bootloader", | 144 | .name = "bootloader(spi)", |
145 | .size = 0x00060000, | 145 | .size = 0x00060000, |
146 | .offset = 0, | 146 | .offset = 0, |
147 | .mask_flags = MTD_CAP_ROM | 147 | .mask_flags = MTD_CAP_ROM |
148 | }, { | 148 | }, { |
149 | .name = "kernel", | 149 | .name = "linux kernel(spi)", |
150 | .size = 0x100000, | 150 | .size = 0x100000, |
151 | .offset = 0x60000 | 151 | .offset = 0x60000 |
152 | }, { | 152 | }, { |
153 | .name = "file system", | 153 | .name = "file system(spi)", |
154 | .size = 0x6a0000, | 154 | .size = 0x6a0000, |
155 | .offset = 0x00160000, | 155 | .offset = 0x00160000, |
156 | } | 156 | } |
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index ed2b0b8f5dc9..dfccf826fa33 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -53,16 +53,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF533"; | |||
53 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 53 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
54 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 54 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
55 | { | 55 | { |
56 | .name = "bootloader", | 56 | .name = "bootloader(spi)", |
57 | .size = 0x00020000, | 57 | .size = 0x00020000, |
58 | .offset = 0, | 58 | .offset = 0, |
59 | .mask_flags = MTD_CAP_ROM | 59 | .mask_flags = MTD_CAP_ROM |
60 | }, { | 60 | }, { |
61 | .name = "kernel", | 61 | .name = "linux kernel(spi)", |
62 | .size = 0xe0000, | 62 | .size = 0xe0000, |
63 | .offset = 0x20000 | 63 | .offset = 0x20000 |
64 | }, { | 64 | }, { |
65 | .name = "file system", | 65 | .name = "file system(spi)", |
66 | .size = 0x700000, | 66 | .size = 0x700000, |
67 | .offset = 0x00100000, | 67 | .offset = 0x00100000, |
68 | } | 68 | } |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 079389cbd859..6a34f1519c07 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -90,16 +90,16 @@ static struct platform_device smc91x_device = { | |||
90 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 90 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
91 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 91 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
92 | { | 92 | { |
93 | .name = "bootloader", | 93 | .name = "bootloader(spi)", |
94 | .size = 0x00020000, | 94 | .size = 0x00020000, |
95 | .offset = 0, | 95 | .offset = 0, |
96 | .mask_flags = MTD_CAP_ROM | 96 | .mask_flags = MTD_CAP_ROM |
97 | }, { | 97 | }, { |
98 | .name = "kernel", | 98 | .name = "linux kernel(spi)", |
99 | .size = 0xe0000, | 99 | .size = 0xe0000, |
100 | .offset = MTDPART_OFS_APPEND, | 100 | .offset = MTDPART_OFS_APPEND, |
101 | }, { | 101 | }, { |
102 | .name = "file system", | 102 | .name = "file system(spi)", |
103 | .size = MTDPART_SIZ_FULL, | 103 | .size = MTDPART_SIZ_FULL, |
104 | .offset = MTDPART_OFS_APPEND, | 104 | .offset = MTDPART_OFS_APPEND, |
105 | } | 105 | } |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 13ae49515f73..d10b2dc59024 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -114,15 +114,15 @@ static struct platform_device net2272_bfin_device = { | |||
114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) | 114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
115 | static struct mtd_partition stamp_partitions[] = { | 115 | static struct mtd_partition stamp_partitions[] = { |
116 | { | 116 | { |
117 | .name = "Bootloader", | 117 | .name = "bootloader(nor)", |
118 | .size = 0x40000, | 118 | .size = 0x40000, |
119 | .offset = 0, | 119 | .offset = 0, |
120 | }, { | 120 | }, { |
121 | .name = "Kernel", | 121 | .name = "linux kernel(nor)", |
122 | .size = 0xE0000, | 122 | .size = 0xE0000, |
123 | .offset = MTDPART_OFS_APPEND, | 123 | .offset = MTDPART_OFS_APPEND, |
124 | }, { | 124 | }, { |
125 | .name = "RootFS", | 125 | .name = "file system(nor)", |
126 | .size = MTDPART_SIZ_FULL, | 126 | .size = MTDPART_SIZ_FULL, |
127 | .offset = MTDPART_OFS_APPEND, | 127 | .offset = MTDPART_OFS_APPEND, |
128 | } | 128 | } |
@@ -164,16 +164,16 @@ static struct platform_device stamp_flash_device = { | |||
164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
165 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 165 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
166 | { | 166 | { |
167 | .name = "bootloader", | 167 | .name = "bootloader(spi)", |
168 | .size = 0x00040000, | 168 | .size = 0x00040000, |
169 | .offset = 0, | 169 | .offset = 0, |
170 | .mask_flags = MTD_CAP_ROM | 170 | .mask_flags = MTD_CAP_ROM |
171 | }, { | 171 | }, { |
172 | .name = "kernel", | 172 | .name = "linux kernel(spi)", |
173 | .size = 0xe0000, | 173 | .size = 0xe0000, |
174 | .offset = MTDPART_OFS_APPEND, | 174 | .offset = MTDPART_OFS_APPEND, |
175 | }, { | 175 | }, { |
176 | .name = "file system", | 176 | .name = "file system(spi)", |
177 | .size = MTDPART_SIZ_FULL, | 177 | .size = MTDPART_SIZ_FULL, |
178 | .offset = MTDPART_OFS_APPEND, | 178 | .offset = MTDPART_OFS_APPEND, |
179 | } | 179 | } |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index 73f2142875e2..cb73ed5cc1a4 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
@@ -56,16 +56,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF537"; | |||
56 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 56 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
57 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 57 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
58 | { | 58 | { |
59 | .name = "bootloader", | 59 | .name = "bootloader(spi)", |
60 | .size = 0x00020000, | 60 | .size = 0x00020000, |
61 | .offset = 0, | 61 | .offset = 0, |
62 | .mask_flags = MTD_CAP_ROM | 62 | .mask_flags = MTD_CAP_ROM |
63 | }, { | 63 | }, { |
64 | .name = "kernel", | 64 | .name = "linux kernel(spi)", |
65 | .size = 0xe0000, | 65 | .size = 0xe0000, |
66 | .offset = 0x20000 | 66 | .offset = 0x20000 |
67 | }, { | 67 | }, { |
68 | .name = "file system", | 68 | .name = "file system(spi)", |
69 | .size = 0x700000, | 69 | .size = 0x700000, |
70 | .offset = 0x00100000, | 70 | .offset = 0x00100000, |
71 | } | 71 | } |
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 01b63e2ec18f..f5bc9258f83b 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -307,16 +307,16 @@ static struct platform_device net2272_bfin_device = { | |||
307 | || defined(CONFIG_MTD_M25P80_MODULE) | 307 | || defined(CONFIG_MTD_M25P80_MODULE) |
308 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 308 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
309 | { | 309 | { |
310 | .name = "bootloader", | 310 | .name = "bootloader(spi)", |
311 | .size = 0x00020000, | 311 | .size = 0x00020000, |
312 | .offset = 0, | 312 | .offset = 0, |
313 | .mask_flags = MTD_CAP_ROM | 313 | .mask_flags = MTD_CAP_ROM |
314 | }, { | 314 | }, { |
315 | .name = "kernel", | 315 | .name = "linux kernel(spi)", |
316 | .size = 0xe0000, | 316 | .size = 0xe0000, |
317 | .offset = 0x20000 | 317 | .offset = 0x20000 |
318 | }, { | 318 | }, { |
319 | .name = "file system", | 319 | .name = "file system(spi)", |
320 | .size = 0x700000, | 320 | .size = 0x700000, |
321 | .offset = 0x00100000, | 321 | .offset = 0x00100000, |
322 | } | 322 | } |
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 18ddf7a52005..48c4cd2d1be6 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -100,16 +100,16 @@ static struct platform_device net2272_bfin_device = { | |||
100 | 100 | ||
101 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 101 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
102 | { | 102 | { |
103 | .name = "uboot", | 103 | .name = "bootloader(spi)", |
104 | .size = PSIZE_UBOOT, | 104 | .size = PSIZE_UBOOT, |
105 | .offset = 0x000000, | 105 | .offset = 0x000000, |
106 | .mask_flags = MTD_CAP_ROM | 106 | .mask_flags = MTD_CAP_ROM |
107 | }, { | 107 | }, { |
108 | .name = "initramfs", | 108 | .name = "initramfs(spi)", |
109 | .size = PSIZE_INITRAMFS, | 109 | .size = PSIZE_INITRAMFS, |
110 | .offset = PSIZE_UBOOT | 110 | .offset = PSIZE_UBOOT |
111 | }, { | 111 | }, { |
112 | .name = "opt", | 112 | .name = "opt(spi)", |
113 | .size = FLASH_SIZE - (PSIZE_UBOOT + PSIZE_INITRAMFS), | 113 | .size = FLASH_SIZE - (PSIZE_UBOOT + PSIZE_INITRAMFS), |
114 | .offset = PSIZE_UBOOT + PSIZE_INITRAMFS, | 114 | .offset = PSIZE_UBOOT + PSIZE_INITRAMFS, |
115 | } | 115 | } |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 51c3bab14a69..f9174c11cbd4 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -231,16 +231,16 @@ static struct platform_device net2272_bfin_device = { | |||
231 | || defined(CONFIG_MTD_M25P80_MODULE) | 231 | || defined(CONFIG_MTD_M25P80_MODULE) |
232 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 232 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
233 | { | 233 | { |
234 | .name = "bootloader", | 234 | .name = "bootloader(spi)", |
235 | .size = 0x00020000, | 235 | .size = 0x00020000, |
236 | .offset = 0, | 236 | .offset = 0, |
237 | .mask_flags = MTD_CAP_ROM | 237 | .mask_flags = MTD_CAP_ROM |
238 | }, { | 238 | }, { |
239 | .name = "kernel", | 239 | .name = "linux kernel(spi)", |
240 | .size = 0xe0000, | 240 | .size = 0xe0000, |
241 | .offset = 0x20000 | 241 | .offset = 0x20000 |
242 | }, { | 242 | }, { |
243 | .name = "file system", | 243 | .name = "file system(spi)", |
244 | .size = 0x700000, | 244 | .size = 0x700000, |
245 | .offset = 0x00100000, | 245 | .offset = 0x00100000, |
246 | } | 246 | } |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 6dbc76fb080b..e93964fdb432 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -364,11 +364,11 @@ const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; | |||
364 | 364 | ||
365 | static struct mtd_partition bfin_plat_nand_partitions[] = { | 365 | static struct mtd_partition bfin_plat_nand_partitions[] = { |
366 | { | 366 | { |
367 | .name = "linux kernel", | 367 | .name = "linux kernel(nand)", |
368 | .size = 0x400000, | 368 | .size = 0x400000, |
369 | .offset = 0, | 369 | .offset = 0, |
370 | }, { | 370 | }, { |
371 | .name = "file system", | 371 | .name = "file system(nand)", |
372 | .size = MTDPART_SIZ_FULL, | 372 | .size = MTDPART_SIZ_FULL, |
373 | .offset = MTDPART_OFS_APPEND, | 373 | .offset = MTDPART_OFS_APPEND, |
374 | }, | 374 | }, |
@@ -439,19 +439,19 @@ static void bfin_plat_nand_init(void) {} | |||
439 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 439 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
440 | static struct mtd_partition stamp_partitions[] = { | 440 | static struct mtd_partition stamp_partitions[] = { |
441 | { | 441 | { |
442 | .name = "Bootloader", | 442 | .name = "bootloader(nor)", |
443 | .size = 0x40000, | 443 | .size = 0x40000, |
444 | .offset = 0, | 444 | .offset = 0, |
445 | }, { | 445 | }, { |
446 | .name = "Kernel", | 446 | .name = "linux kernel(nor)", |
447 | .size = 0xE0000, | 447 | .size = 0xE0000, |
448 | .offset = MTDPART_OFS_APPEND, | 448 | .offset = MTDPART_OFS_APPEND, |
449 | }, { | 449 | }, { |
450 | .name = "RootFS", | 450 | .name = "file system(nor)", |
451 | .size = 0x400000 - 0x40000 - 0xE0000 - 0x10000, | 451 | .size = 0x400000 - 0x40000 - 0xE0000 - 0x10000, |
452 | .offset = MTDPART_OFS_APPEND, | 452 | .offset = MTDPART_OFS_APPEND, |
453 | }, { | 453 | }, { |
454 | .name = "MAC Address", | 454 | .name = "MAC Address(nor)", |
455 | .size = MTDPART_SIZ_FULL, | 455 | .size = MTDPART_SIZ_FULL, |
456 | .offset = 0x3F0000, | 456 | .offset = 0x3F0000, |
457 | .mask_flags = MTD_WRITEABLE, | 457 | .mask_flags = MTD_WRITEABLE, |
@@ -485,16 +485,16 @@ static struct platform_device stamp_flash_device = { | |||
485 | || defined(CONFIG_MTD_M25P80_MODULE) | 485 | || defined(CONFIG_MTD_M25P80_MODULE) |
486 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 486 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
487 | { | 487 | { |
488 | .name = "bootloader", | 488 | .name = "bootloader(spi)", |
489 | .size = 0x00040000, | 489 | .size = 0x00040000, |
490 | .offset = 0, | 490 | .offset = 0, |
491 | .mask_flags = MTD_CAP_ROM | 491 | .mask_flags = MTD_CAP_ROM |
492 | }, { | 492 | }, { |
493 | .name = "kernel", | 493 | .name = "linux kernel(spi)", |
494 | .size = 0xe0000, | 494 | .size = 0xe0000, |
495 | .offset = MTDPART_OFS_APPEND, | 495 | .offset = MTDPART_OFS_APPEND, |
496 | }, { | 496 | }, { |
497 | .name = "file system", | 497 | .name = "file system(spi)", |
498 | .size = MTDPART_SIZ_FULL, | 498 | .size = MTDPART_SIZ_FULL, |
499 | .offset = MTDPART_OFS_APPEND, | 499 | .offset = MTDPART_OFS_APPEND, |
500 | } | 500 | } |
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 4f4ae8787edf..58abbed0a225 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -319,12 +319,12 @@ static struct platform_device bfin_atapi_device = { | |||
319 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 319 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
320 | static struct mtd_partition partition_info[] = { | 320 | static struct mtd_partition partition_info[] = { |
321 | { | 321 | { |
322 | .name = "Linux Kernel", | 322 | .name = "linux kernel(nand)", |
323 | .offset = 0, | 323 | .offset = 0, |
324 | .size = 4 * SIZE_1M, | 324 | .size = 4 * SIZE_1M, |
325 | }, | 325 | }, |
326 | { | 326 | { |
327 | .name = "File System", | 327 | .name = "file system(nand)", |
328 | .offset = 4 * SIZE_1M, | 328 | .offset = 4 * SIZE_1M, |
329 | .size = (256 - 4) * SIZE_1M, | 329 | .size = (256 - 4) * SIZE_1M, |
330 | }, | 330 | }, |
@@ -377,12 +377,12 @@ static struct platform_device bf54x_sdh_device = { | |||
377 | /* SPI flash chip (m25p16) */ | 377 | /* SPI flash chip (m25p16) */ |
378 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 378 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
379 | { | 379 | { |
380 | .name = "bootloader", | 380 | .name = "bootloader(spi)", |
381 | .size = 0x00040000, | 381 | .size = 0x00040000, |
382 | .offset = 0, | 382 | .offset = 0, |
383 | .mask_flags = MTD_CAP_ROM | 383 | .mask_flags = MTD_CAP_ROM |
384 | }, { | 384 | }, { |
385 | .name = "linux kernel", | 385 | .name = "linux kernel(spi)", |
386 | .size = 0x1c0000, | 386 | .size = 0x1c0000, |
387 | .offset = 0x40000 | 387 | .offset = 0x40000 |
388 | } | 388 | } |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 166fa2201ee7..0d6333ada1d9 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -365,12 +365,12 @@ static struct platform_device bfin_atapi_device = { | |||
365 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) | 365 | #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE) |
366 | static struct mtd_partition partition_info[] = { | 366 | static struct mtd_partition partition_info[] = { |
367 | { | 367 | { |
368 | .name = "Linux Kernel", | 368 | .name = "linux kernel(nand)", |
369 | .offset = 0, | 369 | .offset = 0, |
370 | .size = 4 * SIZE_1M, | 370 | .size = 4 * SIZE_1M, |
371 | }, | 371 | }, |
372 | { | 372 | { |
373 | .name = "File System", | 373 | .name = "file system(nand)", |
374 | .offset = MTDPART_OFS_APPEND, | 374 | .offset = MTDPART_OFS_APPEND, |
375 | .size = MTDPART_SIZ_FULL, | 375 | .size = MTDPART_SIZ_FULL, |
376 | }, | 376 | }, |
@@ -419,15 +419,15 @@ static struct platform_device bf54x_sdh_device = { | |||
419 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 419 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
420 | static struct mtd_partition ezkit_partitions[] = { | 420 | static struct mtd_partition ezkit_partitions[] = { |
421 | { | 421 | { |
422 | .name = "Bootloader", | 422 | .name = "bootloader(nor)", |
423 | .size = 0x40000, | 423 | .size = 0x40000, |
424 | .offset = 0, | 424 | .offset = 0, |
425 | }, { | 425 | }, { |
426 | .name = "Kernel", | 426 | .name = "linux kernel(nor)", |
427 | .size = 0x1C0000, | 427 | .size = 0x1C0000, |
428 | .offset = MTDPART_OFS_APPEND, | 428 | .offset = MTDPART_OFS_APPEND, |
429 | }, { | 429 | }, { |
430 | .name = "RootFS", | 430 | .name = "file system(nor)", |
431 | .size = MTDPART_SIZ_FULL, | 431 | .size = MTDPART_SIZ_FULL, |
432 | .offset = MTDPART_OFS_APPEND, | 432 | .offset = MTDPART_OFS_APPEND, |
433 | } | 433 | } |
@@ -461,12 +461,12 @@ static struct platform_device ezkit_flash_device = { | |||
461 | /* SPI flash chip (m25p16) */ | 461 | /* SPI flash chip (m25p16) */ |
462 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 462 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
463 | { | 463 | { |
464 | .name = "bootloader", | 464 | .name = "bootloader(spi)", |
465 | .size = 0x00040000, | 465 | .size = 0x00040000, |
466 | .offset = 0, | 466 | .offset = 0, |
467 | .mask_flags = MTD_CAP_ROM | 467 | .mask_flags = MTD_CAP_ROM |
468 | }, { | 468 | }, { |
469 | .name = "linux kernel", | 469 | .name = "linux kernel(spi)", |
470 | .size = MTDPART_SIZ_FULL, | 470 | .size = MTDPART_SIZ_FULL, |
471 | .offset = MTDPART_OFS_APPEND, | 471 | .offset = MTDPART_OFS_APPEND, |
472 | } | 472 | } |
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 466ef5929a25..1309ec15b3cf 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -54,16 +54,16 @@ const char bfin_board_name[] = "Bluetechnix CM BF561"; | |||
54 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 54 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
55 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 55 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
56 | { | 56 | { |
57 | .name = "bootloader", | 57 | .name = "bootloader(spi)", |
58 | .size = 0x00020000, | 58 | .size = 0x00020000, |
59 | .offset = 0, | 59 | .offset = 0, |
60 | .mask_flags = MTD_CAP_ROM | 60 | .mask_flags = MTD_CAP_ROM |
61 | }, { | 61 | }, { |
62 | .name = "kernel", | 62 | .name = "linux kernel(spi)", |
63 | .size = 0xe0000, | 63 | .size = 0xe0000, |
64 | .offset = 0x20000 | 64 | .offset = 0x20000 |
65 | }, { | 65 | }, { |
66 | .name = "file system", | 66 | .name = "file system(spi)", |
67 | .size = 0x700000, | 67 | .size = 0x700000, |
68 | .offset = 0x00100000, | 68 | .offset = 0x00100000, |
69 | } | 69 | } |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index bc6feded8569..2affbdf2fb4a 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -243,15 +243,15 @@ static struct platform_device bfin_sir_device = { | |||
243 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | 243 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) |
244 | static struct mtd_partition ezkit_partitions[] = { | 244 | static struct mtd_partition ezkit_partitions[] = { |
245 | { | 245 | { |
246 | .name = "Bootloader", | 246 | .name = "bootloader(nor)", |
247 | .size = 0x40000, | 247 | .size = 0x40000, |
248 | .offset = 0, | 248 | .offset = 0, |
249 | }, { | 249 | }, { |
250 | .name = "Kernel", | 250 | .name = "linux kernel(nor)", |
251 | .size = 0x1C0000, | 251 | .size = 0x1C0000, |
252 | .offset = MTDPART_OFS_APPEND, | 252 | .offset = MTDPART_OFS_APPEND, |
253 | }, { | 253 | }, { |
254 | .name = "RootFS", | 254 | .name = "file system(nor)", |
255 | .size = MTDPART_SIZ_FULL, | 255 | .size = MTDPART_SIZ_FULL, |
256 | .offset = MTDPART_OFS_APPEND, | 256 | .offset = MTDPART_OFS_APPEND, |
257 | } | 257 | } |