diff --git a/include/ChangeLog b/include/ChangeLog
index b8c9b6f0..6ffd70b2 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-30  Marcel Telka  <marcel@telka.sk>
+
+	* Makefile.am (nobase_openwinceinc_HEADERS): Added brux/cfi.h.
+	* brux/cfi.h: New file extracted from include/cfi.h from jtag module.
+
 2003-05-30  Marcel Telka  <marcel@telka.sk>
 
 	* Makefile.am (nobase_openwinceinc_HEADERS): Added brux/bus.h.
diff --git a/include/Makefile.am b/include/Makefile.am
index 8e7a0713..276c5891 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -71,6 +71,7 @@ nobase_openwinceinc_HEADERS = \
 	arm/pxa2x0/uart.h \
 	arm/pxa2x0/udc.h \
 	brux/bus.h \
+	brux/cfi.h \
 	device/codec/ac97.h \
 	device/codec/ucb1400.h \
 	device/flash/28fxxxj.h \
diff --git a/include/brux/cfi.h b/include/brux/cfi.h
new file mode 100644
index 00000000..e2452981
--- /dev/null
+++ b/include/brux/cfi.h
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2003 ETC s.r.o.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the ETC s.r.o. nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Written by Marcel Telka <marcel@telka.sk>, 2003.
+ *
+ */
+
+#ifndef BRUX_CFI_H
+#define BRUX_CFI_H
+
+#include <stdint.h>
+#include <flash/cfi.h>
+
+#include <brux/bus.h>
+
+typedef struct {
+	int width;		/* 1 for 8 bits, 2 for 16 bits, 4 for 32 bits, etc. */
+	cfi_query_structure_t cfi;
+} cfi_chip_t;
+
+typedef struct {
+	bus_t *bus;
+	uint32_t address;
+	int bus_width;		/* in cfi_chips, e.g. 4 for 32 bits */
+	cfi_chip_t **cfi_chips;
+} cfi_array_t;
+
+void cfi_array_free( cfi_array_t *cfi_array );
+int cfi_detect( bus_t *bus, uint32_t adr, cfi_array_t **cfi_array );
+
+#endif /* BRUX_CFI_H */