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]
/
board
/
hmi1001
/
hmi1001.c
diff --git
a/board/hmi1001/hmi1001.c
b/board/hmi1001/hmi1001.c
index
8cfd75b
..
9cbed4b
100644
(file)
--- a/
board/hmi1001/hmi1001.c
+++ b/
board/hmi1001/hmi1001.c
@@
-33,7
+33,7
@@
#include <asm/processor.h>
#include <malloc.h>
#include <asm/processor.h>
#include <malloc.h>
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
static void sdram_start (int hi_addr)
{
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
static void sdram_start (int hi_addr)
{
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
@@
-76,14
+76,14
@@
static void sdram_start (int hi_addr)
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
- * use of C
FG_SDRAM_BASE. The code does not work if CFG
_SDRAM_BASE
+ * use of C
ONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS
_SDRAM_BASE
* is something else than 0x00000000.
*/
phys_size_t initdram (int board_type)
{
ulong dramsize = 0;
* is something else than 0x00000000.
*/
phys_size_t initdram (int board_type)
{
ulong dramsize = 0;
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
ulong test1, test2;
uint svr, pvr;
ulong test1, test2;
uint svr, pvr;
@@
-105,9
+105,9
@@
phys_size_t initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((long *)C
FG
_SDRAM_BASE, 0x20000000);
+ test1 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x20000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size((long *)C
FG
_SDRAM_BASE, 0x20000000);
+ test2 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x20000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@
-129,7
+129,7
@@
phys_size_t initdram (int board_type)
}
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
}
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
-#else /* C
FG
_RAMBOOT */
+#else /* C
ONFIG_SYS
_RAMBOOT */
/* retrieve size of memory connected to SDRAM CS0 */
dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
/* retrieve size of memory connected to SDRAM CS0 */
dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
@@
-147,7
+147,7
@@
phys_size_t initdram (int board_type)
dramsize2 = 0;
}
dramsize2 = 0;
}
-#endif /* C
FG
_RAMBOOT */
+#endif /* C
ONFIG_SYS
_RAMBOOT */
/*
* On MPC5200B we need to set the special configuration delay in the
/*
* On MPC5200B we need to set the special configuration delay in the
@@
-193,8
+193,8
@@
struct kbd_data_t {
struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data)
{
struct kbd_data_t* get_keys (struct kbd_data_t *kbd_data)
{
- kbd_data->s1 = *((volatile uchar*)(C
FG
_STATUS1_BASE));
- kbd_data->s2 = *((volatile uchar*)(C
FG
_STATUS2_BASE));
+ kbd_data->s1 = *((volatile uchar*)(C
ONFIG_SYS
_STATUS1_BASE));
+ kbd_data->s2 = *((volatile uchar*)(C
ONFIG_SYS
_STATUS2_BASE));
return kbd_data;
}
return kbd_data;
}
@@
-300,9
+300,9
@@
int board_early_init_r (void)
{
*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
*(vu_long *)MPC5XXX_BOOTCS_START =
{
*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
*(vu_long *)MPC5XXX_BOOTCS_START =
- *(vu_long *)MPC5XXX_CS0_START = START_REG(C
FG
_FLASH_BASE);
+ *(vu_long *)MPC5XXX_CS0_START = START_REG(C
ONFIG_SYS
_FLASH_BASE);
*(vu_long *)MPC5XXX_BOOTCS_STOP =
*(vu_long *)MPC5XXX_BOOTCS_STOP =
- *(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(C
FG_FLASH_BASE, CFG
_FLASH_SIZE);
+ *(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(C
ONFIG_SYS_FLASH_BASE, CONFIG_SYS
_FLASH_SIZE);
return 0;
}
#ifdef CONFIG_PCI
return 0;
}
#ifdef CONFIG_PCI