Index: git/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig
===================================================================
--- git.orig/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig	2015-01-13 13:31:45.162884794 -0600
+++ git/board/at91sam9x5ek/at91sam9x5eknf_uboot_defconfig	2015-01-13 13:45:17.967816395 -0600
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Thu Apr 11 16:45:29 2013
+# Tue Jan 13 13:09:23 2015
 #
 HAVE_DOT_CONFIG=y
 CONFIG_BOARDNAME="at91sam9x5ek"
@@ -42,7 +42,7 @@
 ALLOW_PIO3=y
 CONFIG_HAS_PIO3=y
 CPU_HAS_PMECC=y
-CONFIG_LOAD_ONE_WIRE=y
+# CONFIG_LOAD_ONE_WIRE is not set
 # CONFIG_MMC_SUPPORT is not set
 
 #
@@ -60,8 +60,8 @@
 # ALLOW_SDRAM_16BIT is not set
 # CONFIG_RAM_32MB is not set
 # CONFIG_RAM_64MB is not set
-CONFIG_RAM_128MB=y
-# CONFIG_RAM_256MB is not set
+# CONFIG_RAM_128MB is not set
+CONFIG_RAM_256MB=y
 # CONFIG_RAM_512MB is not set
 # CONFIG_DATAFLASH is not set
 # CONFIG_FLASH is not set
@@ -81,8 +81,8 @@
 #
 # PMECC Configuration
 #
-CONFIG_PMECC_CORRECT_BITS_2=y
-# CONFIG_PMECC_CORRECT_BITS_4 is not set
+# CONFIG_PMECC_CORRECT_BITS_2 is not set
+CONFIG_PMECC_CORRECT_BITS_4=y
 # CONFIG_PMECC_CORRECT_BITS_8 is not set
 # CONFIG_PMECC_CORRECT_BITS_12 is not set
 # CONFIG_PMECC_CORRECT_BITS_24 is not set
@@ -101,7 +101,7 @@
 # CONFIG_LOAD_64KB is not set
 CONFIG_IMG_ADDRESS="0x00040000"
 CONFIG_IMG_SIZE="0x00080000"
-CONFIG_JUMP_ADDR="0x26F00000"
+CONFIG_JUMP_ADDR="0x2EF00000"
 
 #
 # U-Boot Image Storage Setup
@@ -116,4 +116,4 @@
 # CONFIG_USER_HW_INIT is not set
 CONFIG_THUMB=y
 CONFIG_SCLK=y
-CONFIG_DISABLE_WATCHDOG=y
+# CONFIG_DISABLE_WATCHDOG is not set
Index: git/board/at91sam9x5ek/at91sam9x5ek.c
===================================================================
--- git.orig/board/at91sam9x5ek/at91sam9x5ek.c	2015-01-13 13:31:45.162884794 -0600
+++ git/board/at91sam9x5ek/at91sam9x5ek.c	2015-01-13 13:31:45.426881419 -0600
@@ -312,10 +312,8 @@
 
 	reg = readl(AT91C_BASE_CCFG + CCFG_EBICSA);
 	reg |= AT91C_EBI_CS3A_SM;
-	if (get_cm_rev() == 'A')
-		reg &= ~AT91C_EBI_NFD0_ON_D16;
-	else
-		reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16);
+	/* MTCDT */
+	reg |= (AT91C_EBI_DDR_MP_EN | AT91C_EBI_NFD0_ON_D16);
 
 	reg &= ~AT91C_EBI_DRV;
 	writel(reg, AT91C_BASE_CCFG + CCFG_EBICSA);
@@ -345,9 +343,7 @@
 		AT91C_BASE_SMC + SMC_CTRL3);
 
 	/* Configure the PIO controller */
-	if (get_cm_rev() == 'A')
-		pio_configure(nand_pins_lo);
-	else
+	/* MTCDT */
 		pio_configure(nand_pins_hi);
 
 	writel((1 << AT91C_ID_PIOC_D), (PMC_PCER + AT91C_BASE_PMC));