diff options
| author | Teresa Gámez <t.gamez@phytec.de> | 2013-07-09 11:23:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-09 19:33:15 +0200 |
| commit | 5d629c36a867711d0c38b6e18d4c8fdaea61c97c (patch) | |
| tree | 73cab6ab6e64e476e841389446ae927f95d139d4 | |
| parent | d104627c2c2f14de50f26399562fdd5ed6c0aa25 (diff) | |
| download | barebox-5d629c36a867711d0c38b6e18d4c8fdaea61c97c.tar.gz barebox-5d629c36a867711d0c38b6e18d4c8fdaea61c97c.tar.xz | |
PCM051: Rename SPI NOR device
Renamed SPI NOR device from nor0 to m25p0,
to make booting from it possible.
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/pcm051/board.c | 8 | ||||
| -rw-r--r-- | arch/arm/boards/pcm051/env/boot/spi-nor | 2 | ||||
| -rw-r--r-- | arch/arm/boards/pcm051/env/init/mtdparts-nor | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/pcm051/board.c index cb8c1d9b0a..8701596d2a 100644 --- a/arch/arm/boards/pcm051/board.c +++ b/arch/arm/boards/pcm051/board.c @@ -65,7 +65,7 @@ static int pcm051_mem_init(void) mem_initcall(pcm051_mem_init); static struct flash_platform_data pcm051_spi_flash = { - .name = "nor", + .name = "m25p", .type = "w25q64", }; @@ -176,11 +176,11 @@ static int pcm051_devices_init(void) switch (bootsource_get()) { case BOOTSOURCE_SPI: - devfs_add_partition("nor0", 0x00000, SZ_128K, + devfs_add_partition("m25p0", 0x00000, SZ_128K, DEVFS_PARTITION_FIXED, "xload"); - devfs_add_partition("nor0", SZ_128K, SZ_512K, + devfs_add_partition("m25p0", SZ_128K, SZ_512K, DEVFS_PARTITION_FIXED, "self0"); - devfs_add_partition("nor0", SZ_128K + SZ_512K, SZ_128K, + devfs_add_partition("m25p0", SZ_128K + SZ_512K, SZ_128K, DEVFS_PARTITION_FIXED, "env0"); break; default: diff --git a/arch/arm/boards/pcm051/env/boot/spi-nor b/arch/arm/boards/pcm051/env/boot/spi-nor index d5f77c80cf..9273b8439b 100644 --- a/arch/arm/boards/pcm051/env/boot/spi-nor +++ b/arch/arm/boards/pcm051/env/boot/spi-nor @@ -5,7 +5,7 @@ if [ "$1" = menu ]; then exit fi -global.bootm.image="/dev/nor0.kernel" +global.bootm.image="/dev/m25p0.kernel" # Use rootfs form SD-Card for now as rootfs partition < 4MB global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/pcm051/env/init/mtdparts-nor b/arch/arm/boards/pcm051/env/init/mtdparts-nor index 91aa847851..5c762ada4c 100644 --- a/arch/arm/boards/pcm051/env/init/mtdparts-nor +++ b/arch/arm/boards/pcm051/env/init/mtdparts-nor @@ -5,8 +5,8 @@ if [ "$1" = menu ]; then exit fi -mtdparts="128k(nor0.xload),512k(nor0.barebox),128k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" +mtdparts="128k(m25p0.xload),512k(m25p0.barebox),128k(m25p0.bareboxenv),4M(m25p0.kernel),-(m25p0.root)" kernelname="spi_flash" -mtdparts-add -d nor0 -k ${kernelname} -p ${mtdparts} +mtdparts-add -d m25p0 -k ${kernelname} -p ${mtdparts} |