[U-Boot] [PATCH 0/4] CLEANUP: Cleanup of include/ directory

[U-Boot] [PATCH 0/4] CLEANUP: Cleanup of include/ directory

[Marek Vasut]

This series fixes the warnings generated by new debug() macro implementation,
which will be merged after this series. This series fixes the problems before
the macro is reworked to avoid smooth transition. Most of the problems fixed by
this series are printf() formating related problems.

Marek Vasut (4):
  GCC4.6: Squash warning in cmd_date.c
  RFT GCC4.6: Fix muas3001 and IDS8247
  GCC4.6: Squash GTREADREG related errors
  GCC4.6: Squash warning in lcd.c

 include/configs/IDS8247.h     |    4 ++++
 include/configs/PCIPPC2.h     |    4 ++++
 include/configs/PCIPPC6.h     |    4 ++++
 include/configs/mpc7448hpc2.h |    4 ++++
 include/configs/muas3001.h    |    4 ++++
 include/configs/p3mx.h        |    4 ++++
 include/configs/ppmc7xx.h     |    4 ++++
 include/i2c.h                 |   32 +++++++++++++++++++++++---------
 include/lcd.h                 |    4 ++--
 9 files changed, 53 insertions(+), 11 deletions(-)

Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>

-- 
1.7.6.3

[U-Boot] [PATCH 1/4] GCC4.6: Squash warning in cmd_date.c

[Marek Vasut]

cmd_date.c: In function ?do_date?:
cmd_date.c:50:6: warning: variable ?old_bus? set but not used
[-Wunused-but-set-variable]

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>
---
 include/i2c.h |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/include/i2c.h b/include/i2c.h
index 8ceb4c8..ee31034 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -46,16 +46,16 @@
  */
 #define I2C_RXTX_LEN	128	/* maximum tx/rx buffer length */
 
-#if defined(CONFIG_I2C_MULTI_BUS)
-#if !defined(CONFIG_SYS_MAX_I2C_BUS)
-#define CONFIG_SYS_MAX_I2C_BUS		2
-#endif
-#define I2C_GET_BUS()		i2c_get_bus_num()
-#define I2C_SET_BUS(a)		i2c_set_bus_num(a)
+#ifdef	CONFIG_I2C_MULTI_BUS
+#define	MAX_I2C_BUS			2
+#define	I2C_MULTI_BUS			1
 #else
-#define CONFIG_SYS_MAX_I2C_BUS		1
-#define I2C_GET_BUS()		0
-#define I2C_SET_BUS(a)
+#define	MAX_I2C_BUS			1
+#define	I2C_MULTI_BUS			0
+#endif
+
+#if !defined(CONFIG_SYS_MAX_I2C_BUS)
+#define CONFIG_SYS_MAX_I2C_BUS		MAX_I2C_BUS
 #endif
 
 /* define the I2C bus number for RTC and DTT if not already done */
@@ -236,4 +236,18 @@ int i2c_set_bus_speed(unsigned int);
 
 unsigned int i2c_get_bus_speed(void);
 
+/* NOTE: These two functions MUST be always_inline to avoid code growth! */
+static inline unsigned int I2C_GET_BUS(void) __attribute__((always_inline));
+static inline unsigned int I2C_GET_BUS(void)
+{
+	return I2C_MULTI_BUS ? i2c_get_bus_num() : 0;
+}
+
+static inline void I2C_SET_BUS(unsigned int bus) __attribute__((always_inline));
+static inline void I2C_SET_BUS(unsigned int bus)
+{
+	if (I2C_MULTI_BUS)
+		i2c_set_bus_num(bus);
+}
+
 #endif	/* _I2C_H_ */
-- 
1.7.6.3

[U-Boot] [PATCH 2/4] RFT GCC4.6: Fix muas3001 and IDS8247

[Marek Vasut]

The boards suffer from the following error due to undefined configuration
variables:

