From 562788b0a303f3528b920d81f547f5ca77ba528e Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 17 Sep 2008 11:45:51 +0200 Subject: socrates: fix SPD EEPROM address Commit be0bd8234b9777ecd63c4c686f72af070d886517 changed SPD EEPROM address to 0x51 and DDR SDRAM detection stopped working. Change this address back to 0x50. Signed-off-by: Anatolij Gustschin --- include/configs/socrates.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 0135ac8531..28e8fd2f9c 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -117,7 +117,7 @@ #define CONFIG_CHIP_SELECTS_PER_CTRL 2 /* I2C addresses of SPD EEPROMs */ -#define SPD_EEPROM_ADDRESS 0x51 /* CTLR 0 DIMM 0 */ +#define SPD_EEPROM_ADDRESS 0x50 /* CTLR 0 DIMM 0 */ #define CONFIG_DDR_DEFAULT_CL 30 /* CAS latency 3 */ -- cgit From 5c65ecf7cd94df250b295621f3b24135cbcfe579 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 17 Sep 2008 13:46:17 +0200 Subject: socrates: change default mtest address range Running mtest command on socrates without specifying an address range crashes the board. This patch changes default mtest address range to prevent this behavior. Signed-off-by: Anatolij Gustschin --- include/configs/socrates.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 28e8fd2f9c..bbb9d18b5b 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -87,8 +87,8 @@ #define CFG_INIT_DBCR DBCR_IDM /* Enable Debug Exceptions */ #undef CFG_DRAM_TEST /* memory test, takes time */ -#define CFG_MEMTEST_START 0x00000000 -#define CFG_MEMTEST_END 0x10000000 +#define CFG_MEMTEST_START 0x00400000 +#define CFG_MEMTEST_END 0x00C00000 /* * Base addresses -- Note these are effective addresses where the -- cgit From 28113e1f0da4146b823ffce37680d31d5685a60b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 17 Sep 2008 17:41:58 +0200 Subject: Remove duplicate Spartan-3E definition. Signed-off-by: Laurent Pinchart Signed-off-by: Wolfgang Denk --- include/spartan3.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'include') diff --git a/include/spartan3.h b/include/spartan3.h index 9a3a5d49bc..6d471e3959 100644 --- a/include/spartan3.h +++ b/include/spartan3.h @@ -81,9 +81,6 @@ typedef struct { #define XILINX_XC3S1200E_SIZE 3841184/8 #define XILINX_XC3S1600E_SIZE 5969696/8 -/* Spartan-IIIE (1.2V) */ -#define XILINX_XC3S1200E_SIZE 3841184/8 - /* Descriptor Macros *********************************************************************/ /* Spartan-III devices */ @@ -111,7 +108,6 @@ typedef struct { #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie } - /* Spartan-3E devices */ #define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S100E_SIZE, fn_table, cookie } @@ -128,9 +124,4 @@ typedef struct { #define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie } - -/* Spartan-IIIE devices */ -#define XILINX_XC3S1200E_DESC(iface, fn_table, cookie) \ -{ Xilinx_Spartan3, iface, XILINX_XC3S1200E_SIZE, fn_table, cookie } - #endif /* _SPARTAN3_H_ */ -- cgit From a07faf7b9ad5a86763a577c79922c4ff9a70ef23 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 17 Sep 2008 17:57:34 +0200 Subject: Fix Spartan-3 definitions. A few Spartan-3 definitions erroneously use Spartan-3E size constants. This patch fixes them. Signed-off-by: Laurent Pinchart --- include/spartan3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/spartan3.h b/include/spartan3.h index 6d471e3959..b0fa1cdaee 100644 --- a/include/spartan3.h +++ b/include/spartan3.h @@ -100,13 +100,13 @@ typedef struct { { Xilinx_Spartan3, iface, XILINX_XC3S1500_SIZE, fn_table, cookie } #define XILINX_XC3S2000_DESC(iface, fn_table, cookie) \ -{ Xilinx_Spartan3, iface, XILINX_XC3S2000E_SIZE, fn_table, cookie } +{ Xilinx_Spartan3, iface, XILINX_XC3S2000_SIZE, fn_table, cookie } #define XILINX_XC3S4000_DESC(iface, fn_table, cookie) \ -{ Xilinx_Spartan3, iface, XILINX_XC3S4000E_SIZE, fn_table, cookie } +{ Xilinx_Spartan3, iface, XILINX_XC3S4000_SIZE, fn_table, cookie } #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \ -{ Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie } +{ Xilinx_Spartan3, iface, XILINX_XC3S5000_SIZE, fn_table, cookie } /* Spartan-3E devices */ #define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \ -- cgit