diff options
| author | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-21 16:27:47 -0400 |
| commit | 6612ab33956ae09c5ba2fde9c1540b519625ba37 (patch) | |
| tree | b6da2e20793336cf0eed44292edb3b5e7ce88819 /arch/powerpc/cpu/mpc8xxx/law.c | |
| parent | 3fb858891273945ce2238e6d4dac3363a1fb0853 (diff) | |
| parent | b6df9b01fb8c126b212aba92b6523407d3fa60a5 (diff) | |
| download | u-boot-6612ab33956ae09c5ba2fde9c1540b519625ba37.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc8xxx/law.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xxx/law.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 89a561e0ac..a401083107 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -76,7 +76,8 @@ void disable_law(u8 idx) return; } -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_NAND_SPL) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) static int get_law_entry(u8 i, struct law_entry *e) { u32 lawar; @@ -106,7 +107,8 @@ int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id) return idx; } -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD) +#if !defined(CONFIG_NAND_SPL) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SPL_INIT_MINIMAL)) int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id) { u32 idx; |