diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-30 23:39:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-30 23:39:36 +0200 |
| commit | 1d96cfe8f5eebfc6ea39d1a387f35ca4499e6b67 (patch) | |
| tree | c9ddff821d53fb702957b70e96731b1aa64d11b5 /drivers | |
| parent | 7529b4445bc4525765b003d3269bcf37fc33fac5 (diff) | |
| parent | 24b17d8a3c3a4b9ceaf6363ebe0021011b0b8bd8 (diff) | |
| download | blackbird-obmc-uboot-1d96cfe8f5eebfc6ea39d1a387f35ca4499e6b67.tar.gz blackbird-obmc-uboot-1d96cfe8f5eebfc6ea39d1a387f35ca4499e6b67.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/fsl_law.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index 425eb181bf..287e555900 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -79,6 +79,7 @@ void disable_law(u8 idx) return; } +#ifndef CONFIG_NAND_SPL static int get_law_entry(u8 i, struct law_entry *e) { volatile ccsr_local_t *ccm = (void *)(CONFIG_SYS_FSL_CORENET_CCM_ADDR); @@ -96,6 +97,7 @@ static int get_law_entry(u8 i, struct law_entry *e) return 1; } +#endif #else void set_law(u8 idx, phys_addr_t addr, enum law_size sz, enum law_trgt_if id) { @@ -130,6 +132,7 @@ void disable_law(u8 idx) return; } +#ifndef CONFIG_NAND_SPL static int get_law_entry(u8 i, struct law_entry *e) { volatile u32 *base = (volatile u32 *)(CONFIG_SYS_IMMR + 0xc08); @@ -149,6 +152,7 @@ static int get_law_entry(u8 i, struct law_entry *e) return 1; } #endif +#endif int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id) { |
