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>

26 files changed, 74 insertions, 363 deletions

diff --git a/libflash/blocklevel.c b/libflash/blocklevel.c
index 5b57d3c..6147112 100644
--- a/libflash/blocklevel.c
+++ b/libflash/blocklevel.c
@@ -1,18 +1,5 @@
-/* Copyright 2013-2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/libflash/blocklevel.h b/libflash/blocklevel.h
index ba42c83..8a0e855 100644
--- a/libflash/blocklevel.h
+++ b/libflash/blocklevel.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2017 IBM Corp. */
+
 #ifndef __LIBFLASH_BLOCKLEVEL_H
 #define __LIBFLASH_BLOCKLEVEL_H
 
diff --git a/libflash/ecc.c b/libflash/ecc.c
index e920dfa..0b85fb3 100644
--- a/libflash/ecc.c
+++ b/libflash/ecc.c
@@ -1,21 +1,10 @@
-/* Copyright 2013-2014 IBM 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
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * This is based on the hostboot ecc code
  *
- * 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.
  */
 
-/* This is based on the hostboot ecc code */
-
 #include <stdint.h>
 #include <inttypes.h>
 #include <string.h>
diff --git a/libflash/ecc.h b/libflash/ecc.h
index bd66948..608d500 100644
--- a/libflash/ecc.h
+++ b/libflash/ecc.h
@@ -1,21 +1,10 @@
-/* Copyright 2013-2014 IBM 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
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * This is based on the hostboot ecc code
  *
- * 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-2018 IBM Corp.
  */
 
-/* This is based on the hostboot ecc code */
-
 #ifndef __ECC_H
 #define __ECC_H
 
diff --git a/libflash/errors.h b/libflash/errors.h
index 27662c1..c800ada 100644
--- a/libflash/errors.h
+++ b/libflash/errors.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
+
 #ifndef __LIBFLASH_ERRORS_H
 #define __LIBFLASH_ERRORS_H
 
diff --git a/libflash/ffs.h b/libflash/ffs.h
index b147396..f9f2833 100644
--- a/libflash/ffs.h
+++ b/libflash/ffs.h
@@ -1,24 +1,10 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
 /*
- * Copyright (c) International Business Machines Corp., 2012
- *
  * FSP Flash Structure
  *
  * This header defines the layout for the FSP Flash Structure.
+ *
+ * Copyright 2012-2018 IBM Corp.
  */
 
 #ifndef __FFS_H__
diff --git a/libflash/file.c b/libflash/file.c
index d790e29..b395fc0 100644
--- a/libflash/file.c
+++ b/libflash/file.c
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2019 IBM Corp. */
+
 #define _GNU_SOURCE
 #include <errno.h>
 #include <inttypes.h>
diff --git a/libflash/file.h b/libflash/file.h
index c8e58a6..af055ca 100644
--- a/libflash/file.h
+++ b/libflash/file.h
@@ -1,18 +1,5 @@
-/* Copyright 2013-2015 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2016 IBM Corp. */
 
 #ifndef __LIBFLASH_FILE_H
 #define __LIBFLASH_FILE_H
diff --git a/libflash/ipmi-hiomap.c b/libflash/ipmi-hiomap.c
index 9174eab..5f720ef 100644
--- a/libflash/ipmi-hiomap.c
+++ b/libflash/ipmi-hiomap.c
@@ -1,18 +1,5 @@
-/* Copyright 2018 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2018-2019 IBM Corp. */
 
 #define pr_fmt(fmt) "HIOMAP: " fmt
 
diff --git a/libflash/ipmi-hiomap.h b/libflash/ipmi-hiomap.h
index edd4ee0..b517c1f 100644
--- a/libflash/ipmi-hiomap.h
+++ b/libflash/ipmi-hiomap.h
@@ -1,18 +1,5 @@
-/* Copyright 2018 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2018-2019 IBM Corp. */
 
 #ifndef __LIBFLASH_IPMI_HIOMAP_H
 #define __LIBFLASH_IPMI_HIOMAP_H
diff --git a/libflash/libffs.c b/libflash/libffs.c
index 09448a0..fe808d1 100644
--- a/libflash/libffs.c
+++ b/libflash/libffs.c
@@ -1,20 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
-/*
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2019 IBM Corp. */
+
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libflash/libffs.h b/libflash/libffs.h
index f149fd8..fa9359c 100644
--- a/libflash/libffs.h
+++ b/libflash/libffs.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
+
 #ifndef __LIBFFS_H
 #define __LIBFFS_H
 
diff --git a/libflash/libflash-priv.h b/libflash/libflash-priv.h
index e59d829..9a8afc9 100644
--- a/libflash/libflash-priv.h
+++ b/libflash/libflash-priv.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2015 IBM Corp. */
+
 #ifndef __LIBFLASH_PRIV_H
 #define __LIBFLASH_PRIV_H
 
