diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /board/mpl/pip405/pip405.c | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'board/mpl/pip405/pip405.c')
| -rw-r--r-- | board/mpl/pip405/pip405.c | 10 | 
1 files changed, 4 insertions, 6 deletions
| diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c index 75f57ad8e..b203037cf 100644 --- a/board/mpl/pip405/pip405.c +++ b/board/mpl/pip405/pip405.c @@ -36,9 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;  #undef SDRAM_DEBUG -#define FALSE           0 -#define TRUE            1 -  /* stdlib.h causes some compatibility problems; should fixe these! -- wd */  #ifndef __ldiv_t_defined  typedef struct { @@ -700,7 +697,8 @@ int misc_init_r (void)  int overwrite_console (void)  { -	return (in8 (CONFIG_PORT_ADDR) & 0x1);	/* return TRUE if console should be overwritten */ +	/* return true if console should be overwritten */ +	return in8(CONFIG_PORT_ADDR) & 0x1;  } @@ -945,7 +943,7 @@ void print_pip405_info (void)  void user_led0 (unsigned char on)  { -	if (on == TRUE) +	if (on == true)  		out8 (PLD_LED_USER_REG, (in8 (PLD_LED_USER_REG) | 0x1));  	else  		out8 (PLD_LED_USER_REG, (in8 (PLD_LED_USER_REG) & 0xfe)); @@ -953,7 +951,7 @@ void user_led0 (unsigned char on)  void user_led1 (unsigned char on)  { -	if (on == TRUE) +	if (on == true)  		out8 (PLD_LED_USER_REG, (in8 (PLD_LED_USER_REG) | 0x2));  	else  		out8 (PLD_LED_USER_REG, (in8 (PLD_LED_USER_REG) & 0xfd)); |