summaryrefslogtreecommitdiff
path: root/arch
Commit message (Collapse)AuthorAgeLines
...
| * mx6: ddr: pass mx6_ddr_sysinfo to calibration routinesEric Nelson2016-11-29-44/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DDR calibration routines have scattered support for bus widths other than 64-bits: -- The mmdc_do_write_level_calibration() routine assumes the presence of PHY1, and -- The mmdc_do_dqs_calibration() routine tries to determine whether one or two DDR PHYs are active by reading MDCTL. Since a caller of these routines must have a valid struct mx6_ddr_sysinfo for use in calling mx6_dram_cfg(), and the bus width is available in the "dsize" field, use this structure to inform the calibration routines which PHYs are active. This allows the use of the DDR calibration routines on CPU variants like i.MX6SL that only have a single MMDC port. Signed-off-by: Eric Nelson <eric@nelint.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * mx6: ddr: allow 32 cycles for DQS gating calibrationEric Nelson2016-11-29-0/+7
| | | | | | | | | | | | | | | | | | | | | | The DDR calibration code is only setting flag DG_CMP_CYC (DQS gating sample cycle) for the first PHY. Set the 32-cycle flag for both PHYs and clear when done so the MPDGCTRL0 output value isn't polluted with calibration artifacts. Signed-off-by: Eric Nelson <eric@nelint.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * imx: mx6: ddr: add register MPZQLP2CTL for LPDDR2Eric Nelson2016-11-29-0/+2
| | | | | | | | | | | | | | | | | | Add constants for the MPZQLP2CTL DDR register for both banks to allow setting the LPDDR2 timing values in .cfg files using a named constant instead of hex addresses as is currently done in mx6slevk and other board files. Signed-off-by: Eric Nelson <eric@nelint.com>
| * imx: make ipu's di configurableMax Krummenacher2016-11-29-1/+2
| | | | | | | | | | | | | | | | | | The ipu has two display interfaces. Make the used one a parameter in struct display_info_t instead of using unconditionally DI0. DI0 is the default setting. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Reviewed-by: Eric Nelson <eric@nelint.com>
| * ARM: mx6: add MMC2 boot device detection support in SPLMarcin Niestroj2016-11-29-1/+5
| | | | | | | | | | | | | | | | | | Check BOOT_CFG2[3:4] to determine which SD/MMC port is selected to boot from. If MMC2 is selected return BOOT_DEVICE_MMC2. In all other cases return BOOT_DEVICE_MMC1, as we do not have corresponding macro for MMC3 and MMC4. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
| * Merge branch 'master' of git://git.denx.de/u-bootStefano Babic2016-11-29-426/+2989
| |\ | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | imx: mx6ull: update the REFTOP_VBGADJ settingPeng Fan2016-11-16-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to design team, we need to set REFTOP_VBGADJ in PMU MISC0 according to the REFTOP_TRIM[2:0] fuse. the actually table is as below: '000" - set REFTOP_VBGADJ[2:0] to 3'b000 '001" - set REFTOP_VBGADJ[2:0] to 3'b001 '010" - set REFTOP_VBGADJ[2:0] to 3'b010 '011" - set REFTOP_VBGADJ[2:0] to 3'b011 '100" - set REFTOP_VBGADJ[2:0] to 3'b100 '101" - set REFTOP_VBGADJ[2:0] to 3'b101 '110" - set REFTOP_VBGADJ[2:0] to 3'b110 '111" - set REFTOP_VBGADJ[2:0] to 3'b111 Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Bai Ping <ping.bai@nxp.com>
| * | imx: mx6sx: Disable ENET clock before switching clock parentYe.Li2016-11-16-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to gate ENET clock when switching to a new clock parent, because the mux is not glitchless. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Ye.Li <ye.li@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
* | | Merge git://git.denx.de/u-boot-mpc85xxTom Rini2016-11-29-381/+545
|\ \ \
| * | | powerpc: Drop default CONFIG_MAX_CPUSYork Sun2016-11-23-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration has been moved into Kconfig for mpc85xx, and dropped for mpc86xx. Remove the default value in config.h. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: mpc86xx: Remove macro CONFIG_MAX_CPUSYork Sun2016-11-23-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This macro CONFIG_MAX_CPUS is not used for MPC86xx SoCs. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: MPC8641: Remove macro CONFIG_MPC8641York Sun2016-11-23-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_MPC8641 with ARCH_MPC8641 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: MPC8610: Remove macro CONFIG_MPC8610York Sun2016-11-23-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_MPC8610 with ARCH_MPC8610 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: mpc85xx: Move CONFIG_MAX_CPUS to KconfigYork Sun2016-11-23-43/+36
| | | | | | | | | | | | | | | | | | | | | | | | Use Kconfig to set MAX_CPUS for mpc85xx. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4080: Drop configuration for T4080York Sun2016-11-23-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | There is no T4080 target. Drop related macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4240: Remove macro CONFIG_PPC_T4240York Sun2016-11-23-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_ARCH_T4240 from Kconfig instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4160: Remove macro CONFIG_PPC_T4160York Sun2016-11-23-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_ARCH_T4160 instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4160RDB: Separate from T4240RDB in KconfigYork Sun2016-11-23-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_T4160RDB to simplify Kconfig options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4240QDS: Remove macro CONFIG_T4240QDSYork Sun2016-11-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_T4240QDS instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4160QDS: Separate from T4240QDS in KconfigYork Sun2016-11-23-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_T4160QDS to simplify Kconfig options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T2080, T2081: Remove macro CONFIG_PPC_T2080 and CONFIG_PPC_T2081York Sun2016-11-23-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_ARCH_T2080 and CONFIG_ARCH_T2081 instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T2080RDB: Rename from T208XRDB in KconfigYork Sun2016-11-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | T208XRDB only has one target T2080RDB. Use TARGET_T2080RDB in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T208XQDS: Split as T2080QDS and T2081QDSYork Sun2016-11-23-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use two separated targets in Kconfig to simplify configurations. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T104xRDB: Remove macro CONFIG_T104xRDB and T104xD4RDBYork Sun2016-11-23-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_T104xRDB is defined in T104xRDB.h, so it is always enabled for all T1040RDB, T1040D4RDB, T1042RDB, T1042D4RDB, T1042RDB_PI. CONFIG_T104XD4RDB is defined for all T1040D4RDB, T1042D4RDB. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1042D4RDB: Separate from T1042RDB in KconfigYork Sun2016-11-23-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_T1042D4RDB in Kconfig to simplify config options. Remove macro CONFIG_T1042D4RDB. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1042RDB_PI: Split from T1042RDB in KconfigYork Sun2016-11-23-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use separated TARGET_T1042RDB_PI to simplify config options. Remove macro CONFIG_T1042RDB_PI. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1042: Remove macro CONFIG_PPC_T1042York Sun2016-11-23-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_T1042 with ARCH_T1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1040D4RDB: Separate from T1040RDB in KconfigYork Sun2016-11-23-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_T1040D4RDB in Kconfig to simplify config macros. Replace CONFIG_T1040D4RDB with TARGET_T1040D4RDB and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1040: Remove macro CONFIG_PPC_T1040York Sun2016-11-23-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_T1040 with ARCH_T1040 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T104XRDB: Split to T1040RDB and T1042RDB in KconfigYork Sun2016-11-23-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Split ARCH_T104XRDB as ARCH_T1040RDB and ARCH_T1042RDB in Kconfig to simplify config options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1024: Remove macro CONFIG_PPC_T1024York Sun2016-11-23-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_T1024 with ARCH_T1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1024QDS: Rename Kconfig option to match the nameYork Sun2016-11-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rename TARGET_T102XQDS to TARGET_T1024QDS to match the name. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1023: Remove macro CONFIG_PPC_T1023York Sun2016-11-23-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_T1023 with ARCH_T1023 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T102xRDB: Split as T1023RDB and T1024RDBYork Sun2016-11-23-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The defconfig files are separated. Splitting targets in Kconfig simplifies config options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: QEMU_E500: Remove macro CONFIG_QEMU_E500York Sun2016-11-23-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_QEMU_E500 with ARCH_QEMU_E500 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: B4420: Remove macro CONFIG_PPC_B4420York Sun2016-11-23-10/+14
| | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_B4420 with ARCH_B4420 in Kconfig and clean up existing macros.
| * | | powerpc: B4860QDS: Remove macro CONFIG_B4860QDSYork Sun2016-11-23-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_B4860QDS instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: B4860: Remove macro CONFIG_PPC_B4860York Sun2016-11-23-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_B4860 with ARCH_B4860 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: B4420QDS: Split from B4860QDS in KconfigYork Sun2016-11-23-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_B4420QDS to simplify Kconfig options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P5040: Remove macro CONFIG_P5040York Sun2016-11-23-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P5040 with ARCH_P5040 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P5020: Remove macro CONFIG_PPC_P5020York Sun2016-11-23-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_P5020 with ARCH_P5020 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P4080: Remove macro CONFIG_PPC_P4080York Sun2016-11-23-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_P4080 with ARCH_P4080 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P3041: Remove macro CONFIG_PPC_P3041York Sun2016-11-23-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_P3041 with ARCH_P3041 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P2041: Remove macro CONFIG_PPC_P2041York Sun2016-11-23-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_P2041 with ARCH_P2041 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P2010: Drop configuration for P2010York Sun2016-11-23-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | P2010 is a single-core version of P2020. There is no P2010 target configured. Drop related macros. P2010 SoC is still supported. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P2020: Remove macro CONFIG_P2020York Sun2016-11-23-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P2020 with ARCH_P2020 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P1025: Remove macro CONFIG_P1025York Sun2016-11-23-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P1025 with ARCH_P1025 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P1024: Remove CONFIG_P1024York Sun2016-11-23-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P1024 with ARCH_P1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P1021: Remove macro CONFIG_P1021York Sun2016-11-23-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P1021 with ARCH_P1021 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P1020: Remove macro CONFIG_P1020York Sun2016-11-23-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P1020 with ARCH_P1020 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>