-#define ONENAND_BLOCK_SIZE 2048
-
-#ifndef CONFIG_SYS_PRINTF
-#define printf(format, args...)
-#endif
-
-#define onenand_readw(a) readw(a)
-#define onenand_writew(v, a) writew(v, a)
+#define onenand_readw(a) readw(THIS_ONENAND(a))
+#define onenand_writew(v, a) writew(v, THIS_ONENAND(a))