Message ID | 1469189532-29887-1-git-send-email-breno.lima@nxp.com |
---|---|
State | Accepted |
Commit | 68c276019a6ede6dbb099af7e3e2756579e3b23e |
Delegated to: | Stefano Babic |
Headers | show |
On Fri, Jul 22, 2016 at 9:12 AM, Breno Lima <breno.lima@nxp.com> wrote: > It's not necessary to implement the is_mx6q function, there is a macro in > sys_proto.h already implemented. > > Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
On 22/07/2016 14:12, Breno Lima wrote: > It's not necessary to implement the is_mx6q function, there is a macro in > sys_proto.h already implemented. > > Signed-off-by: Breno Lima <breno.lima@nxp.com> > --- > board/congatec/cgtqmx6eval/cgtqmx6eval.c | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c > index 225de7c..3fbd3d2 100644 > --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c > +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c > @@ -678,14 +678,6 @@ int overwrite_console(void) > return 1; > } > > -static bool is_mx6q(void) > -{ > - if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) > - return true; > - else > - return false; > -} > - > int board_early_init_f(void) > { > setup_iomux_uart(); > @@ -703,7 +695,7 @@ int board_init(void) > gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; > > > - if (is_mx6q()) > + if (is_mx6dq()) > setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info1); > else > setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1); > @@ -760,7 +752,7 @@ int misc_init_r(void) > int board_late_init(void) > { > #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > - if (is_mx6q()) > + if (is_mx6dq()) > setenv("board_rev", "MX6Q"); > else > setenv("board_rev", "MX6DL"); > @@ -1053,7 +1045,7 @@ static void spl_dram_init(int width) > return; > } > > - if (is_mx6q()) { > + if (is_mx6dq()) { > mx6dq_dram_iocfg(width, &mx6q_ddr_ioregs, &mx6q_grp_ioregs); > mx6_dram_cfg(&sysinfo, &mx6q_mmcd_calib, &mem_ddr_2g); > } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 225de7c..3fbd3d2 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -678,14 +678,6 @@ int overwrite_console(void) return 1; } -static bool is_mx6q(void) -{ - if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) - return true; - else - return false; -} - int board_early_init_f(void) { setup_iomux_uart(); @@ -703,7 +695,7 @@ int board_init(void) gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - if (is_mx6q()) + if (is_mx6dq()) setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info1); else setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1); @@ -760,7 +752,7 @@ int misc_init_r(void) int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - if (is_mx6q()) + if (is_mx6dq()) setenv("board_rev", "MX6Q"); else setenv("board_rev", "MX6DL"); @@ -1053,7 +1045,7 @@ static void spl_dram_init(int width) return; } - if (is_mx6q()) { + if (is_mx6dq()) { mx6dq_dram_iocfg(width, &mx6q_ddr_ioregs, &mx6q_grp_ioregs); mx6_dram_cfg(&sysinfo, &mx6q_mmcd_calib, &mem_ddr_2g); } else if (is_cpu_type(MXC_CPU_MX6SOLO)) {
It's not necessary to implement the is_mx6q function, there is a macro in sys_proto.h already implemented. Signed-off-by: Breno Lima <breno.lima@nxp.com> --- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)