aboutsummaryrefslogtreecommitdiff
path: root/external/pflash
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2019-07-18 12:30:00 +1000
committerOliver O'Halloran <oohall@gmail.com>2019-07-26 15:08:03 +1000
commit5ef3dd30a98796359c45cbeaf1ce7c381a9120e6 (patch)
tree473cf267823efb0710d892d54e264543d1ba8a1d /external/pflash
parent53baedfd19436e8cc33151a0c17cb57863f7303a (diff)
downloadskiboot-5ef3dd30a98796359c45cbeaf1ce7c381a9120e6.zip
skiboot-5ef3dd30a98796359c45cbeaf1ce7c381a9120e6.tar.gz
skiboot-5ef3dd30a98796359c45cbeaf1ce7c381a9120e6.tar.bz2
SPDX-ify all skiboot code
Use Software Package Data Exchange (SPDX) to indicate license for each file that is unique to skiboot. At the same time, ensure the (C) who and years are correct. See https://spdx.org/ Signed-off-by: Stewart Smith <stewart@linux.ibm.com> [oliver: Added a few missing files] Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'external/pflash')
-rw-r--r--external/pflash/Makefile1
-rw-r--r--external/pflash/Makefile.dist1
-rwxr-xr-xexternal/pflash/build-all-arch.sh2
-rw-r--r--external/pflash/config.h7
-rw-r--r--external/pflash/pflash.c18
-rw-r--r--external/pflash/progress.c7
-rw-r--r--external/pflash/progress.h5
-rw-r--r--external/pflash/rules.mk2
-rw-r--r--external/pflash/test/tests/00-usage1
-rw-r--r--external/pflash/test/tests/01-info1
-rw-r--r--external/pflash/test/tests/02-erase1
-rw-r--r--external/pflash/test/tests/03-erase-parts1
-rw-r--r--external/pflash/test/tests/04-program-rand1
-rw-r--r--external/pflash/test/tests/05-bad-numbers1
-rw-r--r--external/pflash/test/tests/06-miscprint1
15 files changed, 35 insertions, 15 deletions
diff --git a/external/pflash/Makefile b/external/pflash/Makefile
index 243de6e..2918b7c 100644
--- a/external/pflash/Makefile
+++ b/external/pflash/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
include rules.mk
GET_ARCH := ../../external/common/get_arch.sh
include ../../external/common/rules.mk
diff --git a/external/pflash/Makefile.dist b/external/pflash/Makefile.dist
index 46edcb1..b6183d7 100644
--- a/external/pflash/Makefile.dist
+++ b/external/pflash/Makefile.dist
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
include rules.mk
GET_ARCH = common/get_arch.sh
include common/rules.mk
diff --git a/external/pflash/build-all-arch.sh b/external/pflash/build-all-arch.sh
index 5974fbc..0af3a4d 100755
--- a/external/pflash/build-all-arch.sh
+++ b/external/pflash/build-all-arch.sh
@@ -1,9 +1,9 @@
#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
#
# Script to build all pflash backends
#
# Copyright 2015 IBM Corp.
-# Licensed under the Apache License, Version 2.0
#
# pflash has three different backends that are used on powerpc, arm (BMC) and
# x86 (file-backed). In order to test for regressions when touching shared code
diff --git a/external/pflash/config.h b/external/pflash/config.h
index a132a01..b55d13e 100644
--- a/external/pflash/config.h
+++ b/external/pflash/config.h
@@ -1,4 +1,9 @@
-/* For CCAN */
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * For CCAN
+ *
+ * Copyright 2014 IBM Corp.
+ */
#include <endian.h>
#include <byteswap.h>
diff --git a/external/pflash/pflash.c b/external/pflash/pflash.c
index 14157e7..7bf0785 100644
--- a/external/pflash/pflash.c
+++ b/external/pflash/pflash.c
@@ -1,17 +1,9 @@
-/* Copyright 2013-2015 IBM Corp.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Display progress bars, while also writing whole or part
+ * of flash.
*
- * 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.
+ * Copyright 2013-2019 IBM Corp.
*/
#define _GNU_SOURCE
diff --git a/external/pflash/progress.c b/external/pflash/progress.c
index df8eb35..4140446 100644
--- a/external/pflash/progress.c
+++ b/external/pflash/progress.c
@@ -1,3 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * The most important part of pflash, the progress bars
+ *
+ * Copyright 2014-2017 IBM Corp.
+ */
+
#include <inttypes.h>
#include <limits.h>
#include <stdint.h>
diff --git a/external/pflash/progress.h b/external/pflash/progress.h
index b073dbe..efe70c6 100644
--- a/external/pflash/progress.h
+++ b/external/pflash/progress.h
@@ -1,3 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright 2014-2017 IBM Corp.
+ */
+
#ifndef __PROGRESS_H
#define __PROGRESS_H
diff --git a/external/pflash/rules.mk b/external/pflash/rules.mk
index ffc3242..ab9bf14 100644
--- a/external/pflash/rules.mk
+++ b/external/pflash/rules.mk
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
.DEFAULT_GOAL := all
override CFLAGS += -O2 -Wall -I.
diff --git a/external/pflash/test/tests/00-usage b/external/pflash/test/tests/00-usage
index b83bca8..809b995 100644
--- a/external/pflash/test/tests/00-usage
+++ b/external/pflash/test/tests/00-usage
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
run_binary "./pflash" "-h"
if [ "$?" -ne 0 ] ; then
diff --git a/external/pflash/test/tests/01-info b/external/pflash/test/tests/01-info
index 3941461..2fc2755 100644
--- a/external/pflash/test/tests/01-info
+++ b/external/pflash/test/tests/01-info
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"
diff --git a/external/pflash/test/tests/02-erase b/external/pflash/test/tests/02-erase
index dd00f38..911728d 100644
--- a/external/pflash/test/tests/02-erase
+++ b/external/pflash/test/tests/02-erase
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"
diff --git a/external/pflash/test/tests/03-erase-parts b/external/pflash/test/tests/03-erase-parts
index 09421bb..74937fa 100644
--- a/external/pflash/test/tests/03-erase-parts
+++ b/external/pflash/test/tests/03-erase-parts
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"
diff --git a/external/pflash/test/tests/04-program-rand b/external/pflash/test/tests/04-program-rand
index 62f2f92..d732eab 100644
--- a/external/pflash/test/tests/04-program-rand
+++ b/external/pflash/test/tests/04-program-rand
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"
diff --git a/external/pflash/test/tests/05-bad-numbers b/external/pflash/test/tests/05-bad-numbers
index f84e799..6064090 100644
--- a/external/pflash/test/tests/05-bad-numbers
+++ b/external/pflash/test/tests/05-bad-numbers
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"
diff --git a/external/pflash/test/tests/06-miscprint b/external/pflash/test/tests/06-miscprint
index 2d94966..8b37cab 100644
--- a/external/pflash/test/tests/06-miscprint
+++ b/external/pflash/test/tests/06-miscprint
@@ -1,4 +1,5 @@
#! /bin/sh
+# SPDX-License-Identifier: Apache-2.0
touch "$DATA_DIR/$CUR_TEST.pnor"