summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
| * tbs2910: Make Ethernet functional againSoeren Moch2016-11-29-0/+33
| | | | | | | | | | | | | | | | Configure the PHY to output a 125MHz clk from CLK_25M and set tx clock delay. This patch is similar to commit 4b6035da482cccda06aeb419634f99937c9fc783 ("mx6sabresd: Make Ethernet functional again"). Signed-off-by: Soeren Moch <smoch@web.de>
| * 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>
| * spl: mmc: fix switch statementMax Krummenacher2016-11-29-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | If CONFIG_SPL_LIBCOMMON_SUPPORT is not defined there is a lone case statement at the end of the switch leading to a compile error. Remove the offending case statement. | common/spl/spl_mmc.c:339:7: error: label at end of compound statement Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Marek Vasut <marex@denx.de>
| * 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-1827/+9860
| |\ | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | mx35: adjust default environment for flea3 boardHeiko Schocher2016-11-16-5/+4
| | | | | | | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Heiko Schocher <hs@denx.de>
| * | mx35: add GPIO setup on flea3 boardStefano Babic2016-11-16-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardware revision "e" of the board introduces a GPIO to reduce power consumption in stand-by mode. This must be enable (active low) at the startup for normal behaviour. Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Heiko Schocher <hs@denx.de>
| * | mx35: factorize SDRAM setup in flea3Stefano Babic2016-11-16-90/+3
| | | | | | | | | | | | | | | | | | | | | | | | Drop local function to setup SDRAM controller and use the common one for i.MX35. Signed-off-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Heiko Schocher <hs@denx.de>
| * | mx35: add DT support to flea3 boardHeiko Schocher2016-11-16-0/+28
| | | | | | | | | | | | Signed-off-by: Heiko Schocher <hs@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-1104/+1071
|\ \ \
| * | | 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: MPC8641HPCN: Remove macro CONFIG_MPC8641HPCNYork Sun2016-11-23-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_MPC8641HPCN from Kconfig instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: MPC8641: Remove macro CONFIG_MPC8641York Sun2016-11-23-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_MPC8641 with ARCH_MPC8641 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: MPC8610HPCD: Remove macro CONFIG_MPC8610HPCDYork Sun2016-11-23-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_MPC8610HPCD from Kconfig instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: MPC8610: Remove macro CONFIG_MPC8610York Sun2016-11-23-8/+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-18/+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-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | 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-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_ARCH_T4160 instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4240RDB: Remove macro CONFIG_T4240RDBYork Sun2016-11-23-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_T4240RDB instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4160RDB: Separate from T4240RDB in KconfigYork Sun2016-11-23-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_T4240QDS instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T4160QDS: Separate from T4240QDS in KconfigYork Sun2016-11-23-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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-47/+51
| | | | | | | | | | | | | | | | | | | | | | | | 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-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | 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-27/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: T1042RDB: Remove macro CONFIG_T1042RDBYork Sun2016-11-23-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_T1042RDB instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1042D4RDB: Separate from T1042RDB in KconfigYork Sun2016-11-23-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_T1042 with ARCH_T1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1040RDB: Remove macro CONFIG_T1040RDBYork Sun2016-11-23-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_T1040RDB instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: T1040D4RDB: Separate from T1040RDB in KconfigYork Sun2016-11-23-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+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-22/+24
| | | | | | | | | | | | | | | | | | | | Replace CONFIG_PPC_B4420 with ARCH_B4420 in Kconfig and clean up existing macros.
| * | | powerpc: B4860QDS: Remove macro CONFIG_B4860QDSYork Sun2016-11-23-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_B4860QDS instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: B4860: Remove macro CONFIG_PPC_B4860York Sun2016-11-23-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Use TARGET_B4420QDS to simplify Kconfig options. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P5040DS: Remove macro CONFIG_P5040DSYork Sun2016-11-23-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_P5040DS instead. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P5040: Remove macro CONFIG_P5040York Sun2016-11-23-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CONFIG_P5040 with ARCH_P5040 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
| * | | powerpc: P5020DS: Remove macro CONFIG_P5020DSYork Sun2016-11-23-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | Use CONFIG_TARGET_P5020DS instead. Signed-off-by: York Sun <york.sun@nxp.com>