#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_FLASH_CFI_MTD
-#define MTDIDS_DEFAULT         "nor0=omapflash.0,nand0=omapnand.0"
+#define MTDIDS_DEFAULT         "nor0=physmap-flash.0,nand0=gen_nand.0"
 #define MTDPARTS_DEFAULT       "mtdparts=" \
-       "omapflash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \
-       "omapnand.0:4M(kernel0),40M(rootfs0),4M(kernel1),40M(rootfs1),-(data)"
-
+       "physmap-flash.0:8k@16k(env),8k(r_env),448k@576k(u-boot);" \
+       "gen_nand.0:4M(kernel0),40M(rootfs0),4M(kernel1),40M(rootfs1),-(data)"
 
 /*
  * Command line configuration.