common: Drop asm/global_data.h from common header

[u-boot.git] / arch / powerpc / cpu / mpc8xxx / law.c

diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index bd79297f0f7a562c28a83b7aeb8036f1f130c29a..cf03f4101906a28a894b7bc9b0bbd4b057e77d29 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -1,13 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, [email protected].
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <asm/bitops.h>
+#include <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/fsl_law.h>
 #include <asm/io.h>
@@ -260,7 +261,7 @@ void init_laws(void)
 #error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes
 #endif
 
-#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_E500) && \
+#if defined(CONFIG_NXP_ESBC) && defined(CONFIG_E500) && \
                                                !defined(CONFIG_E500MC)
        /* ISBC (Boot ROM) creates a LAW 0 entry for non PBL platforms,
         * which is not disabled before transferring the control to uboot.
@@ -269,7 +270,7 @@ void init_laws(void)
        disable_law(0);
 #endif
 
-#if !defined(CONFIG_SECURE_BOOT)
+#if !defined(CONFIG_NXP_ESBC)
        /*
         * if any non DDR LAWs has been created earlier, remove them before
         * LAW table is parsed.