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
global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace
[platform/kernel/u-boot.git]
/
board
/
advantech
/
imx8qm_rom7720_a1
/
spl.c
diff --git
a/board/advantech/imx8qm_rom7720_a1/spl.c
b/board/advantech/imx8qm_rom7720_a1/spl.c
index
54f48b9
..
22ed639
100644
(file)
--- a/
board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/
board/advantech/imx8qm_rom7720_a1/spl.c
@@
-9,6
+9,7
@@
#include <log.h>
#include <spl.h>
#include <fsl_esdhc.h>
#include <log.h>
#include <spl.h>
#include <fsl_esdhc.h>
+#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/gpio.h>
@@
-63,7
+64,7
@@
DECLARE_GLOBAL_DATA_PTR;
#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 22)
#define USDHC2_CD_GPIO IMX_GPIO_NR(4, 12)
#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 22)
#define USDHC2_CD_GPIO IMX_GPIO_NR(4, 12)
-static struct fsl_esdhc_cfg usdhc_cfg[C
ONFI
G_SYS_FSL_USDHC_NUM] = {
+static struct fsl_esdhc_cfg usdhc_cfg[C
F
G_SYS_FSL_USDHC_NUM] = {
{USDHC1_BASE_ADDR, 0, 8},
{USDHC2_BASE_ADDR, 0, 4},
{USDHC3_BASE_ADDR, 0, 4},
{USDHC1_BASE_ADDR, 0, 8},
{USDHC2_BASE_ADDR, 0, 4},
{USDHC3_BASE_ADDR, 0, 4},
@@
-96,7
+97,7
@@
static iomux_cfg_t usdhc2_sd[] = {
SC_P_USDHC2_CD_B | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL),
};
SC_P_USDHC2_CD_B | MUX_MODE_ALT(3) | MUX_PAD_CTRL(ESDHC_PAD_CTRL),
};
-int board_mmc_init(
bd_t
*bis)
+int board_mmc_init(
struct bd_info
*bis)
{
int i, ret;
{
int i, ret;
@@
-107,7
+108,7
@@
int board_mmc_init(bd_t *bis)
* mmc1 USDHC2
* mmc2 USDHC3
*/
* mmc1 USDHC2
* mmc2 USDHC3
*/
- for (i = 0; i < C
ONFI
G_SYS_FSL_USDHC_NUM; i++) {
+ for (i = 0; i < C
F
G_SYS_FSL_USDHC_NUM; i++) {
switch (i) {
case 0:
ret = sc_pm_set_resource_power_mode(-1, SC_R_SDHC_0, SC_PM_PW_MODE_ON);
switch (i) {
case 0:
ret = sc_pm_set_resource_power_mode(-1, SC_R_SDHC_0, SC_PM_PW_MODE_ON);
@@
-171,7
+172,7
@@
int board_mmc_getcd(struct mmc *mmc)
void spl_board_init(void)
{
void spl_board_init(void)
{
-#if defined(CONFIG_SPL_SPI
_SUPPORT
)
+#if defined(CONFIG_SPL_SPI)
if (sc_rm_is_resource_owned(-1, SC_R_FSPI_0)) {
if (sc_pm_set_resource_power_mode(-1, SC_R_FSPI_0, SC_PM_PW_MODE_ON)) {
puts("Warning: failed to initialize FSPI0\n");
if (sc_rm_is_resource_owned(-1, SC_R_FSPI_0)) {
if (sc_pm_set_resource_power_mode(-1, SC_R_FSPI_0, SC_PM_PW_MODE_ON)) {
puts("Warning: failed to initialize FSPI0\n");
@@
-184,7
+185,7
@@
void spl_board_init(void)
void spl_board_prepare_for_boot(void)
{
void spl_board_prepare_for_boot(void)
{
-#if defined(CONFIG_SPL_SPI
_SUPPORT
)
+#if defined(CONFIG_SPL_SPI)
if (sc_rm_is_resource_owned(-1, SC_R_FSPI_0)) {
if (sc_pm_set_resource_power_mode(-1, SC_R_FSPI_0, SC_PM_PW_MODE_OFF)) {
puts("Warning: failed to turn off FSPI0\n");
if (sc_rm_is_resource_owned(-1, SC_R_FSPI_0)) {
if (sc_pm_set_resource_power_mode(-1, SC_R_FSPI_0, SC_PM_PW_MODE_OFF)) {
puts("Warning: failed to turn off FSPI0\n");