driver/fsl_debug_server: Fix the DDR hide logic for LS2085a

This patch fixes the DDR hide logic for LS2085a, correcting the way
the Debug Server FW and MC FW images are placed on the top of system
DDR and how the rest of the system DDR space is made visibile to Linux.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma at freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar at freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

diff --git a/drivers/misc/fsl_debug_server.c b/drivers/misc/fsl_debug_server.c
index e080fe61323fb215aa68eab1c513b150c1b80a53..44cd9b9fd4874777dd68d0f3266bd2aba042616c 100644 (file)
--- a/drivers/misc/fsl_debug_server.c
+++ b/drivers/misc/fsl_debug_server.c
@@ -10,6 +10,7 @@
 #include <asm/system.h>
 #include <asm/arch-fsl-lsch3/immap_lsch3.h>
 
+#include <fsl-mc/fsl_mc.h>
 #include <fsl_debug_server.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -151,6 +152,10 @@ int debug_server_init(void)
                debug_server_ram_addr =
                        gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
 
+#ifdef CONFIG_FSL_MC_ENET
+       debug_server_ram_addr += mc_get_dram_block_size();
+#endif
+
        error = debug_server_parse_firmware_fit_image(&raw_image_addr,
                                                        &raw_image_size);
        if (error != 0)

diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index c5c44bcab044edc20128e48396b8b6dce4383fee..f4a050afcca9d5fe46a3cb9751965d18e1177d0b 100644 (file)
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -9,7 +9,6 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_private.h>
 #include <fsl-mc/fsl_dpmng.h>
-#include <fsl_debug_server.h>
 #include <fsl-mc/fsl_dprc.h>
 #include <fsl-mc/fsl_dpio.h>
 #include <fsl-mc/fsl_qbman_portal.h>
@@ -403,13 +402,6 @@ int mc_init(void)
                        gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
        }
 
-#ifdef CONFIG_FSL_DEBUG_SERVER
-       /*
-        * FIXME: I don't think this is right. See get_dram_size_to_hide()
-        */
-               mc_ram_addr -= debug_server_get_dram_block_size();
-#endif
-
        error = calculate_mc_private_ram_params(mc_ram_addr,
                                                mc_ram_size,
                                                &mc_ram_aligned_base_addr,