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
odroid: remove CONFIG_DM_I2C_COMPAT config
[platform/kernel/u-boot.git]
/
board
/
jupiter
/
jupiter.c
diff --git
a/board/jupiter/jupiter.c
b/board/jupiter/jupiter.c
index
78e4b5d
..
52d2766
100644
(file)
--- a/
board/jupiter/jupiter.c
+++ b/
board/jupiter/jupiter.c
@@
-29,6
+29,8
@@
#define SDRAM_CONFIG2 0x88b70004
#endif
#define SDRAM_CONFIG2 0x88b70004
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
#ifndef CONFIG_SYS_RAMBOOT
static void sdram_start (int hi_addr)
{
#ifndef CONFIG_SYS_RAMBOOT
static void sdram_start (int hi_addr)
{
@@
-71,12
+73,12
@@
static void sdram_start (int hi_addr)
#endif
/*
#endif
/*
- * ATTENTION: Although partially referenced
initdram
does NOT make real use
+ * ATTENTION: Although partially referenced
dram_init
does NOT make real use
* use of CONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS_SDRAM_BASE
* is something else than 0x00000000.
*/
* use of CONFIG_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
)
+
int dram_init(void
)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
{
ulong dramsize = 0;
ulong dramsize2 = 0;
@@
-194,7
+196,9
@@
phys_size_t initdram (int board_type)
__asm__ volatile ("sync");
}
__asm__ volatile ("sync");
}
- return dramsize + dramsize2;
+ gd->ram_size = dramsize + dramsize2;
+
+ return 0;
}
int checkboard (void)
}
int checkboard (void)
@@
-255,7
+259,7
@@
void pci_init_board(void)
}
#endif
}
#endif
-#if defined(CONFIG_
CMD_
IDE) && defined(CONFIG_IDE_RESET)
+#if defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void)
{
void init_ide_reset (void)
{
@@
-282,10
+286,11
@@
void ide_set_reset (int idereset)
}
#endif
}
#endif
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-void
-ft_board_setup(void *blob, bd_t *bd)
+#ifdef CONFIG_OF_BOARD_SETUP
+int ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
{
ft_cpu_setup(blob, bd);
+
+ return 0;
}
}
-#endif
+#endif
/* CONFIG_OF_BOARD_SETUP */