diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-10-16 15:01:15 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:54:03 +0200 |
| commit | 6d0f6bcf337c5261c08fabe12982178c2c489d76 (patch) | |
| tree | ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f /examples | |
| parent | 71edc271816ec82cf0550dd6980be2da3cc2ad9e (diff) | |
| download | u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.zip u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.gz u-boot-imx-6d0f6bcf337c5261c08fabe12982178c2c489d76.tar.bz2 | |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/mem_to_mem_idma2intr.c | 8 | ||||
| -rw-r--r-- | examples/test_burst.c | 12 |
2 files changed, 10 insertions, 10 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; diff --git a/examples/test_burst.c b/examples/test_burst.c index d8c5ed4..7109c09 100644 --- a/examples/test_burst.c +++ b/examples/test_burst.c @@ -50,19 +50,19 @@ /* Define GPIO ports to signal start of burst transfers and errors */ #ifdef CONFIG_LWMON /* Use PD.8 to signal start of burst transfers */ -#define GPIO1_DAT (((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pddat) +#define GPIO1_DAT (((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat) #define GPIO1_BIT 0x0080 /* Configure PD.8 as general purpose output */ #define GPIO1_INIT \ - ((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pdpar &= ~GPIO1_BIT; \ - ((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pddir |= GPIO1_BIT; + ((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar &= ~GPIO1_BIT; \ + ((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir |= GPIO1_BIT; /* Use PD.9 to signal error */ -#define GPIO2_DAT (((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pddat) +#define GPIO2_DAT (((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat) #define GPIO2_BIT 0x0040 /* Configure PD.9 as general purpose output */ #define GPIO2_INIT \ - ((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pdpar &= ~GPIO2_BIT; \ - ((volatile immap_t *)CFG_IMMR)->im_ioport.iop_pddir |= GPIO2_BIT; + ((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar &= ~GPIO2_BIT; \ + ((volatile immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir |= GPIO2_BIT; #endif /* CONFIG_LWMON */ |