diff options
| author | Timur Tabi <timur@freescale.com> | 2011-11-22 09:21:25 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-11-29 08:48:06 -0600 |
| commit | f2717b47eac74fe262d89c6d8f6bb5a047a77229 (patch) | |
| tree | dc8e99ad4b37a8247e944d4edf668de97517f623 /drivers/qe | |
| parent | fbc20aab119b70119a2c1db7dfbecb4a6ee0f6a5 (diff) | |
| download | blackbird-obmc-uboot-f2717b47eac74fe262d89c6d8f6bb5a047a77229.tar.gz blackbird-obmc-uboot-f2717b47eac74fe262d89c6d8f6bb5a047a77229.zip | |
powerpc/85xx: clean up and document the QE/FMAN microcode macros
Several macros are used to identify and locate the microcode binary image
that U-boot needs to upload to the QE or Fman. Both the QE and the Fman
use the QE Firmware binary format to package their respective microcode data,
which is why the same macros are used for both. A given SOC will only have
a QE or an Fman, so this is safe.
Unfortunately, the current macro definition and usage has inconsistencies.
For example, CONFIG_SYS_FMAN_FW_ADDR was used to define the address of Fman
firmware in NOR flash, but CONFIG_SYS_QE_FW_IN_NAND contains the address
of NAND. There's no way to know by looking at a variable how it's supposed
to be used.
In the future, the code which uploads QE firmware and Fman firmware will
be merged.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/qe')
| -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 c4ec2f4af8..9f711519ed 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); |
