diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-21 20:20:00 -0400 |
| commit | 89ca873e2ddea859526f25f678fa53dda055e90f (patch) | |
| tree | 3de5d39c9e3a257d50727b50057336ca41aac2db /arch/powerpc/cpu/mpc8xxx/fsl_pamu.c | |
| parent | 9f84da8de1873593d9b708aa4a8a24f46e67c744 (diff) | |
| parent | b24a4f6247d867f1301edc1c6390aca79ecbe16b (diff) | |
| download | u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.zip u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.gz u-boot-imx-89ca873e2ddea859526f25f678fa53dda055e90f.tar.bz2 | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc8xxx/fsl_pamu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xxx/fsl_pamu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c index 9421f1e..ede8e66 100644 --- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c @@ -239,15 +239,23 @@ int pamu_init(void) spaact_size = sizeof(struct paace) * NUM_SPAACT_ENTRIES; /* Allocate space for Primary PAACT Table */ +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_PPAACT_ADDR)) + ppaact = (void *)CONFIG_SPL_PPAACT_ADDR; +#else ppaact = memalign(PAMU_TABLE_ALIGNMENT, ppaact_size); if (!ppaact) return -1; +#endif memset(ppaact, 0, ppaact_size); /* Allocate space for Secondary PAACT Table */ +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_SPAACT_ADDR)) + sec = (void *)CONFIG_SPL_SPAACT_ADDR; +#else sec = memalign(PAMU_TABLE_ALIGNMENT, spaact_size); if (!sec) return -1; +#endif memset(sec, 0, spaact_size); ppaact_phys = virt_to_phys((void *)ppaact); |