[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

Move the memory node fixup of the MPC8260ADS, ids8247, mgcoge and muas3001
boards into common mpc8260 CPU code.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
---
 board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
 board/ids8247/ids8247.c                 |   16 ----------------
 board/keymile/mgcoge/mgcoge.c           |    8 +-------
 board/muas3001/muas3001.c               |   16 ----------------
 cpu/mpc8260/cpu.c                       |    1 +
 5 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/board/freescale/mpc8260ads/mpc8260ads.c b/board/freescale/mpc8260ads/mpc8260ads.c
index 49a88bb..be55626 100644
--- a/board/freescale/mpc8260ads/mpc8260ads.c
+++ b/board/freescale/mpc8260ads/mpc8260ads.c
@@ -550,24 +550,11 @@ void pci_init_board(void)
 #endif
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup(blob, bd);
 #ifdef CONFIG_PCI
 	ft_pci_setup(blob, bd);
 #endif
-	ft_blob_update(blob, bd);
 }
 #endif
diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 79fe9da..d621833 100644
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -400,24 +400,8 @@ int board_nand_init(struct nand_chip *nand)
 #endif	/* CONFIG_CMD_NAND */
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
-/*
- * update "memory" property in the blob
- */
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup( blob, bd);
-	ft_blob_update(blob, bd);
 }
 #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index b16a01c..932a805 100644
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -312,11 +312,10 @@ int hush_init_var (void)
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
 /*
- * update "memory" property in the blob
+ * update "flash" property in the blob
  */
 void ft_blob_update (void *blob, bd_t *bd)
 {
-	ulong memory_data[2] = {0};
 	ulong *flash_data = NULL;
 	ulong	flash_reg[6] = {0};
 	flash_info_t	*info;
@@ -324,11 +323,6 @@ void ft_blob_update (void *blob, bd_t *bd)
 	int	size;
 	int	i = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-	fdt_set_node_and_value (blob, "/memory", "reg", memory_data,
-				sizeof (memory_data));
-
 	len = fdt_get_node_and_value (blob, "/localbus", "ranges",
 					(void *)&flash_data);
 
diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index 36caed8..e0a7f32 100644
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -308,25 +308,9 @@ int board_early_init_r (void)
 void ft_blob_update (void *blob, bd_t *bd)
 {
 	int ret, nodeoffset = 0;
-	ulong memory_data[2] = {0};
 	ulong flash_data[4] = {0};
 	ulong	speed = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-
-	nodeoffset = fdt_path_offset (blob, "/memory");
-	if (nodeoffset >= 0) {
-		ret = fdt_setprop (blob, nodeoffset, "reg", memory_data,
-					sizeof(memory_data));
-	if (ret < 0)
-		printf ("ft_blob_update): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror (ret));
-	} else {
-		/* memory node is required in dts */
-		printf ("ft_blob_update(): cannot find /memory node "
-			"err:%s\n", fdt_strerror(nodeoffset));
-	}
 	/* update Flash addr, size */
 	flash_data[2] = cpu_to_be32 (CONFIG_SYS_FLASH_BASE);
 	flash_data[3] = cpu_to_be32 (CONFIG_SYS_FLASH_SIZE);
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 17e6248..aedbf29 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -318,6 +318,7 @@ void ft_cpu_setup (void *blob, bd_t *bd)
 		"timebase-frequency", OF_TBCLK, 1);
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"clock-frequency", bd->bi_intfreq, 1);
+	fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 }
 #endif /* CONFIG_OF_LIBFDT */
 
-- 
1.6.0.4

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252423922.5386.17.camel@com-21> you wrote:
> Move the memory node fixup of the MPC8260ADS, ids8247, mgcoge and muas3001
> boards into common mpc8260 CPU code.

In which way is this patch version 2? I have not seen any v1 of such a
patch?

> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> ---
>  board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
>  board/ids8247/ids8247.c                 |   16 ----------------
>  board/keymile/mgcoge/mgcoge.c           |    8 +-------
>  board/muas3001/muas3001.c               |   16 ----------------
>  cpu/mpc8260/cpu.c                       |    1 +

You want to put the respective board maintainers on Cc:

Also, what is the impact for the other MPC826x board, that are not
listed here?


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
No one can guarantee the actions of another.
	-- Spock, "Day of the Dove", stardate unknown

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

Hi Wolfgang Denk

On Tue, 2009-09-08 at 20:25 +0200, Wolfgang Denk wrote:
> In which way is this patch version 2? I have not seen any v1 of such a
> patch?

What about http://article.gmane.org/gmane.comp.boot-loaders.u-boot/67275? A pair of glasses might help (;-p).

> You want to put the respective board maintainers on Cc:

Most are maintained by Heiko, who I did actually put on CC. Forgot to add Yuli as the MPC8260 maintainer, sorry. Did so now.

> Also, what is the impact for the other MPC826x board, that are not
> listed here?

I can assure you there is no impact at all as they are not using FDT at all.

Cheers

Marcel Ziswiler

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252440603.5386.40.camel@com-21> you wrote:
> 
> On Tue, 2009-09-08 at 20:25 +0200, Wolfgang Denk wrote:
> > In which way is this patch version 2? I have not seen any v1 of such a
> > patch?
> 
> What about http://article.gmane.org/gmane.comp.boot-loaders.u-boot/67275? A pair of glasses might help (;-p).

Heh. If that was sufficient. I'm alrady wearing glasses _and_ contact
lenses, and it didn't help.

Um... but why didn't you set the In-Reply-To: and References:
headers, then?


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
2000 pounds of chinese soup                               = 1 Won Ton

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

Dear Wolfgang Denk

On Tue, 2009-09-08 at 22:44 +0200, Wolfgang Denk wrote:
> Heh. If that was sufficient. I'm alrady wearing glasses _and_ contact
> lenses, and it didn't help.

I do know that as I saw you at the EW in N?rnberg this spring.

> Um... but why didn't you set the In-Reply-To: and References:
> headers, then?

Sorry about that, my understanding was to post new versions of a patch as a new thread. Is that not so?

What exactly is that references header you are talking about?

Cheers

Marcel Ziswiler

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252443768.5386.82.camel@com-21> you wrote:
> 
> Sorry about that, my understanding was to post new versions of a patch as a
>  new thread. Is that not so?

No, on contrary. New versions of a patch should always make sure to
thread correctly to the old version(s). It seems that preferences here
are a matter of taste - my personal preference is to link to the
preceeding version of the patch, but most others seem to prefer to
link to the first version always.

> What exactly is that references header you are talking about?

It's a standard Mail header like this one:

| In-reply-to: <1251879636-9115-1-git-send-email-wd@denx.de>
| References: <1251879636-9115-1-git-send-email-wd@denx.de>

when enables MUAs to display a "threaded view", i. e. you can see the
whole history of previous patch submissions, review comments, etc. and
thus for example check easily if the new version incorporates all
requested changes.

When you use "git send-email" to submit your patches, it will (in
standard configuration) ask you:

Message-ID to be used as In-Reply-To for the first email? 

Here you can simply enter the message ID of the original posting you
are referring to ("<1251879636-9115-1-git-send-email-wd@denx.de>") in
the example above.


Note that the message ID of a posting is also a very convenient
method to look it up in the gmane archives: just append the message ID
to the URL "http://mid.gmane.org/" - i. e. try:

http://mid.gmane.org/1251879636-9115-1-git-send-email-wd at denx.de

Then click on the link in the "Subject: line to see the whole thread.


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The typical page layout program is nothing more  than  an  electronic
light table for cutting and pasting documents.

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

