27 files changed, 98 insertions, 1179 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b740f9a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS = clib fcp ecc ffs fpart
-
-.PHONY: subdirs $(SUBDIRS)
-subdirs: $(SUBDIRS)
-
-fpart:: ffs clib
-fcp:: ffs clib
-ecc:: clib
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all install: $(SUBDIRS)
-
-clean distclean: $(SUBDIRS)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..f7fc56c
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,53 @@
+AM_CFLAGS = -Iclib/ -std=gnu99 -D_GNU_SOURCE -Iffs/  -fshort-enums -fPIC -D_FILE_OFFSET_BITS=64
+AM_LDFLAGS = -L. -fPIC -Wl,-whole-archive  -Wl,-no-whole-archive
+
+bin_PROGRAMS = ecc/ecc fpart/fpart fcp/fcp
+
+noinst_LIBRARIES = libclib.a libffs.a
+
+libclib_a_SOURCES = \
+	clib/src/err.c \
+	clib/src/misc.c \
+	clib/src/ecc.c \
+	clib/src/exception.c \
+	clib/src/list.c \
+	clib/src/list_iter.c \
+	clib/src/tree.c \
+	clib/src/tree_iter.c \
+	clib/src/value.c \
+	clib/src/mq.c \
+	clib/src/trace_indent.c \
+	clib/src/checksum.c
+
+libffs_a_SOURCES = ffs/src/libffs.c ffs/src/libffs2.c
+
+ecc_ecc_SOURCES = ecc/src/main.c
+ecc_ecc_LDADD = libffs.a libclib.a -lpthread
+
+fpart_fpart_LDADD = libffs.a libclib.a -lpthread
+fpart_fpart_SOURCES = \
+	fpart/src/cmd_create.c \
+	fpart/src/cmd_add.c \
+        fpart/src/cmd_delete.c \
+	fpart/src/cmd_list.c \
+	fpart/src/cmd_erase.c \
+        fpart/src/cmd_trunc.c \
+	fpart/src/cmd_user.c \
+	fpart/src/command.c \
+	fpart/src/main.c
+
+fcp_fcp_SOURCES = \
+	fcp/src/cmd_copy.c \
+	fcp/src/cmd_user.c \
+	fcp/src/misc.c \
+	fcp/src/cmd_erase.c \
+	fcp/src/cmd_read.c \
+	fcp/src/cmd_write.c \
+	fcp/src/cmd_list.c \
+	fcp/src/cmd_trunc.c \
+	fcp/src/main.c
+fcp_fcp_LDADD = libffs.a libclib.a -lpthread
+
+bin_SCRIPTS = fpart/fpart.sh
+
+doc_DATA = LICENSE NOTICE
diff --git a/clib/Makefile b/clib/Makefile
deleted file mode 100644
index d4a990b..0000000
--- a/clib/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS=x86
-
-.PHONY: subdirs $(SUBDIRS)
-
-subdirs: $(SUBDIRS)
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean install: $(SUBDIRS)
diff --git a/clib/Rules.cunit.mk b/clib/Rules.cunit.mk
deleted file mode 100644
index 9fe4338..0000000
--- a/clib/Rules.cunit.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/Rules.cunit.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -std=gnu99 -D__USE_GNU -I$(DEPTH)/apps
-LDFLAGS = -rdynamic -L$(DEPTH)/apps/clib/$(ARCH_DEP_DIR)
-
-TARGETS=clib
-
-OBJS=slab.o splay.o map.o vector.o ecc.o tree.o clib.o
-
-vpath %.h ../../src
-vpath %.c ../../cunit
-
-all: $(TARGETS)
-
-clib: $(OBJS) $(DEPTH)/apps/clib/$(ARCH_DEP_DIR)/libclib.a
-	$(CC) $(LDFLAGS) -o $@ $^ -lcunit -lrt
-
-clean:
-	$(RM) $(OBJS) $(TARGETS)
-
-install:
-	$(INSTALL) -d $(CLIB_INSTALL)
-	$(INSTALL) $(TARGETS) $(CLIB_INSTALL)
diff --git a/clib/Rules.mk b/clib/Rules.mk
deleted file mode 100644
index be56885..0000000
--- a/clib/Rules.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/Rules.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -fshort-enums -D_FILE_OFFSET_BITS=64
-CFLAGS += -iquote$(DEPTH) -fPIC
-
-LDFLAGS=-L.
-
-OBJS =	err.o misc.o ecc.o	\
-	exception.o \
-	list.o list_iter.o		\
-	tree.o tree_iter.o		\
-	value.o mq.o	 	\
-	trace_indent.o checksum.o
-
-
-TARGETS=libclib.so libclib.a
-
-vpath	%.c ../src
-vpath	%.h ..
-
-all: $(TARGETS)
-
-libclib.so: $(OBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^ -lpthread \
-		-lrt
-
-libclib.a: $(OBJS)
-	$(AR) -r $@ $^
-
-
-clean distclean:
-	$(RM) *.so *.o *.gch  *.CKP *.lst $(TARGETS)
-	$(RM) html latex
-
-install: $(TARGETS) ../*.h
-	$(INSTALL) -d $(CLIB_INSTALL)/include/clib $(CLIB_INSTALL)/{bin,lib}
-	$(INSTALL) ../*.h $(CLIB_INSTALL)/include/clib
-	$(INSTALL) libclib.so libclib.a $(CLIB_INSTALL)/lib
-	$(MAKE) -C test $@
-	$(MAKE) -C cunit $@
diff --git a/clib/Rules.test.mk b/clib/Rules.test.mk
deleted file mode 100644
index bcb1fb1..0000000
--- a/clib/Rules.test.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/Rules.test.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -std=gnu99 -D__USE_GNU -I$(DEPTH)/apps
-LDFLAGS = -rdynamic -L$(DEPTH)/apps/clib/$(ARCH_DEP_DIR)
-
-TARGETS=exception	\
-	slab		\
-	list		\
-	ecc		\
-	tree		\
-	splay		\
-	map		\
-	table		\
-	mq		\
-	vector		\
-	checksum	\
-	err
-
-vpath %.h ../../src
-vpath %.c ../../test
-
-all: $(TARGETS)
-
-exception: exception.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-slab:  slab.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-list:  list.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-tree:  tree.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-splay:  splay.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-map:  map.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-mq:  mq.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-table:  table.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-watch:  watch.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-dispatch:  dispatch.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-vector:  vector.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-checksum:  checksum.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-err:  err.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-ecc:  ecc.o ../libclib.so
-	$(CC) $(LDFLAGS) -o $@ $^
-
-clean:
-	$(RM) $(TARGETS:=.o) $(TARGETS)
-
-install:
-	$(INSTALL) -d $(CLIB_INSTALL)
-	$(INSTALL) $(TARGETS) $(CLIB_INSTALL)
diff --git a/clib/x86/Makefile b/clib/x86/Makefile
deleted file mode 100644
index 30da3b1..0000000
--- a/clib/x86/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/x86/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ..
-
-CLIB_INSTALL = $(INST_USR_X86)
-
-include ../Rules.mk
diff --git a/clib/x86/cunit/Makefile b/clib/x86/cunit/Makefile
deleted file mode 100644
index 99c4a30..0000000
--- a/clib/x86/cunit/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/x86/cunit/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ../../../..
-include $(DEPTH)/integration/Rules.mk
-include $(DEPTH)/integration/Rules.x86.mk
-
-CLIB_INSTALL = $(INST_TESTS_X86)/clib
-
-include ../../Rules.cunit.mk
diff --git a/clib/x86/test/Makefile b/clib/x86/test/Makefile
deleted file mode 100644
index f2986b7..0000000
--- a/clib/x86/test/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: clib/x86/test/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ../../../..
-include $(DEPTH)/integration/Rules.mk
-include $(DEPTH)/integration/Rules.x86.mk
-
-CLIB_INSTALL = $(INST_TESTS_X86)/clib
-
-include ../../Rules.test.mk
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..c70a51b
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,45 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([ffs], [1.0], [https://github.com/open-power/ffs])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AC_CONFIG_SRCDIR([ecc/src/main.h])
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_RANLIB
+AM_PROG_AR
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_HEADER_STDBOOL
+AC_C_INLINE
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_INT8_T
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_FSEEKO
+AC_FUNC_MALLOC
+AC_FUNC_MMAP
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([ftruncate memmove memset pathconf regcomp strcasecmp strchr strdup strerror strncasecmp strrchr strtol strtoul strtoull])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/ecc/Makefile b/ecc/Makefile
deleted file mode 100644
index 7802e86..0000000
--- a/ecc/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ecc/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS=x86
-
-.PHONY: subdirs $(SUBDIRS)
-
-subdirs: $(SUBDIRS)
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean install: $(SUBDIRS)
diff --git a/ecc/Rules.mk b/ecc/Rules.mk
deleted file mode 100644
index ed3c46d..0000000
--- a/ecc/Rules.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ecc/Rules.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64 -I$(DEPTH)/.. -iquote..
-LDFLAGS += -L. -L$(DEPTH)/../clib/x86
-
-OBJS=main.o
-
-TARGETS=ecc
-
-vpath	%.c ../src
-vpath	%.h ..
-
-all: $(TARGETS)
-
-ecc: main.o $(DEPTH)/../clib/x86/libclib.a
-	$(CC) $(LDFLAGS) -o $@ $^ -lpthread
-
-install: $(TARGETS)
-	$(INSTALL) ecc $(ECC_INSTALL)/bin
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/ecc/x86/Makefile b/ecc/x86/Makefile
deleted file mode 100644
index 753b03f..0000000
--- a/ecc/x86/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ecc/x86/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ..
-
-ARCH=x86
-ECC_INSTALL = $(INST_USR_X86)
-
-include ../Rules.mk
diff --git a/fcp/Makefile b/fcp/Makefile
deleted file mode 100644
index a80dcbb..0000000
--- a/fcp/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fcp/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS=x86
-
-.PHONY: subdirs $(SUBDIRS)
-
-subdirs: $(SUBDIRS)
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean install: $(SUBDIRS)
diff --git a/fcp/Rules.mk b/fcp/Rules.mk
deleted file mode 100644
index d5fcd12..0000000
--- a/fcp/Rules.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fcp/Rules.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64
-CFLAGS += -I$(DEPTH)/.. -iquote..
-
-LDFLAGS += -L.
-
-NAME=fcp
-
-CLIB=$(DEPTH)/../clib/x86/libclib.a
-FFS=$(DEPTH)/../ffs/x86/libffs.a
-
-OBJS=cmd_list.o cmd_read.o cmd_write.o cmd_erase.o	\
-     cmd_copy.o cmd_trunc.o cmd_user.o misc.o main.o
-
-TARGETS=$(NAME)
-
-vpath	%.c ../src
-vpath	%.h ..
-
-all: $(TARGETS)
-
-$(NAME): $(OBJS) $(FFS) $(CLIB)
-	$(CC) $(LDFLAGS) -Wl,-no-whole-archive \
-		-o $@ $^ -lpthread -ldl -lrt
-
-install: $(TARGETS)
-	$(INSTALL) fcp $(FCP_INSTALL)/bin
-	$(INSTALL) ../fcp.sh $(FCP_INSTALL_TEST)
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/fcp/ppc/Makefile b/fcp/ppc/Makefile
deleted file mode 100644
index c0302ce..0000000
--- a/fcp/ppc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fcp/ppc/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ../../..
-include $(DEPTH)/integration/Rules.mk
-include $(DEPTH)/integration/Rules.ppc.mk
-
-ARCH=ppc
-FCP_INSTALL = $(INST_USR)
-FCP_INSTALL_TEST = $(INST_TESTS)
-
-include ../Rules.mk
diff --git a/fcp/src/cmd_probe.c b/fcp/src/cmd_probe.c
deleted file mode 100644
index e06f6c3..0000000
--- a/fcp/src/cmd_probe.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: fcp/src/cmd_probe.c $                                         */
-/*                                                                        */
-/* OpenPOWER FFS Project                                                  */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-/*
- *    File: cmd_probe.c
- *  Author: Shaun Wetzstein <shaun@us.ibm.com>
- *   Descr: probe implementation
- *    Date: 01/30/2013
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <fcntl.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <errno.h>
-#include <ctype.h>
-#include <regex.h>
-
-#include <clib/attribute.h>
-#include <clib/assert.h>
-#include <clib/list.h>
-#include <clib/list_iter.h>
-#include <clib/misc.h>
-#include <clib/min.h>
-#include <clib/err.h>
-#include <clib/raii.h>
-
-#include <spinor/spinor.h>
-#include <spinor/aardvark.h>
-
-#include <dbgx/rwflash.h>
-
-#include "misc.h"
-#include "main.h"
-
-static int aa_probe(int verbose)
-{
-	int size = 16;
-
-	uint16_t ports[size];
-	uint32_t unique_ids[size];
-
-	int rc = aa_find_devices_ext(size, ports, size, unique_ids);
-
-	fprintf(stdout, "%d aardvark(s) found:\n", rc);
-
-	for (int i = 0; i < min(rc, 16); i++) {
-		if (ports[i] & AA_PORT_NOT_FREE) {
-			fprintf(stdout, " %d: [%04d-%06d] ===> BUSY",
-				ports[i] & ~AA_PORT_NOT_FREE,
-				unique_ids[i] / 1000000,
-				unique_ids[i] % 1000000);
-
-			continue;
-		}
-
-		spinor_t * nor = spinor_open(ports[i]);
-		if (nor == NULL) {
-			debug("unable to open aaflash on port '%d'\n", ports[i]);
-			continue;
-		}
-
-		if (spinor_configure(nor) < 0) {
-			debug("unable to configure Aardvark on port '%d'\n",
-			      ports[i]);
-			continue;
-		}
-
-		fprintf(stdout, "  %d: [%04d-%06d] => ",
-			ports[i] & ~AA_PORT_NOT_FREE,
-			unique_ids[i] / 1000000, unique_ids[i] % 1000000);
-
-		spinor_id_t id;
-		if (spinor_read_id(nor, id) < 0) {
-			debug("unable to read device id\n");
-			continue;
-		}
-			
-		fprintf(stdout, "%s %s %s",
-			spinor_id_mfg(id), spinor_id_type(id),
-			spinor_id_capacity(id));
-
-		fprintf(stdout, " [%2.2x %2.2x %2.2x]\n",
-			id[0], id[1], id[2]);
-
-		if (spinor_close(nor) < 0) {
-			debug("unable to read device id\n");
-			continue;
-		}
-
-		nor = NULL;
-	}
-
-	fprintf(stdout, "\n");
-
-	return 0;
-}
-
-static int rw_probe(const char * host, int verbose)
-{
-	assert(host != NULL);
-
-	rwflash_cookie_t * cookie = rwflash_cookie_open(host, verbose);
-	if (cookie == NULL) {
-		debug("unable to open rwflash on host '%s'\n", host);
-		return -1;
-	}
-
-	if (rwflash_cookie_init(cookie) < 0) {
-		debug("unable to init rwflash on host '%s'\n", host);
-		return -1;
-	}
-
-	if (rwflash_cookie_probe(cookie) < 0) {
-		debug("unable to probe rwflash on host '%s'\n", host);
-		return -1;
-	}
-
-	uint8_t * id = spinor_id(rwflash_cookie_spinor(cookie));
-	if (id == NULL) {
-		debug("invalid id rwflash on host '%s'\n", host);
-		return -1;
-	}
-
-	fprintf(stdout, " %s ===> %s %s %s",
-		host,
-		spinor_id_mfg(id), spinor_id_type(id),
-		spinor_id_capacity(id));
-
-	fprintf(stdout, " [%2.2x %2.2x %2.2x]\n",
-		id[0], id[1], id[2]);
-
-	return 0;
-}
-
-int command_probe(args_t * args)
-{
-	assert(args != NULL);
-
-	int rc = 0;
-
-	char * type = args->dst_type;
-	char * target = args->dst_target;
-
-	int verbose = args->verbose == f_VERBOSE;
-
-	if (strcasecmp(type, TYPE_AA) == 0) {
-		rc = aa_probe(verbose);
-	} else if (strcasecmp(type, TYPE_RW) == 0) {
-		rc = rw_probe(target, verbose);
-	} else {
-		UNEXPECTED("NOT IMPLEMENTED YET!");
-		rc = -1;
-	}
-	
-	return rc;
-}
diff --git a/fcp/x86/Makefile b/fcp/x86/Makefile
deleted file mode 100644
index b2dfe43..0000000
--- a/fcp/x86/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fcp/x86/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ..
-
-ARCH=x86
-FCP_INSTALL = $(INST_USR_X86)
-FCP_INSTALL_TEST = $(INST_TESTS_X86)
-
-include ../Rules.mk
diff --git a/ffs/Makefile b/ffs/Makefile
deleted file mode 100644
index b47320f..0000000
--- a/ffs/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ffs/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS=x86
-
-.PHONY: subdirs $(SUBDIRS)
-
-subdirs: $(SUBDIRS)
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean install: $(SUBDIRS)
diff --git a/ffs/Rules.mk b/ffs/Rules.mk
deleted file mode 100644
index c014ffa..0000000
--- a/ffs/Rules.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ffs/Rules.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64
-CFLAGS += -I$(DEPTH)/.. -I$(DEPTH)/boot/fsp2_ipl -iquote.. -fPIC
-
-LDFLAGS += -L.
-
-NAME=libffs
-
-CLIB=$(DEPTH)/../clib/x86/libclib.a
-
-OBJS=$(NAME).o $(NAME)2.o
-
-TARGETS=$(NAME).so $(NAME).a
-
-vpath	%.c ../src
-vpath	%.h ..
-
-all: $(TARGETS)
-
-$(NAME).so: $(OBJS)
-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
-
-$(NAME).a: $(OBJS)
-	$(AR) -r $@ $^
-
-install: $(TARGETS)
-	$(INSTALL) libffs.so libffs.a $(FFS_INSTALL)/lib
-	$(INSTALL) ../ffs.h ../libffs.h ../libffs2.h $(FFS_INSTALL)/include
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/ffs/Rules.test.mk b/ffs/Rules.test.mk
deleted file mode 100644
index cedeb3e..0000000
--- a/ffs/Rules.test.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ffs/Rules.test.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64 -I$(DEPTH)/apps -iquote..
-LDFLAGS += -L. -L$(DEPTH)/apps/clib/$(ARCH_DEP_DIR)
-
-OBJS=test_libffs.o
-
-TARGETS=test_libffs
-
-vpath	%.c ../test
-vpath	%.h ..
-
-all: $(TARGETS)
-
-#libffs.a: $(OBJS)
-#	$(AR) -r $@ $^
-
-test_libffs: test_libffs.o ../ppc/libffs.a $(DEPTH)/apps/clib/$(ARCH_DEP_DIR)/libclib.a
-	$(CC) $(LDFLAGS) -o $@ $^ -lpthread
-
-install: $(TARGETS)
-	$(INSTALL) ../test/test_libffs $(TEST_LIBFFS_INSTALL)
-	$(INSTALL) ../test/libffs_test.sh $(TEST_LIBFFS_INSTALL)
-	$(INSTALL) ../test/ffs_tool_test.sh $(TEST_LIBFFS_INSTALL)
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/ffs/x86/Makefile b/ffs/x86/Makefile
deleted file mode 100644
index 025c50e..0000000
--- a/ffs/x86/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: ffs/x86/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ..
-
-ARCH=x86
-FFS_INSTALL = $(INST_USR_X86)
-FFS_INSTALL_TEST = $(INST_TESTS_X86)
-
-include ../Rules.mk
diff --git a/fpart/Makefile b/fpart/Makefile
deleted file mode 100644
index afda672..0000000
--- a/fpart/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fpart/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-SUBDIRS=x86
-
-.PHONY: subdirs $(SUBDIRS)
-
-subdirs: $(SUBDIRS)
-
-$(SUBDIRS)::
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-all clean install: $(SUBDIRS)
diff --git a/fpart/Rules.mk b/fpart/Rules.mk
deleted file mode 100644
index 11a26fa..0000000
--- a/fpart/Rules.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fpart/Rules.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64
-CFLAGS += -I$(DEPTH)/.. -iquote..
-
-LDFLAGS += -L.
-
-NAME=fpart
-
-CLIB=$(DEPTH)/../clib/x86/libclib.a
-FFS=$(DEPTH)/../ffs/x86/libffs.a
-
-OBJS=cmd_create.o cmd_add.o cmd_delete.o cmd_list.o	\
-     cmd_erase.o cmd_trunc.o cmd_user.o command.o main.o
-
-TARGETS=$(NAME)
-
-vpath	%.c ../src
-vpath	%.h ..
-
-all: $(TARGETS)
-
-$(NAME): $(OBJS) $(FFS) $(DBGX) $(SPINOR) $(CLIB)
-	$(CC) $(LDFLAGS) -Wl,-whole-archive $(DBGX) -Wl,-no-whole-archive \
-		-o $@ $^ -lpthread -ldl -lrt
-
-install: $(TARGETS)
-	$(INSTALL) fpart $(FPART_INSTALL)/bin
-	$(INSTALL) ../fpart.sh $(FPART_INSTALL_TEST)
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/fpart/Rules.test.mk b/fpart/Rules.test.mk
deleted file mode 100644
index 2b93477..0000000
--- a/fpart/Rules.test.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fpart/Rules.test.mk $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-CFLAGS += -D_GNU_SOURCE -std=gnu99 -D_FILE_OFFSET_BITS=64 -I$(DEPTH)/apps -iquote..
-LDFLAGS += -L. -L$(DEPTH)/apps/clib/$(ARCH_DEP_DIR)
-
-OBJS=test_libffs.o
-
-TARGETS=test_libffs
-
-vpath	%.c ../test
-vpath	%.h ..
-
-all: $(TARGETS)
-
-#libffs.a: $(OBJS)
-#	$(AR) -r $@ $^
-
-test_libffs: test_libffs.o ../ppc/libffs.a $(DEPTH)/apps/clib/$(ARCH_DEP_DIR)/libclib.a
-	$(CC) $(LDFLAGS) -o $@ $^ -lpthread
-
-install: $(TARGETS)
-	$(INSTALL) ../test/test_libffs $(TEST_LIBFFS_INSTALL)
-	$(INSTALL) ../test/libffs_test.sh $(TEST_LIBFFS_INSTALL)
-	$(INSTALL) ../test/ffs_tool_test.sh $(TEST_LIBFFS_INSTALL)
-
-clean distclean:
-	$(RM) -f $(TARGETS) $(OBJS)
diff --git a/fpart/ppc/Makefile b/fpart/ppc/Makefile
deleted file mode 100644
index 4dccb3d..0000000
--- a/fpart/ppc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fpart/ppc/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ../../..
-include $(DEPTH)/integration/Rules.mk
-include $(DEPTH)/integration/Rules.ppc.mk
-
-ARCH=ppc
-FPART_INSTALL = $(INST_USR)
-FPART_INSTALL_TEST = $(INST_TESTS)
-
-include ../Rules.mk
diff --git a/fpart/x86/Makefile b/fpart/x86/Makefile
deleted file mode 100644
index 104532b..0000000
--- a/fpart/x86/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# IBM_PROLOG_BEGIN_TAG
-# This is an automatically generated prolog.
-#
-# $Source: fpart/x86/Makefile $
-#
-# OpenPOWER FFS Project
-#
-# Contributors Listed Below - COPYRIGHT 2014,2015
-# [+] International Business Machines Corp.
-#
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-#
-# IBM_PROLOG_END_TAG
-DEPTH = ..
-
-ARCH=x86
-FPART_INSTALL = $(INST_USR_X86)
-FPART_INSTALL_TEST = $(INST_TESTS_X86)
-
-include ../Rules.mk