From 66477820d415b98e6918f7712342d18426bf9696 Mon Sep 17 00:00:00 2001 From: Troy Kisky <troy.kisky@boundarydevices.com> Date: Fri, 18 Apr 2014 12:53:57 -0700 Subject: [PATCH] mtp: initial addition, Boundary Devices board mtp.h: CONFIG_IPUV3_CLK 264000000 mtp: use nitrogen6x clocks.cfg/ddr-setup.cfg mtp: add CONFIG_CMD_GPIO mtp: add usbh2 strobe/data mtp: add cmd_custom, to avoid upgrade message mtp: add imx6QP, mtp_qp_defconfig mtp: add wlmac from fuses mtp: s/mac/mac_address/ for consistency mtp: use boundary.h mtp: add 2g config option mtp: add CONFIG_SPI_FLASH_SPANSION mtp: change i2c drive strength to avoid undershoot mtp: s/PAD_CTL_DSE_90ohm/PAD_CTL_DSE_80ohm/ to fix compile error mtp: gadget mac is in ethaddr not eth1addr, because no FEC mtp: update 2G quadplus calibration based on 15 boards mtp: mtp_defconfig add CONFIG_BLOCK_CACHE mtp2g: mtp2g_defconfig add CONFIG_BLOCK_CACHE mtp2g_qp: mtp2g_qp_defconfig add CONFIG_BLOCK_CACHE mtp_qp: mtp_qp_defconfig add CONFIG_BLOCK_CACHE mtp: use common code for eth init mtp: eth.c now in common directory mtp: move misc_init_r/do_kbd to common mtp: move mmc_init/ dram_init/ overwrite_console/ common_board_init/ splash_screen_prepare/ board_cfb_skip to common mtp: use common 1066mhz_4x256mx16.cfg mtp: use common 1066mhz_4x128mx16.cfg mtp: add CONFIG_SPI_FLASH_GIGADEVICE: to defconfigs mtp: spi: fix at45db041d mtp: use common ddr scripts mtp: port to v2018.07 Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> mtp: update to v2017.01 mtp: update to v2017.03 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> --- arch/arm/mach-imx/mx6/Kconfig | 4 + board/boundary/mtp/Kconfig | 24 ++++ board/boundary/mtp/MAINTAINERS | 7 + board/boundary/mtp/Makefile | 10 ++ board/boundary/mtp/mtp.c | 249 +++++++++++++++++++++++++++++++++ board/boundary/mtp/mtp.cfg | 64 +++++++++ board/boundary/mtp/mtp2g.cfg | 63 +++++++++ board/boundary/mtp/spl.c | 112 +++++++++++++++ configs/mtp2g_defconfig | 67 +++++++++ configs/mtp2g_qp_defconfig | 67 +++++++++ configs/mtp_defconfig | 67 +++++++++ configs/mtp_qp_defconfig | 67 +++++++++ include/configs/mtp.h | 26 ++++ 13 files changed, 827 insertions(+) create mode 100644 board/boundary/mtp/Kconfig create mode 100644 board/boundary/mtp/MAINTAINERS create mode 100644 board/boundary/mtp/Makefile create mode 100644 board/boundary/mtp/mtp.c create mode 100644 board/boundary/mtp/mtp.cfg create mode 100644 board/boundary/mtp/mtp2g.cfg create mode 100644 board/boundary/mtp/spl.c create mode 100644 configs/mtp2g_defconfig create mode 100644 configs/mtp2g_qp_defconfig create mode 100644 configs/mtp_defconfig create mode 100644 configs/mtp_qp_defconfig create mode 100644 include/configs/mtp.h diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 0c82b637836..db19565f99b 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -437,6 +437,9 @@ config TARGET_MCS config TARGET_MED bool "med" +config TARGET_MTP + bool "mtp" + config TARGET_NITROGEN6X bool "nitrogen6x" imply USB_HOST_ETHER @@ -605,6 +608,7 @@ source "board/boundary/lshore/Kconfig" source "board/boundary/ltch/Kconfig" source "board/boundary/mcs/Kconfig" source "board/boundary/med/Kconfig" +source "board/boundary/mtp/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/boundary/ys/Kconfig" source "board/bticino/mamoj/Kconfig" diff --git a/board/boundary/mtp/Kconfig b/board/boundary/mtp/Kconfig new file mode 100644 index 00000000000..7dd4fccc1f8 --- /dev/null +++ b/board/boundary/mtp/Kconfig @@ -0,0 +1,24 @@ +if TARGET_MTP + +config SYS_CPU + default "armv7" + +config SYS_BOARD + default "mtp" + +config SYS_VENDOR + default "boundary" + +config SYS_SOC + default "mx6" + +config SYS_CONFIG_NAME + default "mtp" + +config ENV_WLMAC + bool + default y + +source "board/boundary/common/Kconfig" + +endif diff --git a/board/boundary/mtp/MAINTAINERS b/board/boundary/mtp/MAINTAINERS new file mode 100644 index 00000000000..26e2dac9799 --- /dev/null +++ b/board/boundary/mtp/MAINTAINERS @@ -0,0 +1,7 @@ +MTP BOARD +M: Troy Kisky <troy.kisky@boundarydevices.com> +S: Maintained +F: board/boundary/mtp/ +F: include/configs/mtp.h +F: configs/mtp_defconfig + diff --git a/board/boundary/mtp/Makefile b/board/boundary/mtp/Makefile new file mode 100644 index 00000000000..0f7a4a3e72e --- /dev/null +++ b/board/boundary/mtp/Makefile @@ -0,0 +1,10 @@ +# +# Copyright (C) 2012-2013, Guennadi Liakhovetski <lg@denx.de> +# (C) Copyright 2012-2013 Freescale Semiconductor, Inc. +# Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := mtp.o +obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/boundary/mtp/mtp.c b/board/boundary/mtp/mtp.c new file mode 100644 index 00000000000..68443dedf09 --- /dev/null +++ b/board/boundary/mtp/mtp.c @@ -0,0 +1,249 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/iomux.h> +#include <asm/arch/sys_proto.h> +#include <malloc.h> +#include <asm/arch/mx6-pins.h> +#include <linux/errno.h> +#include <asm/gpio.h> +#include <asm/mach-imx/boot_mode.h> +#include <asm/mach-imx/iomux-v3.h> +#include <asm/mach-imx/mxc_i2c.h> +#include <asm/mach-imx/spi.h> +#include <mmc.h> +#include <fsl_esdhc.h> +#include <linux/fb.h> +#include <ipu_pixfmt.h> +#include <asm/arch/crm_regs.h> +#include <asm/arch/mxc_hdmi.h> +#include <i2c.h> +#include <input.h> +#include <splash.h> +#include <usb/ehci-ci.h> +#include "../common/bd_common.h" +#include "../common/padctrl.h" + +DECLARE_GLOBAL_DATA_PTR; + +#define BUTTON_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ + PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) + +/* PAD_CTL_DSE_80ohm is 50 Ohms at 3.3V */ +#define I2C_PAD_CTRL_3P3V (PAD_CTL_PUS_100K_UP | \ + PAD_CTL_SPEED_MED | PAD_CTL_DSE_80ohm | PAD_CTL_HYS | \ + PAD_CTL_ODE | PAD_CTL_SRE_FAST) + +#define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) + +#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ + PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ + PAD_CTL_HYS | PAD_CTL_SRE_FAST) + +#define USBH2_CTRL (PAD_CTL_PUS_100K_DOWN | \ + PAD_CTL_DSE_34ohm | PAD_CTL_SPEED_HIGH | \ + PAD_CTL_HYS | PAD_CTL_SRE_FAST) + +#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ + PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ + PAD_CTL_HYS | PAD_CTL_SRE_FAST) + +static const iomux_v3_cfg_t init_pads[] = { + /* bt_rfkill */ +#define GP_BT_RFKILL_RESET IMX_GPIO_NR(6, 16) + IOMUX_PAD_CTRL(NANDF_CS3__GPIO6_IO16, WEAK_PULLDN), + + /* ECSPI1 pads */ + IOMUX_PAD_CTRL(EIM_D17__ECSPI1_MISO, SPI_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D18__ECSPI1_MOSI, SPI_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D16__ECSPI1_SCLK, SPI_PAD_CTRL), +#define GP_ECSPI1_NOR_CS IMX_GPIO_NR(3, 19) + IOMUX_PAD_CTRL(EIM_D19__GPIO3_IO19, WEAK_PULLUP), + +#define GP_TP142 IMX_GPIO_NR(1, 29) + IOMUX_PAD_CTRL(ENET_TXD1__GPIO1_IO29, WEAK_PULLUP), + + /* i2c1 rtc rv4162 */ +#define GPIRQ_RTC_RV4162 IMX_GPIO_NR(4, 9) + IOMUX_PAD_CTRL(KEY_ROW1__GPIO4_IO09, WEAK_PULLUP), + + /* PCIe */ +#define GP_PCIE_RESET IMX_GPIO_NR(2, 18) + IOMUX_PAD_CTRL(EIM_A20__GPIO2_IO18, OUTPUT_40OHM), + + /* reg_usbotg_vbus */ +#define GP_REG_USBOTG IMX_GPIO_NR(3, 22) + IOMUX_PAD_CTRL(EIM_D22__GPIO3_IO22, WEAK_PULLDN), + + /* reg_wlan_en */ +#define GP_REG_WLAN_EN IMX_GPIO_NR(6, 15) + IOMUX_PAD_CTRL(NANDF_CS2__GPIO6_IO15, WEAK_PULLDN), + + /* UART1 */ + IOMUX_PAD_CTRL(SD3_DAT7__UART1_TX_DATA, UART_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_DAT6__UART1_RX_DATA, UART_PAD_CTRL), + + /* UART2 */ + IOMUX_PAD_CTRL(EIM_D26__UART2_TX_DATA, UART_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D27__UART2_RX_DATA, UART_PAD_CTRL), + + /* UART3 for wl1271 */ + IOMUX_PAD_CTRL(EIM_D24__UART3_TX_DATA, UART_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D25__UART3_RX_DATA, UART_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D23__UART3_CTS_B, UART_PAD_CTRL), + IOMUX_PAD_CTRL(EIM_D31__UART3_RTS_B, UART_PAD_CTRL), + + /* USBH1 */ + IOMUX_PAD_CTRL(EIM_D30__USB_H1_OC, WEAK_PULLUP), + + /* USBH2 */ + IOMUX_PAD_CTRL(RGMII_TX_CTL__USB_H2_STROBE, USBH2_CTRL), + IOMUX_PAD_CTRL(RGMII_TXC__USB_H2_DATA, USBH2_CTRL), +#define GP_USBH2_HUB_RESET IMX_GPIO_NR(7, 12) + IOMUX_PAD_CTRL(GPIO_17__GPIO7_IO12, OUTPUT_40OHM), + + /* USB OTG */ + IOMUX_PAD_CTRL(GPIO_1__USB_OTG_ID, WEAK_PULLUP), + IOMUX_PAD_CTRL(KEY_COL4__USB_OTG_OC, WEAK_PULLUP), + + /* USDHC2 - TiWi wl1271 pads */ + IOMUX_PAD_CTRL(SD2_CLK__SD2_CLK, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD2_CMD__SD2_CMD, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD2_DAT0__SD2_DATA0, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD2_DAT1__SD2_DATA1, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD2_DAT2__SD2_DATA2, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD2_DAT3__SD2_DATA3, USDHC_PAD_CTRL), + + /* USDHC3 - sdcard */ + IOMUX_PAD_CTRL(SD3_CLK__SD3_CLK, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_CMD__SD3_CMD, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_DAT0__SD3_DATA0, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_DAT1__SD3_DATA1, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_DAT2__SD3_DATA2, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD3_DAT3__SD3_DATA3, USDHC_PAD_CTRL), +#define GP_USDHC3_CD IMX_GPIO_NR(7, 0) + IOMUX_PAD_CTRL(SD3_DAT5__GPIO7_IO00, WEAK_PULLUP), + + /* USDHC4 - emmc */ + IOMUX_PAD_CTRL(SD4_CLK__SD4_CLK, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_CMD__SD4_CMD, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT0__SD4_DATA0, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT1__SD4_DATA1, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT2__SD4_DATA2, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT3__SD4_DATA3, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT4__SD4_DATA4, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT5__SD4_DATA5, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT6__SD4_DATA6, USDHC_PAD_CTRL), + IOMUX_PAD_CTRL(SD4_DAT7__SD4_DATA7, USDHC_PAD_CTRL), +#define GP_EMMC_RESET IMX_GPIO_NR(6, 11) + IOMUX_PAD_CTRL(NANDF_CS0__GPIO6_IO11, OUTPUT_40OHM), /* eMMC reset */ + + /* wl1271 */ +#define GPIRQ_WL1271_WL IMX_GPIO_NR(6, 14) + IOMUX_PAD_CTRL(NANDF_CS1__GPIO6_IO14, WEAK_PULLDN), +}; + +static const struct i2c_pads_info i2c_pads[] = { + /* I2C1, SGTL5000 */ + I2C_PADS_INFO_ENTRY(I2C1, EIM_D21, 3, 21, EIM_D28, 3, 28, I2C_PAD_CTRL_3P3V), + /* I2C2 Camera, MIPI */ + I2C_PADS_INFO_ENTRY(I2C2, KEY_COL3, 4, 12, KEY_ROW3, 4, 13, I2C_PAD_CTRL_3P3V), + /* I2C3, J15 - RGB connector */ + I2C_PADS_INFO_ENTRY(I2C3, GPIO_5, 1, 05, GPIO_16, 7, 11, I2C_PAD_CTRL_3P3V), +}; +#define I2C_BUS_CNT 3 + +#ifdef CONFIG_USB_EHCI_MX6 +int board_ehci_hcd_init(int port) +{ + if (port != 2) + return 0; + /* Reset USB hub */ + gpio_direction_output(GP_USBH2_HUB_RESET, 0); + mdelay(2); + gpio_set_value(GP_USBH2_HUB_RESET, 1); + return 0; +} + +int board_ehci_power(int port, int on) +{ + if (port) + return 0; + gpio_set_value(GP_REG_USBOTG, on); + return 0; +} + +#endif + +#ifdef CONFIG_FSL_ESDHC +struct fsl_esdhc_cfg board_usdhc_cfg[] = { + {.esdhc_base = USDHC3_BASE_ADDR, .bus_width = 4, + .gp_cd = GP_USDHC3_CD}, + {.esdhc_base = USDHC4_BASE_ADDR, .bus_width = 8, + .gp_reset = GP_EMMC_RESET}, +}; +#endif + +int board_spi_cs_gpio(unsigned bus, unsigned cs) +{ + return (bus == 0 && cs == 0) ? GP_ECSPI1_NOR_CS : -1; +} + +static const unsigned short gpios_out_low[] = { + GP_REG_USBOTG, + GP_USBH2_HUB_RESET, + /* Disable wl1271 */ + GP_REG_WLAN_EN, + GP_BT_RFKILL_RESET, /* disable bluetooth */ + GP_EMMC_RESET, /* hold in reset */ + GP_PCIE_RESET, +}; + +static const unsigned short gpios_out_high[] = { + GP_ECSPI1_NOR_CS, /* SS1 of spi nor */ +}; + +static const unsigned short gpios_in[] = { + GP_USDHC3_CD, + GPIRQ_WL1271_WL, + GP_TP142, +}; + +int board_early_init_f(void) +{ + set_gpios_in(gpios_in, ARRAY_SIZE(gpios_in)); + set_gpios(gpios_out_high, ARRAY_SIZE(gpios_out_high), 1); + set_gpios(gpios_out_low, ARRAY_SIZE(gpios_out_low), 0); + SETUP_IOMUX_PADS(init_pads); + return 0; +} + +int board_init(void) +{ + common_board_init(i2c_pads, I2C_BUS_CNT, IOMUXC_GPR1_OTG_ID_GPIO1, + NULL, 0, 0); + return 0; +} + +const struct button_key board_buttons[] = { + {"tp142", GP_TP142, 't', 1}, + {NULL, 0, 0, 0}, +}; + +#ifdef CONFIG_CMD_BMODE +const struct boot_mode board_boot_modes[] = { + /* 4 bit bus width */ + {"mmc0", MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)}, + {"mmc1", MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)}, + {NULL, 0}, +}; +#endif diff --git a/board/boundary/mtp/mtp.cfg b/board/boundary/mtp/mtp.cfg new file mode 100644 index 00000000000..45436cd0b6a --- /dev/null +++ b/board/boundary/mtp/mtp.cfg @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2013 Boundary Devices + * + * SPDX-License-Identifier: GPL-2.0+ + * + * 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 + */ + +/* image version */ +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi, sd (the board has no nand neither onenand) + */ +BOOT_FROM spi + +#define __ASSEMBLY__ +#include <config.h> +#include "asm/arch/mx6-ddr.h" +#include "asm/arch/iomux.h" +#include "asm/arch/crm_regs.h" + +#ifdef CONFIG_MX6QP +/* 1 board sample */ +#define MX6_MMDC_P0_MPDGCTRL0_VAL 0x430c0320 +#define MX6_MMDC_P0_MPDGCTRL1_VAL 0x0300026c +#define MX6_MMDC_P1_MPDGCTRL0_VAL 0x43140324 +#define MX6_MMDC_P1_MPDGCTRL1_VAL 0x030c0260 +#define MX6_MMDC_P0_MPRDDLCTL_VAL 0x42343c3e +#define MX6_MMDC_P1_MPRDDLCTL_VAL 0x423e364a +#define MX6_MMDC_P0_MPWRDLCTL_VAL 0x36343838 +#define MX6_MMDC_P1_MPWRDLCTL_VAL 0x3e30403a +#define MX6_MMDC_P0_MPWLDECTRL0_VAL 0x00140014 +#define MX6_MMDC_P0_MPWLDECTRL1_VAL 0x001d0016 +#define MX6_MMDC_P1_MPWLDECTRL0_VAL 0x000f001f +#define MX6_MMDC_P1_MPWLDECTRL1_VAL 0x00080017 +#define WALAT 0 +#else +/* NC YET */ +#define MX6_MMDC_P0_MPDGCTRL0_VAL 0x42720306 +#define MX6_MMDC_P0_MPDGCTRL1_VAL 0x026F0266 +#define MX6_MMDC_P1_MPDGCTRL0_VAL 0x4273030A +#define MX6_MMDC_P1_MPDGCTRL1_VAL 0x02740240 +#define MX6_MMDC_P0_MPRDDLCTL_VAL 0x45393B3E +#define MX6_MMDC_P1_MPRDDLCTL_VAL 0x403A3747 +#define MX6_MMDC_P0_MPWRDLCTL_VAL 0x40434541 +#define MX6_MMDC_P1_MPWRDLCTL_VAL 0x473E4A3B +#define MX6_MMDC_P0_MPWLDECTRL0_VAL 0x0011000E +#define MX6_MMDC_P0_MPWLDECTRL1_VAL 0x000E001B +#define MX6_MMDC_P1_MPWLDECTRL0_VAL 0x00190015 +#define MX6_MMDC_P1_MPWLDECTRL1_VAL 0x00070018 +#define WALAT 0 +#endif + +#include "../common/mx6/ddr-setup.cfg" +#define RANK 0 +#define BUS_WIDTH 64 +/* H5TQ2G63FFR-H9C */ +#include "../common/mx6/1066mhz_128mx16.cfg" +#include "../common/mx6/clocks.cfg" diff --git a/board/boundary/mtp/mtp2g.cfg b/board/boundary/mtp/mtp2g.cfg new file mode 100644 index 00000000000..641f90b2df8 --- /dev/null +++ b/board/boundary/mtp/mtp2g.cfg @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013 Boundary Devices + * + * SPDX-License-Identifier: GPL-2.0+ + * + * 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 + */ + +/* image version */ +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi, sd (the board has no nand neither onenand) + */ +BOOT_FROM spi + +#define __ASSEMBLY__ +#include <config.h> +#include "asm/arch/mx6-ddr.h" +#include "asm/arch/iomux.h" +#include "asm/arch/crm_regs.h" + +#ifdef CONFIG_MX6QP +#define MX6_MMDC_P0_MPDGCTRL0_VAL 0x43120327 +#define MX6_MMDC_P0_MPDGCTRL1_VAL 0x030f0307 +#define MX6_MMDC_P1_MPDGCTRL0_VAL 0x431b032c +#define MX6_MMDC_P1_MPDGCTRL1_VAL 0x0312025e +#define MX6_MMDC_P0_MPRDDLCTL_VAL 0x4434383b +#define MX6_MMDC_P1_MPRDDLCTL_VAL 0x3e363345 +#define MX6_MMDC_P0_MPWRDLCTL_VAL 0x37373c38 +#define MX6_MMDC_P1_MPWRDLCTL_VAL 0x4331453d +#define MX6_MMDC_P0_MPWLDECTRL0_VAL 0x00130013 +#define MX6_MMDC_P0_MPWLDECTRL1_VAL 0x001c0015 +#define MX6_MMDC_P1_MPWLDECTRL0_VAL 0x000f0021 +#define MX6_MMDC_P1_MPWLDECTRL1_VAL 0x000a0017 +#define WALAT 1 +#else +/* NC YET */ +#define MX6_MMDC_P0_MPDGCTRL0_VAL 0x42740304 +#define MX6_MMDC_P0_MPDGCTRL1_VAL 0x026e0265 +#define MX6_MMDC_P1_MPDGCTRL0_VAL 0x02750306 +#define MX6_MMDC_P1_MPDGCTRL1_VAL 0x02720244 +#define MX6_MMDC_P0_MPRDDLCTL_VAL 0x463d4041 +#define MX6_MMDC_P1_MPRDDLCTL_VAL 0x42413c47 +#define MX6_MMDC_P0_MPWRDLCTL_VAL 0x37414441 +#define MX6_MMDC_P1_MPWRDLCTL_VAL 0x4633473b +#define MX6_MMDC_P0_MPWLDECTRL0_VAL 0x0025001f +#define MX6_MMDC_P0_MPWLDECTRL1_VAL 0x00290027 +#define MX6_MMDC_P1_MPWLDECTRL0_VAL 0x001f002b +#define MX6_MMDC_P1_MPWLDECTRL1_VAL 0x000f0029 +#define WALAT 1 +#endif + +#include "../common/mx6/ddr-setup.cfg" +#define RANK 0 +#define BUS_WIDTH 64 +/* D2516EC4BXGGB-U */ +#include "../common/mx6/1066mhz_256mx16.cfg" +#include "../common/mx6/clocks.cfg" diff --git a/board/boundary/mtp/spl.c b/board/boundary/mtp/spl.c new file mode 100644 index 00000000000..f95099671be --- /dev/null +++ b/board/boundary/mtp/spl.c @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/clock.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/iomux.h> +#include <asm/arch/sys_proto.h> +#include <malloc.h> +#include <asm/arch/mx6-pins.h> +#include <linux/errno.h> +#include <asm/gpio.h> +#include <asm/mach-imx/iomux-v3.h> +#include <asm/mach-imx/mxc_i2c.h> +#include <asm/mach-imx/boot_mode.h> +#include <mmc.h> +#include <fsl_esdhc.h> +#include <linux/fb.h> +#include <ipu_pixfmt.h> +#include <asm/arch/crm_regs.h> +#include <asm/arch/mxc_hdmi.h> +#include <asm/arch/mx6-ddr.h> +#include <asm/mach-imx/boot_mode.h> + +#include <i2c.h> +#include <spl.h> + +#if 0 +void board_init_f(ulong dummy) +{ +#if 0 + arch_cpu_init(); + board_early_init_f(); + timer_init(); + preloader_console_init(); + + print_cpuinfo(); + board_init_r(NULL, 0); +#endif +} +#endif + +void spl_board_init(void) +{ +#if 0 + int i; + u32 const *regs ; + int num_regs; + unsigned char mac_address[6]; + imx_get_mac_from_fuse(0,mac_address); + printf("ethaddr: %pM\n", mac_address); + + if (is_cpu_type(MXC_CPU_MX6Q)) { +#if 1 + regs = mx6q_1g; + num_regs = ARRAY_SIZE(mx6q_1g); +#else + regs = mx6q_2g; + num_regs = ARRAY_SIZE(mx6q_2g); +#endif + } else { +#if CONFIG_DDR_MB == 512 + regs = mx6dl_512m; + num_regs = ARRAY_SIZE(mx6dl_512m); +printf("Configuring for 512MiB narrow memory bus\n"); +#elif CONFIG_DDR_MB == 1024 + regs = mx6dl_1gn; + num_regs = ARRAY_SIZE(mx6dl_1gn); +printf("Configuring for 1GiB narrow memory bus\n"); +#elif CONFIG_DDR_MB == 2048 + regs = mx6dl_2g; + num_regs = ARRAY_SIZE(mx6dl_2g); +printf("Configuring for 2GiB wide memory bus\n"); +#endif + } + for (i=0; i < num_regs; i+=2) { + writel(regs[i+1],regs[i]); + } + dram_init(); +#endif + printf("%s\n", __func__); +} + +u32 spl_boot_device(void) +{ + printf("%s\n", __func__); +#if 0 + unsigned reg; + struct src *psrc = (struct src *)SRC_BASE_ADDR; + printf("%s: sbmr1 == 0x%08x\n", __func__, psrc->sbmr1); + printf("%s: gpr9 == 0x%08x\n", __func__, psrc->gpr9); + printf("%s: gpr10 == 0x%08x\n", __func__, psrc->gpr10); + return BOOT_DEVICE_USB; +#endif +#if 1 + return BOOT_DEVICE_SPI; +#endif +} + +#if 0 +void spl_usb_load_image(void) +{ + boot_mode_apply(MAKE_CFGVAL(0x01, 0x00, 0x00, 0x00)); + reset_cpu(0); +} + +#endif diff --git a/configs/mtp2g_defconfig b/configs/mtp2g_defconfig new file mode 100644 index 00000000000..26cbad75a26 --- /dev/null +++ b/configs/mtp2g_defconfig @@ -0,0 +1,67 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TARGET_MTP=y +CONFIG_FEC_MAC_FUSE=y +CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/mtp/mtp2g.cfg,MX6Q,DDR_MB=2048,DEFCONFIG=\"mtp2g\"" +CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y +CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +# CONFIG_RANDOM_UUID is not set +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +CONFIG_FASTBOOT_BUF_SIZE=0x26000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_SST=y +CONFIG_NETDEVICES=y +CONFIG_SPI=y +CONFIG_MXC_SPI=y +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Boundary" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_OF_LIBFDT=y diff --git a/configs/mtp2g_qp_defconfig b/configs/mtp2g_qp_defconfig new file mode 100644 index 00000000000..b5c51c1cfca --- /dev/null +++ b/configs/mtp2g_qp_defconfig @@ -0,0 +1,67 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TARGET_MTP=y +CONFIG_FEC_MAC_FUSE=y +CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/mtp/mtp2g.cfg,MX6Q,MX6QP,DDR_MB=2048,DEFCONFIG=\"mtp2g_qp\"" +CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y +CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +# CONFIG_RANDOM_UUID is not set +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +CONFIG_FASTBOOT_BUF_SIZE=0x26000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_SST=y +CONFIG_NETDEVICES=y +CONFIG_SPI=y +CONFIG_MXC_SPI=y +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Boundary" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_OF_LIBFDT=y diff --git a/configs/mtp_defconfig b/configs/mtp_defconfig new file mode 100644 index 00000000000..1dee06b87b9 --- /dev/null +++ b/configs/mtp_defconfig @@ -0,0 +1,67 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TARGET_MTP=y +CONFIG_FEC_MAC_FUSE=y +CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/mtp/mtp.cfg,MX6Q,DDR_MB=1024,DEFCONFIG=\"mtp\"" +CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y +CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +# CONFIG_RANDOM_UUID is not set +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +CONFIG_FASTBOOT_BUF_SIZE=0x26000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_SST=y +CONFIG_NETDEVICES=y +CONFIG_SPI=y +CONFIG_MXC_SPI=y +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Boundary" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_OF_LIBFDT=y diff --git a/configs/mtp_qp_defconfig b/configs/mtp_qp_defconfig new file mode 100644 index 00000000000..da2c3e02244 --- /dev/null +++ b/configs/mtp_qp_defconfig @@ -0,0 +1,67 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x17800000 +CONFIG_TARGET_MTP=y +CONFIG_FEC_MAC_FUSE=y +CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/mtp/mtp.cfg,MX6Q,MX6QP,DDR_MB=1024,DEFCONFIG=\"mtp_qp\"" +CONFIG_BOOTDELAY=3 +CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_MEMTEST=y +CONFIG_SYS_ALT_MEMTEST=y +CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +# CONFIG_RANDOM_UUID is not set +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x12000000 +CONFIG_FASTBOOT_BUF_SIZE=0x26000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_SST=y +CONFIG_NETDEVICES=y +CONFIG_SPI=y +CONFIG_MXC_SPI=y +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_KEYBOARD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Boundary" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y +CONFIG_USB_ETH_CDC=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_OF_LIBFDT=y diff --git a/include/configs/mtp.h b/include/configs/mtp.h new file mode 100644 index 00000000000..7a14294c0d2 --- /dev/null +++ b/include/configs/mtp.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. + * + * Configuration settings for the Boundary Devices mtp + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include "mx6_common.h" + +#define CONFIG_MACH_TYPE 3779 + +#define CONFIG_CONSOLE_MUX + +#define CONFIG_SYS_FSL_USDHC_NUM 2 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define BD_I2C_MASK 7 + +#include "boundary.h" +#define CONFIG_EXTRA_ENV_SETTINGS BD_BOUNDARY_ENV_SETTINGS \ + "cmd_custom= \0" \ + +#endif /* __CONFIG_H */ -- GitLab