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 /arch/blackfin/mach-bf548 | |
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>
Diffstat (limited to 'arch/blackfin/mach-bf548')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 14 |
2 files changed, 11 insertions, 11 deletions
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 | } |