Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

engicam: common: Move board_late_init

Browse Source 
Move board_late_init into common area from supported boards.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
master
Jagan Teki 8 years ago committed by Stefano Babic
parent ac880e7742
commit f9247569d8
6 changed files with 32 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      board/engicam/common/board.c
  2. 2
      board/engicam/common/board.h
  3. 21
      board/engicam/geam6ul/geam6ul.c
  4. 21
      board/engicam/icorem6/icorem6.c
  5. 20
      board/engicam/icorem6_rqs/icorem6_rqs.c
  6. 23
      board/engicam/isiotmx6ul/isiotmx6ul.c

28
board/engicam/common/board.c
Unescape View File

@ -15,7 +15,7 @@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_ENV_IS_IN_MMC
void mmc_late_init(void)
static void mmc_late_init(void)
{
char cmd[32];
char mmcblk[32];
@ -32,6 +32,32 @@ void mmc_late_init(void)
}
#endif
int board_late_init(void)
{
switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
IMX6_BMODE_SHIFT) {
case IMX6_BMODE_SD:
case IMX6_BMODE_ESD:
case IMX6_BMODE_MMC:
case IMX6_BMODE_EMMC:
#ifdef CONFIG_ENV_IS_IN_MMC
mmc_late_init();
#endif
setenv("modeboot", "mmcboot");
break;
case IMX6_BMODE_NAND:
setenv("modeboot", "nandboot");
break;
default:
setenv("modeboot", "");
break;
}
setenv_fdt_file();
return 0;
}
int board_init(void)
{
/* Address of boot parameters */

2
board/engicam/common/board.h
Unescape View File

@ -6,7 +6,7 @@
#ifndef _BOARD_H_
#define _BOARD_H_
void mmc_late_init(void);
void setenv_fdt_file(void);
void setup_gpmi_nand(void);
void setup_display(void);
#endif /* _BOARD_H_ */

21
board/engicam/geam6ul/geam6ul.c
Unescape View File

@ -90,29 +90,10 @@ void setup_gpmi_nand(void)
}
#endif /* CONFIG_NAND_MXS */
int board_late_init(void)
void setenv_fdt_file(void)
{
switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
IMX6_BMODE_SHIFT) {
case IMX6_BMODE_SD:
case IMX6_BMODE_ESD:
#ifdef CONFIG_ENV_IS_IN_MMC
mmc_late_init();
#endif
setenv("modeboot", "mmcboot");
break;
case IMX6_BMODE_NAND:
setenv("modeboot", "nandboot");
break;
default:
setenv("modeboot", "");
break;
}
if (is_mx6ul())
setenv("fdt_file", "imx6ul-geam-kit.dtb");
return 0;
}
#ifdef CONFIG_SPL_BUILD

21
board/engicam/icorem6/icorem6.c
Unescape View File

@ -192,31 +192,12 @@ void setup_display(void)
}
#endif /* CONFIG_VIDEO_IPUV3 */
int board_late_init(void)
void setenv_fdt_file(void)
{
switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
IMX6_BMODE_SHIFT) {
case IMX6_BMODE_SD:
case IMX6_BMODE_ESD:
#ifdef CONFIG_ENV_IS_IN_MMC
mmc_late_init();
#endif
setenv("modeboot", "mmcboot");
break;
case IMX6_BMODE_NAND:
setenv("modeboot", "nandboot");
break;
default:
setenv("modeboot", "");
break;
}
if (is_mx6dq())
setenv("fdt_file", "imx6q-icore.dtb");
else if(is_mx6dl() || is_mx6solo())
setenv("fdt_file", "imx6dl-icore.dtb");
return 0;
}
#ifdef CONFIG_SPL_BUILD

20
board/engicam/icorem6_rqs/icorem6_rqs.c
Unescape View File

@ -32,30 +32,12 @@ int board_mmc_get_env_dev(int devno)
}
#endif
int board_late_init(void)
void setenv_fdt_file(void)
{
switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
IMX6_BMODE_SHIFT) {
case IMX6_BMODE_SD:
case IMX6_BMODE_ESD:
case IMX6_BMODE_MMC:
case IMX6_BMODE_EMMC:
#ifdef CONFIG_ENV_IS_IN_MMC
mmc_late_init();
#endif
setenv("modeboot", "mmcboot");
break;
default:
setenv("modeboot", "");
break;
}
if (is_mx6dq())
setenv("fdt_file", "imx6q-icore-rqs.dtb");
else if(is_mx6dl() || is_mx6solo())
setenv("fdt_file", "imx6dl-icore-rqs.dtb");
return 0;
}
#ifdef CONFIG_SPL_BUILD

23
board/engicam/isiotmx6ul/isiotmx6ul.c
Unescape View File

@ -98,27 +98,8 @@ int board_mmc_get_env_dev(int devno)
}
#endif
int board_late_init(void)
void setenv_fdt_file(void)
{
switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
IMX6_BMODE_SHIFT) {
case IMX6_BMODE_SD:
case IMX6_BMODE_ESD:
case IMX6_BMODE_MMC:
case IMX6_BMODE_EMMC:
#ifdef CONFIG_ENV_IS_IN_MMC
mmc_late_init();
#endif
setenv("modeboot", "mmcboot");
break;
case IMX6_BMODE_NAND:
setenv("modeboot", "nandboot");
break;
default:
setenv("modeboot", "");
break;
}
if (is_mx6ul()) {
#ifdef CONFIG_ENV_IS_IN_MMC
setenv("fdt_file", "imx6ul-isiot-emmc.dtb");
@ -126,8 +107,6 @@ int board_late_init(void)
setenv("fdt_file", "imx6ul-isiot-nand.dtb");
#endif
}
return 0;
}
#ifdef CONFIG_SPL_BUILD

Write Preview
Loading…
Cancel
Save