diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/toradex/apalis-imx8x/Kconfig | 33 | ||||
| -rw-r--r-- | board/toradex/apalis-imx8x/MAINTAINERS | 10 | ||||
| -rw-r--r-- | board/toradex/apalis-imx8x/Makefile | 6 | ||||
| -rw-r--r-- | board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg | 23 | ||||
| -rw-r--r-- | board/toradex/apalis-imx8x/apalis-imx8x.c | 155 | ||||
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 13 | 
6 files changed, 1 insertions, 239 deletions
| diff --git a/board/toradex/apalis-imx8x/Kconfig b/board/toradex/apalis-imx8x/Kconfig deleted file mode 100644 index d6cda7e3ff0..00000000000 --- a/board/toradex/apalis-imx8x/Kconfig +++ /dev/null @@ -1,33 +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" - -config IMX_CONFIG -	default "board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg" - -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 93d6cdd4742..00000000000 --- a/board/toradex/apalis-imx8x/MAINTAINERS +++ /dev/null @@ -1,10 +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:	doc/board/toradex/apalis-imx8x.rst -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 9d6e85b7429..00000000000 --- a/board/toradex/apalis-imx8x/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2020 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 c229706f80a..00000000000 --- a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2020 Toradex - * - * Refer doc/imx/mkimage/imx8image.txt for more details about how-to configure - * and create imx8image boot image - */ - - -/* 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 ac3bac66a96..00000000000 --- a/board/toradex/apalis-imx8x/apalis-imx8x.c +++ /dev/null @@ -1,155 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2020 Toradex - */ - -#include <common.h> -#include <cpu_func.h> -#include <init.h> - -#include <asm/arch/clock.h> -#include <asm/arch/imx8-pins.h> -#include <asm/arch/iomux.h> -#include <asm/arch/sci/sci.h> -#include <asm/arch/sys_proto.h> -#include <asm/global_data.h> -#include <asm/gpio.h> -#include <asm/io.h> -#include <env.h> -#include <errno.h> -#include <linux/libfdt.h> - -#include "../common/tdx-cfg-block.h" - -DECLARE_GLOBAL_DATA_PTR; - -#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(u64 *phys_sdram_1_start, -			  u64 *phys_sdram_1_size, -			  u64 *phys_sdram_2_start, -			  u64 *phys_sdram_2_size) -{ -	u32 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_err_t err = 0; - -	/* -	 * This works around that having only UART3 up the baudrate is 1.2M -	 * instead of 115.2k. Set UART0 clock root to 80 MHz -	 */ -	rate = 80000000; -	err = sc_pm_set_clock_rate(-1, SC_R_UART_0, SC_PM_CLK_PER, &rate); -	if (err != SC_ERR_NONE) -		return 0; - -	/* Set UART3 clock root to 80 MHz and enable it */ -	rate = SC_80MHZ; -	err = sc_pm_setup_uart(SC_R_UART_1, rate); -	if (err != SC_ERR_NONE) -		return 0; - -	setup_iomux_uart(); - -	return 0; -} - -#if IS_ENABLED(CONFIG_DM_GPIO) -static void board_gpio_init(void) -{ -	/* TODO */ -} -#else -static inline void board_gpio_init(void) {} -#endif - -#if IS_ENABLED(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 - -int checkboard(void) -{ -	puts("Model: Toradex Apalis iMX8X\n"); - -	build_info(); -	print_bootinfo(); - -	return 0; -} - -int board_init(void) -{ -	board_gpio_init(); - -	return 0; -} - -/* - * Board specific reset that is system reset. - */ -void reset_cpu(void) -{ -	/* TODO */ -} - -#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) -int ft_board_setup(void *blob, struct bd_info *bd) -{ -	return ft_common_board_setup(blob, bd); -} -#endif - -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 iMX8X"); -#endif - -	return 0; -} diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 7cadd05c0a7..0e657a2a0a9 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -13,7 +13,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) || \ @@ -379,7 +378,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) || \ @@ -451,16 +449,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; | 
