diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-15 21:37:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-15 21:37:23 +0200 |
| commit | 1d28d48e3df65ef867395eb84ee0498f1c52a384 (patch) | |
| tree | 155cb75e5f73083f0b77a10679608808c8d7437a /cpu/mpc83xx | |
| parent | 85e5808e8ea9f77da5219f23394112f0b424fa5e (diff) | |
| parent | 1107014e835ec9d46c0333f4211d104f77442db0 (diff) | |
| download | u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.zip u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.tar.gz u-boot-imx-1d28d48e3df65ef867395eb84ee0498f1c52a384.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu/mpc83xx')
| -rw-r--r-- | cpu/mpc83xx/fdt.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c index 02c4d05..fda85c1 100644 --- a/cpu/mpc83xx/fdt.c +++ b/cpu/mpc83xx/fdt.c @@ -26,6 +26,7 @@ #include <common.h> #include <libfdt.h> #include <fdt_support.h> +#include <asm/processor.h> extern void ft_qe_setup(void *blob); @@ -33,6 +34,23 @@ DECLARE_GLOBAL_DATA_PTR; void ft_cpu_setup(void *blob, bd_t *bd) { + immap_t *immr = (immap_t *)CFG_IMMR; + int spridr = immr->sysconf.spridr; + + /* + * delete crypto node if not on an E-processor + * initial revisions of the MPC834xE/6xE have the original SEC 2.0. + * EA revisions got the SEC uprevved to 2.4 but since the default device + * tree contains SEC 2.0 properties we uprev them here. + */ + if (!IS_E_PROCESSOR(spridr)) + fdt_fixup_crypto_node(blob, 0); + else if (IS_E_PROCESSOR(spridr) && + (SPR_FAMILY(spridr) == SPR_834X_FAMILY || + SPR_FAMILY(spridr) == SPR_836X_FAMILY) && + REVID_MAJOR(spridr) >= 2) + fdt_fixup_crypto_node(blob, 0x0204); + #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) fdt_fixup_ethernet(blob, bd); @@ -60,7 +78,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CFG_NS16550 do_fixup_by_compat_u32(blob, "ns16550", - "clock-frequency", bd->bi_busfreq, 1); + "clock-frequency", CFG_NS16550_CLK, 1); #endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); |