apalis-imx8x: Drop support for Apalis iMX8X

Drop Apalis iMX8X platform as no longer supported.

Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>

6 files changed, 1 insertions, 318 deletions

diff --git a/board/toradex/apalis-imx8x/Kconfig b/board/toradex/apalis-imx8x/Kconfig
deleted file mode 100644
index ee61e09736..0000000000
--- a/board/toradex/apalis-imx8x/Kconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-if TARGET_APALIS_IMX8X
-
-config SYS_BOARD
-	default "apalis-imx8x"
-
-config SYS_VENDOR
-	default "toradex"
-
-config SYS_CONFIG_NAME
-	default "apalis-imx8x"
-
-config TDX_CFG_BLOCK
-	default y
-
-config TDX_HAVE_MMC
-	default y
-
-config TDX_CFG_BLOCK_DEV
-	default "0"
-
-config TDX_CFG_BLOCK_PART
-	default "1"
-
-# Toradex config block in eMMC, at the end of 1st "boot sector"
-config TDX_CFG_BLOCK_OFFSET
-	default "-512"
-
-source "board/toradex/common/Kconfig"
-
-endif
diff --git a/board/toradex/apalis-imx8x/MAINTAINERS b/board/toradex/apalis-imx8x/MAINTAINERS
deleted file mode 100644
index 21b8675eb8..0000000000
--- a/board/toradex/apalis-imx8x/MAINTAINERS
+++ /dev/null
@@ -1,9 +0,0 @@
-Apalis iMX8X
-M:	Marcel Ziswiler <marcel.ziswiler@toradex.com>
-W:	http://developer.toradex.com/software/linux/linux-software
-S:	Maintained
-F:	arch/arm/dts/fsl-imx8x-apalis.dts
-F:	arch/arm/dts/fsl-imx8x-apalis-u-boot.dtsi
-F:	board/toradex/apalis-imx8x/
-F:	configs/apalis-imx8x_defconfig
-F:	include/configs/apalis-imx8x.h
diff --git a/board/toradex/apalis-imx8x/Makefile b/board/toradex/apalis-imx8x/Makefile
deleted file mode 100644
index 19025863e8..0000000000
--- a/board/toradex/apalis-imx8x/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright 2018-2019 Toradex
-#
-
-obj-y += apalis-imx8x.o
diff --git a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg b/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
deleted file mode 100644
index e8868cd8e3..0000000000
--- a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2019 Toradex
- *
- * Refer doc/README.imx8image for more details about how-to configure
- * and create imx8image boot image
- */
-
-#define __ASSEMBLY__
-
-/* Boot from SD, sector size 0x400 */
-BOOT_FROM EMMC_FASTBOOT 0x400
-/* SoC type IMX8QX */
-SOC_TYPE IMX8QX
-/* Append seco container image */
-APPEND mx8qx-ahab-container.img
-/* Create the 2nd container */
-CONTAINER
-/* Add scfw image with exec attribute */
-IMAGE SCU mx8qx-apalis-scfw-tcm.bin
-/* Add ATF image with exec attribute */
-IMAGE A35 bl31.bin 0x80000000
-/* Add U-Boot image with load attribute */
-DATA A35 u-boot-dtb.bin 0x80020000
diff --git a/board/toradex/apalis-imx8x/apalis-imx8x.c b/board/toradex/apalis-imx8x/apalis-imx8x.c
deleted file mode 100644
index 493fd126df..0000000000
--- a/board/toradex/apalis-imx8x/apalis-imx8x.c
+++ /dev/null
@@ -1,237 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2018-2019 Toradex
- */
-#include <common.h>
-#include <cpu_func.h>
-#include <env.h>
-#include <errno.h>
-#include <init.h>
-#include <linux/libfdt.h>
-#include <fsl_esdhc_imx.h>
-#include <fdt_support.h>
-
-#include <asm/io.h>
-#include <asm/gpio.h>
-#include <asm/arch/clock.h>
-#include <asm/arch-imx8/sci/sci.h>
-#include <asm/arch/imx8-pins.h>
-#include <asm/arch/snvs_security_sc.h>
-#include <asm/arch/iomux.h>
-#include <asm/arch/sys_proto.h>
-
-#include <power-domain.h>
-#include <usb.h>
-
-#include "../common/tdx-cfg-block.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define ESDHC_PAD_CTRL	((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) \
-						| (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
-
-#define ESDHC_CLK_PAD_CTRL	((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) \
-						| (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
-
-#define GPIO_PAD_CTRL	((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) \
-						| (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
-
-#define UART_PAD_CTRL	((SC_PAD_CONFIG_OUT_IN << PADRING_CONFIG_SHIFT) | (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) \
-						| (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
-
-static iomux_cfg_t uart1_pads[] = {
-	SC_P_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	SC_P_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
-
-static void setup_iomux_uart(void)
-{
-	imx8_iomux_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
-}
-
-void board_mem_get_layout(uint64_t *phys_sdram_1_start,
-			  uint64_t *phys_sdram_1_size,
-			  uint64_t *phys_sdram_2_start,
-			  uint64_t *phys_sdram_2_size)
-{
-	uint32_t is_dualx = 0, val = 0;
-	sc_err_t sciErr = sc_misc_otp_fuse_read(-1, 6, &val);
-
-	if (sciErr == SC_ERR_NONE) {
-		/* DX has two A35 cores disabled */
-		is_dualx = (val & 0xf) != 0x0;
-	}
-
-	*phys_sdram_1_start = PHYS_SDRAM_1;
-	if (is_dualx)
-		/* Our DX based SKUs only have 1 GB RAM */
-		*phys_sdram_1_size = SZ_1G;
-	else
-		*phys_sdram_1_size = PHYS_SDRAM_1_SIZE;
-	*phys_sdram_2_start = PHYS_SDRAM_2;
-	*phys_sdram_2_size = PHYS_SDRAM_2_SIZE;
-}
-
-int board_early_init_f(void)
-{
-	sc_pm_clock_rate_t rate = SC_80MHZ;
-	int ret;
-
-	/*
-	 * This works around that having only UART1 up the baudrate is 1.2M
-	 * instead of 115.2k. Set UART0 clock root to 80 MHz
-	 */
-	ret = sc_pm_setup_uart(SC_R_UART_0, rate);
-	if (ret)
-		return ret;
-
-	/* Set UART0 clock root to 80 MHz */
-	ret = sc_pm_setup_uart(SC_R_UART_1, rate);
-	if (ret)
-		return ret;
-
-	setup_iomux_uart();
-
-	return 0;
-}
-
-
-#ifdef CONFIG_FEC_MXC
-#include <miiphy.h>
-
-int board_phy_config(struct phy_device *phydev)
-{
-	if (phydev->drv->config)
-		phydev->drv->config(phydev);
-
-	return 0;
-}
-#endif
-
-#undef CONFIG_MXC_GPIO /* TODO */
-#ifdef CONFIG_MXC_GPIO
-#define IOEXP_RESET IMX_GPIO_NR(1, 1)
-
-static iomux_cfg_t board_gpios[] = {
-	SC_P_SPI2_SDO | MUX_MODE_ALT(4) | MUX_PAD_CTRL(GPIO_PAD_CTRL),
-	SC_P_ENET0_REFCLK_125M_25M | MUX_MODE_ALT(4) | MUX_PAD_CTRL(GPIO_PAD_CTRL),
-};
-
-static void board_gpio_init(void)
-{
-	int ret;
-	struct gpio_desc desc;
-
-	ret = dm_gpio_lookup_name("gpio@1a_3", &desc);
-	if (ret)
-		return;
-
-	ret = dm_gpio_request(&desc, "bb_per_rst_b");
-	if (ret)
-		return;
-
-	dm_gpio_set_dir_flags(&desc, GPIOD_IS_OUT);
-	dm_gpio_set_value(&desc, 0);
-	udelay(50);
-	dm_gpio_set_value(&desc, 1);
-
-	imx8_iomux_setup_multiple_pads(board_gpios, ARRAY_SIZE(board_gpios));
-
-	/* enable i2c port expander assert reset line */
-	gpio_request(IOEXP_RESET, "ioexp_rst");
-	gpio_direction_output(IOEXP_RESET, 1);
-}
-#endif
-
-int board_init(void)
-{
-#ifdef CONFIG_MXC_GPIO
-	board_gpio_init();
-#endif
-
-#ifdef CONFIG_SNVS_SEC_SC_AUTO
-	{
-		int ret = snvs_security_sc_init();
-
-		if (ret)
-			return ret;
-	}
-#endif
-
-	return 0;
-}
-
-/* With this function there is no console output in linux, drop that for now */
-#if 0
-void board_quiesce_devices(void)
-{
-	const char *power_on_devices[] = {
-		"dma_lpuart1",
-
-		/* HIFI DSP boot */
-		"audio_sai0",
-		"audio_ocram",
-	};
-
-	power_off_pd_devices(power_on_devices, ARRAY_SIZE(power_on_devices));
-}
-#endif
-
-void detail_board_ddr_info(void)
-{
-	puts("\nDDR    ");
-}
-
-/*
- * Board specific reset that is system reset.
- */
-void reset_cpu(ulong addr)
-{
-	sc_pm_reboot(-1, SC_PM_RESET_TYPE_COLD);
-	while(1);
-
-}
-
-#ifdef CONFIG_OF_BOARD_SETUP
-int ft_board_setup(void *blob, bd_t *bd)
-{
-	return ft_common_board_setup(blob, bd);
-}
-#endif
-void board_late_mmc_env_init() {}
-int board_mmc_get_env_dev(int devno)
-{
-	return devno;
-}
-
-int board_late_init(void)
-{
-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-/* TODO move to common */
-	env_set("board_name", "Apalis iMX8QXP");
-	env_set("board_rev", "v1.0");
-#endif
-
-	build_info();
-
-#ifdef CONFIG_AHAB_BOOT
-	env_set("sec_boot", "yes");
-#else
-	env_set("sec_boot", "no");
-#endif
-
-#ifdef CONFIG_ENV_IS_IN_MMC
-	board_late_mmc_env_init();
-#endif
-
-	return 0;
-}
-
-#ifdef CONFIG_FSL_FASTBOOT
-#ifdef CONFIG_ANDROID_RECOVERY
-int is_recovery_key_pressing(void)
-{
-	return 0; /*TODO*/
-}
-#endif /*CONFIG_ANDROID_RECOVERY*/
-#endif /*CONFIG_FSL_FASTBOOT*/
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index b9960922a3..685d2ec786 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -12,7 +12,6 @@
 
 #if defined(CONFIG_TARGET_APALIS_IMX6) || \
 	defined(CONFIG_TARGET_APALIS_IMX8) || \
-	defined(CONFIG_TARGET_APALIS_IMX8X) || \
 	defined(CONFIG_TARGET_COLIBRI_IMX6) || \
 	defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
 	defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
@@ -378,7 +377,6 @@ static int get_cfgblock_interactive(void)
 	it = console_buffer[0];
 
 #if defined(CONFIG_TARGET_APALIS_IMX8) || \
-		defined(CONFIG_TARGET_APALIS_IMX8X) || \
 		defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
 		defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
 		defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
@@ -450,16 +448,7 @@ static int get_cfgblock_interactive(void)
 				tdx_hw_tag.prodid = APALIS_IMX8QP;
 		}
 	} else if (is_cpu_type(MXC_CPU_IMX8QXP)) {
-#ifdef CONFIG_TARGET_APALIS_IMX8X
-		if (it == 'y' || it == 'Y' || wb == 'y' || wb == 'Y') {
-				tdx_hw_tag.prodid = APALIS_IMX8QXP_WIFI_BT_IT;
-		} else {
-			if (gd->ram_size == 0x40000000)
-				tdx_hw_tag.prodid = APALIS_IMX8DXP;
-			else
-				tdx_hw_tag.prodid = APALIS_IMX8QXP;
-		}
-#elif CONFIG_TARGET_COLIBRI_IMX8X
+#ifdef CONFIG_TARGET_COLIBRI_IMX8X
 		if (it == 'y' || it == 'Y') {
 			if (wb == 'y' || wb == 'Y')
 				tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT;