Patchwork [U-Boot,2/6,v2] powerpc/SPL:Allow Parsing of LAW table in both SPL & non SPL

login
register
mail settings
Submitter Prabhakar Kushwaha
Date Oct. 25, 2013, 4:38 a.m.
Message ID <1382675916-24781-1-git-send-email-prabhakar@freescale.com>
Download mbox | patch
Permalink /patch/286075/
State Changes Requested
Delegated to: York Sun
Headers show

Comments

Prabhakar Kushwaha - Oct. 25, 2013, 4:38 a.m.
SPL does not relocates the CCSRBAR hence it is using CCSRBAR at 0xfe00_0000.
U-boot relocates CCSRBAR to 0xf_fe00_0000.

So law talbe needs to be updated again.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
---
 Based upon  git://git.denx.de/u-boot-mpc85xx.git branch next
 Changes for v2: Sending as it is

 arch/powerpc/cpu/mpc8xxx/law.c |    9 ---------
 1 file changed, 9 deletions(-)
Scott Wood - Nov. 6, 2013, 1:28 a.m.
On Fri, 2013-10-25 at 10:08 +0530, Prabhakar Kushwaha wrote:
> SPL does not relocates the CCSRBAR hence it is using CCSRBAR at 0xfe00_0000.
> U-boot relocates CCSRBAR to 0xf_fe00_0000.
> 
> So law talbe needs to be updated again.

"does not relocate CCSRBAR"
"the LAW table"

CCSR isn't mapped by a LAW, so why does it matter?

-Scott

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index a401083..d76ba22 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -244,15 +244,6 @@  void init_laws(void)
 			gd->arch.used_laws |= (1 << i);
 	}
 
-#if (defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)) || \
-	(defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD))
-	/*
-	 * in SPL boot we've already parsed the law_table and setup those LAWs
-	 * so don't do it again.
-	 */
-	return;
-#endif
-
 	for (i = 0; i < num_law_entries; i++) {
 		if (law_table[i].index == -1)
 			set_next_law(law_table[i].addr, law_table[i].size,