powerpc: B4860QDS: Remove macro CONFIG_B4860QDS

[u-boot] / arch / powerpc / include / asm / fsl_secure_boot.h

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index e65487cf16556984d3506c7a064e287c5da35290..d0fef32de5b5892a85c99b022cd3258165a7fdb8 100644 (file)
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -25,7 +25,8 @@
 #endif
 #define CONFIG_SYS_PBI_FLASH_WINDOW            0xcff80000
 
-#if defined(CONFIG_B4860QDS) || \
+#if defined(CONFIG_TARGET_B4860QDS) || \
+       defined(CONFIG_TARGET_B4420QDS) || \
        defined(CONFIG_T4240QDS) || \
        defined(CONFIG_T2080QDS) || \
        defined(CONFIG_T2080RDB) || \
@@ -58,11 +59,11 @@
 #define CONFIG_KEY_REVOCATION
 #endif
 
-#if defined(CONFIG_PPC_P3041)  ||      \
-       defined(CONFIG_PPC_P4080) ||    \
-       defined(CONFIG_PPC_P5020) ||    \
-       defined(CONFIG_PPC_P5040) ||    \
-       defined(CONFIG_PPC_P2041)
+#if defined(CONFIG_ARCH_P3041) ||      \
+       defined(CONFIG_ARCH_P4080) ||   \
+       defined(CONFIG_ARCH_P5020) ||   \
+       defined(CONFIG_ARCH_P5040) ||   \
+       defined(CONFIG_ARCH_P2041)
        #define CONFIG_FSL_TRUST_ARCH_v1
 #endif
 
@@ -134,7 +135,7 @@
 /* The bootscript header address is different for B4860 because the NOR
  * mapping is different on B4 due to reduced NOR size.
  */
-#if defined(CONFIG_B4860QDS)
+#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS)
 #define CONFIG_BOOTSCRIPT_HDR_ADDR     0xecc00000
 #elif defined(CONFIG_FSL_CORENET)
 #define CONFIG_BOOTSCRIPT_HDR_ADDR     0xe8e00000