diff options
| author | Ye Li <ye.li@nxp.com> | 2018-03-23 01:59:21 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 15:58:24 +0800 |
| commit | 9481f3204c80b730a0cf63910e1cb104999e8dd6 (patch) | |
| tree | ec961958d3e3372b171c30b2be64b2348e8b712b /arch/arm/include/asm/arch-mx6 | |
| parent | 206c28200fab6b67fa85fd2357d3c4db26ed1212 (diff) | |
MLK-18143 mx6: Add CONFIG_MX6QP kconfig
Since i.MX6QP is a variant of i.MX6Q, have to add CONFIG_MX6QP
with CONFIG_MX6Q in the soc codes for ddr/pin/clock/plugin
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit a56c1d98d8d56a34ca1226e15fe05b75cd9b3686)
(cherry picked from commit 1fa581642ec8def3fd378b29f8d9b6527358dfe9)
(cherry picked from commit cad8787ee3a37a644e6c981e6b8c9d9748a212de)
(cherry picked from commit 14b75bbfe513e05cc099b78fe8909822e1167a51)
(cherry picked from commit 87f1a3946ec3a5ca55521c31320a799446faa23b)
Diffstat (limited to 'arch/arm/include/asm/arch-mx6')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6-ddr.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6_plugin.S | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h index dbc97b25df..b42af53e42 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h @@ -6,7 +6,7 @@ #define __ASM_ARCH_MX6_DDR_H__ #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_MX6Q +#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6QP) #include "mx6q-ddr.h" #else #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) @@ -26,7 +26,7 @@ #endif /* CONFIG_MX6UL */ #endif /* CONFIG_MX6SX */ #endif /* CONFIG_MX6DL or CONFIG_MX6S */ -#endif /* CONFIG_MX6Q */ +#endif /* CONFIG_MX6Q or CONFIG_MX6QP */ #else enum { diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h b/arch/arm/include/asm/arch-mx6/mx6-pins.h index 9a99a6b704..e8c0bec246 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6-pins.h @@ -20,7 +20,7 @@ enum { MX6_PAD_DECLARE(MX6DL_PAD_,name, pco, mc, mm, sio, si, pc), #include "mx6dl_pins.h" }; -#elif defined(CONFIG_MX6Q) +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6QP) enum { #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \ MX6_PAD_DECLARE(MX6_PAD_,name, pco, mc, mm, sio, si, pc), diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S index 7e3ce68b7e..4ad38b803b 100644 --- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S +++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S @@ -68,7 +68,7 @@ before_calling_rom___pu_irom_hwcnfg_setup: cmp r4, r3 ldrge r3, =ROM_API_TABLE_BASE_ADDR_MX6DL_TO12 ldrlt r3, =ROM_API_TABLE_BASE_ADDR_LEGACY -#elif defined(CONFIG_MX6Q) +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6QP) ldr r3, =ROM_VERSION_TO15 cmp r4, r3 ldrge r3, =ROM_API_TABLE_BASE_ADDR_MX6DQ_TO15 diff --git a/arch/arm/include/asm/arch-mx6/mx6q-ddr.h b/arch/arm/include/asm/arch-mx6/mx6q-ddr.h index c76a920202..009fbe3a71 100644 --- a/arch/arm/include/asm/arch-mx6/mx6q-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6q-ddr.h @@ -5,7 +5,7 @@ #ifndef __ASM_ARCH_MX6Q_DDR_H__ #define __ASM_ARCH_MX6Q_DDR_H__ -#ifndef CONFIG_MX6Q +#if !defined(CONFIG_MX6Q) && !defined(CONFIG_MX6QP) #error "wrong CPU" #endif |