projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
post
/
cpu
/
mpc8xx
/
uart.c
diff --git
a/post/cpu/mpc8xx/uart.c
b/post/cpu/mpc8xx/uart.c
index
635debe
..
f351ac0
100644
(file)
--- a/
post/cpu/mpc8xx/uart.c
+++ b/
post/cpu/mpc8xx/uart.c
@@
-37,7
+37,7
@@
*/
#include <post.h>
*/
#include <post.h>
-#if CONFIG_POST & C
FG
_POST_UART
+#if CONFIG_POST & C
ONFIG_SYS
_POST_UART
#if defined(CONFIG_8xx)
#include <commproc.h>
#elif defined(CONFIG_MPC8260)
#if defined(CONFIG_8xx)
#include <commproc.h>
#elif defined(CONFIG_MPC8260)
@@
-84,7
+84,7
@@
static void smc_init (int smc_index)
{
static int cpm_cr_ch[] = { CPM_CR_CH_SMC1, CPM_CR_CH_SMC2 };
{
static int cpm_cr_ch[] = { CPM_CR_CH_SMC1, CPM_CR_CH_SMC2 };
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile smc_t *sp;
volatile smc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
volatile smc_t *sp;
volatile smc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
@@
-105,15
+105,15
@@
static void smc_init (int smc_index)
im->im_siu_conf.sc_sdcr = 1;
/* clear error conditions */
im->im_siu_conf.sc_sdcr = 1;
/* clear error conditions */
-#ifdef C
FG
_SDSR
- im->im_sdma.sdma_sdsr = C
FG
_SDSR;
+#ifdef C
ONFIG_SYS
_SDSR
+ im->im_sdma.sdma_sdsr = C
ONFIG_SYS
_SDSR;
#else
im->im_sdma.sdma_sdsr = 0x83;
#endif
/* clear SDMA interrupt mask */
#else
im->im_sdma.sdma_sdsr = 0x83;
#endif
/* clear SDMA interrupt mask */
-#ifdef C
FG
_SDMR
- im->im_sdma.sdma_sdmr = C
FG
_SDMR;
+#ifdef C
ONFIG_SYS
_SDMR
+ im->im_sdma.sdma_sdmr = C
ONFIG_SYS
_SDMR;
#else
im->im_sdma.sdma_sdmr = 0x00;
#endif
#else
im->im_sdma.sdma_sdmr = 0x00;
#endif
@@
-133,7
+133,7
@@
static void smc_init (int smc_index)
* the buffer descriptors.
*/
* the buffer descriptors.
*/
-#ifdef C
FG
_ALLOC_DPRAM
+#ifdef C
ONFIG_SYS
_ALLOC_DPRAM
dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
#else
dpaddr = CPM_POST_BASE;
dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
#else
dpaddr = CPM_POST_BASE;
@@
-218,7
+218,7
@@
static void smc_putc (int smc_index, const char c)
volatile cbd_t *tbdf;
volatile char *buf;
volatile smc_uart_t *up;
volatile cbd_t *tbdf;
volatile char *buf;
volatile smc_uart_t *up;
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
up = (smc_uart_t *) & cpmp->cp_dparam[proff_smc[smc_index]];
volatile cpm8xx_t *cpmp = &(im->im_cpm);
up = (smc_uart_t *) & cpmp->cp_dparam[proff_smc[smc_index]];
@@
-250,7
+250,7
@@
static int smc_getc (int smc_index)
volatile cbd_t *rbdf;
volatile unsigned char *buf;
volatile smc_uart_t *up;
volatile cbd_t *rbdf;
volatile unsigned char *buf;
volatile smc_uart_t *up;
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
unsigned char c;
int i;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
unsigned char c;
int i;
@@
-293,7
+293,7
@@
static void scc_init (int scc_index)
CPM_CR_CH_SCC4,
};
CPM_CR_CH_SCC4,
};
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
volatile scc_t *sp;
volatile scc_uart_t *up;
volatile cbd_t *tbdf, *rbdf;
@@
-313,7
+313,7
@@
static void scc_init (int scc_index)
/* Allocate space for two buffer descriptors in the DP ram.
*/
/* Allocate space for two buffer descriptors in the DP ram.
*/
-#ifdef C
FG
_ALLOC_DPRAM
+#ifdef C
ONFIG_SYS
_ALLOC_DPRAM
dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
#else
dpaddr = CPM_POST_BASE;
dpaddr = dpram_alloc_align (sizeof (cbd_t) * 2 + 2, 8);
#else
dpaddr = CPM_POST_BASE;
@@
-420,7
+420,7
@@
static void scc_init (int scc_index)
static void scc_halt(int scc_index)
{
static void scc_halt(int scc_index)
{
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile cpm8xx_t *cp = &(im->im_cpm);
volatile scc_t *sp = (scc_t *) & (cp->cp_scc[scc_index]);
volatile cpm8xx_t *cp = &(im->im_cpm);
volatile scc_t *sp = (scc_t *) & (cp->cp_scc[scc_index]);
@@
-432,7
+432,7
@@
static void scc_putc (int scc_index, const char c)
volatile cbd_t *tbdf;
volatile char *buf;
volatile scc_uart_t *up;
volatile cbd_t *tbdf;
volatile char *buf;
volatile scc_uart_t *up;
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
up = (scc_uart_t *) & cpmp->cp_dparam[proff_scc[scc_index]];
volatile cpm8xx_t *cpmp = &(im->im_cpm);
up = (scc_uart_t *) & cpmp->cp_dparam[proff_scc[scc_index]];
@@
-464,7
+464,7
@@
static int scc_getc (int scc_index)
volatile cbd_t *rbdf;
volatile unsigned char *buf;
volatile scc_uart_t *up;
volatile cbd_t *rbdf;
volatile unsigned char *buf;
volatile scc_uart_t *up;
- volatile immap_t *im = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *im = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
unsigned char c;
int i;
volatile cpm8xx_t *cpmp = &(im->im_cpm);
unsigned char c;
int i;
@@
-553,4
+553,4
@@
int uart_post_test (int flags)
return res;
}
return res;
}
-#endif /* CONFIG_POST & C
FG
_POST_UART */
+#endif /* CONFIG_POST & C
ONFIG_SYS
_POST_UART */