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 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 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 --- Changes for v2: - used do_fixup_by_path_string() instead of fdt_set_node_status() Changes for v3: - none Changes for v4: - modified comments from Kumar Gala - no need for a separate function, and put the two lines in ft_board_setup() Changes for v5: - modified comments from Wolfgang Denk and Tabi Timur Changes for v6: - modified comments from Wolfgang Denk - added change log

board/freescale/p1023rds/p1023rds.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)

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