LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs: tdx: apalis_imx6: drop hw v1.0 support 

Drop optional support for the ancient Apalis iMX6 V1.0 hardware which
had the UART wired as DCE rather than DTE.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
This commit is contained in:
Marcel Ziswiler 2022-04-13 11:33:34 +02:00 committed by Stefano Babic
parent 4625ff6521
commit 405c97fd1d
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
board/toradex/apalis_imx6/apalis_imx6.c
View File

@ -304,13 +304,6 @@ static void setup_dtemode_uart(void)
clrbits_le32((u32 *)(UART4_BASE + UCR3), UCR3_DCD | UCR3_RI); clrbits_le32((u32 *)(UART4_BASE + UCR3), UCR3_DCD | UCR3_RI);
clrbits_le32((u32 *)(UART5_BASE + UCR3), UCR3_DCD | UCR3_RI); clrbits_le32((u32 *)(UART5_BASE + UCR3), UCR3_DCD | UCR3_RI);
} }
static void setup_dcemode_uart(void)
{
clrbits_le32((u32 *)(UART1_BASE + UFCR), UFCR_DCEDTE);
clrbits_le32((u32 *)(UART2_BASE + UFCR), UFCR_DCEDTE);
clrbits_le32((u32 *)(UART4_BASE + UFCR), UFCR_DCEDTE);
clrbits_le32((u32 *)(UART5_BASE + UFCR), UFCR_DCEDTE);
}
static void setup_iomux_dte_uart(void) static void setup_iomux_dte_uart(void)
{ {
@ -318,12 +311,6 @@ static void setup_iomux_dte_uart(void)
imx_iomux_v3_setup_multiple_pads(uart1_pads_dte, imx_iomux_v3_setup_multiple_pads(uart1_pads_dte,
ARRAY_SIZE(uart1_pads_dte)); ARRAY_SIZE(uart1_pads_dte));
} }
static void setup_iomux_dce_uart(void)
{
setup_dcemode_uart();
imx_iomux_v3_setup_multiple_pads(uart1_pads_dce,
ARRAY_SIZE(uart1_pads_dce));
}
#ifdef CONFIG_USB_EHCI_MX6 #ifdef CONFIG_USB_EHCI_MX6
int board_ehci_hcd_init(int port) int board_ehci_hcd_init(int port)
@ -665,11 +652,8 @@ int board_early_init_f(void)
{ {
imx_iomux_v3_setup_multiple_pads(pwr_intb_pads, imx_iomux_v3_setup_multiple_pads(pwr_intb_pads,
ARRAY_SIZE(pwr_intb_pads)); ARRAY_SIZE(pwr_intb_pads));
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
setup_iomux_dte_uart(); setup_iomux_dte_uart();
#else
setup_iomux_dce_uart();
#endif
return 0; return 0;
} }
@ -714,23 +698,7 @@ int board_late_init(void)
rev = get_board_revision(); rev = get_board_revision();
snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev); snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev);
env_set("board_rev", env_str); env_set("board_rev", env_str);
#endif /* CONFIG_BOARD_LATE_INIT */
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
if ((rev & 0xfff0) == 0x0100) {
char *fdt_env;
/* reconfigure the UART to DCE mode dynamically if on V1.0 HW */
setup_iomux_dce_uart();
/* if using the default device tree, use version for V1.0 HW */
fdt_env = env_get("fdt_file");
if ((fdt_env != NULL) && (strcmp(FDT_FILE, fdt_env) == 0)) {
env_set("fdt_file", FDT_FILE_V1_0);
printf("patching fdt_file to " FDT_FILE_V1_0 "\n");
}
}
#endif /* CONFIG_TDX_APALIS_IMX6_V1_0 */
#endif /* CONFIG_REVISION_TAG */
#ifdef CONFIG_CMD_USB_SDP #ifdef CONFIG_CMD_USB_SDP
if (is_boot_from_usb()) { if (is_boot_from_usb()) {
@ -1129,10 +1097,8 @@ void board_init_f(ulong dummy)
/* UART clocks enabled and gd valid - init serial console */ /* UART clocks enabled and gd valid - init serial console */
preloader_console_init(); preloader_console_init();
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
/* Make sure we use dte mode */ /* Make sure we use dte mode */
setup_dtemode_uart(); setup_dtemode_uart();
#endif
/* DDR initialization */ /* DDR initialization */
spl_dram_init(); spl_dram_init();

6
include/configs/apalis_imx6.h
View File

@ -89,12 +89,8 @@
"ramdisk_addr_r=0x12200000\0" \ "ramdisk_addr_r=0x12200000\0" \
"scriptaddr=0x17000000\0" "scriptaddr=0x17000000\0"
#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
#define FDT_FILE "imx6q-apalis-eval.dtb" #define FDT_FILE "imx6q-apalis-eval.dtb"
#define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
#else
#define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"boot_file=zImage\0" \ "boot_file=zImage\0" \