[U-Boot] [PATCH 1/7][v2] powerpc/mpc85xx: Move LAW_EN define outside of config

[U-Boot] [PATCH 1/7][v2] powerpc/mpc85xx: Move LAW_EN define outside of config

[Prabhakar Kushwaha]

LAW_EN is only defined if CONFIG_SYS_CCSRBAR_DEFAULT is not equal to
CONFIG_SYS_CCSRBAR_PHYS. in SPL framework CCSRBAR is not relocated hence
both are same. This cause compilation error.

So LAW_EN define outside of configs

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
---
 Changes for v2: Sending as it is

 arch/powerpc/cpu/mpc85xx/start.S |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index dbbd8e5..67e071b 100644
--- a/arch/powerpc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
@@ -26,6 +26,8 @@
 #undef	MSR_KERNEL
 #define MSR_KERNEL ( MSR_ME )	/* Machine Check */
 
+#define LAW_EN		0x80000000
+
 #if defined(CONFIG_NAND_SPL) || \
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_INIT_MINIMAL))
 #define MINIMAL_SPL
@@ -574,7 +576,6 @@ infinite_debug_loop:
 #ifdef CONFIG_FSL_CORENET
 
 #define CCSR_LAWBARH0	(CONFIG_SYS_CCSRBAR + 0x1000)
-#define LAW_EN		0x80000000
 #define LAW_SIZE_4K	0xb
 #define CCSRBAR_LAWAR	(LAW_EN | (0x1e << 20) | LAW_SIZE_4K)
 #define CCSRAR_C	0x80000000	/* Commit */
-- 
1.7.9.5

[U-Boot] [PATCH 1/7][v2] powerpc/mpc85xx: Move LAW_EN define outside of config

[Kumar Gala]

On Mar 6, 2014, at 6:12 AM, Prabhakar Kushwaha <prabhakar@freescale.com> wrote:

> LAW_EN is only defined if CONFIG_SYS_CCSRBAR_DEFAULT is not equal to
> CONFIG_SYS_CCSRBAR_PHYS. in SPL framework CCSRBAR is not relocated hence
> both are same. This cause compilation error.
> 
> So LAW_EN define outside of configs
> 
> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
> ---
> Changes for v2: Sending as it is
> 
> arch/powerpc/cpu/mpc85xx/start.S |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

why aren?t these coming from asm/fsl_law.h?

> 
> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
> index dbbd8e5..67e071b 100644
> --- a/arch/powerpc/cpu/mpc85xx/start.S
> +++ b/arch/powerpc/cpu/mpc85xx/start.S
> @@ -26,6 +26,8 @@
> #undef	MSR_KERNEL
> #define MSR_KERNEL ( MSR_ME )	/* Machine Check */
> 
> +#define LAW_EN		0x80000000
> +
> #if defined(CONFIG_NAND_SPL) || \
> 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_INIT_MINIMAL))
> #define MINIMAL_SPL
> @@ -574,7 +576,6 @@ infinite_debug_loop:
> #ifdef CONFIG_FSL_CORENET
> 
> #define CCSR_LAWBARH0	(CONFIG_SYS_CCSRBAR + 0x1000)
> -#define LAW_EN		0x80000000
> #define LAW_SIZE_4K	0xb
> #define CCSRBAR_LAWAR	(LAW_EN | (0x1e << 20) | LAW_SIZE_4K)
> #define CCSRAR_C	0x80000000	/* Commit */
> -- 
> 1.7.9.5
> 
> 
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 1/7][v2] powerpc/mpc85xx: Move LAW_EN define outside of config

[Prabhakar Kushwaha]

Hi Kumar,

On 3/6/2014 9:21 PM, Kumar Gala wrote:
> On Mar 6, 2014, at 6:12 AM, Prabhakar Kushwaha <prabhakar@freescale.com> wrote:
>
>> LAW_EN is only defined if CONFIG_SYS_CCSRBAR_DEFAULT is not equal to
>> CONFIG_SYS_CCSRBAR_PHYS. in SPL framework CCSRBAR is not relocated hence
>> both are same. This cause compilation error.
>>
>> So LAW_EN define outside of configs
>>
>> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
>> ---
>> Changes for v2: Sending as it is
>>
>> arch/powerpc/cpu/mpc85xx/start.S |    3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
> why aren?t these coming from asm/fsl_law.h?
>

look like this file is not being include that's why LAW_EN was defined.
We are having include header files
#include <asm-offsets.h>
#include <config.h>
#include <mpc85xx.h>
#include <version.h>

#include <ppc_asm.tmpl>
#include <ppc_defs.h>

#include <asm/cache.h>
#include <asm/mmu.h>

Regards,
Prabhakar