[U-Boot] [PATCH 25/93] arm: Remove warp7 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/mach-imx/mx7/Kconfig |   1 -
 board/warp7/Kconfig           |  23 ----
 board/warp7/MAINTAINERS       |   7 -
 board/warp7/Makefile          |   4 -
 board/warp7/README            |  63 ---------
 board/warp7/imximage.cfg      |  98 --------------
 board/warp7/warp7.c           | 237 ----------------------------------
 configs/warp7_bl33_defconfig  |  41 ------
 configs/warp7_defconfig       |  52 --------
 include/configs/warp7.h       | 169 ------------------------
 10 files changed, 695 deletions(-)
 delete mode 100644 board/warp7/Kconfig
 delete mode 100644 board/warp7/MAINTAINERS
 delete mode 100644 board/warp7/Makefile
 delete mode 100644 board/warp7/README
 delete mode 100644 board/warp7/imximage.cfg
 delete mode 100644 board/warp7/warp7.c
 delete mode 100644 configs/warp7_bl33_defconfig
 delete mode 100644 configs/warp7_defconfig
 delete mode 100644 include/configs/warp7.h

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 232f33285d4..329a4acaebb 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -69,6 +69,5 @@ source "board/compulab/cl-som-imx7/Kconfig"
 source "board/freescale/mx7dsabresd/Kconfig"
 source "board/technexion/pico-imx7d/Kconfig"
 source "board/toradex/colibri_imx7/Kconfig"
-source "board/warp7/Kconfig"
 
 endif
