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/arch-imx/cpu.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/arch-imx/cpu.h')
-rw-r--r-- | arch/arm/include/asm/arch-imx/cpu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index 75ff991248..f37fe21446 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -41,9 +41,7 @@ #define MXC_CPU_IMX8MNDL 0x8f /* dummy ID */ #define MXC_CPU_IMX8MNSL 0x181 /* dummy ID */ #define MXC_CPU_IMX8MP 0x182/* dummy ID */ -#define MXC_CPU_IMX8MP7 0x183 /* dummy ID */ #define MXC_CPU_IMX8MP6 0x184 /* dummy ID */ -#define MXC_CPU_IMX8MP5 0x185 /* dummy ID */ #define MXC_CPU_IMX8MPL 0x186 /* dummy ID */ #define MXC_CPU_IMX8MPD 0x187 /* dummy ID */ #define MXC_CPU_IMX8QXP_A0 0x90 /* dummy ID */ |