diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-04-13 11:33:34 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-04-21 12:44:23 +0200 |
| commit | 405c97fd1dc838e98c8a5595c0a1b79aade8b440 (patch) | |
| tree | 1dcdc94c43f6d5b383cccb7ca8e74fc3d1307fd1 /board/toradex/apalis_imx6 | |
| parent | 4625ff6521694513a46cef6058cac1ea49e9dfcb (diff) | |
| download | u-boot-405c97fd1dc838e98c8a5595c0a1b79aade8b440.zip u-boot-405c97fd1dc838e98c8a5595c0a1b79aade8b440.tar.gz u-boot-405c97fd1dc838e98c8a5595c0a1b79aade8b440.tar.bz2 | |
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>
Diffstat (limited to 'board/toradex/apalis_imx6')
| -rw-r--r-- | board/toradex/apalis_imx6/apalis_imx6.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index a78d52d..5604c46 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -304,13 +304,6 @@ static void setup_dtemode_uart(void) clrbits_le32((u32 *)(UART4_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) { @@ -318,12 +311,6 @@ static void setup_iomux_dte_uart(void) imx_iomux_v3_setup_multiple_pads(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 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, ARRAY_SIZE(pwr_intb_pads)); -#ifndef CONFIG_TDX_APALIS_IMX6_V1_0 setup_iomux_dte_uart(); -#else - setup_iomux_dce_uart(); -#endif + return 0; } @@ -714,23 +698,7 @@ int board_late_init(void) rev = get_board_revision(); snprintf(env_str, ARRAY_SIZE(env_str), "%.4x", rev); env_set("board_rev", env_str); - -#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 */ +#endif /* CONFIG_BOARD_LATE_INIT */ #ifdef CONFIG_CMD_USB_SDP if (is_boot_from_usb()) { @@ -1129,10 +1097,8 @@ void board_init_f(ulong dummy) /* UART clocks enabled and gd valid - init serial console */ preloader_console_init(); -#ifndef CONFIG_TDX_APALIS_IMX6_V1_0 /* Make sure we use dte mode */ setup_dtemode_uart(); -#endif /* DDR initialization */ spl_dram_init(); |