diff mbox

[U-Boot,2/2,v5] powerpc/p1023rds: Disable nor flash node and enable nand flash node

Message ID 1314675698-9847-1-git-send-email-Chunhe.Lan@freescale.com
State Superseded
Headers show

Commit Message

Chunhe Lan Aug. 30, 2011, 3:41 a.m. UTC
In the p1023rds, when system boots from nor flash, kernel only accesses nor
flash and can not access nand flash with BR0/OR0; when system boots from
nand flash, kernel only accesses nand flash and can not access nor flash
with BR0/OR0.

Default device tree nor and nand node should have the following structure:

	Example:

		nor_flash: nor@0,0 {
			#address-cells = <1>;
			#size-cells = <1>;
			compatible = "cfi-flash";
			reg = <0x0 0x0 0x02000000>;
			bank-width = <2>;
			device-width = <1>;
			status = "okay";

			partition@0 {
				label = "ramdisk";
				reg = <0x00000000 0x01c00000>;
			};
		}

		nand_flash: nand@1,0 {
			#address-cells = <1>;
			#size-cells = <1>;
			compatible = "fsl,p1023-fcm-nand",
				     "fsl,elbc-fcm-nand";
			reg = <0x2 0x0 0x00040000>;
			status = "disabled";

			u-boot-nand@0 {
				/* This location must not be altered  */
				/* 1MB for u-boot Bootloader Image */
				reg = <0x0 0x00100000>;
				read-only;
			};
		}

When booting from nor flash, the status of nor node is null that means it
is enabled and the status of nand node is disabled in the default dts file,
so do not do anything.

But, when booting from nand flash, need to do some operations:

	o the status of nor node should be disabled.
	o the status of nand node should be enabled.

Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
---
 board/freescale/p1023rds/p1023rds.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Comments

Wolfgang Denk Aug. 30, 2011, 5:24 a.m. UTC | #1
Dear Chunhe Lan,

In message <1314675698-9847-1-git-send-email-Chunhe.Lan@freescale.com> you wrote:
...
> 			status = "okay";
...
> When booting from nor flash, the status of nor node is null that means it

Description does not match code.

> is enabled and the status of nand node is disabled in the default dts file,
...
> But, when booting from nand flash, need to do some operations:
> 
> 	o the status of nor node should be disabled.
> 	o the status of nand node should be enabled.

Make this:

	o Disable the NOR node by setting status = "disabled";
	o Enable the NAND node by setting status = "okay";

> Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
> ---
>  board/freescale/p1023rds/p1023rds.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)

This is patch v5, but there is no change log.  This is MANDATORY!

Best regards,

Wolfgang Denk
Lan Chunhe-B25806 Aug. 30, 2011, 7:27 a.m. UTC | #2
On Tue, 30 Aug 2011 13:24:34 +0800, Wolfgang Denk <wd@denx.de> wrote:

> Dear Chunhe Lan,
>
> In message <1314675698-9847-1-git-send-email-Chunhe.Lan@freescale.com>  
> you wrote:
> ...
>> 			status = "okay";
> ...
>> When booting from nor flash, the status of nor node is null that means  
>> it
>
> Description does not match code.

     I rewrite it.

>> is enabled and the status of nand node is disabled in the default dts  
>> file,
> ...
>> But, when booting from nand flash, need to do some operations:
>>
>> 	o the status of nor node should be disabled.
>> 	o the status of nand node should be enabled.
>
> Make this:
>
> 	o Disable the NOR node by setting status = "disabled";
> 	o Enable the NAND node by setting status = "okay";

    I rewrite it.

>> Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
>> ---
>>  board/freescale/p1023rds/p1023rds.c |    5 +++++
>>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> This is patch v5, but there is no change log.  This is MANDATORY!

    OK.
    Thanks.

    -Jack Lan

> Best regards,
>
> Wolfgang Denk
diff mbox

Patch

diff --git a/board/freescale/p1023rds/p1023rds.c b/board/freescale/p1023rds/p1023rds.c
index 8cfd199..c99ccee 100644
--- a/board/freescale/p1023rds/p1023rds.c
+++ b/board/freescale/p1023rds/p1023rds.c
@@ -158,5 +158,10 @@  void ft_board_setup(void *blob, bd_t *bd)
 	size = getenv_bootm_size();
 
 	fdt_fixup_memory(blob, (u64)base, (u64)size);
+
+#ifdef CONFIG_NAND_U_BOOT
+	do_fixup_by_path_string(fdt, "nor_flash", "status", "disabled");
+	do_fixup_by_path_string(fdt, "nand_flash", "status", "okay");
+#endif
 }
 #endif