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
env: Finish migration of common ENV options
[platform/kernel/u-boot.git]
/
board
/
freescale
/
t4qds
/
spl.c
diff --git
a/board/freescale/t4qds/spl.c
b/board/freescale/t4qds/spl.c
index
05feede
..
df81205
100644
(file)
--- a/
board/freescale/t4qds/spl.c
+++ b/
board/freescale/t4qds/spl.c
@@
-1,10
+1,10
@@
+// SPDX-License-Identifier: GPL-2.0+
/* Copyright 2014 Freescale Semiconductor, Inc.
/* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <console.h>
*/
#include <common.h>
#include <console.h>
+#include <env_internal.h>
#include <asm/spl.h>
#include <malloc.h>
#include <ns16550.h>
#include <asm/spl.h>
#include <malloc.h>
#include <ns16550.h>
@@
-120,20
+120,20
@@
void board_init_r(gd_t *gd, ulong dest_addr)
#ifdef CONFIG_SPL_NAND_BOOT
nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
#ifdef CONFIG_SPL_NAND_BOOT
nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
- (uchar *)
CONFIG
_ENV_ADDR);
+ (uchar *)
SPL
_ENV_ADDR);
#endif
#ifdef CONFIG_SPL_MMC_BOOT
mmc_initialize(bd);
mmc_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
#endif
#ifdef CONFIG_SPL_MMC_BOOT
mmc_initialize(bd);
mmc_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
- (uchar *)
CONFIG
_ENV_ADDR);
+ (uchar *)
SPL
_ENV_ADDR);
#endif
#endif
- gd->env_addr = (ulong)(
CONFIG
_ENV_ADDR);
- gd->env_valid =
1
;
+ gd->env_addr = (ulong)(
SPL
_ENV_ADDR);
+ gd->env_valid =
ENV_VALID
;
i2c_init_all();
i2c_init_all();
-
initdram
();
+
dram_init
();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();
#ifdef CONFIG_SPL_MMC_BOOT
mmc_boot();