public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/9] GCC4.6: Squash warnings in 44x_spd_ddr.c
Date: Tue, 25 Oct 2011 11:37:36 +0200	[thread overview]
Message-ID: <1319535462-20693-5-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1319535462-20693-1-git-send-email-marek.vasut@gmail.com>

44x_spd_ddr.c: In function 'program_tr0':
44x_spd_ddr.c:823: warning: format '%x' expects type 'unsigned int', but
argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_tr1':
44x_spd_ddr.c:1054: warning: format '%x' expects type 'unsigned int', but
argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_bxcr':
44x_spd_ddr.c:1127: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 3 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 4 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 5 has
type 'long unsigned int'
44x_spd_ddr.c:1242: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
index ec7291f..e05daf2 100644
--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
@@ -820,7 +820,7 @@ static void program_tr0(unsigned long *dimm_populated,
 		break;
 	}
 
-	debug("tr0: %x\n", tr0);
+	debug("tr0: %lx\n", tr0);
 	mtsdram(SDRAM0_TR0, tr0);
 }
 
@@ -1051,7 +1051,7 @@ static void program_tr1(void)
 	}
 	tr1 |= SDRAM_TR1_RDCT_ENCODE(rdclt_average);
 
-	debug("tr1: %x\n", tr1);
+	debug("tr1: %lx\n", tr1);
 
 	/*
 	 * program SDRAM Timing Register 1 TR1
@@ -1124,7 +1124,7 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 			num_col_addr = spd_read(iic0_dimm_addr[dimm_num], 4);
 			num_banks    = spd_read(iic0_dimm_addr[dimm_num], 5);
 			bank_size_id = spd_read(iic0_dimm_addr[dimm_num], 31);
-			debug("DIMM%d: row=%d col=%d banks=%d\n", dimm_num,
+			debug("DIMM%ld: row=%d col=%d banks=%d\n", dimm_num,
 			      num_row_addr, num_col_addr, num_banks);
 
 			/*
@@ -1193,9 +1193,11 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 				bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes =
 					(4 << 20) * bank_size_id;
 				bank_parms[ctrl_bank_num[dimm_num]+i].cr = cr;
-				debug("DIMM%d-bank %d (SDRAM0_B%dCR): bank_size_bytes=%d\n",
-				      dimm_num, i, ctrl_bank_num[dimm_num]+i,
-				      bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes);
+				debug("DIMM%ld-bank %ld (SDRAM0_B%ldCR): "
+					"bank_size_bytes=%ld\n",
+					dimm_num, i,
+					ctrl_bank_num[dimm_num] + i,
+					bank_parms[ctrl_bank_num[dimm_num] + i].bank_size_bytes);
 			}
 		}
 	}
@@ -1239,7 +1241,8 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 				bank_parms[sorted_bank_num[bx_cr_num]].cr;
 			mtdcr(SDRAM0_CFGDATA, temp);
 			bank_base_addr += bank_parms[sorted_bank_num[bx_cr_num]].bank_size_bytes;
-			debug("SDRAM0_B%dCR=0x%08lx\n", sorted_bank_num[bx_cr_num], temp);
+			debug("SDRAM0_B%ldCR=0x%08lx\n",
+				sorted_bank_num[bx_cr_num], temp);
 		}
 	}
 
-- 
1.7.6.3

  parent reply	other threads:[~2011-10-25  9:37 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  9:37 [U-Boot] [PATCH 0/9] CLEANUP: Cleanup of arch/powerpc/ directory Marek Vasut
2011-10-25  9:37 ` [U-Boot] [PATCH 1/9] PowerPC: Squash warning in mpc512x serial.c Marek Vasut
2011-10-27 21:55   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 2/9] GCC4.6: Squash warnings in denali_data_eye.c Marek Vasut
2011-10-27 21:55   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 3/9] GCC4.6: Squash warnings in denali_spd_ddr2.c Marek Vasut
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:37 ` Marek Vasut [this message]
2011-10-27 21:56   ` [U-Boot] [PATCH 4/9] GCC4.6: Squash warnings in 44x_spd_ddr.c Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 5/9] GCC4.6: Squash warnings in 4xx_ibm_ddr2_autocalib.c Marek Vasut
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 6/9] GCC4.6: Squash warnings in 4xx_pcie.c Marek Vasut
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 7/9] GCC4.6: Use dst instead of l2srbar in cpu_early_init.c Marek Vasut
2011-10-25 13:16   ` Kumar Gala
2011-10-25 13:25     ` Marek Vasut
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 8/9] GCC4.6: Squash warnings in ddr[123]_dimm_params.c Marek Vasut
2011-10-25 13:16   ` Kumar Gala
2011-10-25 19:28     ` Wolfgang Denk
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:37 ` [U-Boot] [PATCH 9/9] GCC4.6: Squash warnings in mpc86xx/interrupts.c Marek Vasut
2011-10-27 21:56   ` Wolfgang Denk
2011-10-25  9:46 ` [U-Boot] [PATCH 0/9] CLEANUP: Cleanup of arch/powerpc/ directory Graeme Russ
2011-10-25 19:16   ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319535462-20693-5-git-send-email-marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox