[U-Boot] [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c

[U-Boot] [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c

[Reinhard Meyer]

From: Reinhard Meyer <info@emk-elektronik.de>
Date: Sun, 6 Jun 2010 19:01:59 +0200
Subject: [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c

AVR32 case was missing in cmd_bdinfo, resulting in compiler warning
(bd->bi_baudrate declared unsigned int at AVR32, but printf used %d)

At the same time slightly reordered #if #elif #endif to make ARM one
of the cases and not an extra case surrounding all others


Signed-off-by: Reinhard Meyer <info@emk-elektronik.de>
---
 common/cmd_bdinfo.c |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index a0f7998..710abdf 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -37,8 +37,9 @@ static void print_eth(int idx);
 
 #ifndef CONFIG_ARM	/* PowerPC and other */
 static void print_lnum(const char *, u64);
+#endif
 
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC)
 static void print_str(const char *, const char *);
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -119,7 +120,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-#elif defined(CONFIG_NIOS2) /* Nios-II */
+#elif defined(CONFIG_NIOS2)
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -145,7 +146,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 	return 0;
 }
-#elif defined(CONFIG_MICROBLAZE) /* ! PPC, which leaves Microblaze */
+
+#elif defined(CONFIG_MICROBLAZE)
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -167,7 +169,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-#elif defined(CONFIG_SPARC)	/* SPARC */
+#elif defined(CONFIG_SPARC)
+
 int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	bd_t *bd = gd->bd;
@@ -199,7 +202,8 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-#elif defined(CONFIG_M68K) /* M68K */
+#elif defined(CONFIG_M68K)
+
 static void print_str(const char *, const char *);
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -249,6 +253,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 #elif defined(CONFIG_BLACKFIN)
+
 static void print_str(const char *, const char *);
 
 int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -277,7 +282,7 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-#else /* ! PPC, which leaves MIPS */
+#elif defined(CONFIG_MIPS)
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -296,9 +301,28 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 	return 0;
 }
-#endif  /* MIPS */
 
-#else	/* ARM */
+#elif defined(CONFIG_AVR32)
+
+int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	bd_t *bd = gd->bd;
+
+	print_num ("boot_params",	(ulong)bd->bi_boot_params);
+	print_num ("memstart",		(ulong)bd->bi_memstart);
+	print_lnum ("memsize",		(u64)bd->bi_memsize);
+	print_num ("flashstart",	(ulong)bd->bi_flashstart);
+	print_num ("flashsize",		(ulong)bd->bi_flashsize);
+	print_num ("flashoffset",	(ulong)bd->bi_flashoffset);
+
+	print_eth(0);
+	printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+	printf ("baudrate    = %lu bps\n", bd->bi_baudrate);
+
+	return 0;
+}
+
+#elif defined(CONFIG_ARM)
 
 int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -324,7 +348,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return 0;
 }
 
-#endif /* CONFIG_ARM XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
+#else
+ #error "a case for this architecture does not exist!"
+#endif
 
 static void print_num(const char *name, ulong value)
 {
-- 
1.5.6.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: reinhard_meyer.vcf
Type: text/x-vcard
Size: 370 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20100611/d9a70dac/attachment.vcf 

[U-Boot] [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c

[Andreas Bießmann]

Am 11.06.2010 09:36, schrieb Reinhard Meyer:
> From: Reinhard Meyer <info@emk-elektronik.de>
> Date: Sun, 6 Jun 2010 19:01:59 +0200
> Subject: [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c
> 
> AVR32 case was missing in cmd_bdinfo, resulting in compiler warning
> (bd->bi_baudrate declared unsigned int at AVR32, but printf used %d)
> 
> At the same time slightly reordered #if #elif #endif to make ARM one
> of the cases and not an extra case surrounding all others
> 
> 
> Signed-off-by: Reinhard Meyer <info@emk-elektronik.de>
Tested-by: Andreas Bie?mann <biessmann@corscience.de>

[U-Boot] [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c

[Wolfgang Denk]

Dear Reinhard Meyer,

In message <4C11E777.3060205@emk-elektronik.de> you wrote:
> This is a multi-part message in MIME format.
> --------------060008080708060407080307
> Content-Type: text/plain; charset=ISO-8859-15
> Content-Transfer-Encoding: 7bit
> 
> From: Reinhard Meyer <info@emk-elektronik.de>
> Date: Sun, 6 Jun 2010 19:01:59 +0200
> Subject: [PATCH] fixed #if chain and added AVR32 case in cmd_bdinfo.c
> 
> AVR32 case was missing in cmd_bdinfo, resulting in compiler warning
> (bd->bi_baudrate declared unsigned int at AVR32, but printf used %d)
> 
> At the same time slightly reordered #if #elif #endif to make ARM one
> of the cases and not an extra case surrounding all others
> 
> 
> Signed-off-by: Reinhard Meyer <info@emk-elektronik.de>
> ---
>  common/cmd_bdinfo.c |   44 +++++++++++++++++++++++++++++++++++---------
>  1 files changed, 35 insertions(+), 9 deletions(-)

Applied to "next".

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
People are always a lot more complicated than you  think.  It's  very
important to remember that.             - Terry Pratchett, _Truckers_