On Tue, 2009-09-08 at 23:19 +0200, Wolfgang Denk wrote:
> No, on contrary. New versions of a patch should always make sure to
> thread correctly to the old version(s). It seems that preferences here
> are a matter of taste - my personal preference is to link to the
> preceeding version of the patch, but most others seem to prefer to
> link to the first version always.

That's kind of what I thought at first as well, but then I saw many
others posting patches not adhering to that and still getting your ack
no problem:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/67581
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/67462
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/67394
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/67187

[U-Boot] [PATCH][v2] mpc8260: move FDT memory node fixup into common CPU code.

[Heiko Schocher]

Hello Marcel,

Marcel Ziswiler wrote:
> Move the memory node fixup of the MPC8260ADS, ids8247, mgcoge and muas3001
> boards into common mpc8260 CPU code.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> ---
>  board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
>  board/ids8247/ids8247.c                 |   16 ----------------
>  board/keymile/mgcoge/mgcoge.c           |    8 +-------
>  board/muas3001/muas3001.c               |   16 ----------------
>  cpu/mpc8260/cpu.c                       |    1 +
>  5 files changed, 2 insertions(+), 52 deletions(-)

Tested on the mgcoge board. (ids8247 and muas3001 I have no access
anymore)

Tested-by: Heiko Schocher <hs@denx.de>

Thanks

bye
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH][v3] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>
---
Changes since v1:
- Added previously missed mgcoge board as pointed out by Peter Tyser and Heiko
- Moved the board-specific Ethernet modifications into separate patch
Changes since v2:
- Added Heiko's tested-by

 board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
 board/ids8247/ids8247.c                 |   16 ----------------
 board/keymile/mgcoge/mgcoge.c           |    8 +-------
 board/muas3001/muas3001.c               |   16 ----------------
 cpu/mpc8260/cpu.c                       |    1 +
 5 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/board/freescale/mpc8260ads/mpc8260ads.c b/board/freescale/mpc8260ads/mpc8260ads.c
index 49a88bb..be55626 100644
--- a/board/freescale/mpc8260ads/mpc8260ads.c
+++ b/board/freescale/mpc8260ads/mpc8260ads.c
@@ -550,24 +550,11 @@ void pci_init_board(void)
 #endif
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup(blob, bd);
 #ifdef CONFIG_PCI
 	ft_pci_setup(blob, bd);
 #endif
-	ft_blob_update(blob, bd);
 }
 #endif
diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 79fe9da..d621833 100644
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -400,24 +400,8 @@ int board_nand_init(struct nand_chip *nand)
 #endif	/* CONFIG_CMD_NAND */
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
-/*
- * update "memory" property in the blob
- */
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup( blob, bd);
-	ft_blob_update(blob, bd);
 }
 #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index b16a01c..932a805 100644
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -312,11 +312,10 @@ int hush_init_var (void)
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
 /*
- * update "memory" property in the blob
+ * update "flash" property in the blob
  */
 void ft_blob_update (void *blob, bd_t *bd)
 {
-	ulong memory_data[2] = {0};
 	ulong *flash_data = NULL;
 	ulong	flash_reg[6] = {0};
 	flash_info_t	*info;
@@ -324,11 +323,6 @@ void ft_blob_update (void *blob, bd_t *bd)
 	int	size;
 	int	i = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-	fdt_set_node_and_value (blob, "/memory", "reg", memory_data,
-				sizeof (memory_data));
-
 	len = fdt_get_node_and_value (blob, "/localbus", "ranges",
 					(void *)&flash_data);
 
diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index 36caed8..e0a7f32 100644
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -308,25 +308,9 @@ int board_early_init_r (void)
 void ft_blob_update (void *blob, bd_t *bd)
 {
 	int ret, nodeoffset = 0;
-	ulong memory_data[2] = {0};
 	ulong flash_data[4] = {0};
 	ulong	speed = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-
-	nodeoffset = fdt_path_offset (blob, "/memory");
-	if (nodeoffset >= 0) {
-		ret = fdt_setprop (blob, nodeoffset, "reg", memory_data,
-					sizeof(memory_data));
-	if (ret < 0)
-		printf ("ft_blob_update): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror (ret));
-	} else {
-		/* memory node is required in dts */
-		printf ("ft_blob_update(): cannot find /memory node "
-			"err:%s\n", fdt_strerror(nodeoffset));
-	}
 	/* update Flash addr, size */
 	flash_data[2] = cpu_to_be32 (CONFIG_SYS_FLASH_BASE);
 	flash_data[3] = cpu_to_be32 (CONFIG_SYS_FLASH_SIZE);
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 17e6248..aedbf29 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -318,6 +318,7 @@ void ft_cpu_setup (void *blob, bd_t *bd)
 		"timebase-frequency", OF_TBCLK, 1);
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"clock-frequency", bd->bi_intfreq, 1);
+	fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 }
 #endif /* CONFIG_OF_LIBFDT */
 