diff --git a/board/warp7/Kconfig b/board/warp7/Kconfig
deleted file mode 100644
index c089bca2baf..00000000000
--- a/board/warp7/Kconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-if TARGET_WARP7
-
-config SYS_BOARD
-	default "warp7"
-
-config SYS_CONFIG_NAME
-	default "warp7"
-
-config WARP7_ROOT_PART
-	int "Partition number to use for root filesystem"
-	default 2
-	help
-	  The partition number to use for root filesystem this is the
-	  partition that is typically specified with root=/dev/sdaX or
-	  which gets converted into a root=PARTUUID=some_uuid.
-
-config SYS_FDT_ADDR
-	hex "FDT load address"
-	default 0x83000000
-	help
-	  The address the FDT file should be loaded to.
-
-endif
diff --git a/board/warp7/MAINTAINERS b/board/warp7/MAINTAINERS
deleted file mode 100644
index 55f8c815d46..00000000000
--- a/board/warp7/MAINTAINERS
+++ /dev/null
@@ -1,7 +0,0 @@
-WARP7 BOARD
-M:	Fabio Estevam <fabio.estevam@nxp.com>
-S:	Maintained
-F:	board/warp7/
-F:	include/configs/warp7.h
-F:	configs/warp7_defconfig
-F:	configs/warp7_bl33_defconfig
diff --git a/board/warp7/Makefile b/board/warp7/Makefile
deleted file mode 100644
index 92b0ca9060f..00000000000
--- a/board/warp7/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-# (C) Copyright 2016 NXP Semiconductors
-
-obj-y  := warp7.o
diff --git a/board/warp7/README b/board/warp7/README
deleted file mode 100644
index 60339da5437..00000000000
--- a/board/warp7/README
+++ /dev/null
@@ -1,63 +0,0 @@
-How to Update U-Boot on Warp7 board
-----------------------------------
-
-Required software on the host PC:
-
-- imx_usb_loader: https://github.com/boundarydevices/imx_usb_loader
-
-- dfu-util: http://dfu-util.sourceforge.net/releases/ (if you are in a
-Debian distribution then you can get it via libdfu-dev package)
-
-- libusb: http://libusb.org/ (if you are in a Debian distribution
-then you can get it via libusb-dev and libusb-1.0-0-dev)
-
-In U-Boot folder, build U-Boot for Warp7:
-
-$ make mrproper
-$ make warp7_config
-$ make
-
-This will generate the U-Boot binary called u-boot.imx.
-
-Put warp7 board in USB download mode: 
-
-Remove the CPU board from the base board then put switch 2 in the upper
-position
-
-Connect a USB to serial adapter between the host PC and warp7
-
-Connect a USB cable between the OTG warp7 port and the host PC
-
-Copy u-boot.imx to the imx_usb_loader folder.
-
-Load u-boot.imx via USB:
-
-$ sudo ./imx_usb u-boot.imx
-
-Then U-Boot should start and its messages will appear in the console program.
-
-Open a terminal program such as minicom
-
-Use the default environment variables:
-
-=> env default -f -a
-=> saveenv
-
-Run the DFU command:
-=> dfu 0 mmc 0
-
-Transfer u-boot.imx that will be flashed into the eMMC:
-
-$ sudo dfu-util -D u-boot.imx -a boot
-
-Then on the U-Boot prompt the following message should be seen after a
-successful upgrade:
-
-#DOWNLOAD ... OK
-Ctrl+C to exit ...
-
-Remove power from the warp7 board.
-
-Put warp7 board into normal boot mode (put the switch 2 in the lower position)
-
-Power up the board and the new updated U-Boot should boot from eMMC
diff --git a/board/warp7/imximage.cfg b/board/warp7/imximage.cfg
deleted file mode 100644
index a6edfdacef3..00000000000
--- a/board/warp7/imximage.cfg
+++ /dev/null
@@ -1,98 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2016 NXP Semiconductors
- *
- * Refer doc/README.imximage for more details about how-to configure
- * and create imximage boot image
- *
- * The syntax is taken as close as possible with the kwbimage
- */
-
-#define __ASSEMBLY__
-#include <config.h>
-
-IMAGE_VERSION	2
-#ifdef CONFIG_SECURE_BOOT
-CSF CONFIG_CSF_SIZE
-#endif
-
-BOOT_FROM	sd
-
-/*
- * Device Configuration Data (DCD)
- *
- * Each entry must have the format:
- * Addr-type           Address        Value
- *
- * where:
- *	Addr-type register length (1,2 or 4 bytes)
- *	Address	  absolute address of the register
- *	value	  value to be stored in the register
- */
-
-DATA 4 0x30340004 0x4F400005
-
-DATA 4 0x30391000 0x00000002
-DATA 4 0x307a0000 0x03040008
-DATA 4 0x307a0064 0x00200038
-DATA 4 0x307a0490 0x00000001
-DATA 4 0x307a00d0 0x00350001
-DATA 4 0x307a00dc 0x00c3000a
-DATA 4 0x307a00e0 0x00010000
-DATA 4 0x307a00e4 0x00110006
-DATA 4 0x307a00f4 0x0000033f
-DATA 4 0x307a0100 0x0a0e110b
-DATA 4 0x307a0104 0x00020211
-DATA 4 0x307a0108 0x03060708
-DATA 4 0x307a010c 0x00a0500c
-DATA 4 0x307a0110 0x05020307
-DATA 4 0x307a0114 0x02020404
-DATA 4 0x307a0118 0x02020003
-DATA 4 0x307a011c 0x00000202
-DATA 4 0x307a0120 0x00000202
-
-DATA 4 0x307a0180 0x00600018
-DATA 4 0x307a0184 0x00e00100
-DATA 4 0x307a0190 0x02098205
-DATA 4 0x307a0194 0x00060303
-DATA 4 0x307a01a0 0x80400003
-DATA 4 0x307a01a4 0x00100020
-DATA 4 0x307a01a8 0x80100004
-
-DATA 4 0x307a0200 0x00000015
-DATA 4 0x307a0204 0x00161616
-DATA 4 0x307a0210 0x00000f0f
-DATA 4 0x307a0214 0x04040404
-DATA 4 0x307a0218 0x0f0f0404
-
-DATA 4 0x307a0240 0x06000600
-DATA 4 0x307a0244 0x00000000
-DATA 4 0x30391000 0x00000000
-DATA 4 0x30790000 0x17421e40
-DATA 4 0x30790004 0x10210100
-DATA 4 0x30790008 0x00010000
-DATA 4 0x30790010 0x0007080c
-DATA 4 0x307900b0 0x1010007e
-
-DATA 4 0x3079001C 0x01010000
-DATA 4 0x3079009c 0x00000d6e
-
-DATA 4 0x30790030 0x06060606
-DATA 4 0x30790020 0x0a0a0a0a
-DATA 4 0x30790050 0x01000008
-DATA 4 0x30790050 0x00000008
-DATA 4 0x30790018 0x0000000f
-DATA 4 0x307900c0 0x0e487304
-DATA 4 0x307900c0 0x0e4c7304
-DATA 4 0x307900c0 0x0e4c7306
-DATA 4 0x307900c0 0x0e4c7304
-
-CHECK_BITS_SET 4 0x307900c4 0x1
-
-DATA 4 0x307900c0 0x0e487304
-
-DATA 4 0x30384130 0x00000000
-DATA 4 0x30340020 0x00000178
-DATA 4 0x30384130 0x00000002
-
-CHECK_BITS_SET 4 0x307a0004 0x1
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
deleted file mode 100644
index 3d32b3eb52b..00000000000
--- a/board/warp7/warp7.c
+++ /dev/null
@@ -1,237 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2016 NXP Semiconductors
- * Author: Fabio Estevam <fabio.estevam@nxp.com>
- */
-
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/mx7-pins.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
-#include <asm/mach-imx/hab.h>
-#include <asm/mach-imx/iomux-v3.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <asm/io.h>
-#include <common.h>
-#include <fsl_esdhc.h>
-#include <i2c.h>
-#include <mmc.h>
-#include <asm/arch/crm_regs.h>
-#include <usb.h>
-#include <netdev.h>
-#include <power/pmic.h>
-#include <power/pfuze3000_pmic.h>
-#include "../freescale/common/pfuze.h"
-#include <asm/setup.h>
-#include <asm/bootm.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \
-			PAD_CTL_HYS)
-#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW |	\
-			PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
-
-#define I2C_PAD_CTRL	(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
-	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#ifdef CONFIG_SYS_I2C_MXC
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-/* I2C1 for PMIC */
-static struct i2c_pads_info i2c_pad_info1 = {
-	.scl = {
-		.i2c_mode = MX7D_PAD_I2C1_SCL__I2C1_SCL | PC,
-		.gpio_mode = MX7D_PAD_I2C1_SCL__GPIO4_IO8 | PC,
-		.gp = IMX_GPIO_NR(4, 8),
-	},
-	.sda = {
-		.i2c_mode = MX7D_PAD_I2C1_SDA__I2C1_SDA | PC,
-		.gpio_mode = MX7D_PAD_I2C1_SDA__GPIO4_IO9 | PC,
-		.gp = IMX_GPIO_NR(4, 9),
-	},
-};
-#endif
-
-int dram_init(void)
-{
-	gd->ram_size = PHYS_SDRAM_SIZE;
-
-	/* Subtract the defined OPTEE runtime firmware length */
-#ifdef CONFIG_OPTEE_TZDRAM_SIZE
-		gd->ram_size -= CONFIG_OPTEE_TZDRAM_SIZE;
-#endif
-
-	return 0;
-}
-
-static iomux_v3_cfg_t const wdog_pads[] = {
-	MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const uart1_pads[] = {
-	MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const usdhc3_pads[] = {
-	MX7D_PAD_SD3_CLK__SD3_CLK     | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_CMD__SD3_CMD     | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_RESET_B__SD3_RESET_B | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-};
-
-static void setup_iomux_uart(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-};
-
-static struct fsl_esdhc_cfg usdhc_cfg[1] = {
-	{USDHC3_BASE_ADDR},
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-		/* Assume uSDHC3 emmc is always present */
-		return 1;
-}
-
-int board_mmc_init(bd_t *bis)
-{
-	imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
-	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-
-	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
-}
-
-int board_early_init_f(void)
-{
-	setup_iomux_uart();
-
-	return 0;
-}
-
-#ifdef CONFIG_POWER
-#define I2C_PMIC       0
-static struct pmic *pfuze;
-int power_init_board(void)
-{
-	int ret;
-	unsigned int reg, rev_id;
-
-	ret = power_pfuze3000_init(I2C_PMIC);
-	if (ret)
-		return ret;
-
-	pfuze = pmic_get("PFUZE3000");
-	ret = pmic_probe(pfuze);
-	if (ret)
-		return ret;
-
-	pmic_reg_read(pfuze, PFUZE3000_DEVICEID, &reg);
-	pmic_reg_read(pfuze, PFUZE3000_REVID, &rev_id);
-	printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id);
-
-	/* disable Low Power Mode during standby mode */
-	pmic_reg_write(pfuze, PFUZE3000_LDOGCTL, 0x1);
-
-	return 0;
-}
-#endif
-
-int board_eth_init(bd_t *bis)
-{
-	int ret = 0;
-
-#ifdef CONFIG_USB_ETHER
-	ret = usb_eth_initialize(bis);
-	if (ret < 0)
-		printf("Error %d registering USB ether.\n", ret);
-#endif
-
-	return ret;
-}
-
-int board_init(void)
-{
-	/* address of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-
-	#ifdef CONFIG_SYS_I2C_MXC
-		setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-	#endif
-
-	return 0;
-}
-
-int checkboard(void)
-{
-	char *mode;
-
-	if (IS_ENABLED(CONFIG_ARMV7_BOOT_SEC_DEFAULT))
-		mode = "secure";
-	else
-		mode = "non-secure";
-
-#ifdef CONFIG_OPTEE_TZDRAM_SIZE
-	unsigned long optee_start, optee_end;
-
-	optee_end = PHYS_SDRAM + PHYS_SDRAM_SIZE;
-	optee_start = optee_end - CONFIG_OPTEE_TZDRAM_SIZE;
-
-	printf("Board: WARP7 in %s mode OPTEE DRAM 0x%08lx-0x%08lx\n",
-	       mode, optee_start, optee_end);
-#else
-	printf("Board: WARP7 in %s mode\n", mode);
-#endif
-
-	return 0;
-}
-
-int board_usb_phy_mode(int port)
-{
-	return USB_INIT_DEVICE;
-}
-
-int board_late_init(void)
-{
-	struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;
-#ifdef CONFIG_SERIAL_TAG
-	struct tag_serialnr serialnr;
-	char serial_string[0x20];
-#endif
-
-	imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads));
-
-	set_wdog_reset(wdog);
-
-	/*
-	 * Do not assert internal WDOG_RESET_B_DEB(controlled by bit 4),
-	 * since we use PMIC_PWRON to reset the board.
-	 */
-	clrsetbits_le16(&wdog->wcr, 0, 0x10);
-
-#ifdef CONFIG_SECURE_BOOT
-	/* Determine HAB state */
-	env_set_ulong(HAB_ENABLED_ENVNAME, imx_hab_is_enabled());
-#else
-	env_set_ulong(HAB_ENABLED_ENVNAME, 0);
-#endif
-
-#ifdef CONFIG_SERIAL_TAG
-	/* Set serial# standard environment variable based on OTP settings */
-	get_board_serial(&serialnr);
-	snprintf(serial_string, sizeof(serial_string), "WaRP7-0x%08x%08x",
-		 serialnr.low, serialnr.high);
-	env_set("serial#", serial_string);
-#endif
-
-	return 0;
-}
diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
deleted file mode 100644
index a568c6d10e0..00000000000
--- a/configs/warp7_bl33_defconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX7=y
-CONFIG_SYS_TEXT_BASE=0x87800000
-CONFIG_SECURE_BOOT=y
-CONFIG_TARGET_WARP7=y
-CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"
-CONFIG_HUSH_PARSER=y
-CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_DFU_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=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
-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
-CONFIG_OF_LIBFDT=y
-CONFIG_OPTEE_TZDRAM_SIZE=0x2000000
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
deleted file mode 100644
index 955c7af42af..00000000000
--- a/configs/warp7_defconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_MX7=y
-CONFIG_SYS_TEXT_BASE=0x87800000
-CONFIG_SECURE_BOOT=y
-CONFIG_TARGET_WARP7=y
-CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
-# CONFIG_ARMV7_VIRT is not set
-CONFIG_IMX_RDC=y
-CONFIG_IMX_BOOTAUX=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMD_BOOTD is not set
-CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_XIMG is not set
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_DFU_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_OPTEE=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=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
-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
-CONFIG_OF_LIBFDT=y
-CONFIG_OPTEE_LOAD_ADDR=0x84000000
-CONFIG_OPTEE_TZDRAM_SIZE=0x3000000
-CONFIG_OPTEE_TZDRAM_BASE=0x9d000000
-CONFIG_BOOTM_OPTEE=y
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
deleted file mode 100644
index a391dfb5c10..00000000000
--- a/include/configs/warp7.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2016 NXP Semiconductors
- *
- * Configuration settings for the i.MX7S Warp board.
- */
-
-#ifndef __WARP7_CONFIG_H
-#define __WARP7_CONFIG_H
-
-#include "mx7_common.h"
-#include <imximage.h>
-
-#define PHYS_SDRAM_SIZE			SZ_512M
-
-/*
- * If we have defined the OPTEE ram size and not OPTEE it means that we were
- * launched by OPTEE, because of that we shall skip all the low level
- * initialization since it was already done by ATF or OPTEE
- */
-#ifdef CONFIG_OPTEE_TZDRAM_SIZE
-#ifndef CONFIG_OPTEE
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
-#endif
-
-#define CONFIG_MXC_UART_BASE		UART1_IPS_BASE_ADDR
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(35 * SZ_1M)
-
-/* MMC Config*/
-#define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
-#define CONFIG_SYS_MMC_IMG_LOAD_PART	1
-
-/* Switch on SERIAL_TAG */
-#define CONFIG_SERIAL_TAG
-
-#define CONFIG_DFU_ENV_SETTINGS \
-	"dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	CONFIG_DFU_ENV_SETTINGS \
-	"script=boot.scr\0" \
-	"script_signed=boot.scr.imx-signed\0" \
-	"image=zImage\0" \
-	"console=ttymxc0\0" \
-	"ethact=usb_ether\0" \
-	"fdt_high=0xffffffff\0" \
-	"initrd_high=0xffffffff\0" \
-	"fdt_file=imx7s-warp.dtb\0" \
-	"fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
-	"optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \
-	"boot_fdt=try\0" \
-	"ip_dyn=yes\0" \
-	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
-	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-	"rootpart=" __stringify(CONFIG_WARP7_ROOT_PART) "\0" \
-	"finduuid=part uuid mmc 0:${rootpart} uuid\0" \
-	"mmcargs=setenv bootargs console=${console},${baudrate} " \
-		"root=PARTUUID=${uuid} rootwait rw\0" \
-	"ivt_offset=" __stringify(BOOTROM_IVT_HDR_OFFSET)"\0"\
-	"warp7_auth_or_fail=hab_auth_img_or_fail ${hab_ivt_addr} ${filesize} 0;\0" \
-	"do_bootscript_hab=" \
-		"if test ${hab_enabled} -eq 1; then " \
-			"setexpr hab_ivt_addr ${loadaddr} - ${ivt_offset}; " \
-			"setenv script ${script_signed}; " \
-			"load mmc ${mmcdev}:${mmcpart} ${hab_ivt_addr} ${script}; " \
-			"run warp7_auth_or_fail; " \
-			"run bootscript; "\
-		"fi;\0" \
-	"loadbootscript=" \
-		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-	"bootscript=echo Running bootscript from mmc ...; " \
-		"source\0" \
-	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-	"mmcboot=echo Booting from mmc ...; " \
-		"run finduuid; " \
-		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; 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" \
-
-#define CONFIG_BOOTCOMMAND \
-	   "mmc dev ${mmcdev};" \
-	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-		   "run do_bootscript_hab;" \
-		   "if run loadbootscript; then " \
-			   "run bootscript; " \
-		   "else " \
-			   "if run loadimage; then " \
-				   "run mmcboot; " \
-			   "fi; " \
-		   "fi; " \
-	   "fi"
-
-#define CONFIG_SYS_MEMTEST_START	0x80000000
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x20000000)
-
-#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)
-
-/* I2C configs */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1
-#define CONFIG_SYS_I2C_SPEED		100000
-
-/* PMIC */
-#define CONFIG_POWER
-#define CONFIG_POWER_I2C
-#define CONFIG_POWER_PFUZE3000
-#define CONFIG_POWER_PFUZE3000_I2C_ADDR	0x08
-
-/* environment organization */
-#define CONFIG_ENV_SIZE			SZ_8K
-
-#define CONFIG_ENV_OFFSET		(8 * SZ_64K)
-#define CONFIG_SYS_FSL_USDHC_NUM	1
-
-#define CONFIG_SYS_MMC_ENV_DEV		0
-#define CONFIG_SYS_MMC_ENV_PART		0
-
-/* USB Configs */
-#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 /* Only OTG1 port enabled */
-
-#define CONFIG_IMX_THERMAL
-
-#define CONFIG_USBD_HS
-
-/* USB Device Firmware Update support */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_16M
-#define DFU_DEFAULT_POLL_TIMEOUT	300
-
-#define CONFIG_USBNET_DEV_ADDR		"de:ad:be:af:00:01"
-
-/* Environment variable name to represent HAB enable state */
-#define HAB_ENABLED_ENVNAME		"hab_enabled"
-
-#endif
-- 
2.19.1.1215.g8438c0b245-goog