[U-Boot] [PATCH 50/93] arm: Remove imx6dl_mamoj board

[Simon Glass <sjg@chromium.org>]

This board has not been converted to CONFIG_DM_BLK by the deadline.
Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/arm/dts/imx6dl-mamoj-u-boot.dtsi |  14 --
 arch/arm/dts/imx6dl-mamoj.dts         | 225 --------------------------
 arch/arm/mach-imx/mx6/Kconfig         |   1 -
 board/bticino/mamoj/Kconfig           |  12 --
 board/bticino/mamoj/MAINTAINERS       |  10 --
 board/bticino/mamoj/Makefile          |   8 -
 board/bticino/mamoj/README            | 124 --------------
 board/bticino/mamoj/mamoj.c           |  26 ---
 board/bticino/mamoj/spl.c             | 171 --------------------
 configs/imx6dl_mamoj_defconfig        |  46 ------
 include/configs/imx6dl-mamoj.h        |  99 ------------
 11 files changed, 736 deletions(-)
 delete mode 100644 arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
 delete mode 100644 arch/arm/dts/imx6dl-mamoj.dts
 delete mode 100644 board/bticino/mamoj/Kconfig
 delete mode 100644 board/bticino/mamoj/MAINTAINERS
 delete mode 100644 board/bticino/mamoj/Makefile
 delete mode 100644 board/bticino/mamoj/README
 delete mode 100644 board/bticino/mamoj/mamoj.c
 delete mode 100644 board/bticino/mamoj/spl.c
 delete mode 100644 configs/imx6dl_mamoj_defconfig
 delete mode 100644 include/configs/imx6dl-mamoj.h

