diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /examples/mem_to_mem_idma2intr.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 3ff28041f..15779d0a1 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; |