← Back to branch summary

~ubuntu-branches/ubuntu/maverick/uboot-imx/maverick

« back to all changes in this revision

Viewing changes to drivers/fpga/spartan3.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2010-01-06 09:28:25 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100106092825-q8o7x811035syh8k
Tags: 2009.08-0ubuntu1
* move to new upstream (2009.08)
* move to new freescale patchset for the 2009.08 release
* remove README.nios_CONFIG_SYS_NIOS_CPU from debian/docs, 
  this is not shipped upstream anymore
* update 1000_fix_gcc_4.4_compability.patch to apply to the new code
* Makefile target is now mx51_bbg_config, update rules accordingly
* switch everything to to3 (including the binary package)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/fpga/spartan3.c
281
281
                        }
282
282
                }
283
283
 
284
 
                if (ret_val == FPGA_SUCCESS) {
285
 
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
286
 
                        puts ("Done.\n");
287
 
#endif
288
 
                }
289
284
                /*
290
285
                 * Run the post configuration function if there is one.
291
286
                 */
292
 
                if (*fn->post) {
 
287
                if (*fn->post)
293
288
                        (*fn->post) (cookie);
294
 
                }
295
289
 
296
 
                else {
297
290
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 
291
                if (ret_val == FPGA_SUCCESS)
 
292
                        puts ("Done.\n");
 
293
                else
298
294
                        puts ("Fail.\n");
299
295
#endif
300
 
                }
301
296
 
302
297
        } else {
303
298
                printf ("%s: NULL Interface function table!\n", __FUNCTION__);
567
562
                /*
568
563
                 * Run the post configuration function if there is one.
569
564
                 */
570
 
                if (*fn->post) {
 
565
                if (*fn->post)
571
566
                        (*fn->post) (cookie);
572
 
                }
573
567
 
574
568
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
575
 
                if (ret_val == FPGA_SUCCESS) {
 
569
                if (ret_val == FPGA_SUCCESS)
576
570
                        puts ("Done.\n");
577
 
                }
578
 
                else {
 
571
                else
579
572
                        puts ("Fail.\n");
580
 
                }
581
573
#endif
582
574
 
583
575
        } else {