> Subject: [PATCH v2] mx6sxsabresd: Keep only one target
>
> Currently there are two targets for the i.MX6SX SabreSD board:
> mx6sxsabresd_defconfig and mx6sxsabresd_spl_defconfig.
>
> This brings additional maintainance effort without a clear advantage.
>
> Keep only the mx6sxsabresd_defconfig one and remove
> mx6sxsabresd_spl_defconfig to keep it simpler.
>
> Also remove the SPL related code from the board file.
>
> Signed-off-by: Fabio Estevam <feste...@gmail.com>
Acked-by: Peng Fan <peng....@nxp.com>
> ---
> Changes since v1:
> - Also remove the SPL related code. (Peng)
>
> board/freescale/mx6sxsabresd/MAINTAINERS | 1 -
> board/freescale/mx6sxsabresd/mx6sxsabresd.c | 236 --------------------
> configs/mx6sxsabresd_spl_defconfig | 69 ------
> 3 files changed, 306 deletions(-)
> delete mode 100644 configs/mx6sxsabresd_spl_defconfig
>
> diff --git a/board/freescale/mx6sxsabresd/MAINTAINERS
> b/board/freescale/mx6sxsabresd/MAINTAINERS
> index 1dcec67545..a56d252edb 100644
> --- a/board/freescale/mx6sxsabresd/MAINTAINERS
> +++ b/board/freescale/mx6sxsabresd/MAINTAINERS
> @@ -4,4 +4,3 @@ S: Maintained
> F: board/freescale/mx6sxsabresd/
> F: include/configs/mx6sxsabresd.h
> F: configs/mx6sxsabresd_defconfig
> -F: configs/mx6sxsabresd_spl_defconfig
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 9fff8ffc4c..4f1d6602e5 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -321,239 +321,3 @@ int checkboard(void)
>
> return 0;
> }
> -
> -#ifdef CONFIG_SPL_BUILD
> -#include <linux/libfdt.h>
> -#include <spl.h>
> -#include <asm/arch/mx6-ddr.h>
> -
> -static struct fsl_esdhc_cfg usdhc_cfg[3] = {
> - {USDHC2_BASE_ADDR, 0, 4},
> - {USDHC3_BASE_ADDR},
> - {USDHC4_BASE_ADDR},
> -};
> -
> -#define USDHC3_CD_GPIO IMX_GPIO_NR(2, 10)
> -#define USDHC3_PWR_GPIO IMX_GPIO_NR(2, 11)
> -#define USDHC4_CD_GPIO IMX_GPIO_NR(6, 21)
> -
> -static iomux_v3_cfg_t const usdhc2_pads[] = {
> - MX6_PAD_SD2_CLK__USDHC2_CLK |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD2_CMD__USDHC2_CMD |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD2_DATA0__USDHC2_DATA0 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD2_DATA1__USDHC2_DATA1 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD2_DATA2__USDHC2_DATA2 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD2_DATA3__USDHC2_DATA3 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -};
> -
> -static iomux_v3_cfg_t const usdhc3_pads[] = {
> - MX6_PAD_SD3_CLK__USDHC3_CLK |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_CMD__USDHC3_CMD |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA0__USDHC3_DATA0 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA1__USDHC3_DATA1 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA2__USDHC3_DATA2 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA3__USDHC3_DATA3 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA4__USDHC3_DATA4 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA5__USDHC3_DATA5 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA6__USDHC3_DATA6 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD3_DATA7__USDHC3_DATA7 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> -
> - /* CD pin */
> - MX6_PAD_KEY_COL0__GPIO2_IO_10 |
> MUX_PAD_CTRL(NO_PAD_CTRL),
> -
> - /* RST_B, used for power reset cycle */
> - MX6_PAD_KEY_COL1__GPIO2_IO_11 |
> MUX_PAD_CTRL(NO_PAD_CTRL),
> -};
> -
> -static iomux_v3_cfg_t const usdhc4_pads[] = {
> - MX6_PAD_SD4_CLK__USDHC4_CLK |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_CMD__USDHC4_CMD |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_DATA0__USDHC4_DATA0 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_DATA1__USDHC4_DATA1 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_DATA2__USDHC4_DATA2 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_DATA3__USDHC4_DATA3 |
> MUX_PAD_CTRL(USDHC_PAD_CTRL),
> - MX6_PAD_SD4_DATA7__GPIO6_IO_21 |
> MUX_PAD_CTRL(NO_PAD_CTRL),
> -};
> -
> -int board_mmc_init(bd_t *bis)
> -{
> - struct src *src_regs = (struct src *)SRC_BASE_ADDR;
> - u32 val;
> - u32 port;
> -
> - val = readl(&src_regs->sbmr1);
> -
> - if ((val & 0xc0) != 0x40) {
> - printf("Not boot from USDHC!\n");
> - return -EINVAL;
> - }
> -
> - port = (val >> 11) & 0x3;
> - printf("port %d\n", port);
> - switch (port) {
> - case 1:
> - imx_iomux_v3_setup_multiple_pads(
> - usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
> - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
> - usdhc_cfg[0].esdhc_base = USDHC2_BASE_ADDR;
> - break;
> - case 2:
> - imx_iomux_v3_setup_multiple_pads(
> - usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
> - gpio_direction_input(USDHC3_CD_GPIO);
> - gpio_direction_output(USDHC3_PWR_GPIO, 1);
> - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
> - usdhc_cfg[0].esdhc_base = USDHC3_BASE_ADDR;
> - break;
> - case 3:
> - imx_iomux_v3_setup_multiple_pads(
> - usdhc4_pads, ARRAY_SIZE(usdhc4_pads));
> - gpio_direction_input(USDHC4_CD_GPIO);
> - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
> - usdhc_cfg[0].esdhc_base = USDHC4_BASE_ADDR;
> - break;
> - }
> -
> - gd->arch.sdhc_clk = usdhc_cfg[0].sdhc_clk;
> - return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
> -}
> -
> -int board_mmc_getcd(struct mmc *mmc)
> -{
> - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
> - int ret = 0;
> -
> - switch (cfg->esdhc_base) {
> - case USDHC2_BASE_ADDR:
> - ret = 1; /* Assume uSDHC2 is always present */
> - break;
> - case USDHC3_BASE_ADDR:
> - ret = !gpio_get_value(USDHC3_CD_GPIO);
> - break;
> - case USDHC4_BASE_ADDR:
> - ret = !gpio_get_value(USDHC4_CD_GPIO);
> - break;
> - }
> -
> - return ret;
> -}
> -
> -const struct mx6sx_iomux_ddr_regs mx6_ddr_ioregs = {
> - .dram_dqm0 = 0x00000028,
> - .dram_dqm1 = 0x00000028,
> - .dram_dqm2 = 0x00000028,
> - .dram_dqm3 = 0x00000028,
> - .dram_ras = 0x00000020,
> - .dram_cas = 0x00000020,
> - .dram_odt0 = 0x00000020,
> - .dram_odt1 = 0x00000020,
> - .dram_sdba2 = 0x00000000,
> - .dram_sdcke0 = 0x00003000,
> - .dram_sdcke1 = 0x00003000,
> - .dram_sdclk_0 = 0x00000030,
> - .dram_sdqs0 = 0x00000028,
> - .dram_sdqs1 = 0x00000028,
> - .dram_sdqs2 = 0x00000028,
> - .dram_sdqs3 = 0x00000028,
> - .dram_reset = 0x00000020,
> -};
> -
> -const struct mx6sx_iomux_grp_regs mx6_grp_ioregs = {
> - .grp_addds = 0x00000020,
> - .grp_ddrmode_ctl = 0x00020000,
> - .grp_ddrpke = 0x00000000,
> - .grp_ddrmode = 0x00020000,
> - .grp_b0ds = 0x00000028,
> - .grp_b1ds = 0x00000028,
> - .grp_ctlds = 0x00000020,
> - .grp_ddr_type = 0x000c0000,
> - .grp_b2ds = 0x00000028,
> - .grp_b3ds = 0x00000028,
> -};
> -
> -const struct mx6_mmdc_calibration mx6_mmcd_calib = {
> - .p0_mpwldectrl0 = 0x00290025,
> - .p0_mpwldectrl1 = 0x00220022,
> - .p0_mpdgctrl0 = 0x41480144,
> - .p0_mpdgctrl1 = 0x01340130,
> - .p0_mprddlctl = 0x3C3E4244,
> - .p0_mpwrdlctl = 0x34363638,
> -};
> -
> -static struct mx6_ddr3_cfg mem_ddr = {
> - .mem_speed = 1600,
> - .density = 4,
> - .width = 32,
> - .banks = 8,
> - .rowaddr = 15,
> - .coladdr = 10,
> - .pagesz = 2,
> - .trcd = 1375,
> - .trcmin = 4875,
> - .trasmin = 3500,
> -};
> -
> -static void ccgr_init(void)
> -{
> - struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> -
> - writel(0xFFFFFFFF, &ccm->CCGR0);
> - writel(0xFFFFFFFF, &ccm->CCGR1);
> - writel(0xFFFFFFFF, &ccm->CCGR2);
> - writel(0xFFFFFFFF, &ccm->CCGR3);
> - writel(0xFFFFFFFF, &ccm->CCGR4);
> - writel(0xFFFFFFFF, &ccm->CCGR5);
> - writel(0xFFFFFFFF, &ccm->CCGR6);
> - writel(0xFFFFFFFF, &ccm->CCGR7);
> -}
> -
> -static void spl_dram_init(void)
> -{
> - struct mx6_ddr_sysinfo sysinfo = {
> - .dsize = mem_ddr.width/32,
> - .cs_density = 24,
> - .ncs = 1,
> - .cs1_mirror = 0,
> - .rtt_wr = 2,
> - .rtt_nom = 2, /* RTT_Nom = RZQ/2 */
> - .walat = 1, /* Write additional latency */
> - .ralat = 5, /* Read additional latency */
> - .mif3_mode = 3, /* Command prediction working mode */
> - .bi_on = 1, /* Bank interleaving enabled */
> - .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */
> - .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */
> - .ddr_type = DDR_TYPE_DDR3,
> - .refsel = 1, /* Refresh cycles at 32KHz */
> - .refr = 7, /* 8 refresh commands per refresh cycle */
> - };
> -
> - mx6sx_dram_iocfg(mem_ddr.width, &mx6_ddr_ioregs,
> &mx6_grp_ioregs);
> - mx6_dram_cfg(&sysinfo, &mx6_mmcd_calib, &mem_ddr);
> -}
> -
> -void board_init_f(ulong dummy)
> -{
> - /* setup AIPS and disable watchdog */
> - arch_cpu_init();
> -
> - ccgr_init();
> -
> - /* iomux and setup of i2c */
> - board_early_init_f();
> -
> - /* setup GP timer */
> - timer_init();
> -
> - /* UART clocks enabled and gd valid - init serial console */
> - preloader_console_init();
> -
> - /* DDR initialization */
> - spl_dram_init();
> -
> - /* Clear the BSS. */
> - memset(__bss_start, 0, __bss_end - __bss_start);
> -
> - /* load/boot image from boot device */
> - board_init_r(NULL, 0);
> -}
> -#endif
> diff --git a/configs/mx6sxsabresd_spl_defconfig
> b/configs/mx6sxsabresd_spl_defconfig
> deleted file mode 100644
> index 65a8581044..0000000000
> --
> 2.17.1
