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

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Browse Source
This commit is contained in:
Tom Rini
2017-11-09 08:11:30 -05:00
parent 021a8ae00a 9c8979cdb7
commit 3c674b7e87
32 changed files with 1490 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/Kconfig
View File

@@ -341,17 +341,6 @@ config TARGET_WORK_92105
select CPU_ARM926EJS
select SUPPORT_SPL
config TARGET_MX25PDK
bool "Support mx25pdk"
select BOARD_LATE_INIT
select CPU_ARM926EJS
select BOARD_EARLY_INIT_F
config TARGET_ZMX25
bool "Support zmx25"
select BOARD_LATE_INIT
select CPU_ARM926EJS
config TARGET_APF27
bool "Support apf27"
select CPU_ARM926EJS
@@ -599,6 +588,10 @@ config ARCH_MESON
targeted at media players and tablet computers. We currently
support the S905 (GXBaby) 64-bit SoC.
config ARCH_MX25
bool "NXP MX25"
select CPU_ARM926EJS
config ARCH_MX7ULP
bool "NXP MX7ULP"
select CPU_V7
@@ -1162,6 +1155,8 @@ source "arch/arm/mach-mvebu/Kconfig"
source "arch/arm/cpu/armv7/ls102xa/Kconfig"
source "arch/arm/mach-imx/mx2/Kconfig"
source "arch/arm/mach-imx/mx7ulp/Kconfig"
source "arch/arm/mach-imx/mx7/Kconfig"
@@ -1244,7 +1239,6 @@ source "board/freescale/ls1012aqds/Kconfig"
source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx23evk/Kconfig"
source "board/freescale/mx25pdk/Kconfig"
source "board/freescale/mx28evk/Kconfig"
source "board/freescale/mx31ads/Kconfig"
source "board/freescale/mx31pdk/Kconfig"
@@ -1270,7 +1264,6 @@ source "board/spear/spear320/Kconfig"
source "board/spear/spear600/Kconfig"
source "board/spear/x600/Kconfig"
source "board/st/stv0991/Kconfig"
source "board/syteco/zmx25/Kconfig"
source "board/tcl/sl50/Kconfig"
source "board/birdland/bav335x/Kconfig"
source "board/timll/devkit3250/Kconfig"

18
arch/arm/dts/imx6q-display5.dts Normal file
View File

@@ -0,0 +1,18 @@
/*
* Copyright 2017
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
*/
/dts-v1/;
#include "imx6q.dtsi"
/ {
model = "Liebherr (LWN) display5 i.MX6 Quad Board";
compatible = "lwn,display5", "fsl,imx6q";
};

4
arch/arm/include/asm/arch-mx5/sys_proto.h
View File

@@ -4,5 +4,9 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SYS_PROTO_IMX5_
#define __SYS_PROTO_IMX5_
#include <asm/mach-imx/sys_proto.h>
#endif /* __SYS_PROTO_IMX5_ */

13
arch/arm/include/asm/arch-mx6/iomux.h
View File

@@ -178,4 +178,17 @@
|IOMUXC_GPR13_SATA_PHY_3_MASK \
|IOMUXC_GPR13_SATA_PHY_2_MASK \
|IOMUXC_GPR13_SATA_PHY_1_MASK)
/*
* Setup RGMII voltage levels on iMX6 SoC - the
*
* IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE_RGMII - register
*
* 1P2V_IO - USB_HSIC, MIPI_HSI
* 1P5V_IO - ENET pins
*/
#define IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE_RGMII 0x020e0790
#define DDR_SEL_1P2V_IO (0x2 << 18)
#define DDR_SEL_1P5V_IO (0x3 << 18)
#endif /* __ASM_ARCH_IOMUX_H__ */

16
arch/arm/include/asm/arch-mx6/sys_proto.h
View File

@@ -5,7 +5,11 @@
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SYS_PROTO_IMX6_
#define __SYS_PROTO_IMX6_
#include <asm/mach-imx/sys_proto.h>
#include <asm/arch/iomux.h>
#define USBPHY_PWD 0x00000000
@@ -16,3 +20,15 @@
int imx6_pcie_toggle_power(void);
int imx6_pcie_toggle_reset(void);
/**
* iomuxc_set_rgmii_io_voltage - set voltage level of RGMII/USB pins
*
* @param io_vol - the voltage IO level of pins
*/
static inline void iomuxc_set_rgmii_io_voltage(int io_vol)
{
__raw_writel(io_vol, IOMUXC_SW_PAD_CTL_GRP_DDR_TYPE_RGMII);
}
#endif /* __SYS_PROTO_IMX6_ */

4
arch/arm/include/asm/arch-mx7/sys_proto.h
View File

@@ -3,8 +3,12 @@
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SYS_PROTO_IMX7_
#define __SYS_PROTO_IMX7_
#include <asm/mach-imx/sys_proto.h>
void set_wdog_reset(struct wdog_regs *wdog);
enum boot_device get_boot_device(void);
#endif /* __SYS_PROTO_IMX7_ */

30
arch/arm/mach-imx/mx2/Kconfig Normal file
View File

@@ -0,0 +1,30 @@
if ARCH_MX25
config MX25
bool
default y
select SYS_FSL_ERRATUM_ESDHC_A001
choice
prompt "MX25 board select"
optional
config TARGET_MX25PDK
bool "Support mx25pdk"
select BOARD_LATE_INIT
select CPU_ARM926EJS
select BOARD_EARLY_INIT_F
config TARGET_ZMX25
bool "Support zmx25"
select BOARD_LATE_INIT
select CPU_ARM926EJS1
endchoice
config SYS_SOC
default "mx25"
source "board/freescale/mx25pdk/Kconfig"
source "board/syteco/zmx25/Kconfig"
endif

2
arch/arm/mach-imx/mx5/Kconfig
View File

@@ -6,6 +6,7 @@ config MX5
config MX51
bool
select SYS_FSL_ERRATUM_ESDHC_A001
config MX53
bool
@@ -52,7 +53,6 @@ config TARGET_MX53SMD
config TARGET_TS4800
bool "Support TS4800"
select MX51
select SYS_FSL_ERRATUM_ESDHC_A001
config TARGET_USBARMORY
bool "Support USB armory"

7
arch/arm/mach-imx/mx6/Kconfig
View File

@@ -138,6 +138,12 @@ config TARGET_DHCOMIMX6
select DM_THERMAL
imply CMD_SPL
config TARGET_DISPLAY5
bool "LWN DISPLAY5 board"
select SUPPORT_SPL
select DM
select DM_SERIAL
config TARGET_EMBESTMX6BOARDS
bool "embestmx6boards"
select BOARD_LATE_INIT
@@ -459,6 +465,7 @@ source "board/phytec/pfla02/Kconfig"
source "board/gateworks/gw_ventana/Kconfig"
source "board/kosagi/novena/Kconfig"
source "board/samtec/vining_2000/Kconfig"
source "board/liebherr/display5/Kconfig"
source "board/liebherr/mccmon6/Kconfig"
source "board/logicpd/imx6/Kconfig"
source "board/seco/Kconfig"