[U-Boot-Users] [PATCH] PPC4xx: Simplified post_word_{load,store}

newer
[U-Boot-Users] [PATCH] Additional...

older
[U-Boot-Users] [PATCH] DTT: Issue...

Grant Erickson

21 May 2008 21 May '08

8:24 p.m.

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

Signed-off-by: Grant Erickson gerickson@nuovations.com --- cpu/ppc4xx/commproc.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cpu/ppc4xx/commproc.c b/cpu/ppc4xx/commproc.c index 22156dd..7d5ef46 100644 --- a/cpu/ppc4xx/commproc.c +++ b/cpu/ppc4xx/commproc.c @@ -30,29 +30,25 @@

#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)

-#if defined(CFG_POST_ALT_WORD_ADDR) -void post_word_store (ulong a) -{ - out_be32((void *)CFG_POST_ALT_WORD_ADDR, a); -} +#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR +#elif defined(CFG_POST_ALT_WORD_ADDR) +# define _POST_ADDR CFG_POST_ALT_WORD_ADDR +#endif

-ulong post_word_load (void) -{ - return in_be32((void *)CFG_POST_ALT_WORD_ADDR); -} -#else /* CFG_POST_ALT_WORD_ADDR */ void post_word_store (ulong a) { - volatile void *save_addr = (volatile void *)(CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR); - *(volatile ulong *) save_addr = a; + volatile void *save_addr = (volatile void *)(_POST_ADDR); + + out_be32(save_addr, a); }

ulong post_word_load (void) { - volatile void *save_addr = (volatile void *)(CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR); - return *(volatile ulong *) save_addr; + volatile void *save_addr = (volatile void *)(_POST_ADDR); + + return in_be32(save_addr); } -#endif /* CFG_POST_ALT_WORD_ADDR */

#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/

-- 1.5.4.3

Show replies by date

Wolfgang Denk

21 May 21 May

9:29 p.m.

New subject: [U-Boot-Users] [PATCH] PPC4xx: Simplified post_word_{load, store}

In message 1211394262-26658-1-git-send-email-gerickson@nuovations.com you wrote:

...

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

...

+#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR

Please make this

# define _POST_ADDR ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR))

...

+#elif defined(CFG_POST_ALT_WORD_ADDR) +# define _POST_ADDR CFG_POST_ALT_WORD_ADDR

# define _POST_ADDR (CFG_POST_ALT_WORD_ADDR)

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@denx.de If I don't document something, it's usually either for a good reason, or a bad reason. In this case it's a good reason. :-) - Larry Wall in 1992Jan17.005405.16806@netlabs.com

Grant Erickson

9:43 p.m.

New subject: [U-Boot-Users] [PATCH v2] PPC4xx: Simplified post_word_{load, store}

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

Signed-off-by: Grant Erickson gerickson@nuovations.com --- cpu/ppc4xx/commproc.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cpu/ppc4xx/commproc.c b/cpu/ppc4xx/commproc.c index 22156dd..a6940e2 100644 --- a/cpu/ppc4xx/commproc.c +++ b/cpu/ppc4xx/commproc.c @@ -30,29 +30,25 @@

#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)

-#if defined(CFG_POST_ALT_WORD_ADDR) -void post_word_store (ulong a) -{ - out_be32((void *)CFG_POST_ALT_WORD_ADDR, a); -} +#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR (CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR) +#elif defined(CFG_POST_ALT_WORD_ADDR) +# define _POST_ADDR (CFG_POST_ALT_WORD_ADDR) +#endif

#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/

-- 1.5.4.3

Wolfgang Denk

10:17 p.m.

New subject: [U-Boot-Users] [PATCH v2] PPC4xx: Simplified post_word_{load, store}

In message 1211398998-30954-1-git-send-email-gerickson@nuovations.com you wrote:

...

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

...

+#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR (CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR)

Please make this

# define _POST_ADDR ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR))

This *is* important. Assume

#define CFG_OCM_DATA_ADDR 8 | 1 #define CFG_POST_WORD_ADDR 16 | 3

Then ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR)) gives 28 as intended, but (CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR) gives 27.

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@denx.de I express preference for a chronological sequence of events which precludes a violence. - Terry Pratchett, _The Dark Side of the Sun_

Grant Erickson

10:25 p.m.

New subject: [U-Boot-Users] [PATCH v2] PPC4xx: Simplified post_word_{load, store}

On 5/21/08 1:17 PM, Wolfgang Denk wrote:

...

In message 1211398998-30954-1-git-send-email-gerickson@nuovations.com you wrote:

...
This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

...

...
+#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR (CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR)

Please make this

# define _POST_ADDR ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR))

This *is* important. Assume

#define CFG_OCM_DATA_ADDR 8 | 1 #define CFG_POST_WORD_ADDR 16 | 3

Then ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR)) gives 28 as intended, but (CFG_OCM_DATA_ADDR + CFG_POST_WORD_ADDR) gives 27.

Agreed and I will make the change; however, were that the case, I would tend to favor the approach that the responsibility is on the definer of '8 | 1' and '16 | 3' to wrap those in parens. Thankfully, parens are a free resource.

Regards,

Grant

Grant Erickson

10:28 p.m.

New subject: [U-Boot-Users] [PATCH v3] PPC4xx: Simplified post_word_{load, store}

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

Signed-off-by: Grant Erickson gerickson@nuovations.com --- cpu/ppc4xx/commproc.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cpu/ppc4xx/commproc.c b/cpu/ppc4xx/commproc.c index 22156dd..a6940e2 100644 --- a/cpu/ppc4xx/commproc.c +++ b/cpu/ppc4xx/commproc.c @@ -30,29 +30,25 @@

#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)

-#if defined(CFG_POST_ALT_WORD_ADDR) -void post_word_store (ulong a) -{ - out_be32((void *)CFG_POST_ALT_WORD_ADDR, a); -} +#if defined(CFG_POST_WORD_ADDR) +# define _POST_ADDR ((CFG_OCM_DATA_ADDR) + (CFG_POST_WORD_ADDR)) +#elif defined(CFG_POST_ALT_WORD_ADDR) +# define _POST_ADDR (CFG_POST_ALT_WORD_ADDR) +#endif

#endif /* CONFIG_POST || CONFIG_LOGBUFFER*/

-- 1.5.4.3

Stefan Roese

3 Jun 3 Jun

8:34 p.m.

New subject: [U-Boot-Users] [PATCH v3] PPC4xx: Simplified post_word_{load, store}

On Wednesday 21 May 2008, Grant Erickson wrote:

...

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

Applied to u-boot-ppc4xx repo. Thanks.

Best regards, Stefan

===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================

Wolfgang Denk

5 Jun 5 Jun

12:06 a.m.

New subject: [U-Boot-Users] [PATCH v3] PPC4xx: Simplified post_word_{load, store}

In message 1211401710-31902-1-git-send-email-gerickson@nuovations.com you wrote:

...

This patch simplifies post_word_{load,store} by using the preprocessor to eliminate redundant, copy-and-pasted code.

Signed-off-by: Grant Erickson gerickson@nuovations.com

cpu/ppc4xx/commproc.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

6182

Age (days ago)

6196

Last active (days ago)

List overview

Download

7 comments

3 participants

tags (0)

participants (3)

Grant Erickson
Stefan Roese
Wolfgang Denk