diff --git a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
deleted file mode 100644
index 3af57ff8eb8..00000000000
--- a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- */
-
-#include "imx6qdl-u-boot.dtsi"
-
-&usdhc3 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
-	u-boot,dm-spl;
-};
diff --git a/arch/arm/dts/imx6dl-mamoj.dts b/arch/arm/dts/imx6dl-mamoj.dts
deleted file mode 100644
index 3f6d8aa4a25..00000000000
--- a/arch/arm/dts/imx6dl-mamoj.dts
+++ /dev/null
@@ -1,225 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (C) 2018 BTicino
- * Copyright (C) 2018 Amarula Solutions B.V.
- */
-
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include "imx6dl.dtsi"
-
-/ {
-	model = "BTicino i.MX6DL Mamoj board";
-	compatible = "bticino,imx6dl-mamoj", "fsl,imx6dl";
-};
-
-&fec {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_enet>;
-	phy-mode = "mii";
-	status = "okay";
-};
-
-&i2c3 {
-	clock-frequency = <400000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c3>;
-	status = "okay";
-};
-
-&i2c4 {
-	clock-frequency = <100000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c4>;
-	status = "okay";
-
-	pmic: pfuze100 at 08 {
-		compatible = "fsl,pfuze100";
-		reg = <0x08>;
-
-		regulators {
-			/* CPU vdd_arm core */
-			sw1a_reg: sw1ab {
-				regulator-min-microvolt = <300000>;
-				regulator-max-microvolt = <1875000>;
-				regulator-boot-on;
-				regulator-always-on;
-				regulator-ramp-delay = <6250>;
-			};
-
-			/* SOC vdd_soc */
-			sw1c_reg: sw1c {
-				regulator-min-microvolt = <300000>;
-				regulator-max-microvolt = <1875000>;
-				regulator-boot-on;
-				regulator-always-on;
-				regulator-ramp-delay = <6250>;
-			};
-
-			/* I/O power GEN_3V3 */
-			sw2_reg: sw2 {
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			/* DDR memory */
-			sw3a_reg: sw3a {
-				regulator-min-microvolt = <400000>;
-				regulator-max-microvolt = <1975000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			/* DDR memory */
-			sw3b_reg: sw3b {
-				regulator-min-microvolt = <400000>;
-				regulator-max-microvolt = <1975000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			/* not used */
-			sw4_reg: sw4 {
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <3300000>;
-			};
-
-			/* not used */
-			swbst_reg: swbst {
-				regulator-min-microvolt = <5000000>;
-				regulator-max-microvolt = <5150000>;
-			};
-
-			/* PMIC vsnvs. EX boot mode */
-			snvs_reg: vsnvs {
-				regulator-min-microvolt = <1000000>;
-				regulator-max-microvolt = <3000000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			vref_reg: vrefddr {
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			/* not used */
-			vgen1_reg: vgen1 {
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <1550000>;
-			};
-
-			/* not used */
-			vgen2_reg: vgen2 {
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <1550000>;
-			};
-
-			/* not used */
-			vgen3_reg: vgen3 {
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-			};
-
-			/* 1v8 general power */
-			vgen4_reg: vgen4 {
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-always-on;
-			};
-
-			/* 2v8 general power IMX6 */
-			vgen5_reg: vgen5 {
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-always-on;
-			};
-
-			/* 3v3 Ethernet */
-			vgen6_reg: vgen6 {
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-always-on;
-			};
-		};
-	};
-};
-
-&uart3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart3>;
-	status = "okay";
-};
-
-&usdhc3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc3>;
-	bus-width = <8>;
-	non-removable;
-	keep-power-in-suspend;
-	status = "okay";
-};
-
-&iomuxc {
-	pinctrl_enet: enetgrp {
-		fsl,pins = <
-			MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
-			MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
-			MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b1
-			MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0	0x1b0b0
-			MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1	0x1b0b0
-			MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2	0x1b0b0
-			MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3	0x1b0b0
-			MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN	0x1b0b0
-			MX6QDL_PAD_GPIO_19__ENET_TX_ER		0x1b0b0
-			MX6QDL_PAD_GPIO_18__ENET_RX_CLK		0x1b0b1
-			MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0	0x1b0b0
-			MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1	0x1b0b0
-			MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2	0x1b0b0
-			MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3      0x1b0b0
-			MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN	0x1b0b0
-			MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER	0x1b0b0
-			MX6QDL_PAD_KEY_COL3__ENET_CRS		0x1b0b0
-			MX6QDL_PAD_KEY_ROW1__ENET_COL		0x1b0b0
-		>;
-	};
-
-	pinctrl_i2c3: i2c3grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_3__I2C3_SCL     0x4001b8b1
-			MX6QDL_PAD_GPIO_6__I2C3_SDA     0x4001b8b1
-		>;
-	};
-
-	pinctrl_i2c4: i2c4grp {
-		fsl,pins = <
-			MX6QDL_PAD_GPIO_7__I2C4_SCL	0x4001b8b1
-			MX6QDL_PAD_GPIO_8__I2C4_SDA	0x4001b8b1
-		>;
-	};
-
-	pinctrl_uart3: uart3grp {
-		fsl,pins = <
-			MX6QDL_PAD_EIM_D24__UART3_TX_DATA	0x1b0b1
-			MX6QDL_PAD_EIM_D25__UART3_RX_DATA	0x1b0b1
-		>;
-	};
-
-	pinctrl_usdhc3: usdhc3grp {
-		fsl,pins = <
-			MX6QDL_PAD_SD3_CMD__SD3_CMD	0x17059
-			MX6QDL_PAD_SD3_CLK__SD3_CLK	0x10059
-			MX6QDL_PAD_SD3_DAT0__SD3_DATA0	0x17059
-			MX6QDL_PAD_SD3_DAT1__SD3_DATA1	0x17059
-			MX6QDL_PAD_SD3_DAT2__SD3_DATA2	0x17059
-			MX6QDL_PAD_SD3_DAT3__SD3_DATA3	0x17059
-			MX6QDL_PAD_SD3_DAT4__SD3_DATA4	0x17059
-			MX6QDL_PAD_SD3_DAT5__SD3_DATA5	0x17059
-			MX6QDL_PAD_SD3_DAT6__SD3_DATA6	0x17059
-			MX6QDL_PAD_SD3_DAT7__SD3_DATA7	0x17059
-		>;
-	};
-};
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 6f59044d4ff..c001aaf8cb6 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -528,7 +528,6 @@ source "board/bachmann/ot1200/Kconfig"
 source "board/barco/platinum/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
-source "board/bticino/mamoj/Kconfig"
 source "board/compulab/cm_fx6/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/dhelectronics/dh_imx6/Kconfig"
diff --git a/board/bticino/mamoj/Kconfig b/board/bticino/mamoj/Kconfig
deleted file mode 100644
index e5aec589c87..00000000000
--- a/board/bticino/mamoj/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_MX6DL_MAMOJ
-
-config SYS_BOARD
-	default "mamoj"
-
-config SYS_VENDOR
-	default "bticino"
-
-config SYS_CONFIG_NAME
-	default "imx6dl-mamoj"
-
-endif
diff --git a/board/bticino/mamoj/MAINTAINERS b/board/bticino/mamoj/MAINTAINERS
deleted file mode 100644
index c35b387a820..00000000000
--- a/board/bticino/mamoj/MAINTAINERS
+++ /dev/null
@@ -1,10 +0,0 @@
-MX6DL_MAMOJ BOARD
-M:	Jagan Teki <jagan@amarulasolutions.com>
-M:	Raffaele RECALCATI <raffaele.recalcati@bticino.it>
-M:	Simone CIANNI <simone.cianni@bticino.it>
-S:	Maintained
-F:	board/bticino/mamoj
-F:	include/configs/imx6dl-mamoj.h
-F:	configs/imx6dl_mamoj_defconfig
-F:	arch/arm/dts/imx6dl-mamoj.dts
-F:	arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
diff --git a/board/bticino/mamoj/Makefile b/board/bticino/mamoj/Makefile
deleted file mode 100644
index f1ddda48918..00000000000
--- a/board/bticino/mamoj/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2018 BTicino
-# Copyright (C) 2017 Amarula Solutions B.V.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y := mamoj.o
-obj-$(CONFIG_SPL_BUILD) += spl.o
diff --git a/board/bticino/mamoj/README b/board/bticino/mamoj/README
deleted file mode 100644
index 5333c72537a..00000000000
--- a/board/bticino/mamoj/README
+++ /dev/null
@@ -1,124 +0,0 @@
-BTicino Mamoj board:
-===================
-
-Build:
-
- $ make mrproper
- $ make imx6dl_mamoj_defconfig
- $ make
-
-   This will generate the SPL image called SPL and the u-boot-dtb.img.
-
-The following methods can be used for booting Mamoj boards:
-
-1. USB SDP boot
-
-2. eMMC boot (via DFU)
-
-3. Falcon mode
-
-1. USB SDP boot:
----------------
-
- - Build imx_usb_loader
-
-    $ git clone git://github.com/boundarydevices/imx_usb_loader.git
-    $ cd imx_usb_loader
-    $ make
-
- - Build the BSP and copy SPL, u-boot-dtb.img in imx_usb_loader directory
-
- - Put the board in "Serial Download Mode"
-
- - Plug-in USB-to-Serial, Open minicom 1152008N1 and USB OTG cables to Host
-
- - Turn-on board
-
- - Identify VID/PID using lsusb
-
-    Bus 001 Device 010: ID 15a2:0061 Freescale Semiconductor, Inc. i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode
-
- - Update the conf files
-
-    imx_usb.conf
-      0x15a2:0x0061, mx6_usb_rom.conf, 0x0525:0xb4a4, mx6_usb_sdp_spl.conf
-
-    mx6_usb_rom.conf
-      mx6_usb
-      hid,1024,0x910000,0x10000000,512M,0x00900000,0x40000
-      SPL:jump header2
-
-    mx6_usb_sdp_spl.conf
-      mx6_spl_sdp
-      hid,uboot_header,1024,0x910000,0x10000000,512M,0x00900000,0x40000
-      u-boot-dtb.img:jump header2
-
-  - Launch the loader
-
-     $ ./imx_usb
-
-  We can see U-Boot boot from USB SDP on minicom
-
-2. eMMC boot via DFU:
---------------------
-
-  Once booted from USB SDP, program the eMMC as below(make sure to connect USB OTG)
-
-  - Change eMMC partition config
-
-     => mmc partconf 2 1 0 0
-
-  - Partition eMMC on host
-
-     => ums 0 mmc 2
-
-    Host will able to detect the eMMC disk as UMS, partition the same.
-
-  - Program SPL
-
-     => setenv dfu_alt_info $dfu_alt_info_spl
-     => dfu 0 mmc 2
-
-     At Host
-
-     # dfu-util -D SPL -a spl
-
-  - Program u-boot-dtb.img
-
-     => setenv dfu_alt_info $dfu_alt_info_uboot
-     => dfu 0 mmc 2
-
-     At Host
-
-     # dfu-util -D u-boot-dtb.img -a u-boot
-
-  Poweroff and Poweron the board and see U-Boot booting from eMMC.
-
-3. Falcon mode:
---------------
-
-  - Skip 10M space and create dual partitions for eMMC, start sector is 20480
-
-    Partition Map for MMC device 2  --   Partition Type: DOS
-
-    Part    Start Sector    Num Sectors     UUID            Type
-      1     20480           131072          c52e78be-01     83
-      2     151552          7581696         c52e78be-02     83
-
-  - Write uImage
-
-    => fatload mmc 2:1 $kernel_addr_r uImage
-    => mmc write $kernel_addr_r 0x1000 0x4000
-
-  - Write dtb and args
-
-    => setenv bootargs console=ttymxc2,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw quiet
-    => fatload mmc 2:1 $fdt_addr_r imx6dl-mamoj.dtb
-    => spl export fdt $kernel_addr_r - $fdt_addr_r
-    => mmc write 0x13000000 0x800 0x800
-
-  Poweroff and Poweron the board and see Linux booting directly after SPL.
-
---
-Jagan Teki <jagan@amarulasolutions.com>
-03/12/18
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
deleted file mode 100644
index 6ad7e31092b..00000000000
--- a/board/bticino/mamoj/mamoj.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Simone CIANNI <simone.cianni@bticino.it>
- * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
- * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- */
-
-#include <common.h>
-#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_init(void)
-{
-	/* Address of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-
-	return 0;
-}
-
-int dram_init(void)
-{
-	gd->ram_size = imx_ddr_size();
-
-	return 0;
-}
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
deleted file mode 100644
index c53bdce0ceb..00000000000
--- a/board/bticino/mamoj/spl.c
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2018 Simone CIANNI <simone.cianni@bticino.it>
- * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
- * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- */
-
-#include <common.h>
-#include <spl.h>
-
-#include <asm/io.h>
-#include <linux/sizes.h>
-
-#include <asm/arch/clock.h>
-#include <asm/arch/crm_regs.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/mx6-ddr.h>
-#include <asm/arch/mx6-pins.h>
-#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define IMX6SDL_DRIVE_STRENGTH		0x28
-#define UART_PAD_CTRL	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
-			PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
-
-static iomux_v3_cfg_t const uart3_pads[] = {
-	IOMUX_PADS(PAD_EIM_D24__UART3_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
-	IOMUX_PADS(PAD_EIM_D25__UART3_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
-};
-
-#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
-
-struct mx6sdl_iomux_ddr_regs mx6sdl_ddr_ioregs = {
-	.dram_sdclk_0 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdclk_1 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_cas = IMX6SDL_DRIVE_STRENGTH,
-	.dram_ras = IMX6SDL_DRIVE_STRENGTH,
-	.dram_reset = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdcke0 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdcke1 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdba2 = 0x00000000,
-	.dram_sdodt0 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdodt1 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs0 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs1 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs2 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs3 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs4 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs5 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs6 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_sdqs7 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm0 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm1 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm2 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm3 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm4 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm5 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm6 = IMX6SDL_DRIVE_STRENGTH,
-	.dram_dqm7 = IMX6SDL_DRIVE_STRENGTH,
-};
-
-struct mx6sdl_iomux_grp_regs mx6sdl_grp_ioregs = {
-	.grp_ddr_type = 0x000c0000,
-	.grp_ddrmode_ctl = 0x00020000,
-	.grp_ddrpke = 0x00000000,
-	.grp_addds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_ctlds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_ddrmode = 0x00020000,
-	.grp_b0ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b1ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b2ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b3ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b4ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b5ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b6ds = IMX6SDL_DRIVE_STRENGTH,
-	.grp_b7ds = IMX6SDL_DRIVE_STRENGTH,
-};
-
-static struct mx6_ddr3_cfg mt41k128m16jt_125 = {
-	.mem_speed = 1600,
-	.density = 4,
-	.width = 32,
-	.banks = 8,
-	.rowaddr = 14,
-	.coladdr = 10,
-	.pagesz = 2,
-	.trcd = 1375,
-	.trcmin = 4875,
-	.trasmin = 3500,
-	.SRT = 0,
-};
-
-static struct mx6_mmdc_calibration mx6dl_mmdc_calib = {
-	.p0_mpwldectrl0 = 0x0042004b,
-	.p0_mpwldectrl1 = 0x0038003c,
-	.p0_mpdgctrl0 = 0x42340230,
-	.p0_mpdgctrl1 = 0x0228022c,
-	.p0_mprddlctl = 0x42444646,
-	.p0_mpwrdlctl = 0x38382e2e,
-};
-
-static struct mx6_ddr_sysinfo mem_dl = {
-	.dsize		= 1,
-	.cs1_mirror	= 0,
-	/* config for full 4GB range so that get_mem_size() works */
-	.cs_density	= 32,
-	.ncs		= 1,
-	.bi_on		= 1,
-	.rtt_nom	= 1,
-	.rtt_wr		= 1,
-	.ralat		= 5,
-	.walat		= 0,
-	.mif3_mode	= 3,
-	.rst_to_cke	= 0x23,
-	.sde_to_rst	= 0x10,
-	.refsel		= 1,
-	.refr		= 7,
-};
-
-static void spl_dram_init(void)
-{
-	mx6sdl_dram_iocfg(64, &mx6sdl_ddr_ioregs, &mx6sdl_grp_ioregs);
-	mx6_dram_cfg(&mem_dl, &mx6dl_mmdc_calib, &mt41k128m16jt_125);
-
-	udelay(100);
-}
-
-static void ccgr_init(void)
-{
-	struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-
-	writel(0x00003f3f, &ccm->CCGR0);
-	writel(0x0030fc00, &ccm->CCGR1);
-	writel(0x000fc000, &ccm->CCGR2);
-	writel(0x3f300000, &ccm->CCGR3);
-	writel(0xff00f300, &ccm->CCGR4);
-	writel(0x0f0000c3, &ccm->CCGR5);
-	writel(0x000003cc, &ccm->CCGR6);
-}
-
-void board_init_f(ulong dummy)
-{
-	ccgr_init();
-
-	/* setup AIPS and disable watchdog */
-	arch_cpu_init();
-
-	gpr_init();
-
-	/* iomux */
-	SETUP_IOMUX_PADS(uart3_pads);
-
-	/* setup GP timer */
-	timer_init();
-
-	/* UART clocks enabled and gd valid - init serial console */
-	preloader_console_init();
-
-	/* DDR initialization */
-	spl_dram_init();
-}
diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
deleted file mode 100644
index a7c5c3628de..00000000000
--- a/configs/imx6dl_mamoj_defconfig
+++ /dev/null
@@ -1,46 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX6=y
-CONFIG_SYS_TEXT_BASE=0x17800000
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_SECURE_BOOT=y
-CONFIG_TARGET_MX6DL_MAMOJ=y
-# CONFIG_CMD_BMODE is not set
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
-CONFIG_BOOTDELAY=3
-CONFIG_SPL_OS_BOOT=y
-CONFIG_CRC32_VERIFY=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_PMIC=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mamoj"
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_DFU_MMC=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x12000000
-CONFIG_FASTBOOT_BUF_SIZE=0x10000000
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=2
-CONFIG_SYS_I2C_MXC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_PHYLIB=y
-CONFIG_PHY_MICREL=y
-CONFIG_FEC_MXC=y
-CONFIG_MII=y
-CONFIG_PINCTRL_IMX6=y
-CONFIG_MXC_UART=y
-CONFIG_IMX_THERMAL=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
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
deleted file mode 100644
index 030dbedce81..00000000000
--- a/include/configs/imx6dl-mamoj.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2018 Simone CIANNI <simone.cianni@bticino.it>
- * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
- * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- *
- * Configuration settings for the BTicion i.MX6DL Mamoj board.
- */
-
-#ifndef __IMX6DL_MAMOJ_CONFIG_H
-#define __IMX6DL_MAMOJ_CONFIG_H
-
-#include <linux/sizes.h>
-#include "mx6_common.h"
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(35 * SZ_1M)
-
-/* Total Size of Environment Sector */
-#define CONFIG_ENV_SIZE			SZ_128K
-
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Environment */
-#ifndef CONFIG_ENV_IS_NOWHERE
-/* Environment in MMC */
-# if defined(CONFIG_ENV_IS_IN_MMC)
-#  define CONFIG_ENV_OFFSET		0x100000
-# endif
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS	\
-	"scriptaddr=0x14000000\0"	\
-	"fdt_addr_r=0x13000000\0"	\
-	"kernel_addr_r=0x10008000\0"	\
-	"fdt_high=0xffffffff\0"		\
-	"dfu_alt_info_spl=spl raw 0x2 0x400\0" \
-	"dfu_alt_info_uboot=u-boot raw 0x8a 0x11400\0" \
-	BOOTENV
-
-#define BOOT_TARGET_DEVICES(func) \
-	func(MMC, mmc, 2)
-
-#include <config_distro_bootcmd.h>
-#endif
-
-/* UART */
-#define CONFIG_MXC_UART_BASE		UART3_BASE
-
-/* MMC */
-#define CONFIG_SYS_MMC_ENV_DEV		2
-#define CONFIG_SUPPORT_EMMC_BOOT
-
-/* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR		1
-
-/* 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		2
-
-/* Falcon */
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME	"args"
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME	"uImage"
-#define CONFIG_CMD_SPL
-#define CONFIG_SYS_SPL_ARGS_ADDR	0x13000000
-#define CONFIG_CMD_SPL_WRITE_SIZE	(128 * SZ_1K)
-
-/* 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 */
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START	0x80000000
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x8000000)
-
-#define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_HZ			1000
-
-/* 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)
-
-/* SPL */
-#include "imx6_spl.h"
-
-#endif /* __IMX6DL_MAMOJ_CONFIG_H */
-- 
2.19.1.1215.g8438c0b245-goog