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
mpc83xx: Get rid of CONFIG_SYS_DDR_BASE
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mpc832xemds
/
mpc832xemds.c
diff --git
a/board/freescale/mpc832xemds/mpc832xemds.c
b/board/freescale/mpc832xemds/mpc832xemds.c
index
b7ea0e4
..
61b95c6
100644
(file)
--- a/
board/freescale/mpc832xemds/mpc832xemds.c
+++ b/
board/freescale/mpc832xemds/mpc832xemds.c
@@
-1,9
+1,8
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
*
* Dave Liu <daveliu@freescale.com>
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
*
* Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-17,12
+16,14
@@
#endif
#include <asm/mmu.h>
#if defined(CONFIG_OF_LIBFDT)
#endif
#include <asm/mmu.h>
#if defined(CONFIG_OF_LIBFDT)
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#endif
#if defined(CONFIG_PQ_MDS_PIB)
#include "../common/pq-mds-pib.h"
#endif
#endif
#if defined(CONFIG_PQ_MDS_PIB)
#include "../common/pq-mds-pib.h"
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* ETH3 */
{1, 0, 1, 0, 1}, /* TxD0 */
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* ETH3 */
{1, 0, 1, 0, 1}, /* TxD0 */
@@
-88,21
+89,23
@@
int board_early_init_r(void)
int fixed_sdram(void);
int fixed_sdram(void);
-
phys_size_t initdram(int board_type
)
+
int dram_init(void
)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32) im)
{
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
u32 msize = 0;
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32) im)
- return -
1
;
+ return -
ENXIO
;
/* DDR SDRAM - Main SODIMM */
/* DDR SDRAM - Main SODIMM */
- im->sysconf.ddrlaw[0].bar = CONFIG_SYS_
DDR
_BASE & LAWBAR_BAR;
+ im->sysconf.ddrlaw[0].bar = CONFIG_SYS_
SDRAM
_BASE & LAWBAR_BAR;
msize = fixed_sdram();
msize = fixed_sdram();
- /* return total bus SDRAM size(bytes) -- DDR */
- return (msize * 1024 * 1024);
+ /* set total bus SDRAM size(bytes) -- DDR */
+ gd->ram_size = msize * 1024 * 1024;
+
+ return 0;
}
/*************************************************************************
}
/*************************************************************************
@@
-154,11
+157,13
@@
int checkboard(void)
}
#if defined(CONFIG_OF_BOARD_SETUP)
}
#if defined(CONFIG_OF_BOARD_SETUP)
-
void
ft_board_setup(void *blob, bd_t *bd)
+
int
ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
#endif
{
ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCI
ft_pci_setup(blob, bd);
#endif
+
+ return 0;
}
#endif
}
#endif