Do not (re)define CONFIG_LPC17_SDRAM_32BIT to not conflict with config. If CONFIG_LPC17_SDRAM_16BIT it is defined anyway and with correct symbol redefinition suppression. From Pavel Pisa.

This commit is contained in:
Pavel Pisa
2015-08-20 07:55:02 -06:00
committed by Gregory Nutt
parent f4b35662ec
commit c0881c36a3
+7 -1
View File
@@ -78,15 +78,21 @@
/* Set up for 32-bit SDRAM at CS0 */ /* Set up for 32-bit SDRAM at CS0 */
#define CONFIG_LPC17_SDRAM_32BIT #ifdef CONFIG_LPC17_EXTDRAMSIZE
# define SDRAM_SIZE CONFIG_LPC17_EXTDRAMSIZE
#endif
#ifdef CONFIG_LPC17_SDRAM_16BIT #ifdef CONFIG_LPC17_SDRAM_16BIT
# ifndef SDRAM_SIZE
# define SDRAM_SIZE 0x02000000 /* 256Mbit */ # define SDRAM_SIZE 0x02000000 /* 256Mbit */
# endif
#else /* if defined(CONFIG_LPC17_SDRAM_32BIT) */ #else /* if defined(CONFIG_LPC17_SDRAM_32BIT) */
# undef CONFIG_LPC17_SDRAM_32BIT # undef CONFIG_LPC17_SDRAM_32BIT
# define CONFIG_LPC17_SDRAM_32BIT 1 # define CONFIG_LPC17_SDRAM_32BIT 1
# ifndef SDRAM_SIZE
# define SDRAM_SIZE 0x04000000 /* 512Mbit */ # define SDRAM_SIZE 0x04000000 /* 512Mbit */
# endif # endif
#endif
#define SDRAM_BASE 0xa0000000 /* CS0 */ #define SDRAM_BASE 0xa0000000 /* CS0 */