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
5xxx, fdt: move fdt_fixup_memory() to cpu.c file
[platform/kernel/u-boot.git]
/
board
/
uc101
/
uc101.c
diff --git
a/board/uc101/uc101.c
b/board/uc101/uc101.c
index
7a6b3be
..
c7dfb7b
100644
(file)
--- a/
board/uc101/uc101.c
+++ b/
board/uc101/uc101.c
@@
-31,6
+31,7
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <fdt_support.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <malloc.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <malloc.h>
@@
-99,7
+100,7
@@
#define GP_TIMER_GET_I(n, v) ( \
(((volatile struct mpc5xxx_gpt *)(MPC5XXX_GPT + n))->sr & 0x100) >> 8)
#define GP_TIMER_GET_I(n, v) ( \
(((volatile struct mpc5xxx_gpt *)(MPC5XXX_GPT + n))->sr & 0x100) >> 8)
-#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;
@@
-142,14
+143,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.
*/
* is something else than 0x00000000.
*/
-
long in
t initdram (int board_type)
+
phys_size_
t initdram (int board_type)
{
ulong dramsize = 0;
{
ulong dramsize = 0;
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
ulong test1, test2;
/* setup SDRAM chip selects */
ulong test1, test2;
/* setup SDRAM chip selects */
@@
-170,9
+171,9
@@
long int 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;
@@
-194,7
+195,7
@@
long int 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;
@@
-212,7
+213,7
@@
long int initdram (int board_type)
dramsize2 = 0;
}
dramsize2 = 0;
}
-#endif /* C
FG
_RAMBOOT */
+#endif /* C
ONFIG_SYS
_RAMBOOT */
/* return dramsize + dramsize2; */
return dramsize;
/* return dramsize + dramsize2; */
return dramsize;
@@
-221,6
+222,8
@@
long int initdram (int board_type)
int checkboard (void)
{
puts ("Board: MAN UC101\n");
int checkboard (void)
{
puts ("Board: MAN UC101\n");
+ /* clear the Display */
+ *(char *)(CONFIG_SYS_DISP_CWORD) = 0x80;
return 0;
}
return 0;
}
@@
-343,9
+346,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);
/* Interbus enable it here ?? */
*(vu_long *)MPC5XXX_GPT6_ENABLE = GPT_OUT_1;
return 0;
/* Interbus enable it here ?? */
*(vu_long *)MPC5XXX_GPT6_ENABLE = GPT_OUT_1;
return 0;
@@
-369,3
+372,10
@@
void hw_watchdog_reset(void)
*(vu_long *)MPC5XXX_GPT0_ENABLE = GPT_OUT_0;
}
#endif
*(vu_long *)MPC5XXX_GPT0_ENABLE = GPT_OUT_0;
}
#endif
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+ ft_cpu_setup(blob, bd);
+}
+#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */