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/spear/x600/fpga.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/spear/x600/fpga.c')
| -rw-r--r-- | board/spear/x600/fpga.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/board/spear/x600/fpga.c b/board/spear/x600/fpga.c index 85eb31be7..74baa3fc4 100644 --- a/board/spear/x600/fpga.c +++ b/board/spear/x600/fpga.c @@ -113,7 +113,7 @@ static int fpga_done_fn(int cookie)  static int fpga_pre_config_fn(int cookie)  {  	debug("%s:%d: FPGA pre-configuration\n", __func__, __LINE__); -	fpga_reset(TRUE); +	fpga_reset(true);  	return 0;  } @@ -128,9 +128,9 @@ static int fpga_post_config_fn(int cookie)  	debug("%s:%d: FPGA post configuration\n", __func__, __LINE__); -	fpga_reset(TRUE); +	fpga_reset(true);  	udelay(100); -	fpga_reset(FALSE); +	fpga_reset(false);  	udelay(100);  	return rc; @@ -200,7 +200,7 @@ static Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {  static void fpga_serialslave_init(void)  {  	debug("%s:%d: Initialize serial slave interface\n", __func__, __LINE__); -	fpga_pgm_fn(FALSE, FALSE, 0);	/* make sure program pin is inactive */ +	fpga_pgm_fn(false, false, 0);	/* make sure program pin is inactive */  }  static int expi_setup(int freq) |