-- 
1.6.4.2

[U-Boot] [PATCH][v3] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1252524034.3643.10.camel@com-21> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> Tested-by: Heiko Schocher <hs@denx.de>
> ---
> Changes since v1:
> - Added previously missed mgcoge board as pointed out by Peter Tyser and Heiko
> - Moved the board-specific Ethernet modifications into separate patch
> Changes since v2:
> - Added Heiko's tested-by
> 
>  board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
>  board/ids8247/ids8247.c                 |   16 ----------------
>  board/keymile/mgcoge/mgcoge.c           |    8 +-------
>  board/muas3001/muas3001.c               |   16 ----------------
>  cpu/mpc8260/cpu.c                       |    1 +
>  5 files changed, 2 insertions(+), 52 deletions(-)

Patch does not apply:

Applying: mpc8260: move FDT memory node fixup into common CPU code.
error: patch failed: board/muas3001/muas3001.c:308
error: board/muas3001/muas3001.c: patch does not apply
fatal: sha1 information is lacking or useless (board/keymile/mgcoge/mgcoge.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please fix and repost.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Far back in the mists of ancient time, in the great and glorious days
of the former Galactic Empire, life was wild, rich  and  largely  tax
free.         - Douglas Adams, _The Hitchhiker's Guide to the Galaxy_

[U-Boot] [PATCH][v4] mpc8260: move FDT memory node fixup into common CPU code.

[Marcel Ziswiler]

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
Tested-by: Heiko Schocher <hs@denx.de>
---
Changes since v1:
- Added previously missed mgcoge board as pointed out by Peter Tyser and Heiko
- Moved the board-specific Ethernet modifications into separate patch
Changes since v2:
- Added Heiko's tested-by
Changes since v3:
- Re-based to origin/master

 board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
 board/ids8247/ids8247.c                 |   16 ----------------
 board/keymile/mgcoge/mgcoge.c           |    8 +-------
 board/muas3001/muas3001.c               |   16 ----------------
 cpu/mpc8260/cpu.c                       |    1 +
 5 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/board/freescale/mpc8260ads/mpc8260ads.c b/board/freescale/mpc8260ads/mpc8260ads.c
index 49a88bb..be55626 100644
--- a/board/freescale/mpc8260ads/mpc8260ads.c
+++ b/board/freescale/mpc8260ads/mpc8260ads.c
@@ -550,24 +550,11 @@ void pci_init_board(void)
 #endif
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup(blob, bd);
 #ifdef CONFIG_PCI
 	ft_pci_setup(blob, bd);
 #endif
-	ft_blob_update(blob, bd);
 }
 #endif
diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c
index 79fe9da..d621833 100644
--- a/board/ids8247/ids8247.c
+++ b/board/ids8247/ids8247.c
@@ -400,24 +400,8 @@ int board_nand_init(struct nand_chip *nand)
 #endif	/* CONFIG_CMD_NAND */
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
-/*
- * update "memory" property in the blob
- */
-void ft_blob_update(void *blob, bd_t *bd)
-{
-	int ret;
-
-	ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
-
-	if (ret < 0) {
-		printf("ft_blob_update(): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror(ret));
-	}
-}
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup( blob, bd);
-	ft_blob_update(blob, bd);
 }
 #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index b16a01c..932a805 100644
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -312,11 +312,10 @@ int hush_init_var (void)
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
 /*
- * update "memory" property in the blob
+ * update "flash" property in the blob
  */
 void ft_blob_update (void *blob, bd_t *bd)
 {
-	ulong memory_data[2] = {0};
 	ulong *flash_data = NULL;
 	ulong	flash_reg[6] = {0};
 	flash_info_t	*info;
@@ -324,11 +323,6 @@ void ft_blob_update (void *blob, bd_t *bd)
 	int	size;
 	int	i = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-	fdt_set_node_and_value (blob, "/memory", "reg", memory_data,
-				sizeof (memory_data));
-
 	len = fdt_get_node_and_value (blob, "/localbus", "ranges",
 					(void *)&flash_data);
 
diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index 36caed8..e0a7f32 100644
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -308,25 +308,9 @@ int board_early_init_r (void)
 void ft_blob_update (void *blob, bd_t *bd)
 {
 	int ret, nodeoffset = 0;
-	ulong memory_data[2] = {0};
 	ulong flash_data[4] = {0};
 	ulong	speed = 0;
 
-	memory_data[0] = cpu_to_be32 (bd->bi_memstart);
-	memory_data[1] = cpu_to_be32 (bd->bi_memsize);
-
-	nodeoffset = fdt_path_offset (blob, "/memory");
-	if (nodeoffset >= 0) {
-		ret = fdt_setprop (blob, nodeoffset, "reg", memory_data,
-					sizeof(memory_data));
-	if (ret < 0)
-		printf ("ft_blob_update): cannot set /memory/reg "
-			"property err:%s\n", fdt_strerror (ret));
-	} else {
-		/* memory node is required in dts */
-		printf ("ft_blob_update(): cannot find /memory node "
-			"err:%s\n", fdt_strerror(nodeoffset));
-	}
 	/* update Flash addr, size */
 	flash_data[2] = cpu_to_be32 (CONFIG_SYS_FLASH_BASE);
 	flash_data[3] = cpu_to_be32 (CONFIG_SYS_FLASH_SIZE);
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 17e6248..aedbf29 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -318,6 +318,7 @@ void ft_cpu_setup (void *blob, bd_t *bd)
 		"timebase-frequency", OF_TBCLK, 1);
 	do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
 		"clock-frequency", bd->bi_intfreq, 1);
+	fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 }
 #endif /* CONFIG_OF_LIBFDT */
 
-- 
1.6.0.4

[U-Boot] [PATCH][v4] mpc8260: move FDT memory node fixup into common CPU code.

[Wolfgang Denk]

Dear Marcel Ziswiler,

In message <1254434117.8315.15.camel@com-21> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> Tested-by: Heiko Schocher <hs@denx.de>
> ---
> Changes since v1:
> - Added previously missed mgcoge board as pointed out by Peter Tyser and Heiko
> - Moved the board-specific Ethernet modifications into separate patch
> Changes since v2:
> - Added Heiko's tested-by
> Changes since v3:
> - Re-based to origin/master
> 
>  board/freescale/mpc8260ads/mpc8260ads.c |   13 -------------
>  board/ids8247/ids8247.c                 |   16 ----------------
>  board/keymile/mgcoge/mgcoge.c           |    8 +-------
>  board/muas3001/muas3001.c               |   16 ----------------
>  cpu/mpc8260/cpu.c                       |    1 +
>  5 files changed, 2 insertions(+), 52 deletions(-)

Apoplied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Maintain an awareness for contribution --  to  your  schedule,  your
project, our company."                         - A Group of Employees