diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-30 16:55:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-30 16:55:37 +0200 |
| commit | e0f6a4e8b17afead8add6e528936a505367c091c (patch) | |
| tree | 27df2ba6194aa03a6e4da948c66113076f17f978 /board/gdsys/405ex/io64.c | |
| parent | f588bb034d5d3a0417f45965f1aba4d4cf8a2893 (diff) | |
| parent | 4212657c53f9ed66fd5adc9da9a327e3739646fb (diff) | |
| download | u-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.zip u-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.tar.gz u-boot-imx-e0f6a4e8b17afead8add6e528936a505367c091c.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
powerpc/ppc4xx: Remove typedefs for gdsys FPGA
powerpc/ppc4xx: Fix typo in gdsys_fpga.h
powerpc/ppc4xx: Update gdsys board configurations
powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
powerpc/ppc4xx: Adjust environment size on neo
Diffstat (limited to 'board/gdsys/405ex/io64.c')
| -rw-r--r-- | board/gdsys/405ex/io64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c index 177141d..41fdef7 100644 --- a/board/gdsys/405ex/io64.c +++ b/board/gdsys/405ex/io64.c @@ -100,7 +100,7 @@ int misc_init_r(void) static void print_fpga_info(unsigned dev) { - ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(dev); + struct ihs_fpga *fpga = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(dev); u16 versions = in_le16(&fpga->versions); u16 fpga_version = in_le16(&fpga->fpga_version); u16 fpga_features = in_le16(&fpga->fpga_features); @@ -242,8 +242,8 @@ int last_stage_init(void) { unsigned int k; unsigned int fpga; - ihs_fpga_t *fpga0 = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0); - ihs_fpga_t *fpga1 = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(1); + struct ihs_fpga *fpga0 = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(0); + struct ihs_fpga *fpga1 = (struct ihs_fpga *) CONFIG_SYS_FPGA_BASE(1); int failed = 0; char str_phys[] = "Setup PHYs -"; char str_serdes[] = "Start SERDES blocks"; |