diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
| commit | 98f3ee09d096c6c1bc49e08d805f6354dffb0e59 (patch) | |
| tree | b02cd94de7fc93381d8ce7d07481ff9952986218 /arch/arm/include/asm/mach-imx/sys_proto.h | |
| parent | 9de3126e80cdac7ee15b6671065a952184533dda (diff) | |
| parent | 4516b535bf16db4231ea27bb95197d869f86893b (diff) | |
Merge tag 'u-boot-imx-20200918' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
----------------------------------------------------------------
Fixes for 2020.10
-----------------
- Toradex boards
- mx6qsabrelite: fix env offset
- esdhc_imx: waiting for clock instead of sleep
- dyn RAM calibration for entry point i.MX6
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/728274602
Diffstat (limited to 'arch/arm/include/asm/mach-imx/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 15d1cba8e7..5f0c1ae218 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -67,13 +67,10 @@ struct bd_info; #define is_imx8mndl() (is_cpu_type(MXC_CPU_IMX8MNDL)) #define is_imx8mnsl() (is_cpu_type(MXC_CPU_IMX8MNSL)) #define is_imx8mp() (is_cpu_type(MXC_CPU_IMX8MP) || is_cpu_type(MXC_CPU_IMX8MPD) || \ - is_cpu_type(MXC_CPU_IMX8MPL) || is_cpu_type(MXC_CPU_IMX8MP7) || \ - is_cpu_type(MXC_CPU_IMX8MP6) || is_cpu_type(MXC_CPU_IMX8MP5)) + is_cpu_type(MXC_CPU_IMX8MPL) || is_cpu_type(MXC_CPU_IMX8MP6)) #define is_imx8mpd() (is_cpu_type(MXC_CPU_IMX8MPD)) #define is_imx8mpl() (is_cpu_type(MXC_CPU_IMX8MPL)) -#define is_imx8mp7() (is_cpu_type(MXC_CPU_IMX8MP7)) #define is_imx8mp6() (is_cpu_type(MXC_CPU_IMX8MP6)) -#define is_imx8mp5() (is_cpu_type(MXC_CPU_IMX8MP5)) #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP)) |