diff --git a/nuttx/configs/px4fmu/include/board.h b/nuttx/configs/px4fmu/include/board.h
index 0db8580ba9..29ad52c61c 100755
--- a/nuttx/configs/px4fmu/include/board.h
+++ b/nuttx/configs/px4fmu/include/board.h
@@ -289,7 +289,7 @@
  */
 #define PX4_I2C_OBDEV_HMC5883	0x1e
 #define PX4_I2C_OBDEV_MS5611	NOTDEFINED
-#define PX4_I2C_OBDEV_EEPROM	0x50
+#define PX4_I2C_OBDEV_EEPROM	NOTDEFINED
 
 #define PX4_I2C_OBDEV_PX4IO_BL	0x18
 #define PX4_I2C_OBDEV_PX4IO	0x19
diff --git a/nuttx/configs/px4fmu/include/drv_eeprom.h b/nuttx/configs/px4fmu/include/drv_eeprom.h
index e6801f6c4a..57589ed84b 100644
--- a/nuttx/configs/px4fmu/include/drv_eeprom.h
+++ b/nuttx/configs/px4fmu/include/drv_eeprom.h
@@ -31,34 +31,21 @@
  *
  ****************************************************************************/
 
-/*
- * Driver for the ST MS5611 gyroscope
- */
-
-/* IMPORTANT NOTES:
- *
- * SPI max. clock frequency: 10 Mhz
- * CS has to be high before transfer,
- * go low right before transfer and
- * go high again right after transfer
+/**
+ * @file drv_eeprom.h
  *
+ * Config for the non-MTD EEPROM driver.
  */
 
 /* IMPORTANT: Adjust this number! */
-#define MAX_EEPROMS									2
+#define MAX_EEPROMS					2
 
 /* FMU onboard */
-#define FMU_ONBOARD_EEPROM_ADDRESS					0x50
-#define FMU_ONBOARD_EEPROM_TOTAL_SIZE_BYTES			16000
-#define FMU_ONBOARD_EEPROM_PAGE_SIZE_BYTES			64
-#define FMU_ONBOARD_EEPROM_PAGE_WRITE_TIME_US		5500
-#define FMU_ONBOARD_EEPROM_BUS_CLOCK				1000000   ///< 1 Mhz max. clock
-
-#define FMU_BASEBOARD_EEPROM_ADDRESS				0x57
+#define FMU_BASEBOARD_EEPROM_ADDRESS			0x57
 #define FMU_BASEBOARD_EEPROM_TOTAL_SIZE_BYTES		128
 #define FMU_BASEBOARD_EEPROM_PAGE_SIZE_BYTES		8
 #define FMU_BASEBOARD_EEPROM_PAGE_WRITE_TIME_US		3300
-#define FMU_BASEBOARD_EEPROM_BUS_CLOCK				400000    ///< 400 KHz max. clock
+#define FMU_BASEBOARD_EEPROM_BUS_CLOCK			400000    ///< 400 KHz max. clock
 
 /**
  * @brief i2c I2C bus struct
diff --git a/nuttx/configs/px4fmu/src/up_nsh.c b/nuttx/configs/px4fmu/src/up_nsh.c
index d089f2df33..d185bf7f1a 100644
--- a/nuttx/configs/px4fmu/src/up_nsh.c
+++ b/nuttx/configs/px4fmu/src/up_nsh.c
@@ -290,6 +290,7 @@ int nsh_archinitialize(void)
 		  FMU_BASEBOARD_EEPROM_PAGE_SIZE_BYTES,
 		  FMU_BASEBOARD_EEPROM_PAGE_WRITE_TIME_US, "/dev/baseboard_eeprom", 1);
 
+#if 0
   int eeprom_attempts = 0;
   int eeprom_fail;
   while (eeprom_attempts < 5)
@@ -306,8 +307,10 @@ int nsh_archinitialize(void)
 
   if (eeprom_fail) message("[boot] FAILED to attach FMU EEPROM\r\n");
 
+#endif
+
   /* Report back sensor status */
-  if (gyro_fail || mag_fail || baro_fail || eeprom_fail)
+  if (gyro_fail || mag_fail || baro_fail/* || eeprom_fail*/)
   {
 	  up_ledon(LED_AMBER);
   }