Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / arm / mach-uniphier / dram_init.c

diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
index 6eb8d26504243d5b4e31767df65356d1fb02064d..22136855fa1a4ba04fdca5884b3978327992486b 100644 (file)
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -15,9 +15,6 @@
 #include "sg-regs.h"
 #include "soc-info.h"
 
-#define pr_warn(fmt, args...)  printf(fmt, ##args)
-#define pr_err(fmt, args...)   printf(fmt, ##args)
-
 DECLARE_GLOBAL_DATA_PTR;
 
 struct uniphier_memif_data {
@@ -27,15 +24,6 @@ struct uniphier_memif_data {
 };
 
 static const struct uniphier_memif_data uniphier_memif_data[] = {
-       {
-               .soc_id = UNIPHIER_SLD3_ID,
-               .sparse_ch1_base = 0xc0000000,
-               /*
-                * In fact, SLD3 has DRAM ch2, but the memory regions for ch1
-                * and ch2 overlap, and host cannot get access to them at the
-                * same time.  Hide the ch2 from U-Boot.
-                */
-       },
        {
                .soc_id = UNIPHIER_LD4_ID,
                .sparse_ch1_base = 0xc0000000,