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
IMX: MX31: Cleanup include files and drop nasty #ifdef in drivers
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mx31pdk
/
mx31pdk.c
diff --git
a/board/freescale/mx31pdk/mx31pdk.c
b/board/freescale/mx31pdk/mx31pdk.c
index
9f47169
..
3f291fc
100644
(file)
--- a/
board/freescale/mx31pdk/mx31pdk.c
+++ b/
board/freescale/mx31pdk/mx31pdk.c
@@
-26,20
+26,26
@@
#include <common.h>
#include <netdev.h>
#include <common.h>
#include <netdev.h>
-#include <asm/arch/
mx31
.h>
-#include <asm/arch/
mx31
-regs.h>
+#include <asm/arch/
clock
.h>
+#include <asm/arch/
imx
-regs.h>
DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)
{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
+ PHYS_SDRAM_1_SIZE);
+ return 0;
+}
+
+void dram_init_banksize(void)
+{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
- return 0;
}
}
-int board_
init
(void)
+int board_
early_init_f
(void)
{
/* CS5: CPLD incl. network controller */
__REG(CSCR_U(5)) = 0x0000d843;
{
/* CS5: CPLD incl. network controller */
__REG(CSCR_U(5)) = 0x0000d843;
@@
-50,6
+56,11
@@
int board_init(void)
mx31_uart1_hw_init();
mx31_spi2_hw_init();
mx31_uart1_hw_init();
mx31_spi2_hw_init();
+ return 0;
+}
+
+int board_init(void)
+{
gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
/* adress of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
/* adress of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;