diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 20:07:57 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 20:07:57 (GMT) |
commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
tree | 52f7223e7c63f43322f3eee4722743e12190a19f /board/gen860t | |
parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
download | u-boot-fsl-qoriq-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
drivers/video/exynos_fb.c
Diffstat (limited to 'board/gen860t')
-rw-r--r-- | board/gen860t/fpga.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/gen860t/fpga.c b/board/gen860t/fpga.c index d42c500..4c36009 100644 --- a/board/gen860t/fpga.c +++ b/board/gen860t/fpga.c @@ -182,7 +182,7 @@ void fpga_selectmap_init (void) { PRINTF ("%s:%d: Initialize SelectMap interface\n", __FUNCTION__, __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 */ } @@ -314,7 +314,7 @@ int fpga_abort_fn (int cookie) int fpga_pre_config_fn (int cookie) { PRINTF ("%s:%d: FPGA pre-configuration\n", __FUNCTION__, __LINE__); - fpga_reset (TRUE); + fpga_reset(true); return 0; } @@ -328,9 +328,9 @@ int fpga_post_config_fn (int cookie) int rc; PRINTF ("%s:%d: FPGA post configuration\n", __FUNCTION__, __LINE__); - fpga_reset (TRUE); + fpga_reset(true); udelay (1000); - fpga_reset (FALSE); + fpga_reset(false); udelay (1000); /* |