diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-12-15 17:59:19 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-12-15 18:43:23 +1100 |
commit | 799ef76e460a71ab27280fc7cb7a9e259cef2b7b (patch) | |
tree | 80e68069b2091bb568b1748d7e7f8ec0919e5a13 /fcp | |
parent | 58cc12860727eb2a3c6c8b535c269abee9b2c7fc (diff) | |
download | ffs-799ef76e460a71ab27280fc7cb7a9e259cef2b7b.tar.gz ffs-799ef76e460a71ab27280fc7cb7a9e259cef2b7b.zip |
Move to autotools
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'fcp')
-rw-r--r-- | fcp/Makefile | 34 | ||||
-rw-r--r-- | fcp/Rules.mk | 54 | ||||
-rw-r--r-- | fcp/ppc/Makefile | 33 | ||||
-rw-r--r-- | fcp/src/cmd_probe.c | 186 | ||||
-rw-r--r-- | fcp/x86/Makefile | 31 |
5 files changed, 0 insertions, 338 deletions
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 |