projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tegra: medcom: Add device tree support
[oweals/u-boot.git]
/
board
/
jupiter
/
jupiter.c
diff --git
a/board/jupiter/jupiter.c
b/board/jupiter/jupiter.c
index 04fda4a69f1bbd9e2bf9f25daecb33d4ead78e42..967aabdcfa98b52bd2dfe7c8049013e764291ed2 100644
(file)
--- a/
board/jupiter/jupiter.c
+++ b/
board/jupiter/jupiter.c
@@
-28,11
+28,7
@@
#include <mpc5xxx.h>
#include <pci.h>
#include <asm/processor.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <asm/processor.h>
-
-#if defined(CONFIG_OF_FLAT_TREE)
-#include <ft_build.h>
-#endif
-
+#include <libfdt.h>
#define SDRAM_DDR 0
#if 1
#define SDRAM_DDR 0
#if 1
@@
-49,7
+45,7
@@
#define SDRAM_CONFIG2 0x88b70004
#endif
#define SDRAM_CONFIG2 0x88b70004
#endif
-#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;
@@
-92,17
+88,17
@@
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 dramsize2 = 0;
uint svr, pvr;
{
ulong dramsize = 0;
ulong dramsize2 = 0;
uint svr, pvr;
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
ulong test1, test2;
/* setup SDRAM chip selects */
ulong test1, test2;
/* setup SDRAM chip selects */
@@
-123,9
+119,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, 0x80000000);
+ test1 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size((long *)C
FG
_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((long *)C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@
-151,10
+147,10
@@
long int initdram (int board_type)
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
/* find RAM size using SDRAM CS1 only */
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((long *)(C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((long *)(C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((long *)(C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((long *)(C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
sdram_start(0);
}
if (test1 > test2) {
sdram_start(0);
@@
-176,7
+172,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;
@@
-194,7
+190,7
@@
long int 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
@@
-231,10
+227,6
@@
void flash_preinit(void)
* Note that CS_BOOT cannot be cleared when
* executing in flash.
*/
* Note that CS_BOOT cannot be cleared when
* executing in flash.
*/
-#if defined(CONFIG_MGT5100)
- *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */
- *(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */
-#endif
*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
}
*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */
}
@@
-248,14
+240,12
@@
void flash_afterinit(ulong size)
{
if (size == 0x1000000) { /* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
{
if (size == 0x1000000) { /* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
- START_REG(C
FG
_BOOTCS_START | size);
+ START_REG(C
ONFIG_SYS
_BOOTCS_START | size);
*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
- STOP_REG(C
FG
_BOOTCS_START | size, size);
+ STOP_REG(C
ONFIG_SYS
_BOOTCS_START | size, size);
}
}
-#if defined(CONFIG_MPC5200)
*(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */
*(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */
*(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */
*(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */
-#endif
}
int update_flash_size (int flash_size)
}
int update_flash_size (int flash_size)
@@
-281,7
+271,7
@@
void pci_init_board(void)
}
#endif
}
#endif
-#if defined
(CFG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
+#if defined
(CONFIG_CMD_IDE) && defined
(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
void init_ide_reset (void)
{
@@
-306,9
+296,9
@@
void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
}
}
-#endif
/* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
+#endif
-#if defined(CONFIG_OF_
FLAT_TREE
) && defined(CONFIG_OF_BOARD_SETUP)
+#if defined(CONFIG_OF_
LIBFDT
) && defined(CONFIG_OF_BOARD_SETUP)
void
ft_board_setup(void *blob, bd_t *bd)
{
void
ft_board_setup(void *blob, bd_t *bd)
{