Configuring for IDS8247 board...
ether_fcc.c:75: error: 'CONFIG_SYS_CMXFCR_MASK1' undeclared here (not in a
function)
ether_fcc.c:76: error: 'CONFIG_SYS_CMXFCR_VALUE1' undeclared here (not in a
function)

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 include/configs/IDS8247.h  |    4 ++++
 include/configs/muas3001.h |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index be778fe..a9c6e06 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -147,6 +147,10 @@
 #define	CONFIG_ETHER_INDEX	1	/* which SCC/FCC channel for ethernet */
 #define CONFIG_ETHER_ON_FCC1
 #define FCC_ENET
+#define CONFIG_SYS_CMXFCR_MASK1		\
+	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE1	\
+	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK12)
 
 /*
  * - Rx-CLK is CLK10
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index 18bd37e..c552413 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -78,6 +78,10 @@
 #define CONFIG_ETHER_ON_FCC1
 #define CONFIG_HAS_ETH0
 #define FCC_ENET
+#define CONFIG_SYS_CMXFCR_MASK1		\
+	(CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE1	\
+	(CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK12)
 
 /*
  * - Rx-CLK is CLK11
-- 
1.7.6.3

[U-Boot] [PATCH 3/4] GCC4.6: Squash GTREADREG related errors

[Marek Vasut]

interrupts.c: In function 'interrupt_init_cpu':
interrupts.c:37: warning: implicit declaration of function 'GTREGREAD'
interrupts.c:37: error: 'LOW_INTERRUPT_CAUSE_REGISTER' undeclared (first use in
this function)
interrupts.c:37: error: (Each undeclared identifier is reported only once
interrupts.c:37: error: for each function it appears in.)
interrupts.c:37: error: 'HIGH_INTERRUPT_CAUSE_REGISTER' undeclared (first use in
this function)
interrupts.c:40: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:40: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:40: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)

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>
---
 include/configs/PCIPPC2.h     |    4 ++++
 include/configs/PCIPPC6.h     |    4 ++++
 include/configs/mpc7448hpc2.h |    4 ++++
 include/configs/p3mx.h        |    4 ++++
 include/configs/ppmc7xx.h     |    4 ++++
 5 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index fb485b0..77cedc0 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -55,6 +55,10 @@
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
 
+#ifndef __ASSEMBLY__
+#include <galileo/core.h>
+#endif
+
 /*
  * BOOTP options
  */
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index 16d6450..a8d20ca 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -55,6 +55,10 @@
 #define CONFIG_PREBOOT		""
 #define CONFIG_BOOTDELAY	5
 
+#ifndef __ASSEMBLY__
+#include <galileo/core.h>
+#endif
+
 /*
  * BOOTP options
  */
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 61d758e..3e73775 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -54,6 +54,10 @@
 
 #undef  CONFIG_ECC		/* disable ECC support */
 
+#ifndef __ASSEMBLY__
+#include <galileo/core.h>
+#endif
+
 /* Board-specific Initialization Functions to be called */
 #define CONFIG_SYS_BOARD_ASM_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 94a6992..e44009e 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -447,4 +447,8 @@
 
 #define L2_ENABLE	(L2_INIT | L2CR_L2E)
 
+#ifndef __ASSEMBLY__
+#include <../board/Marvell/include/core.h>
+#endif
+
 #endif	/* __CONFIG_H */
diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index d3c8990..4ceee17 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -51,6 +51,10 @@
 
 #define	CONFIG_SYS_TEXT_BASE	0xFFF00000
 
+#ifndef __ASSEMBLY__
+#include <galileo/core.h>
+#endif
+
 /*
  * Monitor configuration
  *
-- 
1.7.6.3

[U-Boot] [PATCH 4/4] GCC4.6: Squash warning in lcd.c

[Marek Vasut]

lcd.c: In function 'lcd_setmem':
lcd.c:446:2: warning: format '%d' expects type 'int', but argument 2 has type
'u_long'
lcd.c:446:2: warning: format '%d' expects type 'int', but argument 3 has type
'u_long'

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>
---
 include/lcd.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/lcd.h b/include/lcd.h
index 0e098d9..89cc90c 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -159,8 +159,8 @@ typedef struct vidinfo {
 #elif defined(CONFIG_ATMEL_LCD)
 
 typedef struct vidinfo {
-	u_long vl_col;		/* Number of columns (i.e. 640) */
-	u_long vl_row;		/* Number of rows (i.e. 480) */
+	ushort vl_col;		/* Number of columns (i.e. 640) */
+	ushort vl_row;		/* Number of rows (i.e. 480) */
 	u_long vl_clk;	/* pixel clock in ps    */
 
 	/* LCD configuration register */
-- 
1.7.6.3

[U-Boot] [PATCH 1/4] GCC4.6: Squash warning in cmd_date.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535660-20881-2-git-send-email-marek.vasut@gmail.com> you wrote:
> cmd_date.c: In function ?do_date?:
> cmd_date.c:50:6: warning: variable ?old_bus? set but not used
> [-Wunused-but-set-variable]
> 
> 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>
> ---
>  include/i2c.h |   32 +++++++++++++++++++++++---------
>  1 files changed, 23 insertions(+), 9 deletions(-)

Applied, 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
365 Days of drinking Lo-Cal beer.                       = 1 Lite-year

[U-Boot] [PATCH 2/4] RFT GCC4.6: Fix muas3001 and IDS8247

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535660-20881-3-git-send-email-marek.vasut@gmail.com> you wrote:
> The boards suffer from the following error due to undefined configuration
> variables:
> 
> Configuring for IDS8247 board...
> ether_fcc.c:75: error: 'CONFIG_SYS_CMXFCR_MASK1' undeclared here (not in a
> function)
> ether_fcc.c:76: error: 'CONFIG_SYS_CMXFCR_VALUE1' undeclared here (not in a
> function)
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  include/configs/IDS8247.h  |    4 ++++
>  include/configs/muas3001.h |    4 ++++
>  2 files changed, 8 insertions(+), 0 deletions(-)

Collission with commit d4590da4 by Mike Frysinger.  Dropped.

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
Never ascribe to malice that which can  adequately  be  explained  by
stupidity.

[U-Boot] [PATCH 3/4] GCC4.6: Squash GTREADREG related errors

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535660-20881-4-git-send-email-marek.vasut@gmail.com> you wrote:
> interrupts.c: In function 'interrupt_init_cpu':
> interrupts.c:37: warning: implicit declaration of function 'GTREGREAD'
> interrupts.c:37: error: 'LOW_INTERRUPT_CAUSE_REGISTER' undeclared (first use in
> this function)
> interrupts.c:37: error: (Each undeclared identifier is reported only once
> interrupts.c:37: error: for each function it appears in.)
> interrupts.c:37: error: 'HIGH_INTERRUPT_CAUSE_REGISTER' undeclared (first use in
> this function)
> interrupts.c:40: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:40: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:40: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> 
> 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>
> ---
>  include/configs/PCIPPC2.h     |    4 ++++
>  include/configs/PCIPPC6.h     |    4 ++++
>  include/configs/mpc7448hpc2.h |    4 ++++
>  include/configs/p3mx.h        |    4 ++++
>  include/configs/ppmc7xx.h     |    4 ++++
>  5 files changed, 20 insertions(+), 0 deletions(-)

Applied, 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
Women professionals do tend to over-compensate.
	-- Dr. Elizabeth Dehaver, "Where No Man Has Gone Before",
	   stardate 1312.9.

[U-Boot] [PATCH 4/4] GCC4.6: Squash warning in lcd.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535660-20881-5-git-send-email-marek.vasut@gmail.com> you wrote:
> lcd.c: In function 'lcd_setmem':
> lcd.c:446:2: warning: format '%d' expects type 'int', but argument 2 has type
> 'u_long'
> lcd.c:446:2: warning: format '%d' expects type 'int', but argument 3 has type
> 'u_long'
> 
> 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>
> ---
>  include/lcd.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Applied, 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
The only solution is ... a balance of power. We  arm  our  side  with
exactly  that  much  more.  A balance of power -- the trickiest, most
difficult, dirtiest game of them all. But the only one that preserves
both sides.
	-- Kirk, "A Private Little War", stardate 4211.8