Permalink
Browse files

changes required to get things compiling again

  • Loading branch information...
1 parent c1a32cc commit 8540e1308b426809cff6e5e669ab6075f03005e9 @cbrake committed Feb 19, 2013
Showing with 5 additions and 3 deletions.
  1. +2 −0 board/cm_t35/cm_t35.c
  2. +3 −3 include/configs/cm_t35.h
View
2 board/cm_t35/cm_t35.c
@@ -207,12 +207,14 @@ static u32 gpmc_nand_config[GPMC_MAX_REG] = {
*/
int board_early_init_f(void)
{
+#if 0
enum env_multi_dev env_name = ENV_NAND;
if (get_boot_type() & 0x20)
env_name = ENV_MMC;
env_multi_set_current(env_name, 0);
+#endif
return 0;
}
View
6 include/configs/cm_t35.h
@@ -169,7 +169,7 @@
* Board NAND Info.
*/
#define CONFIG_SYS_NAND_QUIET_TEST
-#define CONFIG_NAND_OMAP_GPMC
+#undef CONFIG_NAND_OMAP_GPMC
#define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
/* to access nand */
#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */
@@ -302,10 +302,10 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
-#define CONFIG_ENV_MULTI
+#undef CONFIG_ENV_MULTI
#define CONFIG_ENV_MULTI_DEFAULT ENV_NAND
-#define CONFIG_ENV_IS_IN_NAND
+#undef CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET

0 comments on commit 8540e13

Please sign in to comment.