diff options
469 files changed, 1418 insertions, 5959 deletions
diff --git a/Makefile.main b/Makefile.main index 56fa2ba..0e338d5 100644 --- a/Makefile.main +++ b/Makefile.main @@ -1,6 +1,8 @@ -# -*-Makefile-*- +# SPDX-License-Identifier: Apache-2.0 # # This is the main Makefile +# +# Copyright 2013-2019 IBM Corp # Target tools CC=$(CROSS)gcc$(POSTFIX) diff --git a/asm/asm-offsets.c b/asm/asm-offsets.c index 0aea93d..e458405 100644 --- a/asm/asm-offsets.c +++ b/asm/asm-offsets.c @@ -1,17 +1,5 @@ -/* 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 <stddef.h> diff --git a/asm/cvc_entry.S b/asm/cvc_entry.S index 069ed09..1296e88 100644 --- a/asm/cvc_entry.S +++ b/asm/cvc_entry.S @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # diff --git a/asm/dummy_map.S b/asm/dummy_map.S index 19a8d62..cb8f9df 100644 --- a/asm/dummy_map.S +++ b/asm/dummy_map.S @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 .section ".sym_map","a" .byte 0 @@ -1,17 +1,8 @@ -/* 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 +/* + * OPAL Entry points (and related 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. */ #include <asm-utils.h> diff --git a/asm/kernel-wrapper.S b/asm/kernel-wrapper.S index 2ab4d67..27ff47c 100644 --- a/asm/kernel-wrapper.S +++ b/asm/kernel-wrapper.S @@ -1,17 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 /* 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. */ @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Misc asm functions * - * 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-2014 IBM Corp. */ #include <asm-utils.h> diff --git a/asm/real_map.S b/asm/real_map.S index fbbf2cc..4dfb71a 100644 --- a/asm/real_map.S +++ b/asm/real_map.S @@ -1,20 +1,8 @@ -/* 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-2014 IBM Corp. */ - .section ".sym_map","a" .incbin "skiboot.tmp.map" diff --git a/core/affinity.c b/core/affinity.c index 070a1cd..d2bf030 100644 --- a/core/affinity.c +++ b/core/affinity.c @@ -1,18 +1,5 @@ -/* 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. */ /* * diff --git a/core/bitmap.c b/core/bitmap.c index be0700f..0900a61 100644 --- a/core/bitmap.c +++ b/core/bitmap.c @@ -1,18 +1,6 @@ -/* Copyright 2016 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 2016 IBM Corp. */ + #include "bitmap.h" static int __bitmap_find_bit(bitmap_t map, unsigned int start, unsigned int count, diff --git a/core/buddy.c b/core/buddy.c index b98a229..d3f7ee3 100644 --- a/core/buddy.c +++ b/core/buddy.c @@ -1,18 +1,6 @@ -/* Copyright 2016 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 2016-2017 IBM Corp. */ + #include <assert.h> #include <stdlib.h> #include <string.h> diff --git a/core/chip.c b/core/chip.c index 221cf2d..4a4a9a2 100644 --- a/core/chip.c +++ b/core/chip.c @@ -1,19 +1,5 @@ -/* 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 <skiboot.h> #include <chip.h> diff --git a/core/console-log.c b/core/console-log.c index dd23027..09176af 100644 --- a/core/console-log.c +++ b/core/console-log.c @@ -1,24 +1,11 @@ -/* 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 /* * Console Log routines * Wraps libc and console lower level functions * does fancy-schmancy things like timestamps and priorities * Doesn't make waffles. + * + * Copyright 2013-2018 IBM Corp. */ #include "skiboot.h" diff --git a/core/console.c b/core/console.c index 0e9bc45..139ba4a 100644 --- a/core/console.c +++ b/core/console.c @@ -1,24 +1,12 @@ -/* 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 /* * Console IO routine for use by libc * * fd is the classic posix 0,1,2 (stdin, stdout, stderr) + * + * Copyright 2013-2018 IBM Corp. */ + #include <skiboot.h> #include <unistd.h> #include <console.h> @@ -1,23 +1,10 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Code to manage and manipulate CPUs * - * 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. */ -/* - * TODO: Index array by PIR to be able to catch them easily - * from assembly such as machine checks etc... - */ #include <skiboot.h> #include <cpu.h> #include <device.h> diff --git a/core/cpufeatures.c b/core/cpufeatures.c index 6981dec..ec30c97 100644 --- a/core/cpufeatures.c +++ b/core/cpufeatures.c @@ -1,21 +1,8 @@ -/* Copyright 2017-2019 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 /* * This file deals with setup of /cpus/ibm,powerpc-cpu-features dt + * + * Copyright 2017-2019 IBM Corp. */ #include <skiboot.h> diff --git a/core/device.c b/core/device.c index 251550e..ce0171b 100644 --- a/core/device.c +++ b/core/device.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Manipulate the device tree * - * 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. */ #include <stdarg.h> diff --git a/core/direct-controls.c b/core/direct-controls.c index 28191b7..507a16f 100644 --- a/core/direct-controls.c +++ b/core/direct-controls.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Directly control CPU cores/threads. SRESET, special wakeup, etc * - * 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 2017-2019 IBM Corp. */ #include <direct-controls.h> diff --git a/core/errorlog.c b/core/errorlog.c index 522dfcc..01e2969 100644 --- a/core/errorlog.c +++ b/core/errorlog.c @@ -1,24 +1,12 @@ -/* 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 /* This file contains the front end for OPAL error logging. It is used * to construct a struct errorlog representing the event/error to be * logged which is then passed to the platform specific backend to log * the actual errors. + * + * Copyright 2013-2017 IBM Corp. */ + #include <skiboot.h> #include <lock.h> #include <errorlog.h> diff --git a/core/exceptions.c b/core/exceptions.c index 4e5c081..90e412b 100644 --- a/core/exceptions.c +++ b/core/exceptions.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Deal with exceptions when in OPAL. * - * 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-2014 IBM Corp. */ #include <skiboot.h> diff --git a/core/fast-reboot.c b/core/fast-reboot.c index 35c9a2b..ed5f546 100644 --- a/core/fast-reboot.c +++ b/core/fast-reboot.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2019 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 +/* + * Full IPL is slow, let's cheat! * - * 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. */ #include <skiboot.h> @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Produce and consume flattened device trees * - * 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. */ #include <skiboot.h> diff --git a/core/flash-firmware-versions.c b/core/flash-firmware-versions.c index 59294e4..3e58379 100644 --- a/core/flash-firmware-versions.c +++ b/core/flash-firmware-versions.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Parse VERSION partition, add to device tree * - * 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. */ #include <skiboot.h> diff --git a/core/flash-subpartition.c b/core/flash-subpartition.c index 7931790..06a53a6 100644 --- a/core/flash-subpartition.c +++ b/core/flash-subpartition.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Parse flash sub-partitions * - * 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. */ #include <skiboot.h> diff --git a/core/flash.c b/core/flash.c index 3da6d4a..203b695 100644 --- a/core/flash.c +++ b/core/flash.c @@ -1,18 +1,9 @@ -/* Copyright 2013-2018 IBM Corp. - * Copyright 2018 Raptor Engineering, LLC - * - * 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 +/* + * Init, manage, read, write, and load resources from flash * - * 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. + * Copyright 2018-2019 Raptor Engineering, LLC */ #include <skiboot.h> diff --git a/core/gcov-profiling.c b/core/gcov-profiling.c index 3ff7e6e..c94438e 100644 --- a/core/gcov-profiling.c +++ b/core/gcov-profiling.c @@ -1,17 +1,8 @@ -/* 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 +/* + * libgcov skeleton reimplementation to build skiboot with gcov support * - * 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 2015-2018 IBM Corp. */ #include <skiboot.h> @@ -1,17 +1,8 @@ -/* Copyright 2013-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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Deal with Hypervisor Maintenance Interrupts * - * 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 pr_fmt(fmt) "HMI: " fmt @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * I2C * - * 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. */ #include <skiboot.h> diff --git a/core/init.c b/core/init.c index 7a35da1..2c77c15 100644 --- a/core/init.c +++ b/core/init.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * skiboot C entry point * - * 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. */ #include <skiboot.h> diff --git a/core/interrupts.c b/core/interrupts.c index b053401..b0c1da1 100644 --- a/core/interrupts.c +++ b/core/interrupts.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Excuse me, you do work for me now? * - * 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. */ #include <skiboot.h> diff --git a/core/ipmi-opal.c b/core/ipmi-opal.c index c739546..796508c 100644 --- a/core/ipmi-opal.c +++ b/core/ipmi-opal.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * IPMI OPAL calls * - * 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. */ #include <stdlib.h> diff --git a/core/ipmi.c b/core/ipmi.c index 9cf5aa6..566300e 100644 --- a/core/ipmi.c +++ b/core/ipmi.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * in-band IPMI, probably over bt (or via FSP mbox on FSP) * - * 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. */ #include <stdio.h> diff --git a/core/lock.c b/core/lock.c index 6fbb5eb..9594e05 100644 --- a/core/lock.c +++ b/core/lock.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Simple spinlock * - * 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. */ #include <skiboot.h> diff --git a/core/malloc.c b/core/malloc.c index 669cc59..613cff9 100644 --- a/core/malloc.c +++ b/core/malloc.c @@ -1,19 +1,11 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Implement malloc()/free() etc on top of our memory region allocator, + * which provides mem_alloc()/mem_free(). * - * 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-2015 IBM Corp. */ -/* Wrappers for malloc, et. al. */ + #include <mem_region.h> #include <lock.h> #include <string.h> diff --git a/core/mem_region.c b/core/mem_region.c index 7455192..47d7544 100644 --- a/core/mem_region.c +++ b/core/mem_region.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Simple memory allocator * - * 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. */ #include <inttypes.h> diff --git a/core/nvram-format.c b/core/nvram-format.c index e34add3..15a4a2d 100644 --- a/core/nvram-format.c +++ b/core/nvram-format.c @@ -1,26 +1,13 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * NVRAM Format as specified in PAPR * - * 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. */ #include <skiboot.h> #include <nvram.h> -/* - * NVRAM Format as specified in PAPR - */ - struct chrp_nvram_hdr { uint8_t sig; uint8_t cksum; diff --git a/core/nvram.c b/core/nvram.c index 8c68957..ce24684 100644 --- a/core/nvram.c +++ b/core/nvram.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NVRAM support * - * 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. */ #include <skiboot.h> diff --git a/core/opal-msg.c b/core/opal-msg.c index af1ec7d..c393be7 100644 --- a/core/opal-msg.c +++ b/core/opal-msg.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2019 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL Message queue between host and skiboot * - * 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 pr_fmt(fmt) "opalmsg: " fmt diff --git a/core/opal.c b/core/opal.c index 6508116..151c5d9 100644 --- a/core/opal.c +++ b/core/opal.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Base support for OPAL calls * - * 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. */ #include <skiboot.h> diff --git a/core/pci-dt-slot.c b/core/pci-dt-slot.c index 448a8f0..5c44955 100644 --- a/core/pci-dt-slot.c +++ b/core/pci-dt-slot.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * PCI slots in the device tree. * - * 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 2017-2018 IBM Corp. */ #include <stdarg.h> diff --git a/core/pci-opal.c b/core/pci-opal.c index 94afc6d..213a725 100644 --- a/core/pci-opal.c +++ b/core/pci-opal.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * PCIe OPAL Calls * - * 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. */ #include <skiboot.h> diff --git a/core/pci-quirk.c b/core/pci-quirk.c index 1007e96..e8f9d22 100644 --- a/core/pci-quirk.c +++ b/core/pci-quirk.c @@ -1,17 +1,8 @@ -/* Copyright 2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Deal with PCI device quirks * - * 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 2017-2018 IBM Corp. */ #define pr_fmt(fmt) "PCI-QUIRK: " fmt diff --git a/core/pci-slot.c b/core/pci-slot.c index d8c8024..ffb54cb 100644 --- a/core/pci-slot.c +++ b/core/pci-slot.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * PCI Slots * - * 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. */ #include <skiboot.h> diff --git a/core/pci-virt.c b/core/pci-virt.c index b531470..606e4f5 100644 --- a/core/pci-virt.c +++ b/core/pci-virt.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Support virtual PCI devices * - * 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-2016 IBM Corp. */ #include <skiboot.h> @@ -1,17 +1,8 @@ -/* 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 +/* + * Base PCI support * - * 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. */ #include <skiboot.h> diff --git a/core/pcie-slot.c b/core/pcie-slot.c index dc5e4dc..894fd40 100644 --- a/core/pcie-slot.c +++ b/core/pcie-slot.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2016 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 +/* + * PCIe Slots * - * 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. */ #include <skiboot.h> @@ -1,3 +1,10 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Platform Error Log (PEL) generation + * + * Copyright 2014-2016 IBM Corp + */ + #include <string.h> #include <errorlog.h> #include <device.h> diff --git a/core/platform.c b/core/platform.c index efcf63d..7220c6c 100644 --- a/core/platform.c +++ b/core/platform.c @@ -1,20 +1,14 @@ -/* Copyright 2013-2016 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL Platform abstraction * - * http://www.apache.org/licenses/LICENSE-2.0 + * Some OPAL calls may/may not call into the struct platform that's + * probed during boot. There's also a bunch of platform specific init + * and configuration that's called. * - * 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. */ - #include <skiboot.h> #include <opal.h> #include <console.h> diff --git a/core/pool.c b/core/pool.c index adf6c90..9294f8c 100644 --- a/core/pool.c +++ b/core/pool.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. - */ - -/* This file provides some functions to manage a pool of pre-allocated +// SPDX-License-Identifier: Apache-2.0 +/* + * This file provides some functions to manage a pool of pre-allocated * objects. It also provides a method to reserve a pre-defined number * of objects for higher priorty requests. The allocations follow the * following rules: @@ -26,6 +12,8 @@ * 3. When an allocation is freed it is always added to the high priority * pool if there are less than the reserved number of allocations * available. + * + * Copyright 2013-2014 IBM Corp. */ #include <pool.h> diff --git a/core/powercap.c b/core/powercap.c index 50b5996..b9d172b 100644 --- a/core/powercap.c +++ b/core/powercap.c @@ -1,17 +1,8 @@ -/* Copyright 2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL calls to get/set power caps * - * 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 2017 IBM Corp. */ #include <powercap.h> @@ -1,17 +1,10 @@ -/* Copyright 2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL calls to get/set Power Shift Ratio (PSR) * - * 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 + * i.e. when something has to be throttled, what gets throttled? * - * 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 2017 IBM Corp. */ #include <psr.h> diff --git a/core/relocate.c b/core/relocate.c index 7255803..8e1f1b2 100644 --- a/core/relocate.c +++ b/core/relocate.c @@ -1,27 +1,17 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Relocate ourselves * - * 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 + * WARNING: This code is used to self-relocate, it cannot have any + * global reference nor TOC reference. It's also called before BSS + * is cleared. * - * 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-2015 IBM Corp. */ #include <stdbool.h> #include <elf.h> -/* WARNING: This code is used to self-relocate, it cannot have any - * global reference nor TOC reference. It's also called before BSS - * is cleared. - */ - /* Called from head.S, thus no header. */ int relocate(uint64_t offset, struct elf64_dyn *dyn, struct elf64_rela *rela); @@ -1,20 +1,10 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Real Time Clock (RTC) Cache * - * 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-2014 IBM Corp. */ - #include <skiboot.h> #include <lock.h> #include <rtc.h> diff --git a/core/sensor.c b/core/sensor.c index bd329a1..a804f96 100644 --- a/core/sensor.c +++ b/core/sensor.c @@ -1,20 +1,10 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL Sensor APIs * - * 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. */ - #include <sensor.h> #include <skiboot.h> #include <device.h> diff --git a/core/stack.c b/core/stack.c index b5a352d..711761b 100644 --- a/core/stack.c +++ b/core/stack.c @@ -1,20 +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 +/* + * Create/Print backtraces, check stack usage etc. * - * 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. */ - #include <skiboot.h> #include <processor.h> #include <cpu.h> diff --git a/core/test/dummy-cpu.h b/core/test/dummy-cpu.h index 88b54ce..804a047 100644 --- a/core/test/dummy-cpu.h +++ b/core/test/dummy-cpu.h @@ -1,20 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2013-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. - */ - -/* A dummy cpu.h for tests. + * A dummy cpu.h for tests. * We don't want to include the real skiboot cpu.h, it's PPC-specific */ diff --git a/core/test/run-api-test.c b/core/test/run-api-test.c index 583910d..1029c7d 100644 --- a/core/test/run-api-test.c +++ b/core/test/run-api-test.c @@ -1,20 +1,7 @@ -/* Copyright 2014-2016 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 2014-2016 IBM Corp. + * * For now it just validates that addresses passed are sane and test the * wrapper that validates addresses */ diff --git a/core/test/run-bitmap.c b/core/test/run-bitmap.c index 7c68460..2c7cea7 100644 --- a/core/test/run-bitmap.c +++ b/core/test/run-bitmap.c @@ -1,18 +1,8 @@ -/* 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 "../bitmap.c" #include <assert.h> #include <stdlib.h> diff --git a/core/test/run-buddy.c b/core/test/run-buddy.c index a0a933d..6f7957d 100644 --- a/core/test/run-buddy.c +++ b/core/test/run-buddy.c @@ -1,17 +1,6 @@ -/* Copyright 2016-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 2016-2017 IBM Corp. */ #include <buddy.h> #include <assert.h> diff --git a/core/test/run-console-log-buf-overrun.c b/core/test/run-console-log-buf-overrun.c index 01fca9b..05cc414 100644 --- a/core/test/run-console-log-buf-overrun.c +++ b/core/test/run-console-log-buf-overrun.c @@ -1,17 +1,6 @@ -/* Copyright 2014-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 2014-2015 IBM Corp. */ #include <config.h> diff --git a/core/test/run-console-log-pr_fmt.c b/core/test/run-console-log-pr_fmt.c index ae9d206..ba15fd3 100644 --- a/core/test/run-console-log-pr_fmt.c +++ b/core/test/run-console-log-pr_fmt.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-console-log.c b/core/test/run-console-log.c index 01376ee..71c1d6a 100644 --- a/core/test/run-console-log.c +++ b/core/test/run-console-log.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-cpufeatures.c b/core/test/run-cpufeatures.c index c072e5f..1ec8c22 100644 --- a/core/test/run-cpufeatures.c +++ b/core/test/run-cpufeatures.c @@ -1,17 +1,6 @@ -/* Copyright 2019 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 2019 IBM Corp. */ #include <skiboot.h> diff --git a/core/test/run-device.c b/core/test/run-device.c index 287d5a8..ca160bc 100644 --- a/core/test/run-device.c +++ b/core/test/run-device.c @@ -1,17 +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-2014 IBM Corp. */ #include <skiboot.h> diff --git a/core/test/run-flash-firmware-versions.c b/core/test/run-flash-firmware-versions.c index 8fff714..33baf4d 100644 --- a/core/test/run-flash-firmware-versions.c +++ b/core/test/run-flash-firmware-versions.c @@ -1,17 +1,6 @@ -/* 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 IBM Corp. */ #include <stdlib.h> diff --git a/core/test/run-flash-subpartition.c b/core/test/run-flash-subpartition.c index 419de88..bc41dbf 100644 --- a/core/test/run-flash-subpartition.c +++ b/core/test/run-flash-subpartition.c @@ -1,17 +1,6 @@ -/* Copyright 2013-2016 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. */ #include <skiboot.h> diff --git a/core/test/run-malloc-speed.c b/core/test/run-malloc-speed.c index 94e96e7..bafd5af 100644 --- a/core/test/run-malloc-speed.c +++ b/core/test/run-malloc-speed.c @@ -1,17 +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. */ #include <config.h> diff --git a/core/test/run-malloc.c b/core/test/run-malloc.c index cb68768..7e7bfcd 100644 --- a/core/test/run-malloc.c +++ b/core/test/run-malloc.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_range_is_reserved.c b/core/test/run-mem_range_is_reserved.c index 8d70a24..ea276b7 100644 --- a/core/test/run-mem_range_is_reserved.c +++ b/core/test/run-mem_range_is_reserved.c @@ -1,17 +1,6 @@ -/* Copyright 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 2015 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region.c b/core/test/run-mem_region.c index d48f552..fea256e 100644 --- a/core/test/run-mem_region.c +++ b/core/test/run-mem_region.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region_init.c b/core/test/run-mem_region_init.c index b6d33f5..4f849fe 100644 --- a/core/test/run-mem_region_init.c +++ b/core/test/run-mem_region_init.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region_next.c b/core/test/run-mem_region_next.c index 3228d4f..9f1180b 100644 --- a/core/test/run-mem_region_next.c +++ b/core/test/run-mem_region_next.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region_release_unused.c b/core/test/run-mem_region_release_unused.c index 1834a4c..e5811ef 100644 --- a/core/test/run-mem_region_release_unused.c +++ b/core/test/run-mem_region_release_unused.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region_release_unused_noalloc.c b/core/test/run-mem_region_release_unused_noalloc.c index 9ee2742..99b2ff5 100644 --- a/core/test/run-mem_region_release_unused_noalloc.c +++ b/core/test/run-mem_region_release_unused_noalloc.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/run-mem_region_reservations.c b/core/test/run-mem_region_reservations.c index 6cb1361..3a8a645 100644 --- a/core/test/run-mem_region_reservations.c +++ b/core/test/run-mem_region_reservations.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #include <config.h> diff --git a/core/test/run-msg.c b/core/test/run-msg.c index 34bb424..8b79f17 100644 --- a/core/test/run-msg.c +++ b/core/test/run-msg.c @@ -1,17 +1,6 @@ -/* Copyright 2013-2019 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 <inttypes.h> #include <stdbool.h> diff --git a/core/test/run-nvram-format.c b/core/test/run-nvram-format.c index c8a7583..d421880 100644 --- a/core/test/run-nvram-format.c +++ b/core/test/run-nvram-format.c @@ -1,17 +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-2014 IBM Corp. */ #include <stdlib.h> diff --git a/core/test/run-pel.c b/core/test/run-pel.c index 433842b..72b4c32 100644 --- a/core/test/run-pel.c +++ b/core/test/run-pel.c @@ -1,20 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * 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. - */ - -/* Test for our PEL record generation. Currently this doesn't actually + * Test for our PEL record generation. Currently this doesn't actually * test that the records we generate are correct, but it at least lets * us run valgrind over the generation routines to check for buffer * overflows, etc. diff --git a/core/test/run-time-utils.c b/core/test/run-time-utils.c index 21c9978..26b8a38 100644 --- a/core/test/run-time-utils.c +++ b/core/test/run-time-utils.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #include <config.h> diff --git a/core/test/run-timebase.c b/core/test/run-timebase.c index 38c41fd..2771db3 100644 --- a/core/test/run-timebase.c +++ b/core/test/run-timebase.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #include <stdint.h> diff --git a/core/test/run-trace.c b/core/test/run-trace.c index 10494a2..7350ee5 100644 --- a/core/test/run-trace.c +++ b/core/test/run-trace.c @@ -1,17 +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-2014 IBM Corp. */ #include <config.h> diff --git a/core/test/stubs.c b/core/test/stubs.c index 0a8d852..343ee9f 100644 --- a/core/test/stubs.c +++ b/core/test/stubs.c @@ -1,17 +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-2014 IBM Corp. */ #include <stdlib.h> #include <stdio.h> diff --git a/core/time-utils.c b/core/time-utils.c index 8a02f46..97ca962 100644 --- a/core/time-utils.c +++ b/core/time-utils.c @@ -1,21 +1,4 @@ -/* 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. - */ - -#include <time-utils.h> - +// SPDX-License-Identifier: Apache-2.0 /* * Converts an OPAL formatted datetime into a struct tm. We ignore microseconds * as Linux doesn't use them anyway. @@ -25,8 +8,12 @@ * | hour | minute | secs | reserved | * +------------------------------------+ * | microseconds | + * + * Copyright 2013-2014 IBM Corp. */ +#include <time-utils.h> + void datetime_to_tm(uint32_t y_m_d, uint64_t h_m_s_m, struct tm *tm) { uint32_t x; diff --git a/core/timebase.c b/core/timebase.c index b1a02a4..4cb0b51 100644 --- a/core/timebase.c +++ b/core/timebase.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Wait for things, by waiting for timebase to tick over * - * 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. */ #include <timebase.h> @@ -44,6 +35,7 @@ static void time_wait_poll(unsigned long duration) } while (tb_compare(now, end) != TB_AAFTERB) { + unsigned long remaining = end - now; /* Call pollers periodically but not continually to avoid diff --git a/core/timer.c b/core/timer.c index 8f754cd..5cf9069 100644 --- a/core/timer.c +++ b/core/timer.c @@ -1,3 +1,14 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * run something, but later. + * + * Timers are run when the SBE timer interrupt triggers (based on us setting + * it) or when the regular heartbeat call from the OS occurs and there's a + * timer that's expired. + * + * Copyright 2014-2019 IBM Corp. + */ + #include <timer.h> #include <timebase.h> #include <lock.h> diff --git a/core/trace.c b/core/trace.c index de6b661..614be08 100644 --- a/core/trace.c +++ b/core/trace.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Trace various things into in-memory buffers * - * 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. */ #include <trace.h> diff --git a/core/utils.c b/core/utils.c index 508bba9..728cea4 100644 --- a/core/utils.c +++ b/core/utils.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Misc utility functions * - * 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. */ #include <skiboot.h> @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Parse Vital Product Data (VPD) * - * 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. */ #include <skiboot.h> diff --git a/external/Makefile.check b/external/Makefile.check index b5266ae..46ff66e 100644 --- a/external/Makefile.check +++ b/external/Makefile.check @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # -*-Makefile-*- TOOL=gard ffspart pflash diff --git a/external/common/arch_flash.h b/external/common/arch_flash.h index c1be706..4feed27 100644 --- a/external/common/arch_flash.h +++ b/external/common/arch_flash.h @@ -1,17 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 /* Copyright 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. */ #ifndef __EXTERNAL_ARCH_FLASH_H diff --git a/external/common/arch_flash_arm.c b/external/common/arch_flash_arm.c index 3cdd41d..5842fdd 100644 --- a/external/common/arch_flash_arm.c +++ b/external/common/arch_flash_arm.c @@ -1,17 +1,5 @@ -/* Copyright 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 2015-2016 IBM Corp. */ #define _GNU_SOURCE #include <stdlib.h> diff --git a/external/common/arch_flash_arm_io.h b/external/common/arch_flash_arm_io.h index a1ee1f3..bffcb53 100644 --- a/external/common/arch_flash_arm_io.h +++ b/external/common/arch_flash_arm_io.h @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2015 IBM Corp. + */ #ifndef __IO_H #define __IO_H diff --git a/external/common/arch_flash_common.c b/external/common/arch_flash_common.c index 6bce7e1..d3e34fd 100644 --- a/external/common/arch_flash_common.c +++ b/external/common/arch_flash_common.c @@ -1,26 +1,14 @@ -/* Copyright 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Default implementations * - * 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 2015-2017 IBM Corp. */ -#include <stdlib.h> +#include <stdlib.h> #include <libflash/blocklevel.h> - #include "arch_flash.h" -/* Default implementations */ - /* * This just assumes that an erase from zero to total size is * 'correct'. diff --git a/external/common/arch_flash_powerpc.c b/external/common/arch_flash_powerpc.c index 95402ee..9bd4ba2 100644 --- a/external/common/arch_flash_powerpc.c +++ b/external/common/arch_flash_powerpc.c @@ -1,17 +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-2017 IBM Corp. */ #define _GNU_SOURCE diff --git a/external/common/arch_flash_x86.c b/external/common/arch_flash_x86.c index 3638d73..00a3556 100644 --- a/external/common/arch_flash_x86.c +++ b/external/common/arch_flash_x86.c @@ -1,17 +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-2017 IBM Corp. */ #include <stdlib.h> diff --git a/external/common/get_arch.sh b/external/common/get_arch.sh index f4beb1d..b5e0867 100755 --- a/external/common/get_arch.sh +++ b/external/common/get_arch.sh @@ -1,4 +1,6 @@ #!/bin/sh +# SPDX-License-Identifier: Apache-2.0 + echo "#if defined(__powerpc__) echo -n ARCH_POWERPC #elif defined(__x86_64__) || defined(__i386__) diff --git a/external/common/rules.mk b/external/common/rules.mk index af8958b..05eb755 100644 --- a/external/common/rules.mk +++ b/external/common/rules.mk @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + CC ?= $(CROSS_COMPILE)gcc LD ?= $(CROSS_COMPILE)ld ARCH := $(shell $(GET_ARCH) "$(CROSS_COMPILE)") diff --git a/external/devicetree/Makefile b/external/devicetree/Makefile index 2ce622b..02e7a17 100644 --- a/external/devicetree/Makefile +++ b/external/devicetree/Makefile @@ -1,3 +1,7 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2019 IBM Corp. + DTC=dtc OUT=p9-simics.dtb diff --git a/external/devicetree/p9-simics.dts b/external/devicetree/p9-simics.dts index bd05d09..bc6747c 100644 --- a/external/devicetree/p9-simics.dts +++ b/external/devicetree/p9-simics.dts @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * POWER9 Simics Device Tree + */ + /include/ "p9.dts" / { diff --git a/external/devicetree/p9.dts b/external/devicetree/p9.dts index 905e33d..fac348b 100644 --- a/external/devicetree/p9.dts +++ b/external/devicetree/p9.dts @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * base POWER9 device tree + */ + /dts-v1/; / { diff --git a/external/ffspart/Makefile b/external/ffspart/Makefile index a9b8cfa..9814022 100644 --- a/external/ffspart/Makefile +++ b/external/ffspart/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # Use make V=1 for a verbose build. include rules.mk GET_ARCH = ../../external/common/get_arch.sh diff --git a/external/ffspart/config.h b/external/ffspart/config.h index a132a01..4509837 100644 --- a/external/ffspart/config.h +++ b/external/ffspart/config.h @@ -1,4 +1,9 @@ -/* For CCAN */ +// SPDX-License-Identifier: Apache-2.0 +/* + * For CCAN + * + * Copyright 2017 IBM Corp. + */ #include <endian.h> #include <byteswap.h> diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c index 9fc015c..e0dd8d3 100644 --- a/external/ffspart/ffspart.c +++ b/external/ffspart/ffspart.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Assemble a FFS Image (no, not that FFS, this FFS) * - * 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. */ #include <ctype.h> diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk index d0100a2..1c6a838 100644 --- a/external/ffspart/rules.mk +++ b/external/ffspart/rules.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 .DEFAULT_GOAL := all override CFLAGS += -O2 -Wall -g -I. diff --git a/external/fwts/generate-fwts-olog b/external/fwts/generate-fwts-olog index d108823..3018965 100755 --- a/external/fwts/generate-fwts-olog +++ b/external/fwts/generate-fwts-olog @@ -1,19 +1,7 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: Apache-2.0 # # Copyright 2016 Jeremy Kerr <jk@ozlabs.org> -# -# 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. import os.path import re diff --git a/external/fwts/merge-fwts-olog b/external/fwts/merge-fwts-olog index 2a4b290..6b0befb 100755 --- a/external/fwts/merge-fwts-olog +++ b/external/fwts/merge-fwts-olog @@ -1,19 +1,7 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: Apache-2.0 # # Copyright 2016 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. import json import sys diff --git a/external/gard/Makefile b/external/gard/Makefile index 50589cf..e249cf8 100644 --- a/external/gard/Makefile +++ b/external/gard/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # This tool is a linux userland tool and should be completely stand alone include rules.mk GET_ARCH = ../../external/common/get_arch.sh diff --git a/external/gard/Makefile.dist b/external/gard/Makefile.dist index 759b3ea..4d44a04 100644 --- a/external/gard/Makefile.dist +++ b/external/gard/Makefile.dist @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 #Prevent make from trying to remake arch links symlinks #which are fixed files now ARCH_LINKS := diff --git a/external/gard/config.h b/external/gard/config.h index 2e0347f..d3edaea 100644 --- a/external/gard/config.h +++ b/external/gard/config.h @@ -1,4 +1,9 @@ -/* For CCAN */ +// SPDX-License-Identifier: Apache-2.0 +/* + * For CCAN + * + * Copyright 2015-2017 IBM Corp + */ #include <endian.h> #include <byteswap.h> diff --git a/external/gard/gard.c b/external/gard/gard.c index ba15e87..f8c1032 100644 --- a/external/gard/gard.c +++ b/external/gard/gard.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Manipulate GARD records in the GARD partition * - * 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. */ #include <fcntl.h> diff --git a/external/gard/gard.h b/external/gard/gard.h index 191cbaf..5999cf9 100644 --- a/external/gard/gard.h +++ b/external/gard/gard.h @@ -1,17 +1,5 @@ -/* 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 <stdint.h> diff --git a/external/gard/rules.mk b/external/gard/rules.mk index 9e8b581..8db66b8 100644 --- a/external/gard/rules.mk +++ b/external/gard/rules.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 .DEFAULT_GOAL := all override CFLAGS += -O2 -Wall -Werror -Wno-stringop-truncation -I. diff --git a/external/gard/units.c b/external/gard/units.c index 554d85c..62033a1 100644 --- a/external/gard/units.c +++ b/external/gard/units.c @@ -1,5 +1,4 @@ -#include "gard.h" - +// SPDX-License-Identifier: Apache-2.0 /* * Each chip has a set of "units" that are detailed by the System MRW. Granted * they're pretty much fixed for a given chip generation so hardcoding them here @@ -8,8 +7,11 @@ * These tables we generated from obj/genfiles/errl/errludtarget.H. Which is * generated as a part of the hostboot build process. Yeah that's about as * dumb as it sounds, but whatever. + * + * Copyright 2017 IBM Corp */ +#include "gard.h" /* * Notes: diff --git a/external/lpc/Makefile b/external/lpc/Makefile index 81e0b09..be71b5f 100644 --- a/external/lpc/Makefile +++ b/external/lpc/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + all: lpc lpc: lpc.c diff --git a/external/lpc/lpc.c b/external/lpc/lpc.c index b8a4fa1..e8d87b8 100644 --- a/external/lpc/lpc.c +++ b/external/lpc/lpc.c @@ -1,17 +1,8 @@ -/* Copyright 2014-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * LPC operations through debugfs interface * - * 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 - * imitations under the License. + * Copyright 2014-2018 IBM Corp. */ #include <stdio.h> diff --git a/external/mambo/Makefile b/external/mambo/Makefile index fbc696e..d750b98 100644 --- a/external/mambo/Makefile +++ b/external/mambo/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + CFLAGS=-O2 -m64 -pthread -Werror -Wall CC=$(CROSS)gcc diff --git a/external/mambo/mambo-socket-proxy.c b/external/mambo/mambo-socket-proxy.c index f3a1a2f..16053e7 100644 --- a/external/mambo/mambo-socket-proxy.c +++ b/external/mambo/mambo-socket-proxy.c @@ -1,19 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 /* - * Copyright (C) 2017 Michael Neuling <mikey@neuling.org>, IBM - * - * 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. - * * Compile with: * gcc -static -O2 mambo-socket-proxy.c -o mambo-socket-proxy -pthread * Run inside the simulator: @@ -23,6 +9,8 @@ * ssh -p 10022 localhost * - to allow http proxy access from inside the sim to local http proxy * ./mambo-socket-proxy -b proxy.mynetwork -h 3128 -s 3128 + * + * Copyright (C) 2017 Michael Neuling <mikey@neuling.org>, IBM */ #include <stdio.h> diff --git a/external/mambo/mambo_utils.tcl b/external/mambo/mambo_utils.tcl index 1defe95..8bde1e1 100644 --- a/external/mambo/mambo_utils.tcl +++ b/external/mambo/mambo_utils.tcl @@ -1,5 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 # -# behave like gdb +# Make Mambo behave a bit more like gdb # set target_t 0 set target_c 0 diff --git a/external/mambo/qtrace_utils.tcl b/external/mambo/qtrace_utils.tcl index e12a4c5..3fbcd59 100644 --- a/external/mambo/qtrace_utils.tcl +++ b/external/mambo/qtrace_utils.tcl @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + if { [file exists $env(LIB_DIR)/perf/qtrace.tcl] == 1} { if { [catch {source $env(LIB_DIR)/perf/qtrace.tcl} issue ] } { puts "QTrace not available: $issue" diff --git a/external/mambo/skiboot.tcl b/external/mambo/skiboot.tcl index 60a0f30..a16bd32 100644 --- a/external/mambo/skiboot.tcl +++ b/external/mambo/skiboot.tcl @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# scripts to run skiboot (and a payload) with Mambo (otherwise known as the +# POWER[89] Functional Simulator) +# +# Copyright 2014-2019 IBM Corp. + # need to get images path defined early source $env(LIB_DIR)/ppc/util.tcl if { [file exists qtrace_utils.tcl] } then { diff --git a/external/memboot/Makefile b/external/memboot/Makefile index 9b526a3..85c0f58 100644 --- a/external/memboot/Makefile +++ b/external/memboot/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 all: memboot CFLAGS=-O2 -Wall diff --git a/external/memboot/memboot.c b/external/memboot/memboot.c index 848c5fe..4d2b5f8 100644 --- a/external/memboot/memboot.c +++ b/external/memboot/memboot.c @@ -1,18 +1,11 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * The old way of booting a temporary f/w image. + * These days, use mboxd on a BMC. * - * 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-2015 IBM Corp. */ + #include <stdint.h> #include <stdio.h> #include <stdlib.h> diff --git a/external/npu/run_procedure.sh b/external/npu/run_procedure.sh index f61ec8d..31a6c42 100755 --- a/external/npu/run_procedure.sh +++ b/external/npu/run_procedure.sh @@ -1,20 +1,10 @@ #!/bin/bash - -# Copyright 2016 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 +# SPDX-License-Identifier: Apache-2.0 # -# 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. +# Run an NPU Hardware procedure # +# Copyright 2016 IBM Corp. + function usage() { echo -e "$0: run a NPU hardware procedure (requires root)\n" diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile index ccd3401..fb9402f 100644 --- a/external/opal-prd/Makefile +++ b/external/opal-prd/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 CFLAGS += -m64 -Werror -Wall -g2 -ggdb LDFLAGS += -m64 ASFLAGS = -m64 diff --git a/external/opal-prd/config.h b/external/opal-prd/config.h index a132a01..5de618b 100644 --- a/external/opal-prd/config.h +++ b/external/opal-prd/config.h @@ -1,4 +1,9 @@ -/* For CCAN */ +// SPDX-License-Identifier: Apache-2.0 +/* + * For CCAN + * + * Copyright 2015 IBM Corp. + */ #include <endian.h> #include <byteswap.h> diff --git a/external/opal-prd/hostboot-interface.h b/external/opal-prd/hostboot-interface.h index d571f63..60951fe 100644 --- a/external/opal-prd/hostboot-interface.h +++ b/external/opal-prd/hostboot-interface.h @@ -1,23 +1,13 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Hostboot runtime interface * - * 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 + * Derived from src/include/runtime/interface.h in Hostboot * - * 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. */ #include <stdint.h> -/* Hostboot runtime interface */ -/* Derived from src/include/runtime/interface.h in Hostboot */ - #define HOSTBOOT_RUNTIME_INTERFACE_VERSION 0x9002 /** Memory error types defined for memory_error() interface. */ diff --git a/external/opal-prd/i2c.c b/external/opal-prd/i2c.c index 0c9947c..3cf8868 100644 --- a/external/opal-prd/i2c.c +++ b/external/opal-prd/i2c.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * I2C operations for opal-prd * - * 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. */ #define _GNU_SOURCE /* for aspritnf */ diff --git a/external/opal-prd/i2c.h b/external/opal-prd/i2c.h index d31bc0e..bdadec6 100644 --- a/external/opal-prd/i2c.h +++ b/external/opal-prd/i2c.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015 IBM Corp */ + #ifndef __I2C_H #define __I2C_H diff --git a/external/opal-prd/module.c b/external/opal-prd/module.c index 12fc3f9..6797d4c 100644 --- a/external/opal-prd/module.c +++ b/external/opal-prd/module.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Load kernel modules needed for opal-prd * - * 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 - * imitations under the License. + * Copyright 2015 IBM Corp. */ #include <stdlib.h> diff --git a/external/opal-prd/module.h b/external/opal-prd/module.h index 3a9e4aa..e55d321 100644 --- a/external/opal-prd/module.h +++ b/external/opal-prd/module.h @@ -1,18 +1,5 @@ -/* Copyright 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 - * imitations under the License. - */ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015 IBM Corp. */ #ifndef MODULES_H #define MODULES_H diff --git a/external/opal-prd/opal-prd.c b/external/opal-prd/opal-prd.c index d0a507c..b49d9ae 100644 --- a/external/opal-prd/opal-prd.c +++ b/external/opal-prd/opal-prd.c @@ -1,17 +1,11 @@ -/* Copyright 2014-2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * OPAL Processor Runtime Diagnostics (PRD) + * Runs Hostboot RunTime (HBRT) code in a userspace wrapper * - * 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 + * Firmware in userspace? Brilliant! * - * 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 - * imitations under the License. + * Copyright 2014-2019 IBM Corp. */ #define _GNU_SOURCE diff --git a/external/opal-prd/opal-prd.h b/external/opal-prd/opal-prd.h index f37b18b..17333d2 100644 --- a/external/opal-prd/opal-prd.h +++ b/external/opal-prd/opal-prd.h @@ -1,18 +1,6 @@ -/* Copyright 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 - * imitations under the License. - */ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015 IBM Corp. */ + #ifndef OPAL_PRD_H #define OPAL_PRD_H diff --git a/external/opal-prd/pnor.c b/external/opal-prd/pnor.c index c032421..6ddc2b5 100644 --- a/external/opal-prd/pnor.c +++ b/external/opal-prd/pnor.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * PNOR Access (/dev/mtd) for opal-prd * - * 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-2017 IBM Corp. */ #include <libflash/libffs.h> diff --git a/external/opal-prd/pnor.h b/external/opal-prd/pnor.h index 28571af..0d25325 100644 --- a/external/opal-prd/pnor.h +++ b/external/opal-prd/pnor.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015-2017 IBM Corp */ + #ifndef PNOR_H #define PNOR_H diff --git a/external/opal-prd/test/test_pnor.c b/external/opal-prd/test/test_pnor.c index 84e4231..4e599e5 100644 --- a/external/opal-prd/test/test_pnor.c +++ b/external/opal-prd/test/test_pnor.c @@ -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-2015 IBM Corp. */ #include <stdarg.h> #include <stdio.h> diff --git a/external/opal-prd/test/test_pnor_ops.c b/external/opal-prd/test/test_pnor_ops.c index fd5e2c2..ab05930 100644 --- a/external/opal-prd/test/test_pnor_ops.c +++ b/external/opal-prd/test/test_pnor_ops.c @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015-2016 IBM Corp */ + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/external/opal-prd/thunk.S b/external/opal-prd/thunk.S index d0ccd64..227607c 100644 --- a/external/opal-prd/thunk.S +++ b/external/opal-prd/thunk.S @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2015-2017 IBM Corp */ + #include <endian.h> #include <asm/unistd.h> 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" diff --git a/external/read_esel.sh b/external/read_esel.sh index 492fbce..3007092 100644 --- a/external/read_esel.sh +++ b/external/read_esel.sh @@ -1,18 +1,7 @@ #!/bin/bash +# SPDX-License-Identifier: Apache-2.0 # 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. + set -e BMC_HOST=$1 diff --git a/external/shared/Makefile b/external/shared/Makefile index 4baa6b4..9442954 100644 --- a/external/shared/Makefile +++ b/external/shared/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 .DEFAULT_GOAL := all GET_ARCH := ../../external/common/get_arch.sh include ../../external/common/rules.mk diff --git a/external/shared/config.h b/external/shared/config.h index a132a01..9ed42d2 100644 --- a/external/shared/config.h +++ b/external/shared/config.h @@ -1,4 +1,9 @@ -/* For CCAN */ +// SPDX-License-Identifier: Apache-2.0 +/* + * For CCAN + * + * Copyright 2016 IBM Corp. + */ #include <endian.h> #include <byteswap.h> diff --git a/external/shared/rules.mk b/external/shared/rules.mk index 147c38f..632c62c 100644 --- a/external/shared/rules.mk +++ b/external/shared/rules.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # NOTE: shared lib versioning has *NOTHING* to do with software package version # # If source code has changed, revision++ diff --git a/external/test/test.sh b/external/test/test.sh index fd596b1..1ff534b 100755 --- a/external/test/test.sh +++ b/external/test/test.sh @@ -1,20 +1,7 @@ #! /bin/sh - -# 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. run_binary() { if [ -x "$1" ] ; then diff --git a/external/trace/Makefile b/external/trace/Makefile index d806046..f18e5bc 100644 --- a/external/trace/Makefile +++ b/external/trace/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 HOSTEND=$(shell uname -m | sed -e 's/^i.*86$$/LITTLE/' -e 's/^x86.*/LITTLE/' -e 's/^ppc64le/LITTLE/' -e 's/^ppc.*/BIG/') CFLAGS=-g -Wall -DHAVE_$(HOSTEND)_ENDIAN -I../../include -I../../ diff --git a/external/trace/dump_trace.c b/external/trace/dump_trace.c index 502adcd..4a01bde 100644 --- a/external/trace/dump_trace.c +++ b/external/trace/dump_trace.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Dump the content of an OPAL trace * - * 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. */ #include <trace.h> diff --git a/external/trace/trace.c b/external/trace/trace.c index aa9fa15..f28630f 100644 --- a/external/trace/trace.c +++ b/external/trace/trace.c @@ -1,19 +1,10 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * This example code shows how to read from the trace buffer. * - * 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. */ -/* This example code shows how to read from the trace buffer. */ + #include <external/trace/trace.h> #include "../ccan/endian/endian.h" #include "../ccan/short_types/short_types.h" diff --git a/external/trace/trace.h b/external/trace/trace.h index 729c031..14b94d0 100644 --- a/external/trace/trace.h +++ b/external/trace/trace.h @@ -1,17 +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. */ #ifndef E_TRACE_H #define E_TRACE_H diff --git a/external/xscom-utils/Makefile b/external/xscom-utils/Makefile index 2eda4ea..b0b1089 100644 --- a/external/xscom-utils/Makefile +++ b/external/xscom-utils/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 CC = $(CROSS_COMPILE)gcc XSCOM_VERSION ?= $(shell ../../make_version.sh xscom-utils) diff --git a/external/xscom-utils/adu_scoms.py b/external/xscom-utils/adu_scoms.py index a1b7d89..4d1f3fa 100755 --- a/external/xscom-utils/adu_scoms.py +++ b/external/xscom-utils/adu_scoms.py @@ -1,22 +1,10 @@ #!/usr/bin/python - +# SPDX-License-Identifier: Apache-2.0 +# # Python library for in-band SCom access # (based on xscom-utils from OPAL firmware) # # 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. import os, sys, struct, getopt diff --git a/external/xscom-utils/getscom.c b/external/xscom-utils/getscom.c index dab4994..430a23e 100644 --- a/external/xscom-utils/getscom.c +++ b/external/xscom-utils/getscom.c @@ -1,17 +1,8 @@ -/* Copyright 2014-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * getscom * - * 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 - * imitations under the License. + * Copyright 2014-2017 IBM Corp. */ #include <stdio.h> diff --git a/external/xscom-utils/getsram.c b/external/xscom-utils/getsram.c index 18c52c7..a3e53e1 100644 --- a/external/xscom-utils/getsram.c +++ b/external/xscom-utils/getsram.c @@ -1,17 +1,8 @@ -/* Copyright 2014-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Read SRAM * - * 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 - * imitations under the License. + * Copyright 2014-2018 IBM Corp. */ #include <stdio.h> diff --git a/external/xscom-utils/putscom.c b/external/xscom-utils/putscom.c index 84b6f89..ba575e0 100644 --- a/external/xscom-utils/putscom.c +++ b/external/xscom-utils/putscom.c @@ -1,17 +1,8 @@ -/* Copyright 2014-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * getscom * - * 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 - * imitations under the License. + * Copyright 2014-2017 IBM Corp. */ #include <stdio.h> diff --git a/external/xscom-utils/sram.c b/external/xscom-utils/sram.c index 52f92b8..fd3fe8c 100644 --- a/external/xscom-utils/sram.c +++ b/external/xscom-utils/sram.c @@ -1,18 +1,5 @@ -/* Copyright 2014-2016 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 - * imitations under the License. - */ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2014-2019 IBM Corp. */ #include <stdint.h> #include <stdio.h> diff --git a/external/xscom-utils/sram.h b/external/xscom-utils/sram.h index 1db128c..92ab512 100644 --- a/external/xscom-utils/sram.h +++ b/external/xscom-utils/sram.h @@ -1,18 +1,5 @@ -/* Copyright 2014-2016 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 - * imitations under the License. - */ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2014-2016 IBM Corp. */ #ifndef __SRAM_H #define __SRAM_H diff --git a/external/xscom-utils/xscom.c b/external/xscom-utils/xscom.c index 2425730..f742336 100644 --- a/external/xscom-utils/xscom.c +++ b/external/xscom-utils/xscom.c @@ -1,17 +1,8 @@ -/* Copyright 2014-2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Do XSCOMs through linux debugfs interface * - * 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 - * imitations under the License. + * Copyright 2014-2017 IBM Corp. */ #define _LARGEFILE64_SOURCE diff --git a/external/xscom-utils/xscom.h b/external/xscom-utils/xscom.h index 4932315..8929fb2 100644 --- a/external/xscom-utils/xscom.h +++ b/external/xscom-utils/xscom.h @@ -1,17 +1,5 @@ -/* Copyright 2014-2016 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 - * imitations under the License. +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2014-2017 IBM Corp. */ #ifndef __XSCOM_H diff --git a/extract-gcov.c b/extract-gcov.c index e5bcf16..ececbc1 100644 --- a/extract-gcov.c +++ b/extract-gcov.c @@ -1,18 +1,5 @@ -/* Copyright 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 2015-2018 IBM Corp. */ #define _DEFAULT_SOURCE #include <ccan/short_types/short_types.h> diff --git a/hdata/cpu-common.c b/hdata/cpu-common.c index 0924dd5..55a663f 100644 --- a/hdata/cpu-common.c +++ b/hdata/cpu-common.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. */ + #include <skiboot.h> #include "spira.h" #include <cpu.h> diff --git a/hdata/fsp.c b/hdata/fsp.c index efa3a48..5923f1f 100644 --- a/hdata/fsp.c +++ b/hdata/fsp.c @@ -1,18 +1,5 @@ -/* 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 <device.h> #include "spira.h" diff --git a/hdata/hdata.h b/hdata/hdata.h index 426c9c9..f778471 100644 --- a/hdata/hdata.h +++ b/hdata/hdata.h @@ -1,18 +1,5 @@ -/* 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 __HDATA_H #define __HDATA_H diff --git a/hdata/hdif.c b/hdata/hdif.c index 6c9febf..2c26038 100644 --- a/hdata/hdif.c +++ b/hdata/hdif.c @@ -1,18 +1,5 @@ -/* 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 "hdif.h" #include <stack.h> diff --git a/hdata/hdif.h b/hdata/hdif.h index d54e533..b9d4391 100644 --- a/hdata/hdif.h +++ b/hdata/hdif.h @@ -1,18 +1,5 @@ -/* 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 __HDIF_H #define __HDIF_H diff --git a/hdata/hostservices.c b/hdata/hostservices.c index bbd1816..7fb5bac 100644 --- a/hdata/hostservices.c +++ b/hdata/hostservices.c @@ -1,18 +1,5 @@ -/* 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 <stdint.h> #include <stdlib.h> diff --git a/hdata/i2c.c b/hdata/i2c.c index e3615a5..b979f35 100644 --- a/hdata/i2c.c +++ b/hdata/i2c.c @@ -1,18 +1,5 @@ -/* Copyright 2017-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 2017-2019 IBM Corp. */ #include <device.h> #include <cpu.h> diff --git a/hdata/iohub.c b/hdata/iohub.c index b0ef0c3..99c31c0 100644 --- a/hdata/iohub.c +++ b/hdata/iohub.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include "spira.h" diff --git a/hdata/memory.c b/hdata/memory.c index bd9671a..9af7ae7 100644 --- a/hdata/memory.c +++ b/hdata/memory.c @@ -1,18 +1,5 @@ -/* Copyright 2013-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 2013-2019 IBM Corp. */ #include <cpu.h> #include <device.h> diff --git a/hdata/paca.c b/hdata/paca.c index 3d13a5f..28025b0 100644 --- a/hdata/paca.c +++ b/hdata/paca.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include "spira.h" diff --git a/hdata/pcia.c b/hdata/pcia.c index 0638327..ff645ab 100644 --- a/hdata/pcia.c +++ b/hdata/pcia.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include "spira.h" diff --git a/hdata/slca.c b/hdata/slca.c index 3130d5b..a658af6 100644 --- a/hdata/slca.c +++ b/hdata/slca.c @@ -1,19 +1,5 @@ -/* 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. */ #include <device.h> #include <include/opal-internal.h> diff --git a/hdata/spira.c b/hdata/spira.c index dad779f..b34a1a2 100644 --- a/hdata/spira.c +++ b/hdata/spira.c @@ -1,18 +1,5 @@ -/* Copyright 2013-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 2013-2019 IBM Corp. */ #include <inttypes.h> #include <device.h> diff --git a/hdata/spira.h b/hdata/spira.h index 563a98c..72f0ad9 100644 --- a/hdata/spira.h +++ b/hdata/spira.h @@ -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-2019 IBM Corp. */ #ifndef __SPIRA_H #define __SPIRA_H diff --git a/hdata/test/Makefile.check b/hdata/test/Makefile.check index 368fcba..4c579ae 100644 --- a/hdata/test/Makefile.check +++ b/hdata/test/Makefile.check @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 # -*-Makefile-*- HDATA_TEST := hdata/test/hdata_to_dt diff --git a/hdata/test/dtdiff_wrap.sh b/hdata/test/dtdiff_wrap.sh index 75c18ba..e746e25 100755 --- a/hdata/test/dtdiff_wrap.sh +++ b/hdata/test/dtdiff_wrap.sh @@ -1,8 +1,11 @@ #!/bin/bash - +# SPDX-License-Identifier: Apache-2.0 +# # Takes /dev/stdin as dtb, saves to file, does dtdiff # Also runs parameter through a dts->dtb->dts conversion # in order to work around dtc bugs. +# +# Copyright 2018 IBM Corp. T=$(mktemp) cp /dev/stdin $T.dtb diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c index 8692177..56c0429 100644 --- a/hdata/test/hdata_to_dt.c +++ b/hdata/test/hdata_to_dt.c @@ -1,19 +1,10 @@ -/* Copyright 2013-2019 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 +/* + * Given a hdata dump, output the device tree. * - * 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. */ -/* Given a hdata dump, output the device tree. */ + #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> diff --git a/hdata/test/stubs.c b/hdata/test/stubs.c index 3637633..1d924b6 100644 --- a/hdata/test/stubs.c +++ b/hdata/test/stubs.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. */ + #include <stdlib.h> #include <stdio.h> #include <stdarg.h> diff --git a/hdata/tpmrel.c b/hdata/tpmrel.c index 01ef10c..1fe14c7 100644 --- a/hdata/tpmrel.c +++ b/hdata/tpmrel.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. */ #ifndef pr_fmt #define pr_fmt(fmt) "TPMREL: " fmt diff --git a/hdata/vpd-common.c b/hdata/vpd-common.c index 674c8c3..db6384b 100644 --- a/hdata/vpd-common.c +++ b/hdata/vpd-common.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include <vpd.h> diff --git a/hdata/vpd.c b/hdata/vpd.c index 5a01bcc..a29155a 100644 --- a/hdata/vpd.c +++ b/hdata/vpd.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-2019 IBM Corp. */ #include <skiboot.h> #include <vpd.h> diff --git a/hw/ast-bmc/Makefile.inc b/hw/ast-bmc/Makefile.inc index 29e7a35..1ab9627 100644 --- a/hw/ast-bmc/Makefile.inc +++ b/hw/ast-bmc/Makefile.inc @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 SUBDIRS += hw/ast-bmc AST_BMC_OBJS = ast-io.o ast-sf-ctrl.o diff --git a/hw/ast-bmc/ast-io.c b/hw/ast-bmc/ast-io.c index 472b151..171942a 100644 --- a/hw/ast-bmc/ast-io.c +++ b/hw/ast-bmc/ast-io.c @@ -1,18 +1,4 @@ -/* 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 /* * Note about accesses to the AST2400 internal memory map: * @@ -83,6 +69,8 @@ * we'll only do that after the boot script/program on the BMC is * updated to restore the bridge to a state compatible with the SBE * expectations on boot. + * + * Copyright 2013-2019 IBM Corp. */ #include <skiboot.h> diff --git a/hw/ast-bmc/ast-sf-ctrl.c b/hw/ast-bmc/ast-sf-ctrl.c index 11eb30f..ece847d 100644 --- a/hw/ast-bmc/ast-sf-ctrl.c +++ b/hw/ast-bmc/ast-sf-ctrl.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 <stdint.h> #include <stdbool.h> #include <stdlib.h> @@ -1,17 +1,8 @@ -/* Copyright 2013-2019 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 +/* + * Block Transfer, typically what IPMI goes over * - * 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 pr_fmt(fmt) "BT: " fmt @@ -1,18 +1,10 @@ -/* Copyright 2013-2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * CAPP unit (i.e. CAPI) * - * 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. */ + #include <skiboot.h> #include <io.h> #include <opal.h> diff --git a/hw/centaur.c b/hw/centaur.c index f673745..641f2f0 100644 --- a/hw/centaur.c +++ b/hw/centaur.c @@ -1,18 +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 +/* + * Centaur memory buffer chip * - * 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-2017 IBM Corp. */ + #include <skiboot.h> #include <xscom.h> #include <processor.h> diff --git a/hw/chiptod.c b/hw/chiptod.c index a2eaf02..f7e9225 100644 --- a/hw/chiptod.c +++ b/hw/chiptod.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 +/* + * Handle ChipTOD chip & configure core and CAPP timebases * - * 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. */ -/* Handle ChipTOD chip & configure core and CAPP timebases */ - #define pr_fmt(fmt) "CHIPTOD: " fmt #include <skiboot.h> diff --git a/hw/dio-p9.c b/hw/dio-p9.c index e2d40ac..59c4873 100644 --- a/hw/dio-p9.c +++ b/hw/dio-p9.c @@ -1,19 +1,5 @@ -/* Copyright 2019 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 2019 IBM Corp. */ #define pr_fmt(fmt) "DIO: " fmt @@ -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-2019 IBM Corp. */ #include <xscom.h> #include <chip.h> diff --git a/hw/fake-nvram.c b/hw/fake-nvram.c index 236ad5b..6411400 100644 --- a/hw/fake-nvram.c +++ b/hw/fake-nvram.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include <opal.h> diff --git a/hw/fake-rtc.c b/hw/fake-rtc.c index bf2fc0b..328be97 100644 --- a/hw/fake-rtc.c +++ b/hw/fake-rtc.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include <opal.h> diff --git a/hw/fsi-master.c b/hw/fsi-master.c index 7977880..87d1b5f 100644 --- a/hw/fsi-master.c +++ b/hw/fsi-master.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-2017 IBM Corp. */ + #include <skiboot.h> #include <xscom.h> #include <lock.h> diff --git a/hw/fsp/fsp-attn.c b/hw/fsp/fsp-attn.c index 667d9ab..2c0260c 100644 --- a/hw/fsp/fsp-attn.c +++ b/hw/fsp/fsp-attn.c @@ -1,17 +1,11 @@ -/* 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 +/* + * FSP ATTentioN support + * + * FSP can grab a bunch of things on host firmware dying, + * let's set that up. + * + * Copyright 2013-2019 IBM Corp. */ #include <fsp.h> #include <skiboot.h> diff --git a/hw/fsp/fsp-chiptod.c b/hw/fsp/fsp-chiptod.c index 7efad1b..fef98e0 100644 --- a/hw/fsp/fsp-chiptod.c +++ b/hw/fsp/fsp-chiptod.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * On some chiptod errors, ask the FSP for a new topology * - * 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-2017 IBM Corp. */ #define pr_fmt(fmt) "CHIPTOD: " fmt diff --git a/hw/fsp/fsp-codeupdate.c b/hw/fsp/fsp-codeupdate.c index e38b187..67732a7 100644 --- a/hw/fsp/fsp-codeupdate.c +++ b/hw/fsp/fsp-codeupdate.c @@ -1,20 +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 +/* + * Firmware code update for FSP systems * - * 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. */ - #include <skiboot.h> #include <fsp.h> #include <fsp-sysparam.h> diff --git a/hw/fsp/fsp-codeupdate.h b/hw/fsp/fsp-codeupdate.h index 4e0384c..237043c 100644 --- a/hw/fsp/fsp-codeupdate.h +++ b/hw/fsp/fsp-codeupdate.h @@ -1,19 +1,5 @@ -/* 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 __CODEUPDATE_H #define __CODEUPDATE_H diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index 9d9b7ab..42fb988 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -1,22 +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 +/* + * Flexible Service Processor (FSP) serial console handling 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. */ -/* - * Service Processor serial console handling code - */ #include <skiboot.h> #include <processor.h> #include <io.h> diff --git a/hw/fsp/fsp-diag.c b/hw/fsp/fsp-diag.c index 5f588af..0ee8975 100644 --- a/hw/fsp/fsp-diag.c +++ b/hw/fsp/fsp-diag.c @@ -1,23 +1,11 @@ -/* 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 /* * Code for handling FSP_MCLASS_DIAG messages (cmd 0xee) * Receiving a high level ack timeout is likely indicative of a firmware bug + * + * Copyright 2013-2014 IBM Corp. */ + #include <skiboot.h> #include <fsp.h> #include <lock.h> diff --git a/hw/fsp/fsp-dpo.c b/hw/fsp/fsp-dpo.c index 66a240b..0796d9a 100644 --- a/hw/fsp/fsp-dpo.c +++ b/hw/fsp/fsp-dpo.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 +/* + * FSP DPO (Delayed Power Off) event support * - * 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-2017 IBM Corp. */ -/* FSP DPO (Delayed Power Off) event support */ - #define pr_fmt(fmt) "FSP-DPO: " fmt #include <skiboot.h> diff --git a/hw/fsp/fsp-dump.c b/hw/fsp/fsp-dump.c index b1dd090..37efa9d 100644 --- a/hw/fsp/fsp-dump.c +++ b/hw/fsp/fsp-dump.c @@ -1,20 +1,4 @@ -/* 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 /* * Dump support: * We get dump notification from different sources: @@ -33,6 +17,8 @@ * - Sapphire fetches dump data from FSP. * - Linux writes dump to disk and sends acknowledgement. * - Sapphire acknowledges FSP. + * + * Copyright 2013-2015 IBM Corp. */ #include <fsp.h> diff --git a/hw/fsp/fsp-elog-read.c b/hw/fsp/fsp-elog-read.c index d441904..5b373aa 100644 --- a/hw/fsp/fsp-elog-read.c +++ b/hw/fsp/fsp-elog-read.c @@ -1,20 +1,4 @@ -/* Copyright 2013-2016 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 /* * This code will enable retrieving of error log from FSP -> Sapphire in * sequence. @@ -23,6 +7,8 @@ * OPAL_EVENT_ERROR_LOG_AVAIL is signaled. This will remain raised until a call * to opal_elog_read() is made and OPAL_SUCCESS is returned. Upon which, the * operation is complete and the event is cleared. This is READ action from FSP. + * + * Copyright 2013-2017 IBM Corp. */ /* diff --git a/hw/fsp/fsp-elog-write.c b/hw/fsp/fsp-elog-write.c index 9243931..6aa0c59 100644 --- a/hw/fsp/fsp-elog-write.c +++ b/hw/fsp/fsp-elog-write.c @@ -1,26 +1,12 @@ -/* Copyright 2013-2016 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 /* * This code will enable generation and pushing of error log from Sapphire * to FSP. * Critical events from Sapphire that needs to be reported will be pushed * on to FSP after converting the error log to Platform Error Log(PEL) format. * This is termed as write action to FSP. + * + * Copyright 2013-2016 IBM Corp. */ #include <cpu.h> diff --git a/hw/fsp/fsp-epow.c b/hw/fsp/fsp-epow.c index 512a15c..bac1d3d 100644 --- a/hw/fsp/fsp-epow.c +++ b/hw/fsp/fsp-epow.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 +/* + * FSP Environmental and Power Warnings (EPOW) support * - * 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-2016 IBM Corp. */ -/* FSP Environmental and Power Warnings (EPOW) support */ - #define pr_fmt(fmt) "FSP-EPOW: " fmt #include <fsp.h> diff --git a/hw/fsp/fsp-epow.h b/hw/fsp/fsp-epow.h index 52e5ac4..6a01de0 100644 --- a/hw/fsp/fsp-epow.h +++ b/hw/fsp/fsp-epow.h @@ -1,21 +1,8 @@ -/* 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 /* * Handle FSP EPOW event notifications + * + * Copyright 2013-2015 IBM Corp. */ #ifndef __FSP_EPOW_H diff --git a/hw/fsp/fsp-ipmi.c b/hw/fsp/fsp-ipmi.c index 8c65e6c..a04d9aa 100644 --- a/hw/fsp/fsp-ipmi.c +++ b/hw/fsp/fsp-ipmi.c @@ -1,17 +1,8 @@ -/* Copyright 2014-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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Conduit for IPMI messages to/from FSP * - * 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 2014-2019 IBM Corp. */ #include <errorlog.h> diff --git a/hw/fsp/fsp-leds.c b/hw/fsp/fsp-leds.c index edfda51..7d234a8 100644 --- a/hw/fsp/fsp-leds.c +++ b/hw/fsp/fsp-leds.c @@ -1,22 +1,8 @@ -/* 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 /* * LED location code and indicator handling + * + * Copyright 2013-2019 IBM Corp. */ #define pr_fmt(fmt) "FSPLED: " fmt diff --git a/hw/fsp/fsp-mdst-table.c b/hw/fsp/fsp-mdst-table.c index 0f145ba..98f667f 100644 --- a/hw/fsp/fsp-mdst-table.c +++ b/hw/fsp/fsp-mdst-table.c @@ -1,20 +1,4 @@ -/* 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 /* * Sapphire dump design: * - During initialization we setup Memory Dump Source Table (MDST) table @@ -24,6 +8,8 @@ * - FSP retrieves HWDUMP. * - FSP retrieves CEC memory based on MDST table. * - Once Sapphire reboot FSP sends new dump avialable notification via HDAT + * + * Copyright 2013-2016 IBM Corp. */ #include <fsp.h> diff --git a/hw/fsp/fsp-mem-err.c b/hw/fsp/fsp-mem-err.c index 7f01c58..ffafb96 100644 --- a/hw/fsp/fsp-mem-err.c +++ b/hw/fsp/fsp-mem-err.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2019 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 +/* + * Sometimes some memory needs to go and sit in the naughty corner * - * 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 pr_fmt(fmt) "FSPMEMERR: " fmt diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c index eef535c..159a956 100644 --- a/hw/fsp/fsp-nvram.c +++ b/hw/fsp/fsp-nvram.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Read/Write NVRAM from/to FSP * - * 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-2017 IBM Corp. */ #include <skiboot.h> diff --git a/hw/fsp/fsp-occ.c b/hw/fsp/fsp-occ.c index 6286078..d48c28f 100644 --- a/hw/fsp/fsp-occ.c +++ b/hw/fsp/fsp-occ.c @@ -1,17 +1,13 @@ -/* Copyright 2013-2019 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * FSP/OCC interactions * - * 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 + * Unlike OpenPOWER machines, FSP machines are much more tightly coupled + * between FSP, host, and OCC. On P8 we have to do a dance to start the + * OCC, but on P9 Hostboot does that, consistent with what we do on + * OpenPOWER. * - * 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. */ #include <skiboot.h> diff --git a/hw/fsp/fsp-op-panel.c b/hw/fsp/fsp-op-panel.c index 530871f..320da24 100644 --- a/hw/fsp/fsp-op-panel.c +++ b/hw/fsp/fsp-op-panel.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Small LCD screen on the front of FSP machines * - * 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. */ #include <skiboot.h> diff --git a/hw/fsp/fsp-psi.c b/hw/fsp/fsp-psi.c index 6c2d4bf..76feb0b 100644 --- a/hw/fsp/fsp-psi.c +++ b/hw/fsp/fsp-psi.c @@ -1,18 +1,5 @@ -/* 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 <io.h> #include <psi.h> diff --git a/hw/fsp/fsp-rtc.c b/hw/fsp/fsp-rtc.c index 807d664..53838f8 100644 --- a/hw/fsp/fsp-rtc.c +++ b/hw/fsp/fsp-rtc.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Real Time Clock (RTC) attached to FSP * - * 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-2017 IBM Corp. */ #include <skiboot.h> diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c index eff5d21..43c8ce4 100644 --- a/hw/fsp/fsp-sensor.c +++ b/hw/fsp/fsp-sensor.c @@ -1,24 +1,5 @@ -/* 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 /* - */ - - -/* - * Design note: * This code will enable the 'powernv' to retrieve sensor related data from FSP * using SPCN passthru mailbox commands. * @@ -27,6 +8,8 @@ * expected as an argument for OPAL read call which has already been exported * to the device tree during fsp init. The sapphire code decodes this Id to * determine requested attribute and sensor. + * + * Copyright 2013-2017 IBM Corp. */ #include <skiboot.h> diff --git a/hw/fsp/fsp-surveillance.c b/hw/fsp/fsp-surveillance.c index d5f2340..d774bea 100644 --- a/hw/fsp/fsp-surveillance.c +++ b/hw/fsp/fsp-surveillance.c @@ -1,18 +1,10 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * We don't want to go on the cart! * - * 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. */ + #include <skiboot.h> #include <fsp.h> #include <lock.h> diff --git a/hw/fsp/fsp-sysparam.c b/hw/fsp/fsp-sysparam.c index 5d7ae91..09005ef 100644 --- a/hw/fsp/fsp-sysparam.c +++ b/hw/fsp/fsp-sysparam.c @@ -1,18 +1,14 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * There's some system level parameters that aren't over IPMI or NVRAM + * but that the FSP exposes through this interface. * - * 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 + * We expose these through an OPAL API as there really isn't any other/better + * way of doing so. * - * 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-2017 IBM Corp. */ + #include <skiboot.h> #include <fsp.h> #include <opal.h> diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c index 456099f..6fa6534 100644 --- a/hw/fsp/fsp.c +++ b/hw/fsp/fsp.c @@ -1,17 +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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Base FSP (Flexible Service Processor) Support * - * http://www.apache.org/licenses/LICENSE-2.0 + * FSP is the BMC-like thing in some IBM POWER servers * - * 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. */ #include <stdarg.h> @@ -1,18 +1,5 @@ -/* Copyright 2013-2019 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 <skiboot.h> #include <xscom.h> @@ -1,18 +1,11 @@ -/* Copyright 2016-2019 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 +/* + * In-Memory Counters (IMC) + * Sometimes called IMA, but that's also a different thing. * - * 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 2016-2019 IBM Corp. */ + #define pr_fmt(fmt) "IMC: " fmt #include <skiboot.h> #include <xscom.h> diff --git a/hw/ipmi/Makefile.inc b/hw/ipmi/Makefile.inc index b0af7a6..250dfc8 100644 --- a/hw/ipmi/Makefile.inc +++ b/hw/ipmi/Makefile.inc @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 + SUBDIRS += hw/ipmi IPMI_OBJS = ipmi-rtc.o ipmi-power.o ipmi-fru.o ipmi-sel.o diff --git a/hw/ipmi/ipmi-attn.c b/hw/ipmi/ipmi-attn.c index c6c1c59..03ea4f9 100644 --- a/hw/ipmi/ipmi-attn.c +++ b/hw/ipmi/ipmi-attn.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * When everything is terrible, tell the FSP as much as possible as to why * - * 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. */ #include <errorlog.h> diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c index 7e7f0a6..c66f2e1 100644 --- a/hw/ipmi/ipmi-fru.c +++ b/hw/ipmi/ipmi-fru.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Fill out firmware related FRUs (Field Replaceable Units) * - * 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. */ #include <skiboot.h> diff --git a/hw/ipmi/ipmi-info.c b/hw/ipmi/ipmi-info.c index be2bd44..b078e19 100644 --- a/hw/ipmi/ipmi-info.c +++ b/hw/ipmi/ipmi-info.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Various bits of info retreived over IPMI * - * 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 2018-2019 IBM Corp. */ #include <device.h> diff --git a/hw/ipmi/ipmi-power.c b/hw/ipmi/ipmi-power.c index 40e1351..1ff9dda 100644 --- a/hw/ipmi/ipmi-power.c +++ b/hw/ipmi/ipmi-power.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Power as in electricity, not POWER as in POWER * - * 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. */ #include <skiboot.h> diff --git a/hw/ipmi/ipmi-rtc.c b/hw/ipmi/ipmi-rtc.c index ba6f977..deb4add 100644 --- a/hw/ipmi/ipmi-rtc.c +++ b/hw/ipmi/ipmi-rtc.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Talk to a Real Time Clock (RTC) over IPMI * - * 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-2015 IBM Corp. */ #include <stdlib.h> diff --git a/hw/ipmi/ipmi-sel.c b/hw/ipmi/ipmi-sel.c index 0996275..59f45f8 100644 --- a/hw/ipmi/ipmi-sel.c +++ b/hw/ipmi/ipmi-sel.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #define pr_fmt(fmt) "IPMI: " fmt #include <ccan/list/list.h> diff --git a/hw/ipmi/ipmi-sensor.c b/hw/ipmi/ipmi-sensor.c index 9c4eb6b..68af5bd 100644 --- a/hw/ipmi/ipmi-sensor.c +++ b/hw/ipmi/ipmi-sensor.c @@ -1,18 +1,5 @@ -/* 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 <device.h> #include <ipmi.h> diff --git a/hw/ipmi/ipmi-watchdog.c b/hw/ipmi/ipmi-watchdog.c index ce97f61..dc0a9e5 100644 --- a/hw/ipmi/ipmi-watchdog.c +++ b/hw/ipmi/ipmi-watchdog.c @@ -1,17 +1,7 @@ -/* Copyright 2013-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 2013-2018 IBM Corp. + * Copyright 2018 Google Corp. */ #include <stdlib.h> diff --git a/hw/ipmi/test/run-fru.c b/hw/ipmi/test/run-fru.c index ff8df39..1951541 100644 --- a/hw/ipmi/test/run-fru.c +++ b/hw/ipmi/test/run-fru.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. */ + #include <unistd.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/hw/lpc-mbox.c b/hw/lpc-mbox.c index 58a9969..71fc252 100644 --- a/hw/lpc-mbox.c +++ b/hw/lpc-mbox.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * LPC MBOX * - * 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 2017-2018 IBM Corp. */ #define pr_fmt(fmt) "LPC-MBOX: " fmt diff --git a/hw/lpc-port80h.c b/hw/lpc-port80h.c index caff0fd..eb1378c 100644 --- a/hw/lpc-port80h.c +++ b/hw/lpc-port80h.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * op_display() but over the 1 byte LPC port 80h just like an original IBM PC * - * 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 2018-2019 IBM Corp. */ #define pr_fmt(fmt) "Port80h: " fmt diff --git a/hw/lpc-rtc.c b/hw/lpc-rtc.c index 95506cd..f560c8c 100644 --- a/hw/lpc-rtc.c +++ b/hw/lpc-rtc.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Real Time Clock hanging off LPC * - * 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 2015 IBM Corp. */ #include <stdlib.h> diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c index f964355..feca229 100644 --- a/hw/lpc-uart.c +++ b/hw/lpc-uart.c @@ -1,17 +1,8 @@ -/* 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 +/* + * Serial port hanging off LPC * - * 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. */ #include <skiboot.h> @@ -1,17 +1,8 @@ -/* 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 +/* + * Low Pin Count (LPC) Bus. * - * 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 pr_fmt(fmt) "LPC: " fmt diff --git a/hw/npu-hw-procedures.c b/hw/npu-hw-procedures.c index ec1f72b..1c0cf1a 100644 --- a/hw/npu-hw-procedures.c +++ b/hw/npu-hw-procedures.c @@ -1,18 +1,10 @@ -/* Copyright 2013-2019 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NPU (NVLink1, POWER8NVL) Hardware Procedures * - * 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. */ + #include <skiboot.h> #include <io.h> #include <timebase.h> @@ -1,18 +1,10 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * NVLink1, supported by the NPU (POWER8) * - * 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. */ + #include <skiboot.h> #include <io.h> #include <timebase.h> diff --git a/hw/npu2-common.c b/hw/npu2-common.c index f3f2f45..4043769 100644 --- a/hw/npu2-common.c +++ b/hw/npu2-common.c @@ -1,18 +1,5 @@ -/* Copyright 2013-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 2013-2019 IBM Corp. */ #include <skiboot.h> #include <xscom.h> diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index 0779dde..c1ae8f1 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -1,18 +1,10 @@ -/* Copyright 2013-2019 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 +/* + * NPU2 (POWER9) Hardware Procedures * - * 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. */ + #include <skiboot.h> #include <io.h> #include <timebase.h> diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c index 4c47150..9a391bb 100644 --- a/hw/npu2-opencapi.c +++ b/hw/npu2-opencapi.c @@ -1,19 +1,4 @@ -/* Copyright 2013-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 /* * Support for OpenCAPI on POWER9 NPUs * @@ -33,6 +18,8 @@ * - Presence detection * - Consume HDAT NPU information * - LPC Memory support + * + * Copyright 2013-2019 IBM Corp. */ #include <skiboot.h> @@ -1,18 +1,10 @@ -/* Copyright 2013-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 +// SPDX-License-Identifier: Apache-2.0 +/* + * NPU - NVlink and OpenCAPI * - * 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. */ + #include <skiboot.h> #include <io.h> #include <timebase.h> diff --git a/hw/nx-842.c b/hw/nx-842.c index d4abe08..fd6f74c 100644 --- a/hw/nx-842.c +++ b/hw/nx-842.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NX unit 842 compression accellerator * - * 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 2015-2019 IBM Corp. */ #include <skiboot.h> diff --git a/hw/nx-compress.c b/hw/nx-compress.c index 659e0e2..84b5a59 100644 --- a/hw/nx-compress.c +++ b/hw/nx-compress.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NX has 842 and GZIP (P9) accellerators * - * 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 2015-2018 IBM Corp. */ #include <skiboot.h> diff --git a/hw/nx-crypto.c b/hw/nx-crypto.c index 04cc789..aa317de 100644 --- a/hw/nx-crypto.c +++ b/hw/nx-crypto.c @@ -1,17 +1,8 @@ -/* Copyright 2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NX Cryptographic accellerators * - * 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 2015-2019 IBM Corp. */ #include <skiboot.h> diff --git a/hw/nx-gzip.c b/hw/nx-gzip.c index b80750d..a259a09 100644 --- a/hw/nx-gzip.c +++ b/hw/nx-gzip.c @@ -1,17 +1,8 @@ -/* Copyright 2016 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NX GZIP (p9) accellerator support * - * 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 2016-2017 IBM Corp. */ #include <skiboot.h> diff --git a/hw/nx-rng.c b/hw/nx-rng.c index d2fc7a3..24038c8 100644 --- a/hw/nx-rng.c +++ b/hw/nx-rng.c @@ -1,21 +1,10 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * NX Hardware Random Number Generator * - * 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. */ - - #include <skiboot.h> #include <xscom.h> #include <io.h> @@ -1,21 +1,10 @@ -/* Copyright 2013-2015 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * NX Accellerator unit support * - * 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. */ - - #include <skiboot.h> #include <xscom.h> #include <io.h> diff --git a/hw/occ-sensor.c b/hw/occ-sensor.c index 0337294..d06ca72 100644 --- a/hw/occ-sensor.c +++ b/hw/occ-sensor.c @@ -1,17 +1,8 @@ -/* Copyright 2017-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 +// SPDX-License-Identifier: Apache-2.0 +/* + * OCC (On Chip Controller) exports a bunch of sensors * - * 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 2017-2019 IBM Corp. */ #include <skiboot.h> @@ -1,17 +1,9 @@ -/* Copyright 2013-2019 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 +/* + * Interface with the On Chip Controller, + * which enforces power and thermal management * - * 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. */ #include <skiboot.h> diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c index 599614c..1b28062 100644 --- a/hw/p8-i2c.c +++ b/hw/p8-i2c.c @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * P8 i2c master * - * 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. */ #undef DEBUG @@ -1,18 +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 +/* + * PHB3: PCI Host Bridge 3, in POWER8 * - * 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. */ + #include <skiboot.h> #include <io.h> #include <timebase.h> @@ -1,22 +1,9 @@ -/* Copyright 2013-2016 IBM Corp. - * Copyright 2018 Raptor Engineering, LLC - * - * 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 /* - * PHB4 support + * PHB4: PCI Host Bridge 4, in POWER9 * + * Copyright 2013-2019 IBM Corp. + * Copyright 2018 Raptor Engineering, LLC */ /* diff --git a/hw/phys-map.c b/hw/phys-map.c index 7583629..53b825d 100644 --- a/hw/phys-map.c +++ b/hw/phys-map.c @@ -1,17 +1,8 @@ -/* Copyright 2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Physical memory map * - * 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 2017-2019 IBM Corp. */ #include <phys-map.h> @@ -1,17 +1,8 @@ -/* Copyright 2014-2019 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 +/* + * PRD: Processor Runtime Diagnostics * - * 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 - * imitations under the License. + * Copyright 2014-2019 IBM Corp. */ #include <skiboot.h> @@ -1,22 +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 /* * Service Processor serial console handling code + * + * Copyright 2013-2019 IBM Corp. */ + #include <io.h> #include <psi.h> #include <fsp.h> diff --git a/hw/sbe-p8.c b/hw/sbe-p8.c index 452af41..a26883c 100644 --- a/hw/sbe-p8.c +++ b/hw/sbe-p8.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * POWER8 Self Boot Engine (SLW - SLeep/Winkle) * - * 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. */ #include <device.h> diff --git a/hw/sbe-p9.c b/hw/sbe-p9.c index c28dbb9..852d8f3 100644 --- a/hw/sbe-p9.c +++ b/hw/sbe-p9.c @@ -1,22 +1,10 @@ -/* Copyright 2017-2019 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 /* + * * P9 OPAL - SBE communication driver * + * SBE firmware at https://github.com/open-power/sbe + * * P9 chip has Self Boot Engine (SBE). OPAL uses SBE for various purpose like * timer, scom, MPIPL, etc,. Every chip has SBE. OPAL can communicate to SBE * on all chips. Based on message type it selects appropriate SBE (ex: schedule @@ -42,6 +30,8 @@ * Constraints: * - Only one command is accepted in the command buffer until the response for * the command is enqueued in the response buffer by SBE. + * + * Copyright 2017-2019 IBM Corp. */ #define pr_fmt(fmt) "SBE: " fmt diff --git a/hw/sfc-ctrl.c b/hw/sfc-ctrl.c index 16922d3..f17b8de 100644 --- a/hw/sfc-ctrl.c +++ b/hw/sfc-ctrl.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-2014 IBM Corp. */ + #include <stdint.h> #include <stdbool.h> #include <stdlib.h> @@ -1,22 +1,11 @@ -/* Copyright 2013-2016 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 +/* + * Everything to do with deep power saving (stop) states + * SLeep/Winkle, Handle ChipTOD chip & configure core timebases * - * 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. */ -/* - * Handle ChipTOD chip & configure core timebases - */ #include <skiboot.h> #include <xscom.h> #include <xscom-p8-regs.h> diff --git a/hw/test/phys-map-test.c b/hw/test/phys-map-test.c index ab75a1e..3356919 100644 --- a/hw/test/phys-map-test.c +++ b/hw/test/phys-map-test.c @@ -1,17 +1,8 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Physical memory map 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-2017 IBM Corp. */ #include "../../core/test/stubs.c" diff --git a/hw/test/run-port80h.c b/hw/test/run-port80h.c index e0d9437..85e8d87 100644 --- a/hw/test/run-port80h.c +++ b/hw/test/run-port80h.c @@ -1,17 +1,8 @@ -/* Copyright 2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Test result of our LPC port 80h boot progress code * - * 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 2018-2019 IBM Corp. */ #include <stdio.h> @@ -1,18 +1,6 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <chip.h> #include <phys-map.h> @@ -1,18 +1,10 @@ -/* Copyright 2016-2019 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 +/* + * XIVE - P9 interrupt controller * - * 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 2016-2019 IBM Corp. */ + #include <skiboot.h> #include <xscom.h> #include <chip.h> @@ -1,17 +1,8 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * XSCOM driver * - * 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. */ #include <skiboot.h> diff --git a/include/affinity.h b/include/affinity.h index eba26db..fe952bf 100644 --- a/include/affinity.h +++ b/include/affinity.h @@ -1,23 +1,9 @@ -/* 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 /* - * * All functions in charge of generating the associativity/affinity * properties in the device-tree + * + * Copyright 2013-2014 IBM Corp. */ #ifndef __AFFINITY_H diff --git a/include/asm-utils.h b/include/asm-utils.h index e94a143..2d26545 100644 --- a/include/asm-utils.h +++ b/include/asm-utils.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __ASM_UTILS_H #define __ASM_UTILS_H diff --git a/include/ast.h b/include/ast.h index 5c46cf2..2720ee1 100644 --- a/include/ast.h +++ b/include/ast.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-2019 IBM Corp. */ + #ifndef __AST_H #define __AST_H diff --git a/include/bitmap.h b/include/bitmap.h index f3510f7..ba31b01 100644 --- a/include/bitmap.h +++ b/include/bitmap.h @@ -1,18 +1,5 @@ -/* Copyright 2016 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 2016-2017 IBM Corp. */ #ifndef __BITMAP_H #define __BITMAP_H diff --git a/include/bitutils.h b/include/bitutils.h index d6d1f88..b34ac11 100644 --- a/include/bitutils.h +++ b/include/bitutils.h @@ -1,18 +1,5 @@ -/* 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-2016 IBM Corp. */ #ifndef __BITUTILS_H #define __BITUTILS_H diff --git a/include/bt.h b/include/bt.h index 1763d9f..f6655d9 100644 --- a/include/bt.h +++ b/include/bt.h @@ -1,18 +1,5 @@ -/* 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 __BT_H #define __BT_H diff --git a/include/buddy.h b/include/buddy.h index fa97eb0..a8414f5 100644 --- a/include/buddy.h +++ b/include/buddy.h @@ -1,21 +1,10 @@ -/* Copyright 2016 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 +/* * Simple power-of-two buddy allocation mechanism. * + * Copyright 2016 IBM Corp. */ + #ifndef __BUDDY_H #define __BUDDY_H diff --git a/include/capp.h b/include/capp.h index cc70e44..b099a16 100644 --- a/include/capp.h +++ b/include/capp.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __CAPP_H #define __CAPP_H diff --git a/include/cec.h b/include/cec.h index 97da17a..22da563 100644 --- a/include/cec.h +++ b/include/cec.h @@ -1,18 +1,5 @@ -/* 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 __CEC_H #define __CEC_H diff --git a/include/centaur.h b/include/centaur.h index 7a50bee..9b60a21 100644 --- a/include/centaur.h +++ b/include/centaur.h @@ -1,18 +1,5 @@ -/* 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-2016 IBM Corp. */ #ifndef __CENTAUR_H #define __CENTAUR_H diff --git a/include/chip.h b/include/chip.h index f94149b..9bddd38 100644 --- a/include/chip.h +++ b/include/chip.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __CHIP_H #define __CHIP_H diff --git a/include/chiptod.h b/include/chiptod.h index 1a78980..85a23df 100644 --- a/include/chiptod.h +++ b/include/chiptod.h @@ -1,26 +1,14 @@ -/* 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 +/* + * The ChipTOD is the HW facility that maintains a synchronized + * time base across the fabric. * - * 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. */ #ifndef __CHIPTOD_H #define __CHIPTOD_H -/* The ChipTOD is the HW facility that maintains a synchronized - * time base across the fabric. - */ - enum chiptod_topology { chiptod_topo_unknown = -1, chiptod_topo_primary = 0, diff --git a/include/cmpxchg.h b/include/cmpxchg.h index 28911c0..3541a41 100644 --- a/include/cmpxchg.h +++ b/include/cmpxchg.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 __CMPXCHG_H #define __CMPXCHG_H diff --git a/include/compiler.h b/include/compiler.h index 9a4602e..7d6dda8 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __COMPILER_H #define __COMPILER_H diff --git a/include/config.h b/include/config.h index 7059e39..d7a64b7 100644 --- a/include/config.h +++ b/include/config.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/console.h b/include/console.h index 94138af..26602b7 100644 --- a/include/console.h +++ b/include/console.h @@ -1,18 +1,5 @@ -/* 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 __CONSOLE_H #define __CONSOLE_H diff --git a/include/cpu.h b/include/cpu.h index 011b12b..cda7864 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __CPU_H #define __CPU_H diff --git a/include/debug_descriptor.h b/include/debug_descriptor.h index 0a4d17c..774c360 100644 --- a/include/debug_descriptor.h +++ b/include/debug_descriptor.h @@ -1,18 +1,5 @@ -/* Copyright 2013-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 2013-2019 IBM Corp. */ #ifndef __DEBUG_DESCRIPTOR_H #define __DEBUG_DESCRIPTOR_H diff --git a/include/device.h b/include/device.h index a447dcd..25325ec 100644 --- a/include/device.h +++ b/include/device.h @@ -1,18 +1,5 @@ -/* 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 __DEVICE_H #define __DEVICE_H diff --git a/include/dio-p9.h b/include/dio-p9.h index 65aed2d..06563bf 100644 --- a/include/dio-p9.h +++ b/include/dio-p9.h @@ -1,19 +1,5 @@ - -/* Copyright 2019 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 2019 IBM Corp. */ #ifndef __DIO_H #define __DIO_H diff --git a/include/direct-controls.h b/include/direct-controls.h index 9df1549..8c7b356 100644 --- a/include/direct-controls.h +++ b/include/direct-controls.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 __DIRECT_CONTROLS_H #define __DIRECT_CONTROLS_H diff --git a/include/dts.h b/include/dts.h index 30188ac..2b54054 100644 --- a/include/dts.h +++ b/include/dts.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-2017 IBM Corp. */ #ifndef __DTS_H #define __DTS_H diff --git a/include/elf-abi.h b/include/elf-abi.h index e8397f7..827f2af 100644 --- a/include/elf-abi.h +++ b/include/elf-abi.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 __ELF_ABI_H #define __ELF_ABI_H diff --git a/include/elf.h b/include/elf.h index 7d12e5a..93524bb 100644 --- a/include/elf.h +++ b/include/elf.h @@ -1,18 +1,5 @@ -/* 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 __ELF_H #define __ELF_H diff --git a/include/errorlog.h b/include/errorlog.h index 6da9664..2d93bf7 100644 --- a/include/errorlog.h +++ b/include/errorlog.h @@ -1,18 +1,5 @@ -/* 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 __ERRORLOG_H #define __ERRORLOG_H diff --git a/include/fsi-master.h b/include/fsi-master.h index e727214..62035a4 100644 --- a/include/fsi-master.h +++ b/include/fsi-master.h @@ -1,18 +1,5 @@ -/* 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-2014 IBM Corp. */ #ifndef __FSI_MASTER_H #define __FSI_MASTER_H diff --git a/include/fsp-attn.h b/include/fsp-attn.h index bc09fcc..4399ead 100644 --- a/include/fsp-attn.h +++ b/include/fsp-attn.h @@ -1,18 +1,5 @@ -/* 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 __FSP_ATTN_H #define __FSP_ATTN_H diff --git a/include/fsp-elog.h b/include/fsp-elog.h index eb9c28f..f24251d 100644 --- a/include/fsp-elog.h +++ b/include/fsp-elog.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-2016 IBM Corp. */ + #include <opal.h> #include <errorlog.h> #include <pel.h> diff --git a/include/fsp-leds.h b/include/fsp-leds.h index c5a33ac..57b3d1f 100644 --- a/include/fsp-leds.h +++ b/include/fsp-leds.h @@ -1,24 +1,8 @@ -/* 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 /* * SPCN based LED location code and other information + * + * Copyright 2013-2016 IBM Corp. */ #ifndef __FSP_LEDS_H diff --git a/include/fsp-mdst-table.h b/include/fsp-mdst-table.h index 5989cdb..7f0ce14 100644 --- a/include/fsp-mdst-table.h +++ b/include/fsp-mdst-table.h @@ -1,19 +1,5 @@ -/* 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 __FSPMDST_H #define __FSPMDST_H diff --git a/include/fsp-sysparam.h b/include/fsp-sysparam.h index 1275776..b107f18 100644 --- a/include/fsp-sysparam.h +++ b/include/fsp-sysparam.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 __FSP_SYSPARAM_H #define __FSP_SYSPARAM_H diff --git a/include/fsp.h b/include/fsp.h index 0df7f93..b4c1759 100644 --- a/include/fsp.h +++ b/include/fsp.h @@ -1,23 +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 /* * IBM System P FSP (Flexible Service Processor) + * + * Copyright 2013-2019 IBM Corp. */ + #ifndef __FSP_H #define __FSP_H diff --git a/include/hiomap.h b/include/hiomap.h index 3270554..3b3f7a9 100644 --- a/include/hiomap.h +++ b/include/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 IBM Corp. */ #ifndef __HIOMAP_H #define __HIOMAP_H diff --git a/include/hostservices.h b/include/hostservices.h index 06c5fe7..205de84 100644 --- a/include/hostservices.h +++ b/include/hostservices.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __HOSTSERVICES_H #define __HOSTSERVICES_H diff --git a/include/i2c.h b/include/i2c.h index e530683..e68d499 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __I2C_H #define __I2C_H diff --git a/include/imc.h b/include/imc.h index 9b65824..bfc28bc 100644 --- a/include/imc.h +++ b/include/imc.h @@ -1,19 +1,5 @@ -/* Copyright 2016 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 2016-2019 IBM Corp. */ /* * In-Memory Collection (IMC) Counters : * Power9 has IMC instrumentation support with which several diff --git a/include/interrupts.h b/include/interrupts.h index 7024fac..d1ee5c4 100644 --- a/include/interrupts.h +++ b/include/interrupts.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __INTERRUPTS_H #define __INTERRUPTS_H diff --git a/include/inttypes.h b/include/inttypes.h index 8e640ca..57bd732 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -1,23 +1,10 @@ -/* Copyright 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 /* This file exists because a bunch of files are built as part of * unit tests as well as skiboot and inttypes.h is part of libc rather * than gcc, so to get the magic to work when we don't have libc sitting * around, we get to rewrite inttypes.h. + * + * Copyright 2015 IBM Corp. */ #ifndef __SKIBOOT_INTTYPES_H diff --git a/include/io.h b/include/io.h index c056c37..c6203a2 100644 --- a/include/io.h +++ b/include/io.h @@ -1,18 +1,5 @@ -/* 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 __IO_H #define __IO_H diff --git a/include/ipmi.h b/include/ipmi.h index 5310b57..4f51347 100644 --- a/include/ipmi.h +++ b/include/ipmi.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __IPMI_H #define __IPMI_H diff --git a/include/lock.h b/include/lock.h index e08ec08..04bc9f9 100644 --- a/include/lock.h +++ b/include/lock.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __LOCK_H #define __LOCK_H diff --git a/include/lpc-mbox.h b/include/lpc-mbox.h index 8ecf0c8..37ec341 100644 --- a/include/lpc-mbox.h +++ b/include/lpc-mbox.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-2018 IBM Corp. */ #ifndef __LPC_MBOX_H #define __LPC_MBOX_H diff --git a/include/lpc.h b/include/lpc.h index 83b6c9d..58cfe6b 100644 --- a/include/lpc.h +++ b/include/lpc.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __LPC_H #define __LPC_H diff --git a/include/mem-map.h b/include/mem-map.h index fc535e5..4d06b64 100644 --- a/include/mem-map.h +++ b/include/mem-map.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __MEM_MAP_H #define __MEM_MAP_H diff --git a/include/mem_region-malloc.h b/include/mem_region-malloc.h index 41e19de..4350c56 100644 --- a/include/mem_region-malloc.h +++ b/include/mem_region-malloc.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __MEM_REGION_MALLOC_H #define __MEM_REGION_MALLOC_H diff --git a/include/mem_region.h b/include/mem_region.h index d9e490a..65eda42 100644 --- a/include/mem_region.h +++ b/include/mem_region.h @@ -1,18 +1,5 @@ -/* 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 __MEMORY_REGION #define __MEMORY_REGION diff --git a/include/npu-regs.h b/include/npu-regs.h index 0ccc40f..87d4499 100644 --- a/include/npu-regs.h +++ b/include/npu-regs.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-2018 IBM Corp. */ #ifndef __NPU_REGS_H #define __NPU_REGS_H diff --git a/include/npu.h b/include/npu.h index a76acdf..ed905e2 100644 --- a/include/npu.h +++ b/include/npu.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-2017 IBM Corp. */ #ifndef __NPU_H #define __NPU_H diff --git a/include/npu2-regs.h b/include/npu2-regs.h index 00a72e6..847fc2c 100644 --- a/include/npu2-regs.h +++ b/include/npu2-regs.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __NPU2_REGS_H #define __NPU2_REGS_H diff --git a/include/npu2.h b/include/npu2.h index 5b2a436..b63eba8 100644 --- a/include/npu2.h +++ b/include/npu2.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __NPU2_H #define __NPU2_H diff --git a/include/nvram.h b/include/nvram.h index a018a11..b056829 100644 --- a/include/nvram.h +++ b/include/nvram.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __NVRAM_H #define __NVRAM_H diff --git a/include/nx.h b/include/nx.h index dcaf20f..675d17a 100644 --- a/include/nx.h +++ b/include/nx.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __NX_H #define __NX_H diff --git a/include/occ.h b/include/occ.h index 7ba6be8..0030af5 100644 --- a/include/occ.h +++ b/include/occ.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-2019 IBM Corp. */ #include <chip.h> diff --git a/include/op-panel.h b/include/op-panel.h index 557e750..04c52ba 100644 --- a/include/op-panel.h +++ b/include/op-panel.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __OP_PANEL_H #define __OP_PANEL_H diff --git a/include/opal-api.h b/include/opal-api.h index 0b0ae19..782666d 100644 --- a/include/opal-api.h +++ b/include/opal-api.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2019 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. */ #ifndef __OPAL_API_H #define __OPAL_API_H diff --git a/include/opal-internal.h b/include/opal-internal.h index 448f4b5..fd2187f 100644 --- a/include/opal-internal.h +++ b/include/opal-internal.h @@ -1,23 +1,13 @@ -/* 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 +/* + * Internal header for OPAL API related things in skiboot * - * 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. */ #ifndef __OPAL_INTERNAL_H #define __OPAL_INTERNAL_H -/****** Internal header for OPAL API related things in skiboot **********/ #include <skiboot.h> diff --git a/include/opal-msg.h b/include/opal-msg.h index bfe148b..0361833 100644 --- a/include/opal-msg.h +++ b/include/opal-msg.h @@ -1,19 +1,5 @@ -/* Copyright 2013-2019 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. */ #ifndef __OPALMSG_H #define __OPALMSG_H diff --git a/include/opal.h b/include/opal.h index 6fe9f8c..a702655 100644 --- a/include/opal.h +++ b/include/opal.h @@ -1,18 +1,5 @@ -/* 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 __OPAL_H #define __OPAL_H diff --git a/include/pci-cfg.h b/include/pci-cfg.h index 6061584..0830723 100644 --- a/include/pci-cfg.h +++ b/include/pci-cfg.h @@ -1,22 +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 /* * PCI Configuration space definitions + * + * Copyright 2013-2017 IBM Corp. */ + #ifndef __PCI_CFG_H #define __PCI_CFG_H diff --git a/include/pci-quirk.h b/include/pci-quirk.h index 1883248..784970c 100644 --- a/include/pci-quirk.h +++ b/include/pci-quirk.h @@ -1,18 +1,5 @@ -/* Copyright 2016 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 2016-2017 IBM Corp. */ #ifndef __PCI_QUIRK_H #define __PCI_QUIRK_H diff --git a/include/pci-slot.h b/include/pci-slot.h index 7c5fd60..6e7dc1c 100644 --- a/include/pci-slot.h +++ b/include/pci-slot.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __PCI_SLOT_H #define __PCI_SLOT_H diff --git a/include/pci-virt.h b/include/pci-virt.h index 7c787cf..508baf8 100644 --- a/include/pci-virt.h +++ b/include/pci-virt.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __PCI_VIRT_H #define __PCI_VIRT_H diff --git a/include/pci.h b/include/pci.h index c10d794..c7c15d0 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __PCI_H #define __PCI_H diff --git a/include/pel.h b/include/pel.h index 1213c43..19361d3 100644 --- a/include/pel.h +++ b/include/pel.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-2014 IBM Corp. */ + #ifndef __PEL_H #define __PEL_H diff --git a/include/phb3-capp.h b/include/phb3-capp.h index 3dab4ab..d2e814d 100644 --- a/include/phb3-capp.h +++ b/include/phb3-capp.h @@ -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-2017 IBM Corp. */ #ifndef __PHB3_CAPP_H #define __PHB3_CAPP_H diff --git a/include/phb3-regs.h b/include/phb3-regs.h index 5a3cea6..d79af7e 100644 --- a/include/phb3-regs.h +++ b/include/phb3-regs.h @@ -1,23 +1,9 @@ -/* 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-2016 IBM Corp. */ #ifndef __PHB3_REGS_H #define __PHB3_REGS_H - /* * PHB registers */ diff --git a/include/phb3.h b/include/phb3.h index bc46da7..249a8b2 100644 --- a/include/phb3.h +++ b/include/phb3.h @@ -1,18 +1,5 @@ -/* 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 __PHB3_H #define __PHB3_H diff --git a/include/phb4-capp.h b/include/phb4-capp.h index 2f309d4..bea29fd 100644 --- a/include/phb4-capp.h +++ b/include/phb4-capp.h @@ -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. */ #ifndef __PHB4_CAPP_H #define __PHB4_CAPP_H diff --git a/include/phb4-regs.h b/include/phb4-regs.h index 8dd8cdc..d2fc357 100644 --- a/include/phb4-regs.h +++ b/include/phb4-regs.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __PHB4_REGS_H #define __PHB4_REGS_H diff --git a/include/phb4.h b/include/phb4.h index c52a840..af2e3ed 100644 --- a/include/phb4.h +++ b/include/phb4.h @@ -1,21 +1,6 @@ -/* Copyright 2013-2016 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. */ -/* -*/ #ifndef __PHB4_H #define __PHB4_H diff --git a/include/phys-map.h b/include/phys-map.h index 0cf48b6..6fd8cf5 100644 --- a/include/phys-map.h +++ b/include/phys-map.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-2019 IBM Corp. */ #ifndef __PHYS_MAP_H #define __PHYS_MAP_H diff --git a/include/platform.h b/include/platform.h index da27c03..ee22752 100644 --- a/include/platform.h +++ b/include/platform.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __PLATFORM_H #define __PLATFORM_H diff --git a/include/pool.h b/include/pool.h index 11730a9..41081ca 100644 --- a/include/pool.h +++ b/include/pool.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2014 IBM Corp. */ + #ifndef __POOL_H #define __POOL_H diff --git a/include/powercap.h b/include/powercap.h index ec5e126..a45e63e 100644 --- a/include/powercap.h +++ b/include/powercap.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 __POWERCAP_H #define __POWERCAP_H diff --git a/include/prd-fw-msg.h b/include/prd-fw-msg.h index 9333a30..9c9cbdf 100644 --- a/include/prd-fw-msg.h +++ b/include/prd-fw-msg.h @@ -1,19 +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-2019 IBM Corp. */ #ifndef __PRD_FW_MSG_H #define __PRD_FW_MSG_H diff --git a/include/processor.h b/include/processor.h index b759752..352fd1e 100644 --- a/include/processor.h +++ b/include/processor.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __PROCESSOR_H #define __PROCESSOR_H diff --git a/include/psi.h b/include/psi.h index 1aca1af..9836e35 100644 --- a/include/psi.h +++ b/include/psi.h @@ -1,22 +1,8 @@ -/* 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 /* * IBM System P PSI (Processor Service Interface) + * + * Copyright 2013-2019 IBM Corp. */ #ifndef __PSI_H #define __PSI_H diff --git a/include/psr.h b/include/psr.h index 92c0aa5..6997943 100644 --- a/include/psr.h +++ b/include/psr.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 __PSR_H #define __PSR_H diff --git a/include/rtc.h b/include/rtc.h index a993fd4..1887003 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -1,18 +1,5 @@ -/* 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-2014 IBM Corp. */ #ifndef __RTC_H #define __RTC_H diff --git a/include/sbe-p8.h b/include/sbe-p8.h index 785c2cd..50a7a55 100644 --- a/include/sbe-p8.h +++ b/include/sbe-p8.h @@ -1,18 +1,6 @@ -/* Copyright 2013-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 2013-2018 IBM Corp. */ + #ifndef __SBE_P8_H #define __SBE_P8_H diff --git a/include/sbe-p9.h b/include/sbe-p9.h index 5ad0422..779c799 100644 --- a/include/sbe-p9.h +++ b/include/sbe-p9.h @@ -1,18 +1,5 @@ -/* Copyright 2017-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 2017-2019 IBM Corp. */ #ifndef __SBE_P9_H #define __SBE_P9_H diff --git a/include/sensor.h b/include/sensor.h index 40b275a..a79e1de 100644 --- a/include/sensor.h +++ b/include/sensor.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-2017 IBM Corp. */ #ifndef __SENSOR_H #define __SENSOR_H diff --git a/include/sfc-ctrl.h b/include/sfc-ctrl.h index 8ff9780..72da8b7 100644 --- a/include/sfc-ctrl.h +++ b/include/sfc-ctrl.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-2014 IBM Corp. */ + #ifndef SFC_CTRL_H #define SFC_CTRL_H diff --git a/include/skiboot-valgrind.h b/include/skiboot-valgrind.h index bdeaa8f..5b3a27f 100644 --- a/include/skiboot-valgrind.h +++ b/include/skiboot-valgrind.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 __SKIBOOT_VALGRIND_H #define __SKIBOOT_VALGRIND_H diff --git a/include/skiboot.h b/include/skiboot.h index 1b3bacb..9b7942f 100644 --- a/include/skiboot.h +++ b/include/skiboot.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __SKIBOOT_H #define __SKIBOOT_H diff --git a/include/spcn.h b/include/spcn.h index 0df9163..bec7134 100644 --- a/include/spcn.h +++ b/include/spcn.h @@ -1,21 +1,5 @@ -/* 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-2016 IBM Corp. */ #ifndef __SPCN_H #define __SPCN_H diff --git a/include/stack.h b/include/stack.h index 004beb0..9a1d18b 100644 --- a/include/stack.h +++ b/include/stack.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __STACKFRAME_H #define __STACKFRAME_H diff --git a/include/time-utils.h b/include/time-utils.h index e0a9a98..3fdb03c 100644 --- a/include/time-utils.h +++ b/include/time-utils.h @@ -1,18 +1,5 @@ -/* 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 __TIME_UTILS_H #define __TIME_UTILS_H diff --git a/include/timebase.h b/include/timebase.h index 1e30bca..d7469c3 100644 --- a/include/timebase.h +++ b/include/timebase.h @@ -1,24 +1,12 @@ -/* 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 /* * Timebase helpers. * * Note: Only use after the TODs are in sync ! + * + * Copyright 2013-2016 IBM Corp. */ + #ifndef __TIME_H #define __TIME_H diff --git a/include/timer.h b/include/timer.h index 116b9ac..59f963d 100644 --- a/include/timer.h +++ b/include/timer.h @@ -1,3 +1,6 @@ +// SPDX-License-Identifier: Apache-2.0 +/* Copyright 2014-2015 IBM Corp. */ + #ifndef __TIMER_H #define __TIMER_H diff --git a/include/trace.h b/include/trace.h index 665817a..43c6a9d 100644 --- a/include/trace.h +++ b/include/trace.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __TRACE_H #define __TRACE_H diff --git a/include/trace_types.h b/include/trace_types.h index a525a00..54228b9 100644 --- a/include/trace_types.h +++ b/include/trace_types.h @@ -1,19 +1,10 @@ -/* Copyright 2013-2014 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * API for kernel to read trace buffer. * - * 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. */ -/* API for kernel to read trace buffer. */ + #ifndef __TRACE_TYPES_H #define __TRACE_TYPES_H diff --git a/include/types.h b/include/types.h index 07a9db6..a7a45f5 100644 --- a/include/types.h +++ b/include/types.h @@ -1,18 +1,5 @@ -/* 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 __TYPES_H #define __TYPES_H diff --git a/include/vas.h b/include/vas.h index f8c7add..9f761be 100644 --- a/include/vas.h +++ b/include/vas.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __VAS_H #define __VAS_H diff --git a/include/vpd.h b/include/vpd.h index bf66a12..ec1ec95 100644 --- a/include/vpd.h +++ b/include/vpd.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __VPD_H #define __VPD_H diff --git a/include/xive.h b/include/xive.h index acc696a..4100e71 100644 --- a/include/xive.h +++ b/include/xive.h @@ -1,18 +1,6 @@ -/* Copyright 2016 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 2016-2018 IBM Corp. */ + #ifndef __XIVE_H__ #define __XIVE_H__ diff --git a/include/xscom-p8-regs.h b/include/xscom-p8-regs.h index 3523272..cd4e31f 100644 --- a/include/xscom-p8-regs.h +++ b/include/xscom-p8-regs.h @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2013-2019 IBM Corp. + */ + #ifndef __XSCOM_P8_REGS_H__ #define __XSCOM_P8_REGS_H__ diff --git a/include/xscom-p9-regs.h b/include/xscom-p9-regs.h index 5137d91..b322605 100644 --- a/include/xscom-p9-regs.h +++ b/include/xscom-p9-regs.h @@ -1,3 +1,8 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2016-2019 IBM Corp. + */ + #ifndef __XSCOM_P9_REGS_H__ #define __XSCOM_P9_REGS_H__ diff --git a/include/xscom.h b/include/xscom.h index 649de67..1f89ba9 100644 --- a/include/xscom.h +++ b/include/xscom.h @@ -1,18 +1,5 @@ -/* 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. */ #ifndef __XSCOM_H #define __XSCOM_H diff --git a/libc/string/memcpy_from_ci.c b/libc/string/memcpy_from_ci.c index 4c5582f..89fcd5a 100644 --- a/libc/string/memcpy_from_ci.c +++ b/libc/string/memcpy_from_ci.c @@ -1,17 +1,6 @@ -/* Copyright 2013-2016 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 */ #include <ccan/short_types/short_types.h> diff --git a/libc/test/run-ctype-test.c b/libc/test/run-ctype-test.c index bbe91d3..fa094ff 100644 --- a/libc/test/run-ctype-test.c +++ b/libc/test/run-ctype-test.c @@ -1,20 +1,7 @@ -/* 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-2015 IBM Corp. + * * This file is run with the skiboot libc files rather than system libc. * This means we have a bit of "fun" with actually executing the tests on * the host. diff --git a/libc/test/run-ctype.c b/libc/test/run-ctype.c index 3851a5d..43ec47d 100644 --- a/libc/test/run-ctype.c +++ b/libc/test/run-ctype.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #define BUFSZ 50 diff --git a/libc/test/run-memops-test.c b/libc/test/run-memops-test.c index 6303b33..9f1a2c5 100644 --- a/libc/test/run-memops-test.c +++ b/libc/test/run-memops-test.c @@ -1,20 +1,7 @@ -/* 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-2015 IBM Corp. + * * This file is run with the skiboot libc files rather than system libc. * This means we have a bit of "fun" with actually executing the tests on * the host. diff --git a/libc/test/run-memops.c b/libc/test/run-memops.c index 55912ea..22aec2d 100644 --- a/libc/test/run-memops.c +++ b/libc/test/run-memops.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #define BUFSZ 50 diff --git a/libc/test/run-snprintf-test.c b/libc/test/run-snprintf-test.c index b75d887..06428d5 100644 --- a/libc/test/run-snprintf-test.c +++ b/libc/test/run-snprintf-test.c @@ -1,20 +1,7 @@ -/* 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-2015 IBM Corp. + * * This file is run with the skiboot libc files rather than system libc. * This means we have a bit of "fun" with actually executing the tests on * the host. diff --git a/libc/test/run-snprintf.c b/libc/test/run-snprintf.c index 5e67030..d7313c0 100644 --- a/libc/test/run-snprintf.c +++ b/libc/test/run-snprintf.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #define BUFSZ 50 diff --git a/libc/test/run-stdlib-test.c b/libc/test/run-stdlib-test.c index d48c5d5..77b4bcc 100644 --- a/libc/test/run-stdlib-test.c +++ b/libc/test/run-stdlib-test.c @@ -1,20 +1,7 @@ -/* 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-2015 IBM Corp. + * * This file is run with the skiboot libc files rather than system libc. * This means we have a bit of "fun" with actually executing the tests on * the host. diff --git a/libc/test/run-stdlib.c b/libc/test/run-stdlib.c index bf17604..814289c 100644 --- a/libc/test/run-stdlib.c +++ b/libc/test/run-stdlib.c @@ -1,17 +1,6 @@ -/* 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-2015 IBM Corp. */ #define BUFSZ 50 diff --git a/libc/test/run-time.c b/libc/test/run-time.c index aae7f4f..138803d 100644 --- a/libc/test/run-time.c +++ b/libc/test/run-time.c @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2014-2015 IBM Corp. + */ #include "/usr/include/assert.h" #include <stdio.h> #include <libc/include/time.h> 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> diff --git a/libstb/container-utils.c b/libstb/container-utils.c index d2c1f9d..919245a 100644 --- a/libstb/container-utils.c +++ b/libstb/container-utils.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 "config.h" diff --git a/libstb/container-utils.h b/libstb/container-utils.h index d3337b1..d972f40 100644 --- a/libstb/container-utils.h +++ b/libstb/container-utils.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 _CREATE_CONTAINER_UTILS_H #define _CREATE_CONTAINER_UTILS_H diff --git a/libstb/container.c b/libstb/container.c index 5287c94..58fd18f 100644 --- a/libstb/container.c +++ b/libstb/container.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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. */ #include <skiboot.h> #include "container.h" diff --git a/libstb/container.h b/libstb/container.h index 0d0acb2..c21943f 100644 --- a/libstb/container.h +++ b/libstb/container.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __STB_CONTAINER_H #define __STB_CONTAINER_H diff --git a/libstb/create-container.c b/libstb/create-container.c index d9f377f..689a5d5 100644 --- a/libstb/create-container.c +++ b/libstb/create-container.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 <config.h> diff --git a/libstb/cvc.c b/libstb/cvc.c index d46617b..dca4ac8 100644 --- a/libstb/cvc.c +++ b/libstb/cvc.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. */ #ifndef pr_fmt #define pr_fmt(fmt) "STB: " fmt diff --git a/libstb/cvc.h b/libstb/cvc.h index 6bbd3a3..6d8546f 100644 --- a/libstb/cvc.h +++ b/libstb/cvc.h @@ -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-2017 IBM Corp. */ #ifndef __CVC_H #define __CVC_H diff --git a/libstb/drivers/tpm_i2c_interface.c b/libstb/drivers/tpm_i2c_interface.c index ea0dd66..7b45841 100644 --- a/libstb/drivers/tpm_i2c_interface.c +++ b/libstb/drivers/tpm_i2c_interface.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <opal-api.h> diff --git a/libstb/drivers/tpm_i2c_interface.h b/libstb/drivers/tpm_i2c_interface.h index 1134cd5..401cb08 100644 --- a/libstb/drivers/tpm_i2c_interface.h +++ b/libstb/drivers/tpm_i2c_interface.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __TPM_I2C_H #define __TPM_I2C_H diff --git a/libstb/drivers/tpm_i2c_nuvoton.c b/libstb/drivers/tpm_i2c_nuvoton.c index 7f29deb..ef32b79 100644 --- a/libstb/drivers/tpm_i2c_nuvoton.c +++ b/libstb/drivers/tpm_i2c_nuvoton.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 <timebase.h> #include <skiboot.h> diff --git a/libstb/drivers/tpm_i2c_nuvoton.h b/libstb/drivers/tpm_i2c_nuvoton.h index 4d8a0b2..2851f05 100644 --- a/libstb/drivers/tpm_i2c_nuvoton.h +++ b/libstb/drivers/tpm_i2c_nuvoton.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __TPM_I2C_NUVOTON_H #define __TPM_I2C_NUVOTON_H diff --git a/libstb/print-container.c b/libstb/print-container.c index 17aea12..b275715 100644 --- a/libstb/print-container.c +++ b/libstb/print-container.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 <config.h> diff --git a/libstb/secureboot.c b/libstb/secureboot.c index 1578f52..bfc98f2 100644 --- a/libstb/secureboot.c +++ b/libstb/secureboot.c @@ -1,18 +1,5 @@ -/* Copyright 2013-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 2013-2019 IBM Corp. */ #ifndef pr_fmt #define pr_fmt(fmt) "STB: " fmt diff --git a/libstb/secureboot.h b/libstb/secureboot.h index b1cb29b..426483f 100644 --- a/libstb/secureboot.h +++ b/libstb/secureboot.h @@ -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-2017 IBM Corp. */ #ifndef __SECUREBOOT_H #define __SECUREBOOT_H diff --git a/libstb/status_codes.h b/libstb/status_codes.h index 4896132..0f5e1a5 100644 --- a/libstb/status_codes.h +++ b/libstb/status_codes.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __STB_STATUS_CODES_H #define __STB_STATUS_CODES_H diff --git a/libstb/test/run-stb-container.c b/libstb/test/run-stb-container.c index 4bcb4c3..8da8e6f 100644 --- a/libstb/test/run-stb-container.c +++ b/libstb/test/run-stb-container.c @@ -1,18 +1,5 @@ -/* 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 2016 IBM Corp. */ #include <config.h> diff --git a/libstb/tpm_chip.c b/libstb/tpm_chip.c index 2858caf..51ba1be 100644 --- a/libstb/tpm_chip.c +++ b/libstb/tpm_chip.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 pr_fmt #define pr_fmt(fmt) "STB: " fmt diff --git a/libstb/tpm_chip.h b/libstb/tpm_chip.h index de7f8ed..dede420 100644 --- a/libstb/tpm_chip.h +++ b/libstb/tpm_chip.h @@ -1,18 +1,5 @@ -/* Copyright 2013-2016 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 __TPM_H #define __TPM_H diff --git a/libstb/trustedboot.c b/libstb/trustedboot.c index f431e33..3f977de 100644 --- a/libstb/trustedboot.c +++ b/libstb/trustedboot.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-2019 IBM Corp. */ #ifndef pr_fmt #define pr_fmt(fmt) "STB: " fmt diff --git a/libstb/trustedboot.h b/libstb/trustedboot.h index 3003c80..17478c1 100644 --- a/libstb/trustedboot.h +++ b/libstb/trustedboot.h @@ -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-2017 IBM Corp. */ #ifndef __TRUSTEDBOOT_H #define __TRUSTEDBOOT_H diff --git a/platforms/astbmc/astbmc.h b/platforms/astbmc/astbmc.h index c302b60..b9f71fc 100644 --- a/platforms/astbmc/astbmc.h +++ b/platforms/astbmc/astbmc.h @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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. */ #ifndef __ASTBMC_H #define __ASTBMC_H diff --git a/platforms/astbmc/barreleye.c b/platforms/astbmc/barreleye.c index 6cc5537..f7542d6 100644 --- a/platforms/astbmc/barreleye.c +++ b/platforms/astbmc/barreleye.c @@ -1,20 +1,9 @@ -/* Copyright 2016 Ingrasys. - * - * 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 2016 Ingrasys. + * Copyright 2016-2019 IBM Corp. */ - #include <skiboot.h> #include <device.h> #include <console.h> diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 76fa25f..85043f3 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c index 29ee377..5e30c25 100644 --- a/platforms/astbmc/firestone.c +++ b/platforms/astbmc/firestone.c @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c index b931057..1b0f865 100644 --- a/platforms/astbmc/garrison.c +++ b/platforms/astbmc/garrison.c @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c index 068c315..0cec64f 100644 --- a/platforms/astbmc/habanero.c +++ b/platforms/astbmc/habanero.c @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/nicole.c b/platforms/astbmc/nicole.c index 34954a5..6893cdd 100644 --- a/platforms/astbmc/nicole.c +++ b/platforms/astbmc/nicole.c @@ -1,17 +1,6 @@ -/** +// SPDX-License-Identifier: Apache-2.0 +/* * Copyright (c) 2019 YADRO - * - * 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. */ #include <skiboot.h> diff --git a/platforms/astbmc/p8dnu.c b/platforms/astbmc/p8dnu.c index 8d7d16b..a76fbd9 100644 --- a/platforms/astbmc/p8dnu.c +++ b/platforms/astbmc/p8dnu.c @@ -1,20 +1,9 @@ -/* Copyright 2017 Supermicro and 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 Supermicro + * Copyright 2017-2019 IBM Corp. */ - #include <skiboot.h> #include <device.h> #include <console.h> diff --git a/platforms/astbmc/p8dtu.c b/platforms/astbmc/p8dtu.c index f4a0c7f..c62223b 100644 --- a/platforms/astbmc/p8dtu.c +++ b/platforms/astbmc/p8dtu.c @@ -1,20 +1,9 @@ -/* Copyright 2016 supermicro. - * - * 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 2016 Supermicro. + * Copyright 2016-2019 IBM Corp. */ - #include <skiboot.h> #include <device.h> #include <console.h> diff --git a/platforms/astbmc/p9dsu.c b/platforms/astbmc/p9dsu.c index 72645ec..d49f7fe 100644 --- a/platforms/astbmc/p9dsu.c +++ b/platforms/astbmc/p9dsu.c @@ -1,18 +1,7 @@ -/* Copyright 2017 Supermicro Inc. - * 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 2017 Supermicro Inc. + * Copyright 2018-2019 IBM Corp. */ #include <skiboot.h> diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c index 9136d15..8cfd48a 100644 --- a/platforms/astbmc/palmetto.c +++ b/platforms/astbmc/palmetto.c @@ -1,19 +1,5 @@ -/* Copyright 2013-2016 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/pnor.c b/platforms/astbmc/pnor.c index 6c1d287..ce0de07 100644 --- a/platforms/astbmc/pnor.c +++ b/platforms/astbmc/pnor.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/romulus.c b/platforms/astbmc/romulus.c index 3e4003a..2f3a0a4 100644 --- a/platforms/astbmc/romulus.c +++ b/platforms/astbmc/romulus.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-2019 IBM Corp. */ #include <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/slots.c b/platforms/astbmc/slots.c index 0bd8403..2f8cf0c 100644 --- a/platforms/astbmc/slots.c +++ b/platforms/astbmc/slots.c @@ -1,18 +1,6 @@ -/* Copyright 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 2015-2018 IBM Corp. */ + #include <skiboot.h> #include <device.h> #include <console.h> diff --git a/platforms/astbmc/talos.c b/platforms/astbmc/talos.c index f4cbb76..55a3385 100644 --- a/platforms/astbmc/talos.c +++ b/platforms/astbmc/talos.c @@ -1,18 +1,7 @@ -/* Copyright 2017 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2017-2019 IBM Corp. * Copyright 2018-2019 Raptor Engineering, LLC - * - * 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. */ #include <skiboot.h> diff --git a/platforms/astbmc/vesnin.c b/platforms/astbmc/vesnin.c index 8ec1ebc..030944e 100644 --- a/platforms/astbmc/vesnin.c +++ b/platforms/astbmc/vesnin.c @@ -1,17 +1,7 @@ -/** +// SPDX-License-Identifier: Apache-2.0 +/* * Copyright (c) 2018 YADRO - * - * 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 2018-2019 IBM Corp. */ #include <skiboot.h> diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/witherspoon.c index 7dab020..8aaed97 100644 --- a/platforms/astbmc/witherspoon.c +++ b/platforms/astbmc/witherspoon.c @@ -1,18 +1,5 @@ -/* Copyright 2017-2019 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-2019 IBM Corp. */ #include <skiboot.h> #include <device.h> diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c index ae8ca4b..ab35588 100644 --- a/platforms/astbmc/zaius.c +++ b/platforms/astbmc/zaius.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-2019 IBM Corp. */ #include <skiboot.h> #include <device.h> diff --git a/platforms/ibm-fsp/common.c b/platforms/ibm-fsp/common.c index 6f9d57a..a0339ec 100644 --- a/platforms/ibm-fsp/common.c +++ b/platforms/ibm-fsp/common.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-2019 IBM Corp. */ #include <skiboot.h> diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c index ac2580f..da49672 100644 --- a/platforms/ibm-fsp/firenze-pci.c +++ b/platforms/ibm-fsp/firenze-pci.c @@ -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-2019 IBM Corp. */ #define pr_fmt(fmt) "FIRENZE-PCI: " fmt #include <skiboot.h> diff --git a/platforms/ibm-fsp/firenze.c b/platforms/ibm-fsp/firenze.c index db18e2f..2697745 100644 --- a/platforms/ibm-fsp/firenze.c +++ b/platforms/ibm-fsp/firenze.c @@ -1,19 +1,5 @@ -/* 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 <skiboot.h> #include <device.h> diff --git a/platforms/ibm-fsp/fsp-vpd.c b/platforms/ibm-fsp/fsp-vpd.c index 9871b32..5577796 100644 --- a/platforms/ibm-fsp/fsp-vpd.c +++ b/platforms/ibm-fsp/fsp-vpd.c @@ -1,18 +1,5 @@ -/* Copyright 2013-2019 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 <skiboot.h> #include <vpd.h> diff --git a/platforms/ibm-fsp/hostservices.c b/platforms/ibm-fsp/hostservices.c index 9de8a63..3bdad4a 100644 --- a/platforms/ibm-fsp/hostservices.c +++ b/platforms/ibm-fsp/hostservices.c @@ -1,18 +1,5 @@ -/* 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 <stdint.h> #include <stdlib.h> diff --git a/platforms/ibm-fsp/ibm-fsp.h b/platforms/ibm-fsp/ibm-fsp.h index c055d4a..b3418e6 100644 --- a/platforms/ibm-fsp/ibm-fsp.h +++ b/platforms/ibm-fsp/ibm-fsp.h @@ -1,19 +1,5 @@ -/* 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. */ #ifndef __IBM_FSP_COMMON_H #define __IBM_FSP_COMMON_H diff --git a/platforms/ibm-fsp/lxvpd.c b/platforms/ibm-fsp/lxvpd.c index 4317c59..39c1cbf 100644 --- a/platforms/ibm-fsp/lxvpd.c +++ b/platforms/ibm-fsp/lxvpd.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 pr_fmt(fmt) "LXVPD: " fmt #include <skiboot.h> diff --git a/platforms/ibm-fsp/lxvpd.h b/platforms/ibm-fsp/lxvpd.h index c7ca21b..bc9daf5 100644 --- a/platforms/ibm-fsp/lxvpd.h +++ b/platforms/ibm-fsp/lxvpd.h @@ -1,18 +1,5 @@ -/* 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-2016 IBM Corp. */ #ifndef __LXVPD_H #define __LXVPD_H diff --git a/platforms/ibm-fsp/zz.c b/platforms/ibm-fsp/zz.c index bbeaf29..2bde315 100644 --- a/platforms/ibm-fsp/zz.c +++ b/platforms/ibm-fsp/zz.c @@ -1,18 +1,5 @@ -/* Copyright 2016-2019 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 2016-2019 IBM Corp. */ #include <skiboot.h> #include <device.h> diff --git a/platforms/mambo/console.c b/platforms/mambo/console.c index d02cde9..4a601fa 100644 --- a/platforms/mambo/console.c +++ b/platforms/mambo/console.c @@ -1,18 +1,5 @@ -/* Copyright 2016 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 2016-2017 IBM Corp. */ #include <skiboot.h> #include <console.h> diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c index cb6e103..e523cd3 100644 --- a/platforms/mambo/mambo.c +++ b/platforms/mambo/mambo.c @@ -1,19 +1,5 @@ -/* Copyright 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 2015-2017 IBM Corp. */ #include <skiboot.h> #include <device.h> diff --git a/platforms/mambo/mambo.h b/platforms/mambo/mambo.h index bce3e87..1bd5278 100644 --- a/platforms/mambo/mambo.h +++ b/platforms/mambo/mambo.h @@ -1,18 +1,5 @@ -/* Copyright 2016 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 2016 IBM Corp. */ #ifndef __MAMBO_H__ #define __MAMBO_H__ diff --git a/platforms/qemu/qemu.c b/platforms/qemu/qemu.c index b528a82..757c086 100644 --- a/platforms/qemu/qemu.c +++ b/platforms/qemu/qemu.c @@ -1,18 +1,5 @@ -/* 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 <skiboot.h> #include <console.h> diff --git a/platforms/rhesus/ec/config.h b/platforms/rhesus/ec/config.h index 201ccac..df2ad5d 100644 --- a/platforms/rhesus/ec/config.h +++ b/platforms/rhesus/ec/config.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-2014 IBM Corp. */ + /** * @file config.H * diff --git a/platforms/rhesus/ec/gpio.h b/platforms/rhesus/ec/gpio.h index 82a9343..65d7d87 100644 --- a/platforms/rhesus/ec/gpio.h +++ b/platforms/rhesus/ec/gpio.h @@ -1,18 +1,6 @@ -/* Copyright 2013-2014 Google 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-2014 Google Corp. */ + /** * @file gpio.h * diff --git a/platforms/rhesus/gpio.c b/platforms/rhesus/gpio.c index 0a2223d..2ac3630 100644 --- a/platforms/rhesus/gpio.c +++ b/platforms/rhesus/gpio.c @@ -1,18 +1,6 @@ -/* Copyright 2013-2014 Google 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-2014 Google Corp. */ + #include <stdint.h> #include "ec/config.h" #include "ec/gpio.h" diff --git a/platforms/rhesus/rhesus.c b/platforms/rhesus/rhesus.c index 7a629f7..125f2c5 100644 --- a/platforms/rhesus/rhesus.c +++ b/platforms/rhesus/rhesus.c @@ -1,20 +1,9 @@ -/* 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. + * Copyright 2014 Google Corp. */ - #include <skiboot.h> #include <device.h> #include <lpc.h> diff --git a/skiboot.lds.S b/skiboot.lds.S index 4a7727d..477c06a 100644 --- a/skiboot.lds.S +++ b/skiboot.lds.S @@ -1,17 +1,8 @@ -/* Copyright 2013-2018 IBM Corp. +// SPDX-License-Identifier: Apache-2.0 +/* + * Skiboot linker script * - * 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. */ #include <config.h> diff --git a/test/dt_common.c b/test/dt_common.c index 2da1d72..0551a4a 100644 --- a/test/dt_common.c +++ b/test/dt_common.c @@ -1,18 +1,5 @@ -/* Copyright 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 2015-2017 IBM Corp. */ #include <skiboot.h> #include <stdlib.h> diff --git a/test/hello_world/hello_kernel/hello_kernel.S b/test/hello_world/hello_kernel/hello_kernel.S index fecf5a3..49fb775 100644 --- a/test/hello_world/hello_kernel/hello_kernel.S +++ b/test/hello_world/hello_kernel/hello_kernel.S @@ -1,28 +1,13 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * hello_kernel.S! * - * http://www.apache.org/licenses/LICENSE-2.0 + * Because skiboot has its own stack, we don't even need that! + * All we need to do is make an OPAL call to write to the console. * - * 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 2014-2016 IBM Corp. */ -/* - hello_kernel.S! - --------------- - - Because skiboot has its own stack, we don't even need that! - All we need to do is make an OPAL call to write to the console. - -*/ - . = 0x0 .globl _start _start: diff --git a/test/sreset_world/sreset_kernel/sreset_kernel.S b/test/sreset_world/sreset_kernel/sreset_kernel.S index aae5fb7..1e65d44 100644 --- a/test/sreset_world/sreset_kernel/sreset_kernel.S +++ b/test/sreset_world/sreset_kernel/sreset_kernel.S @@ -1,24 +1,11 @@ -/* 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 +// SPDX-License-Identifier: Apache-2.0 +/* + * Test the SRESET OPAL call in Mambo by + * having a bit of fun printing 'Hello World' from the SRESET vector. * - * 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-2017 IBM Corp. */ -/* - Test the SRESET OPAL call in Mambo by - having a bit of fun printing 'Hello World' from the SRESET vector. -*/ - . = 0x0 .globl _start _start: |