* [U-Boot] [PATCH] ARMv7: LS102xA: Move two macros from header files to Kconfig
@ 2016-09-20 4:59 macro.wave.z at gmail.com
2016-09-20 17:31 ` york sun
0 siblings, 1 reply; 3+ messages in thread
From: macro.wave.z at gmail.com @ 2016-09-20 4:59 UTC (permalink / raw)
To: u-boot
From: Hongbo Zhang <hongbo.zhang@nxp.com>
ARMV7_PSCI depends on ARMV7_NONSEC && ARCH_SUPPORT_PSCI, and ARMV7_NONSEC
depends on CPU_V7_HAS_NONSEC, LS102XA didn't enable CPU_V7_HAS_NONSEC, but
defined ARMV7_NONSEC in a internal header file, this cannot be recognized by
Kconfig, so ARMV7_PSCI isn't defined at last.
This patch selects CPU_V7_HAS_NONSEC in Kconfig, and remove ARMV7_NONSEC in
header file, and meanwhile selects CPU_V7_HAS_VIRT in Kconfig and remove
CONFIG_ARMV7_VIRT in header file too.
Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com>
---
arch/arm/Kconfig | 4 ++++
include/configs/ls1021aqds.h | 2 --
include/configs/ls1021atwr.h | 2 --
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1560bcc..7fcb1cb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -818,12 +818,16 @@ config TARGET_LS1021AQDS
select CPU_V7
select SUPPORT_SPL
select ARCH_SUPPORT_PSCI
+ select CPU_V7_HAS_NONSEC
+ select CPU_V7_HAS_VIRT
config TARGET_LS1021ATWR
bool "Support ls1021atwr"
select CPU_V7
select SUPPORT_SPL
select ARCH_SUPPORT_PSCI
+ select CPU_V7_HAS_NONSEC
+ select CPU_V7_HAS_VIRT
config TARGET_LS1043AQDS
bool "Support ls1043aqds"
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 5aaecc7..7b608c1 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -563,8 +563,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_CMDLINE_TAG
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_ARMV7_NONSEC
-#define CONFIG_ARMV7_VIRT
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_LAYERSCAPE_NS_ACCESS
#define CONFIG_SMP_PEN_ADDR 0x01ee0200
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index ef238a4..d946224 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -425,8 +425,6 @@
#define CONFIG_CMDLINE_TAG
#define CONFIG_CMDLINE_EDITING
-#define CONFIG_ARMV7_NONSEC
-#define CONFIG_ARMV7_VIRT
#define CONFIG_PEN_ADDR_BIG_ENDIAN
#define CONFIG_LAYERSCAPE_NS_ACCESS
#define CONFIG_SMP_PEN_ADDR 0x01ee0200
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARMv7: LS102xA: Move two macros from header files to Kconfig
2016-09-20 4:59 [U-Boot] [PATCH] ARMv7: LS102xA: Move two macros from header files to Kconfig macro.wave.z at gmail.com
@ 2016-09-20 17:31 ` york sun
2016-09-21 10:32 ` Hongbo Zhang
0 siblings, 1 reply; 3+ messages in thread
From: york sun @ 2016-09-20 17:31 UTC (permalink / raw)
To: u-boot
On 09/19/2016 09:59 PM, macro.wave.z at gmail.com wrote:
> From: Hongbo Zhang <hongbo.zhang@nxp.com>
>
> ARMV7_PSCI depends on ARMV7_NONSEC && ARCH_SUPPORT_PSCI, and ARMV7_NONSEC
> depends on CPU_V7_HAS_NONSEC, LS102XA didn't enable CPU_V7_HAS_NONSEC, but
> defined ARMV7_NONSEC in a internal header file, this cannot be recognized by
> Kconfig, so ARMV7_PSCI isn't defined at last.
> This patch selects CPU_V7_HAS_NONSEC in Kconfig, and remove ARMV7_NONSEC in
> header file, and meanwhile selects CPU_V7_HAS_VIRT in Kconfig and remove
> CONFIG_ARMV7_VIRT in header file too.
Detail explanation in commit message helps us to understand why the
change. But for this case, it may be too verbose. I would say following
commits xxxxxx and xxxxxx, these two config options are moved to
Kconfig, for correctly select ARMV7_PSCI.
York
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARMv7: LS102xA: Move two macros from header files to Kconfig
2016-09-20 17:31 ` york sun
@ 2016-09-21 10:32 ` Hongbo Zhang
0 siblings, 0 replies; 3+ messages in thread
From: Hongbo Zhang @ 2016-09-21 10:32 UTC (permalink / raw)
To: u-boot
On Wed, Sep 21, 2016 at 1:31 AM, york sun <york.sun@nxp.com> wrote:
> On 09/19/2016 09:59 PM, macro.wave.z at gmail.com wrote:
>> From: Hongbo Zhang <hongbo.zhang@nxp.com>
>>
>> ARMV7_PSCI depends on ARMV7_NONSEC && ARCH_SUPPORT_PSCI, and ARMV7_NONSEC
>> depends on CPU_V7_HAS_NONSEC, LS102XA didn't enable CPU_V7_HAS_NONSEC, but
>> defined ARMV7_NONSEC in a internal header file, this cannot be recognized by
>> Kconfig, so ARMV7_PSCI isn't defined at last.
>> This patch selects CPU_V7_HAS_NONSEC in Kconfig, and remove ARMV7_NONSEC in
>> header file, and meanwhile selects CPU_V7_HAS_VIRT in Kconfig and remove
>> CONFIG_ARMV7_VIRT in header file too.
>
> Detail explanation in commit message helps us to understand why the
> change. But for this case, it may be too verbose. I would say following
> commits xxxxxx and xxxxxx, these two config options are moved to
> Kconfig, for correctly select ARMV7_PSCI.
>
Thanks.
I've sent a v2 with commit comments updated.
> York
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-21 10:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-20 4:59 [U-Boot] [PATCH] ARMv7: LS102xA: Move two macros from header files to Kconfig macro.wave.z at gmail.com
2016-09-20 17:31 ` york sun
2016-09-21 10:32 ` Hongbo Zhang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.