[U-Boot] [PATCH 48/93] arm: Remove imx6q_logic board

Adam Ford
2018-11-19T18:10:34Z

On Mon, Nov 19, 2018 at 9:55 AM Simon Glass <sjg@chromium.org> wrote:
>
> This board has not been converted to CONFIG_DM_BLK by the deadline.
> Remove it.
>

NAK. I disagree with your assessment.

make imx6q_logic_defconfig
cat .config | grep BLK
CONFIG_BLK=y
CONFIG_SPL_BLK=y

Like the other board, I think you're looking for CONFIG_DM_BLK when
you should be looking for CONFIG_BLK which is dependent on DM

adam

> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/arm/mach-imx/mx6/Kconfig | 1 -
> board/logicpd/imx6/Kconfig | 12 --
> board/logicpd/imx6/MAINTAINERS | 6 -
> board/logicpd/imx6/Makefile | 10 -
> board/logicpd/imx6/README | 37 ----
> board/logicpd/imx6/imx6logic.c | 325 ---------------------------------
> configs/imx6q_logic_defconfig | 77 --------
> include/configs/imx6_logic.h | 172 -----------------
> 8 files changed, 640 deletions(-)
> delete mode 100644 board/logicpd/imx6/Kconfig
> delete mode 100644 board/logicpd/imx6/MAINTAINERS
> delete mode 100644 board/logicpd/imx6/Makefile
> delete mode 100644 board/logicpd/imx6/README
> delete mode 100644 board/logicpd/imx6/imx6logic.c
> delete mode 100644 configs/imx6q_logic_defconfig
> delete mode 100644 include/configs/imx6_logic.h
>
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
> index face0f09827..7e0f9369eaf 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -548,7 +548,6 @@ source "board/freescale/mx6ullevk/Kconfig"
> source "board/grinn/liteboard/Kconfig"
> source "board/kosagi/novena/Kconfig"
> source "board/liebherr/display5/Kconfig"
> -source "board/logicpd/imx6/Kconfig"
> source "board/seco/Kconfig"
> source "board/solidrun/mx6cuboxi/Kconfig"
> source "board/technexion/pico-imx6ul/Kconfig"
> diff --git a/board/logicpd/imx6/Kconfig b/board/logicpd/imx6/Kconfig
> deleted file mode 100644
> index f5e2f58b12b..00000000000
> --- a/board/logicpd/imx6/Kconfig
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -if TARGET_MX6LOGICPD
> -
> -config SYS_BOARD
> - default "imx6"
> -
> -config SYS_VENDOR
> - default "logicpd"
> -
> -config SYS_CONFIG_NAME
> - default "imx6_logic"
> -
> -endif
> diff --git a/board/logicpd/imx6/MAINTAINERS b/board/logicpd/imx6/MAINTAINERS
> deleted file mode 100644
> index 5db7d2cadd9..00000000000
> --- a/board/logicpd/imx6/MAINTAINERS
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -MX6LOGICPD BOARD
> -M: Adam Ford <aford173@gmail.com>
> -S: Maintained
> -F: board/logicpd/imx6/
> -F: include/configs/imx6_logic.h
> -F: configs/imx6q_logic_defconfig
> diff --git a/board/logicpd/imx6/Makefile b/board/logicpd/imx6/Makefile
> deleted file mode 100644
> index 337df9247df..00000000000
> --- a/board/logicpd/imx6/Makefile
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#
> -# Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
> -#
> -# (C) Copyright 2011 Freescale Semiconductor, Inc.
> -#
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -
> -obj-y := imx6logic.o
> -
> diff --git a/board/logicpd/imx6/README b/board/logicpd/imx6/README
> deleted file mode 100644
> index df43b55d6bf..00000000000
> --- a/board/logicpd/imx6/README
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -U-Boot for LogicPD i.MX6 Development Kit
> -----------------------------------------
> -
> -This file contains information for the port of U-Boot to the Logic PD Development kit.
> -
> -Logic PD has an i.MX6 System On Module (SOM) and a correspondong development
> -board. SOM has a built-in microSD socket, DDR and NAND flash. The development kit has
> -an SMSC Ethernet PHY, serial debug port and a variety of peripherals.
> -
> -On the intial release, the SOM came with either an i.MX6D or i.MX6Q.
> -
> -For more details about Logic PD i.MX6 Development kit, visit:
> -https://www.logicpd.com/
> -
> -Building U-Boot for Logic PD Development Kit
> ---------------------------------------------
> -To build U-Boot for the Dual and Quad variants:
> -
> - make imx6q_logic_defconfig
> - make u-boot.imx ARCH=arm CROSS_COMPILE=arm-linux-
> -
> -
> -Flashing U-Boot into the SD card
> ---------------------------------
> -
> -See README.imximage for details on booting from SD
> -
> -Flashing U-Boot into NAND
> --------------------------
> -Once in Linux with MTD support for the NAND on /dev/mtd0, program U-Boot with the following:
> -with:
> -
> - kobs-ng init -v -x u-boot-dtb.imx
> -
> -Additional Support Documentation can be found at:
> -https://support.logicpd.com/
> -
> diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c
> deleted file mode 100644
> index ce1c8a5d6bc..00000000000
> --- a/board/logicpd/imx6/imx6logic.c
> +++ /dev/null
> @@ -1,325 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (C) 2017 Logic PD, Inc.
> - *
> - * Author: Adam Ford <aford173@gmail.com>
> - *
> - * Based on SabreSD by Fabio Estevam <fabio.estevam@nxp.com>
> - * and updates by Jagan Teki <jagan@amarulasolutions.com>
> - */
> -
> -#include <common.h>
> -#include <miiphy.h>
> -#include <input.h>
> -#include <mmc.h>
> -#include <fsl_esdhc.h>
> -#include <asm/io.h>
> -#include <asm/gpio.h>
> -#include <linux/sizes.h>
> -#include <asm/arch/clock.h>
> -#include <asm/arch/crm_regs.h>
> -#include <asm/arch/iomux.h>
> -#include <asm/arch/mxc_hdmi.h>
> -#include <asm/arch/mx6-pins.h>
> -#include <asm/arch/sys_proto.h>
> -#include <asm/mach-imx/boot_mode.h>
> -#include <asm/mach-imx/iomux-v3.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
> - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
> - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
> -
> -#define NAND_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \
> - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
> - PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
> -
> -int dram_init(void)
> -{
> - gd->ram_size = imx_ddr_size();
> - return 0;
> -}
> -
> -static iomux_v3_cfg_t const uart1_pads[] = {
> - MX6_PAD_SD3_DAT7__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_SD3_DAT6__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> -};
> -
> -static iomux_v3_cfg_t const uart2_pads[] = {
> - MX6_PAD_SD4_DAT4__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_SD4_DAT5__UART2_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_SD4_DAT6__UART2_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_SD4_DAT7__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> -};
> -
> -static iomux_v3_cfg_t const uart3_pads[] = {
> - MX6_PAD_EIM_D23__UART3_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_EIM_D24__UART3_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_EIM_D25__UART3_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
> - MX6_PAD_EIM_EB3__UART3_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
> -};
> -
> -static void fixup_enet_clock(void)
> -{
> - struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
> - struct gpio_desc nint;
> - struct gpio_desc reset;
> - int ret;
> -
> - /* Set Ref Clock to 50 MHz */
> - enable_fec_anatop_clock(0, ENET_50MHZ);
> -
> - /* Set GPIO_16 as ENET_REF_CLK_OUT */
> - setbits_le32(&iomuxc_regs->gpr[1], IOMUXC_GPR1_ENET_CLK_SEL_MASK);
> -
> - /* Request GPIO Pins to reset Ethernet with new clock */
> - ret = dm_gpio_lookup_name("GPIO4_7", &nint);
> - if (ret) {
> - printf("Unable to lookup GPIO4_7\n");
> - return;
> - }
> -
> - ret = dm_gpio_request(&nint, "eth0_nInt");
> - if (ret) {
> - printf("Unable to request eth0_nInt\n");
> - return;
> - }
> -
> - /* Ensure nINT is input or PHY won't startup */
> - dm_gpio_set_dir_flags(&nint, GPIOD_IS_IN);
> -
> - ret = dm_gpio_lookup_name("GPIO4_9", &reset);
> - if (ret) {
> - printf("Unable to lookup GPIO4_9\n");
> - return;
> - }
> -
> - ret = dm_gpio_request(&reset, "eth0_reset");
> - if (ret) {
> - printf("Unable to request eth0_reset\n");
> - return;
> - }
> -
> - /* Reset LAN8710A PHY */
> - dm_gpio_set_dir_flags(&reset, GPIOD_IS_OUT);
> - dm_gpio_set_value(&reset, 0);
> - udelay(150);
> - dm_gpio_set_value(&reset, 1);
> - mdelay(50);
> -}
> -
> -static void setup_iomux_uart(void)
> -{
> - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
> - imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads));
> - imx_iomux_v3_setup_multiple_pads(uart3_pads, ARRAY_SIZE(uart3_pads));
> -}
> -
> -static iomux_v3_cfg_t const nand_pads[] = {
> - MX6_PAD_NANDF_CS0__NAND_CE0_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_ALE__NAND_ALE | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_WP_B__NAND_WP_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_RB0__NAND_READY_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D0__NAND_DATA00 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D1__NAND_DATA01 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D2__NAND_DATA02 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D3__NAND_DATA03 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D4__NAND_DATA04 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D5__NAND_DATA05 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D6__NAND_DATA06 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_NANDF_D7__NAND_DATA07 | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_SD4_CLK__NAND_WE_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
> - MX6_PAD_SD4_CMD__NAND_RE_B | MUX_PAD_CTRL(NAND_PAD_CTRL),
> -};
> -
> -static void setup_nand_pins(void)
> -{
> - imx_iomux_v3_setup_multiple_pads(nand_pads, ARRAY_SIZE(nand_pads));
> -}
> -
> -int board_phy_config(struct phy_device *phydev)
> -{
> - if (phydev->drv->config)
> - phydev->drv->config(phydev);
> -
> - return 0;
> -}
> -
> -/*
> - * Do not overwrite the console
> - * Use always serial for U-Boot console
> - */
> -int overwrite_console(void)
> -{
> - return 1;
> -}
> -
> -int board_early_init_f(void)
> -{
> - fixup_enet_clock();
> - setup_iomux_uart();
> - setup_nand_pins();
> - return 0;
> -}
> -
> -int board_init(void)
> -{
> - /* address of boot parameters */
> - gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
> - return 0;
> -}
> -
> -int board_late_init(void)
> -{
> - env_set("board_name", "imx6logic");
> -
> - if (is_mx6dq()) {
> - env_set("board_rev", "MX6DQ");
> - env_set("fdt_file", "imx6q-logicpd.dtb");
> - }
> -
> - return 0;
> -}
> -
> -#ifdef CONFIG_SPL_BUILD
> -#include <asm/arch/mx6-ddr.h>
> -#include <asm/arch/mx6q-ddr.h>
> -#include <spl.h>
> -#include <linux/libfdt.h>
> -
> -#ifdef CONFIG_SPL_OS_BOOT
> -int spl_start_uboot(void)
> -{
> - /* break into full u-boot on 'c' */
> - if (serial_tstc() && serial_getc() == 'c')
> - return 1;
> -
> - return 0;
> -}
> -#endif
> -
> -static void ccgr_init(void)
> -{
> - struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
> -
> - writel(0x00C03F3F, &ccm->CCGR0);
> - writel(0x0030FC03, &ccm->CCGR1);
> - writel(0x0FFFC000, &ccm->CCGR2);
> - writel(0x3FF00000, &ccm->CCGR3);
> - writel(0xFFFFF300, &ccm->CCGR4);
> - writel(0x0F0000F3, &ccm->CCGR5);
> - writel(0x00000FFF, &ccm->CCGR6);
> -}
> -
> -static int mx6q_dcd_table[] = {
> - MX6_IOM_GRP_DDR_TYPE, 0x000C0000,
> - MX6_IOM_GRP_DDRPKE, 0x00000000,
> - MX6_IOM_DRAM_SDCLK_0, 0x00000030,
> - MX6_IOM_DRAM_SDCLK_1, 0x00000030,
> - MX6_IOM_DRAM_CAS, 0x00000030,
> - MX6_IOM_DRAM_RAS, 0x00000030,
> - MX6_IOM_GRP_ADDDS, 0x00000030,
> - MX6_IOM_DRAM_RESET, 0x00000030,
> - MX6_IOM_DRAM_SDBA2, 0x00000000,
> - MX6_IOM_DRAM_SDODT0, 0x00000030,
> - MX6_IOM_DRAM_SDODT1, 0x00000030,
> - MX6_IOM_GRP_CTLDS, 0x00000030,
> - MX6_IOM_DDRMODE_CTL, 0x00020000,
> - MX6_IOM_DRAM_SDQS0, 0x00000030,
> - MX6_IOM_DRAM_SDQS1, 0x00000030,
> - MX6_IOM_DRAM_SDQS2, 0x00000030,
> - MX6_IOM_DRAM_SDQS3, 0x00000030,
> - MX6_IOM_GRP_DDRMODE, 0x00020000,
> - MX6_IOM_GRP_B0DS, 0x00000030,
> - MX6_IOM_GRP_B1DS, 0x00000030,
> - MX6_IOM_GRP_B2DS, 0x00000030,
> - MX6_IOM_GRP_B3DS, 0x00000030,
> - MX6_IOM_DRAM_DQM0, 0x00000030,
> - MX6_IOM_DRAM_DQM1, 0x00000030,
> - MX6_IOM_DRAM_DQM2, 0x00000030,
> - MX6_IOM_DRAM_DQM3, 0x00000030,
> - MX6_MMDC_P0_MDSCR, 0x00008000,
> - MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003,
> - MX6_MMDC_P0_MPWLDECTRL0, 0x002D003A,
> - MX6_MMDC_P0_MPWLDECTRL1, 0x0038002B,
> - MX6_MMDC_P0_MPDGCTRL0, 0x03340338,
> - MX6_MMDC_P0_MPDGCTRL1, 0x0334032C,
> - MX6_MMDC_P0_MPRDDLCTL, 0x4036383C,
> - MX6_MMDC_P0_MPWRDLCTL, 0x2E384038,
> - MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333,
> - MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333,
> - MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333,
> - MX6_MMDC_P0_MPRDDQBY3DL, 0x33333333,
> - MX6_MMDC_P0_MPMUR0, 0x00000800,
> - MX6_MMDC_P0_MDPDC, 0x00020036,
> - MX6_MMDC_P0_MDOTC, 0x09444040,
> - MX6_MMDC_P0_MDCFG0, 0xB8BE7955,
> - MX6_MMDC_P0_MDCFG1, 0xFF328F64,
> - MX6_MMDC_P0_MDCFG2, 0x01FF00DB,
> - MX6_MMDC_P0_MDMISC, 0x00011740,
> - MX6_MMDC_P0_MDSCR, 0x00008000,
> - MX6_MMDC_P0_MDRWD, 0x000026D2,
> - MX6_MMDC_P0_MDOR, 0x00BE1023,
> - MX6_MMDC_P0_MDASP, 0x00000047,
> - MX6_MMDC_P0_MDCTL, 0x85190000,
> - MX6_MMDC_P0_MDSCR, 0x00888032,
> - MX6_MMDC_P0_MDSCR, 0x00008033,
> - MX6_MMDC_P0_MDSCR, 0x00008031,
> - MX6_MMDC_P0_MDSCR, 0x19408030,
> - MX6_MMDC_P0_MDSCR, 0x04008040,
> - MX6_MMDC_P0_MDREF, 0x00007800,
> - MX6_MMDC_P0_MPODTCTRL, 0x00000007,
> - MX6_MMDC_P0_MDPDC, 0x00025576,
> - MX6_MMDC_P0_MAPSR, 0x00011006,
> - MX6_MMDC_P0_MDSCR, 0x00000000,
> - /* enable AXI cache for VDOA/VPU/IPU */
> -
> - MX6_IOMUXC_GPR4, 0xF00000CF,
> - /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
> - MX6_IOMUXC_GPR6, 0x007F007F,
> - MX6_IOMUXC_GPR7, 0x007F007F,
> -};
> -
> -static void ddr_init(int *table, int size)
> -{
> - int i;
> -
> - for (i = 0; i < size / 2 ; i++)
> - writel(table[2 * i + 1], table[2 * i]);
> -}
> -
> -static void spl_dram_init(void)
> -{
> - if (is_mx6dq())
> - ddr_init(mx6q_dcd_table, ARRAY_SIZE(mx6q_dcd_table));
> -}
> -
> -void board_init_f(ulong dummy)
> -{
> - /* DDR initialization */
> - spl_dram_init();
> -
> - /* setup AIPS and disable watchdog */
> - arch_cpu_init();
> -
> - ccgr_init();
> - gpr_init();
> -
> - /* iomux and setup of uart and NAND pins */
> - board_early_init_f();
> -
> - /* setup GP timer */
> - timer_init();
> -
> - /* UART clocks enabled and gd valid - init serial console */
> - preloader_console_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/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
> deleted file mode 100644
> index 036069a4374..00000000000
> --- a/configs/imx6q_logic_defconfig
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_MX6=y
> -CONFIG_SYS_TEXT_BASE=0x17800000
> -CONFIG_SPL_GPIO_SUPPORT=y
> -CONFIG_SPL_LIBCOMMON_SUPPORT=y
> -CONFIG_SPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SYS_MALLOC_F_LEN=0x2000
> -CONFIG_TARGET_MX6LOGICPD=y
> -CONFIG_SPL_SERIAL_SUPPORT=y
> -CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
> -CONFIG_SPL=y
> -CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_NR_DRAM_BANKS=1
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
> -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> -CONFIG_BOOTDELAY=3
> -# CONFIG_USE_BOOTCOMMAND is not set
> -CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> -CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> -# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -CONFIG_SPL_SEPARATE_BSS=y
> -CONFIG_SPL_DMA_SUPPORT=y
> -CONFIG_SPL_I2C_SUPPORT=y
> -CONFIG_SPL_NAND_SUPPORT=y
> -CONFIG_SPL_OS_BOOT=y
> -CONFIG_SPL_USB_HOST_SUPPORT=y
> -CONFIG_SPL_USB_GADGET_SUPPORT=y
> -CONFIG_SPL_USB_SDP_SUPPORT=y
> -CONFIG_SPL_WATCHDOG_SUPPORT=y
> -CONFIG_SYS_PROMPT="i.MX6 Logic # "
> -CONFIG_CMD_SPL=y
> -CONFIG_CMD_SPL_WRITE_SIZE=0x20000
> -CONFIG_CMD_MEMTEST=y
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_GPIO=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_NAND_TRIMFFS=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_USB_SDP=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
> -CONFIG_CMD_CACHE=y
> -# CONFIG_CMD_LED is not set
> -CONFIG_CMD_PMIC=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_MTDPARTS=y
> -CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
> -CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)"
> -CONFIG_CMD_UBI=y
> -CONFIG_SPL_OF_CONTROL=y
> -CONFIG_DEFAULT_DEVICE_TREE="imx6q-logicpd"
> -CONFIG_ENV_IS_IN_NAND=y
> -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -CONFIG_SPL_DM=y
> -CONFIG_PCF8575_GPIO=y
> -CONFIG_SYS_I2C_MXC=y
> -CONFIG_LED=y
> -CONFIG_LED_GPIO=y
> -CONFIG_FSL_ESDHC=y
> -CONFIG_NAND=y
> -CONFIG_NAND_MXS=y
> -CONFIG_PHYLIB=y
> -CONFIG_PHY_ATHEROS=y
> -CONFIG_FEC_MXC=y
> -CONFIG_MII=y
> -CONFIG_PINCTRL=y
> -CONFIG_SPL_PINCTRL=y
> -CONFIG_PINCTRL_IMX6=y
> -CONFIG_DM_PMIC_PFUZE100=y
> -CONFIG_MXC_UART=y
> -CONFIG_USB=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_MANUFACTURER="FSL"
> -CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> -CONFIG_CI_UDC=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
> deleted file mode 100644
> index e55941408c9..00000000000
> --- a/include/configs/imx6_logic.h
> +++ /dev/null
> @@ -1,172 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Copyright (C) 2017 Logic PD, Inc.
> - *
> - * Configuration settings for the LogicPD i.MX6 SOM.
> - */
> -
> -#ifndef __IMX6LOGIC_CONFIG_H
> -#define __IMX6LOGIC_CONFIG_H
> -
> -#define CONFIG_MXC_UART_BASE UART1_BASE
> -#define CONSOLE_DEV "ttymxc0"
> -
> -#ifdef CONFIG_SPL
> -#include "imx6_spl.h"
> -#endif
> -
> -#include "mx6_common.h"
> -
> -/* Size of malloc() pool */
> -#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
> -
> -/* MMC Configs */
> -#define CONFIG_SYS_FSL_ESDHC_ADDR 0
> -#define CONFIG_SYS_FSL_USDHC_NUM 2
> -#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* Dev kit SD card */
> -
> -/* Ethernet Configs */
> -#define CONFIG_FEC_XCV_TYPE RMII
> -#define CONFIG_ETHPRIME "FEC"
> -#define CONFIG_FEC_MXC_PHYADDR 0
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> - "script=boot.scr\0" \
> - "image=zImage\0" \
> - "bootm_size=0x10000000\0" \
> - "fdt_addr_r=0x13000000\0" \
> - "ramdisk_addr_r=0x14000000\0" \
> - "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
> - "ramdisk_file=rootfs.cpio.uboot\0" \
> - "boot_fdt=try\0" \
> - "ip_dyn=yes\0" \
> - "console=" CONSOLE_DEV "\0" \
> - "mmcdev=1\0" \
> - "mmcpart=1\0" \
> - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
> - "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
> - "mmcargs=setenv bootargs console=${console},${baudrate}" \
> - " root=${mmcroot} ${mtdparts}\0" \
> - "nandargs=setenv bootargs console=${console},${baudrate}" \
> - " ubi.mtd=fs root=${nandroot} ${mtdparts}\0" \
> - "ramargs=setenv bootargs console=${console},${baudrate}" \
> - " root=/dev/ram rw ${mtdparts}\0" \
> - "loadbootscript=" \
> - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
> - "bootscript=echo Running bootscript from mmc ...;" \
> - " source\0" \
> - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image};" \
> - " setenv kernelsize ${filesize}\0" \
> - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdt_file}\0" \
> - "loadramdisk=fatload mmc ${mmcdev}:${mmcpart} ${ramdisk_addr_r}" \
> - " ${ramdisk_file}; setenv ramdisksize ${filesize}\0" \
> - "mmcboot=echo Booting from mmc...; run mmcargs; run loadimage;" \
> - " run loadfdt; bootz ${loadaddr} - ${fdt_addr_r}\0" \
> - "mmcramboot=run ramargs; run loadimage;" \
> - " run loadfdt; run loadramdisk;" \
> - " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
> - "nandboot=echo Booting from nand ...; " \
> - " run nandargs;" \
> - " nand read ${loadaddr} kernel ${kernelsize};" \
> - " nand read ${fdt_addr} dtb;" \
> - " bootz ${loadaddr} - ${fdt_addr}\0" \
> - "nandramboot=echo Booting RAMdisk from nand ...; " \
> - " nand read ${ramdisk_addr_r} fs ${ramdisksize};" \
> - " nand read ${loadaddr} kernel ${kernelsize};" \
> - " nand read ${fdt_addr_r} dtb;" \
> - " run ramargs;" \
> - " bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
> - "netargs=setenv bootargs console=${console},${baudrate} " \
> - "root=/dev/nfs" \
> - " ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
> - "netboot=echo Booting from net ...; " \
> - "run netargs; " \
> - "if test ${ip_dyn} = yes; then " \
> - "setenv get_cmd dhcp; " \
> - "else " \
> - "setenv get_cmd tftp; " \
> - "fi; " \
> - "${get_cmd} ${image}; " \
> - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
> - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
> - "bootz ${loadaddr} - ${fdt_addr}; " \
> - "else " \
> - "if test ${boot_fdt} = try; then " \
> - "bootz; " \
> - "else " \
> - "echo WARN: Cannot load the DT; " \
> - "fi; " \
> - "fi; " \
> - "else " \
> - "bootz; " \
> - "fi;\0" \
> - "autoboot=mmc dev ${mmcdev};" \
> - "if mmc rescan; then " \
> - "if run loadbootscript; then " \
> - "run bootscript; " \
> - "else " \
> - "if run loadimage; then " \
> - "run mmcboot; " \
> - "else run netboot; " \
> - "fi; " \
> - "fi; " \
> - "else run netboot; fi"
> -#define CONFIG_BOOTCOMMAND \
> - "run autoboot"
> -
> -#define CONFIG_ARP_TIMEOUT 200UL
> -
> -#define CONFIG_SYS_MEMTEST_START 0x10000000
> -#define CONFIG_SYS_MEMTEST_END 0x10010000
> -#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000
> -
> -/* Physical Memory Map */
> -#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
> -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
> -#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
> -#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
> -
> -#define CONFIG_SYS_INIT_SP_OFFSET \
> - (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
> -#define CONFIG_SYS_INIT_SP_ADDR \
> - (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
> -
> -/* Environment organization */
> -#define CONFIG_ENV_SIZE (1024 * 1024)
> -#define CONFIG_ENV_OFFSET 0x400000
> -#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
> -
> -/* NAND stuff */
> -#define CONFIG_SYS_MAX_NAND_DEVICE 1
> -#define CONFIG_SYS_NAND_BASE 0x40000000
> -#define CONFIG_SYS_NAND_5_ADDR_CYCLE
> -#define CONFIG_SYS_NAND_ONFI_DETECTION
> -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
> -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000
> -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
> -/* MTD device */
> -
> -/* DMA stuff, needed for GPMI/MXS NAND support */
> -
> -/* EEPROM contains serial no, MAC addr and other Logic PD info */
> -#define CONFIG_I2C_EEPROM
> -
> -/* USB Configs */
> -#ifdef CONFIG_CMD_USB
> -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
> -#define CONFIG_MXC_USB_FLAGS 0
> -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Enabled USB controller number */
> -#endif
> -
> -/* Falcon Mode */
> -#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
> -#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
> -#define CONFIG_SYS_SPL_ARGS_ADDR 0x15000000
> -
> -/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
> -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
> -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
> -#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */
> -
> -#endif /* __IMX6LOGIC_CONFIG_H */
> --
> 2.19.1.1215.g8438c0b245-goog
>