rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
committed by
Wolfgang Denk
parent
71edc27181
commit
6d0f6bcf33
@@ -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;
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user