diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-01 23:58:11 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-01 23:58:11 +0100 |
| commit | d51e6d6de2b7dcba43fadcae2c89f7346d8bc301 (patch) | |
| tree | 49bedf2073e031a421c89644f62134bf9ee4f44b /drivers/qe/qe.c | |
| parent | 22e0f5a9ecab85f36a0fe69892d950c1ac212c91 (diff) | |
| parent | 9839709ea3df89f6021034508f48b97cab33ebb8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx:
mpc85xx: support for Freescale COM Express P2020
arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
mpc85xx: support board-specific reset function
powerpc/85xx: verify the localbus device tree address before booting the OS
mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
powerpc/p3060qds: Add board related support for P3060QDS platform
powerpc/85xx: clean up and document the QE/FMAN microcode macros
powerpc/85xx: always implement the work-around for Erratum SATA_A001
powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
powerpc/85xx: Add workaround for erratum A-003474
powerpc/85xx: fixup flexcan device tree clock-frequency
powerpc/85xx: Add workaround for erratum CPU-A003999
Diffstat (limited to 'drivers/qe/qe.c')
| -rw-r--r-- | drivers/qe/qe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index c4ec2f4af89..9f711519ede 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -170,11 +170,11 @@ void qe_init(uint qe_base) /* Init the QE IMMR base */ qe_immr = (qe_map_t *)qe_base; -#ifdef CONFIG_SYS_QE_FW_ADDR +#ifdef CONFIG_SYS_QE_FMAN_FW_IN_NOR /* * Upload microcode to IRAM for those SOCs which do not have ROM in QE. */ - qe_upload_firmware((const struct qe_firmware *) CONFIG_SYS_QE_FW_ADDR); + qe_upload_firmware((const void *)CONFIG_SYS_QE_FMAN_FW_ADDR); /* enable the microcode in IRAM */ out_be32(&qe_immr->iram.iready,QE_IRAM_READY); |