projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v2021.01-rc5' into next
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
armv8
/
fsl-layerscape
/
fdt.c
diff --git
a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
index
3a04dce
..
7f29aa4
100644
(file)
--- a/
arch/arm/cpu/armv8/fsl-layerscape/fdt.c
+++ b/
arch/arm/cpu/armv8/fsl-layerscape/fdt.c
@@
-26,7
+26,7
@@
#endif
#include <fsl_sec.h>
#include <asm/arch-fsl-layerscape/soc.h>
#endif
#include <fsl_sec.h>
#include <asm/arch-fsl-layerscape/soc.h>
-#if
def CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#if
CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
#include <asm/armv8/sec_firmware.h>
#endif
#include <asm/arch/speed.h>
#include <asm/armv8/sec_firmware.h>
#endif
#include <asm/arch/speed.h>
@@
-81,7
+81,7
@@
void ft_fixup_cpu(void *blob)
"device_type", "cpu", 4);
}
"device_type", "cpu", 4);
}
-#if
defined(CONFIG_
ARMV8_SEC_FIRMWARE_SUPPORT) && \
+#if
CONFIG_IS_ENABLED(
ARMV8_SEC_FIRMWARE_SUPPORT) && \
defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
int node;
u32 psci_ver;
defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
int node;
u32 psci_ver;
@@
-383,7
+383,7
@@
static void fdt_fixup_msi(void *blob)
}
#endif
}
#endif
-#if
def CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#if
CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
/* Remove JR node used by SEC firmware */
void fdt_fixup_remove_jr(void *blob)
{
/* Remove JR node used by SEC firmware */
void fdt_fixup_remove_jr(void *blob)
{
@@
-490,7
+490,7
@@
void ft_cpu_setup(void *blob, struct bd_info *bd)
else {
ccsr_sec_t __iomem *sec;
else {
ccsr_sec_t __iomem *sec;
-#if
def CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#if
CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
fdt_fixup_remove_jr(blob);
fdt_fixup_kaslr(blob);
#endif
fdt_fixup_remove_jr(blob);
fdt_fixup_kaslr(blob);
#endif