aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGerlando Falauto <gerlando.falauto@keymile.com>2012-07-27 05:16:35 +0000
committerWolfgang Denk <wd@denx.de>2012-07-31 22:30:01 +0200
commitbae5407dd235c520210f994b39ff613409d7219e (patch)
tree46ebff41cc561f9faac8884ad6b6082512ca4519 /include
parent4fdfe376eb7c163c4fe90bc84907f6157e48c8d9 (diff)
downloadu-boot-linaro-stable-bae5407dd235c520210f994b39ff613409d7219e.tar.gz
powerpc/82xx: move mgcoge, mgcoge3ne defines to ease subsequent merge
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mgcoge.h34
-rw-r--r--include/configs/mgcoge3ne.h34
2 files changed, 34 insertions, 34 deletions
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index b736c56c0..ad3b58ed2 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -33,6 +33,7 @@
#define CONFIG_MGCOGE
#define CONFIG_HOSTNAME mgcoge
#define CONFIG_KM_82XX
+#define CONFIG_KM_BOARD_EXTRA_ENV ""
#define CONFIG_SYS_TEXT_BASE 0xFE000000
@@ -68,25 +69,24 @@
/* SDRAM initialization values
*/
-#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \
- ORxS_SDAM_MSK) |\
- ORxS_BPD_8 |\
- ORxS_ROWST_PBI0_A7 |\
- ORxS_NUMR_13)
-
-#define CONFIG_SYS_PSDMR (PSDMR_SDAM_A14_IS_A5 |\
- PSDMR_BSMA_A14_A16 |\
- PSDMR_SDA10_PBI0_A9 |\
- PSDMR_RFRC_5_CLK |\
- PSDMR_PRETOACT_2W |\
- PSDMR_ACTTORW_2W |\
- PSDMR_LDOTOPRE_1C |\
- PSDMR_WRC_1C |\
- PSDMR_CL_2)
+#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \
+ ORxS_SDAM_MSK) |\
+ ORxS_BPD_8 |\
+ ORxS_ROWST_PBI0_A7 |\
+ ORxS_NUMR_13)
+
+#define CONFIG_SYS_PSDMR ( \
+ PSDMR_SDAM_A14_IS_A5 |\
+ PSDMR_BSMA_A14_A16 |\
+ PSDMR_SDA10_PBI0_A9 |\
+ PSDMR_RFRC_5_CLK |\
+ PSDMR_PRETOACT_2W |\
+ PSDMR_ACTTORW_2W |\
+ PSDMR_LDOTOPRE_1C |\
+ PSDMR_WRC_1C |\
+ PSDMR_CL_2)
-#define CONFIG_KM_BOARD_EXTRA_ENV ""
-
/* include further common stuff for all keymile 82xx boards */
#include "km/km82xx-common.h"
diff --git a/include/configs/mgcoge3ne.h b/include/configs/mgcoge3ne.h
index 43d14baf5..7ab03a0b8 100644
--- a/include/configs/mgcoge3ne.h
+++ b/include/configs/mgcoge3ne.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2011
+ * (C) Copyright 2007-2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -21,8 +21,8 @@
* MA 02111-1307 USA
*/
-#ifndef __MGCOGE3NE
-#define __MGCOGE3NE
+#ifndef __CONFIG_H
+#define __CONFIG_H
/*
* High Level Configuration Options
@@ -33,6 +33,7 @@
#define CONFIG_MGCOGE3NE
#define CONFIG_HOSTNAME mgcoge3ne
#define CONFIG_KM_82XX
+#define CONFIG_KM_BOARD_EXTRA_ENV "bobcatreset=true\0"
#define CONFIG_SYS_TEXT_BASE 0xFE000000
@@ -68,26 +69,25 @@
#define SDRAM_MAX_SIZE 0x10000000 /* max. 256 MB */
#define CONFIG_SYS_GLOBAL_SDRAM_LIMIT (512 << 20) /* less than 512 MB */
-#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \
- ORxS_SDAM_MSK) |\
+#define CONFIG_SYS_OR1 ((~(CONFIG_SYS_GLOBAL_SDRAM_LIMIT-1) & \
+ ORxS_SDAM_MSK) |\
ORxS_BPD_4 |\
ORxS_ROWST_PBI1_A4 |\
ORxS_NUMR_13)
-#define CONFIG_SYS_PSDMR (PSDMR_PBI |\
- PSDMR_SDAM_A17_IS_A5 |\
- PSDMR_BSMA_A13_A15 |\
- PSDMR_SDA10_PBI1_A6 |\
- PSDMR_RFRC_5_CLK |\
- PSDMR_PRETOACT_2W |\
- PSDMR_ACTTORW_2W |\
- PSDMR_LDOTOPRE_1C |\
- PSDMR_WRC_2C |\
+#define CONFIG_SYS_PSDMR ( \
+ PSDMR_PBI |\
+ PSDMR_SDAM_A17_IS_A5 |\
+ PSDMR_BSMA_A13_A15 |\
+ PSDMR_SDA10_PBI1_A6 |\
+ PSDMR_RFRC_5_CLK |\
+ PSDMR_PRETOACT_2W |\
+ PSDMR_ACTTORW_2W |\
+ PSDMR_LDOTOPRE_1C |\
+ PSDMR_WRC_2C |\
PSDMR_CL_2)
-#define CONFIG_KM_BOARD_EXTRA_ENV "bobcatreset=true\0"
-
/* include further common stuff for all keymile 82xx boards */
#include "km/km82xx-common.h"
-#endif /* __MGCOGE3NE */
+#endif /* __CONFIG_H */