diff --git a/libflash/libflash.c b/libflash/libflash.c
index 992d35c..4d56969 100644
--- a/libflash/libflash.c
+++ b/libflash/libflash.c
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2017 IBM Corp. */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libflash/libflash.h b/libflash/libflash.h
index 01b4d60..31be920 100644
--- a/libflash/libflash.h
+++ b/libflash/libflash.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2017 IBM Corp. */
+
 #ifndef __LIBFLASH_H
 #define __LIBFLASH_H
 
diff --git a/libflash/mbox-flash.c b/libflash/mbox-flash.c
index 11ec905..5cede3c 100644
--- a/libflash/mbox-flash.c
+++ b/libflash/mbox-flash.c
@@ -1,18 +1,5 @@
-/* Copyright 2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2017-2018 IBM Corp. */
 
 #define pr_fmt(fmt) "MBOX-FLASH: " fmt
 
diff --git a/libflash/mbox-flash.h b/libflash/mbox-flash.h
index 34b4f65..7a8201c 100644
--- a/libflash/mbox-flash.h
+++ b/libflash/mbox-flash.h
@@ -1,18 +1,5 @@
-/* Copyright 2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2017 IBM Corp. */
 
 #ifndef __LIBFLASH_MBOX_FLASH_H
 #define __LIBFLASH_MBOX_FLASH_H
diff --git a/libflash/test/mbox-server.c b/libflash/test/mbox-server.c
index e035788..69499dc 100644
--- a/libflash/test/mbox-server.c
+++ b/libflash/test/mbox-server.c
@@ -1,18 +1,5 @@
-/* Copyright 2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2017 IBM Corp. */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libflash/test/mbox-server.h b/libflash/test/mbox-server.h
index 0a961ba..b573f34 100644
--- a/libflash/test/mbox-server.h
+++ b/libflash/test/mbox-server.h
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2017 IBM Corp. */
+
 #include <stdint.h>
 
 uint32_t mbox_server_total_size(void);
diff --git a/libflash/test/stubs.c b/libflash/test/stubs.c
index f113067..30ccf4c 100644
--- a/libflash/test/stubs.c
+++ b/libflash/test/stubs.c
@@ -1,19 +1,10 @@
-/* Copyright 2013-2017 IBM Corp.
+// SPDX-License-Identifier: Apache-2.0
+/*
+ * Stubs for libflash test
  *
- * 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-2018 IBM Corp.
  */
-/* Stubs for libflash test */
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libflash/test/stubs.h b/libflash/test/stubs.h
index bb87dba..ec408bc 100644
--- a/libflash/test/stubs.h
+++ b/libflash/test/stubs.h
@@ -1,18 +1,6 @@
-/* Copyright 2013-2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
+
 #include <lock.h>
 #include <stdint.h>
 
diff --git a/libflash/test/test-blocklevel.c b/libflash/test/test-blocklevel.c
index a67f588..4f5adc1 100644
--- a/libflash/test/test-blocklevel.c
+++ b/libflash/test/test-blocklevel.c
@@ -1,18 +1,6 @@
-/* Copyright 2013-2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/libflash/test/test-ecc.c b/libflash/test/test-ecc.c
index 5ce4c57..af5f42f 100644
--- a/libflash/test/test-ecc.c
+++ b/libflash/test/test-ecc.c
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2018 IBM Corp. */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/libflash/test/test-flash.c b/libflash/test/test-flash.c
index 3c04fd3..9cc8499 100644
--- a/libflash/test/test-flash.c
+++ b/libflash/test/test-flash.c
@@ -1,18 +1,6 @@
-/* Copyright 2013-2014 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2013-2017 IBM Corp. */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/libflash/test/test-ipmi-hiomap.c b/libflash/test/test-ipmi-hiomap.c
index e1bc5ef..30dbe24 100644
--- a/libflash/test/test-ipmi-hiomap.c
+++ b/libflash/test/test-ipmi-hiomap.c
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2018-2019 IBM Corp. */
+
 #include <assert.h>
 #include <ccan/container_of/container_of.h>
 #include <libflash/blocklevel.h>
diff --git a/libflash/test/test-mbox.c b/libflash/test/test-mbox.c
index 9bd6f7c..6e30b9e 100644
--- a/libflash/test/test-mbox.c
+++ b/libflash/test/test-mbox.c
@@ -1,18 +1,5 @@
-/* Copyright 2017 IBM 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+/* Copyright 2017-2018 IBM Corp. */
 
 #include <stdio.h>
 #include <stdlib.h>