diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /examples/mem_to_mem_idma2intr.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.gz u-boot-imx-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.bz2 | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'examples/mem_to_mem_idma2intr.c')
| -rw-r--r-- | examples/mem_to_mem_idma2intr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/mem_to_mem_idma2intr.c b/examples/mem_to_mem_idma2intr.c index 3ff2804..15779d0 100644 --- a/examples/mem_to_mem_idma2intr.c +++ b/examples/mem_to_mem_idma2intr.c @@ -39,8 +39,8 @@ DECLARE_GLOBAL_DATA_PTR; #include <watchdog.h> #else /* Standalone app of PPCBoot */ #define WATCHDOG_RESET() { \ - *(ushort *)(CFG_IMMR + 0x1000E) = 0x556c; \ - *(ushort *)(CFG_IMMR + 0x1000E) = 0xaa39; \ + *(ushort *)(CONFIG_SYS_IMMR + 0x1000E) = 0x556c; \ + *(ushort *)(CONFIG_SYS_IMMR + 0x1000E) = 0xaa39; \ } #endif /* STANDALONE */ @@ -156,7 +156,7 @@ typedef struct pram_idma { } pram_idma_t; -volatile immap_t *immap = (immap_t *) CFG_IMMR; +volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile ibd_t *bdf; volatile pram_idma_t *piptr; @@ -348,7 +348,7 @@ static uint dpbase = 0; uint dpalloc (uint size, uint align) { - volatile immap_t *immr = (immap_t *) CFG_IMMR; + volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; uint retloc; uint align_mask, off; uint savebase; |