Re: [U-Boot] [PATCH v2 1/7] mpc512x: make MEM IO Control configuration a board config option

2010-03-21 Thread Wolfgang Denk 
Dear Anatolij Gustschin,

In message 1268755808-24931-2-git-send-email-ag...@denx.de you wrote:
 Signed-off-by: Anatolij Gustschin ag...@denx.de
 ---
 No changes since v1.
 
  cpu/mpc512x/fixed_sdram.c|2 +-
  include/asm-ppc/immap_512x.h |4 
  include/configs/aria.h   |2 ++
  include/configs/mecp5123.h   |2 ++
  include/configs/mpc5121ads.h |2 ++
  5 files changed, 7 insertions(+), 5 deletions(-)

Applied to u-boot-mpc5xxx repository. Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
Death. Destruction. Disease. Horror. That's what war  is  all  about.
That's what makes it a thing to be avoided.
-- Kirk, A Taste of Armageddon, stardate 3193.0
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 1/7] mpc512x: make MEM IO Control configuration a board config option

2010-03-16 Thread Anatolij Gustschin 
Signed-off-by: Anatolij Gustschin ag...@denx.de
---
No changes since v1.

 cpu/mpc512x/fixed_sdram.c|2 +-
 include/asm-ppc/immap_512x.h |4 
 include/configs/aria.h   |2 ++
 include/configs/mecp5123.h   |2 ++
 include/configs/mpc5121ads.h |2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cpu/mpc512x/fixed_sdram.c b/cpu/mpc512x/fixed_sdram.c
index 442b5fc..72d524c 100644
--- a/cpu/mpc512x/fixed_sdram.c
+++ b/cpu/mpc512x/fixed_sdram.c
@@ -91,7 +91,7 @@ long int fixed_sdram(ddr512x_config_t *mddrc_config,
}
 
/* Initialize IO Control */
-   out_be32(im-io_ctrl.io_control_mem, IOCTRL_MUX_DDR);
+   out_be32(im-io_ctrl.io_control_mem, CONFIG_SYS_IOCTRL_MUX_DDR);
 
/* Initialize DDR Local Window */
out_be32(im-sysconf.ddrlaw.bar, CONFIG_SYS_DDR_BASE  0xF000);
diff --git a/include/asm-ppc/immap_512x.h b/include/asm-ppc/immap_512x.h
index 95350fd..1dc47e5 100644
--- a/include/asm-ppc/immap_512x.h
+++ b/include/asm-ppc/immap_512x.h
@@ -848,10 +848,6 @@ typedef struct ioctrl512x {
u8  reserved[0x0cfc];   /* fill to 4096 bytes size */
 } ioctrl512x_t;
 
-/* Indexes in regs array */
-/* Set for DDR */
-#define IOCTRL_MUX_DDR 0x0036
-
 /* IO pin fields */
 #define IO_PIN_FMUX(v) ((v)  7)  /* pin function */
 #define IO_PIN_HOLD(v) ((v)  5)  /* hold time, pci only */
diff --git a/include/configs/aria.h b/include/configs/aria.h
index f89fc57..a73c0c7 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -79,6 +79,8 @@
 #define CONFIG_SYS_DDR_BASE0x
 #define CONFIG_SYS_SDRAM_BASE  CONFIG_SYS_DDR_BASE
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR  0x0036
+
 /* DDR Controller Configuration
  *
  * SYS_CFG:
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index 31d..cafd6a7 100644
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -67,6 +67,8 @@
 #define CONFIG_SYS_DDR_BASE0x  /* DDR is sys memory*/
 #define CONFIG_SYS_SDRAM_BASE  CONFIG_SYS_DDR_BASE
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR  0x0036
+
 /* DDR Controller Configuration
  *
  * SYS_CFG:
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index fb49388..8ecc9e1 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -86,6 +86,8 @@
 #define CONFIG_SYS_DDR_BASE0x  /* DDR is system 
memory*/
 #define CONFIG_SYS_SDRAM_BASE  CONFIG_SYS_DDR_BASE
 
+#define CONFIG_SYS_IOCTRL_MUX_DDR  0x0036
+
 /* DDR Controller Configuration
  *
  * SYS_CFG:
-- 
1.6.3.3

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot