From 16849bbe0c8a79277e1a682dcb42eafd2025959c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 10 May 2020 17:52:40 +0200 Subject: treewide: split off license text, remove extra copyright notices Copyright notices are best stored in AUTHORS Change-Id: Ib9025c58987ee2f7db600e038f5d3e4edc69aacc Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/41203 Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- src/drivers/aspeed/common/ast_i2c.c | 10 +++------- src/drivers/aspeed/common/ast_mode.c | 14 ++++---------- src/drivers/aspeed/common/ast_mode_corebootfb.c | 11 +++-------- src/drivers/intel/gma/i915_reg.h | 4 +--- src/drivers/intel/gma/intel_bios.h | 5 ++--- src/drivers/intel/gma/intel_ddi.c | 7 ------- src/lib/edid.c | 4 ---- src/lib/edid_fill_fb.c | 2 -- src/lib/ubsan.c | 6 ++---- src/northbridge/intel/haswell/pei_data.h | 5 ----- src/soc/intel/baytrail/include/soc/efi_wrapper.h | 1 - src/soc/intel/baytrail/include/soc/mrc_wrapper.h | 1 - src/soc/intel/broadwell/include/soc/pei_data.h | 1 - src/soc/intel/quark/bootblock/esram_init.S | 2 +- src/soc/intel/quark/include/soc/pei_wrapper.h | 1 - src/soc/qualcomm/ipq40xx/include/soc/clock.h | 3 +-- src/soc/qualcomm/ipq40xx/include/soc/ebi2.h | 4 +--- src/soc/qualcomm/ipq40xx/include/soc/gpio.h | 3 +-- src/soc/qualcomm/ipq40xx/include/soc/spi.h | 3 +-- src/soc/qualcomm/ipq40xx/uart.c | 3 +-- src/soc/qualcomm/ipq806x/include/soc/clock.h | 3 +-- src/soc/qualcomm/ipq806x/include/soc/gpio.h | 4 +--- src/soc/qualcomm/ipq806x/uart.c | 3 +-- src/soc/qualcomm/qcs405/include/soc/spi.h | 3 +-- src/soc/qualcomm/qcs405/uart.c | 3 +-- 25 files changed, 26 insertions(+), 80 deletions(-) (limited to 'src') diff --git a/src/drivers/aspeed/common/ast_i2c.c b/src/drivers/aspeed/common/ast_i2c.c index 0838d10fcb..a8cfc54a91 100644 --- a/src/drivers/aspeed/common/ast_i2c.c +++ b/src/drivers/aspeed/common/ast_i2c.c @@ -1,11 +1,4 @@ /* - * Copied from Linux drivers/gpu/drm/ast/ast_mode.c - * - * Copyright 2012 Red Hat Inc. - * Parts based on xf86-video-ast - * Copyright (c) 2005 ASPEED Technology Inc. - * Copyright Dave Airlie - * Copyright 2019 9Elements Agency GmbH * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -29,6 +22,9 @@ * */ +/* + * Copied from Linux drivers/gpu/drm/ast/ast_mode.c + */ #include #include diff --git a/src/drivers/aspeed/common/ast_mode.c b/src/drivers/aspeed/common/ast_mode.c index 2b6cedae3c..ef76ab3a77 100644 --- a/src/drivers/aspeed/common/ast_mode.c +++ b/src/drivers/aspeed/common/ast_mode.c @@ -1,12 +1,4 @@ /* - * Copied from Linux drivers/gpu/drm/ast/ast_mode.c - * - * Copyright 2012 Red Hat Inc. - * Parts based on xf86-video-ast - * Copyright (c) 2005 ASPEED Technology Inc. - * Copyright Dave Airlie - * Copyright 2019 9Elements Agency GmbH - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -26,10 +18,12 @@ * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * - * Please try to keep as close as possible to the upstream source. */ +/* + * Copied from Linux drivers/gpu/drm/ast/ast_mode.c + * Please try to keep as close as possible to the upstream source. + */ #include "ast_drv.h" #include "ast_tables.h" diff --git a/src/drivers/aspeed/common/ast_mode_corebootfb.c b/src/drivers/aspeed/common/ast_mode_corebootfb.c index 2ec85ac31f..071ff7f0ff 100644 --- a/src/drivers/aspeed/common/ast_mode_corebootfb.c +++ b/src/drivers/aspeed/common/ast_mode_corebootfb.c @@ -1,12 +1,4 @@ /* - * Copied from Linux drivers/gpu/drm/ast/ast_mode.c - * - * Copyright 2012 Red Hat Inc. - * Parts based on xf86-video-ast - * Copyright (c) 2005 ASPEED Technology Inc. - * Copyright Dave Airlie - * Copyright 2019 9Elements Agency GmbH - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -29,6 +21,9 @@ * */ +/* + * Copied from Linux drivers/gpu/drm/ast/ast_mode.c + */ #include #include "ast_drv.h" diff --git a/src/drivers/intel/gma/i915_reg.h b/src/drivers/intel/gma/i915_reg.h index 4ebdc5999f..b37471d7bb 100644 --- a/src/drivers/intel/gma/i915_reg.h +++ b/src/drivers/intel/gma/i915_reg.h @@ -1,6 +1,4 @@ -/* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * +/* * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including diff --git a/src/drivers/intel/gma/intel_bios.h b/src/drivers/intel/gma/intel_bios.h index 8bf44eeb8d..b71fd70b28 100644 --- a/src/drivers/intel/gma/intel_bios.h +++ b/src/drivers/intel/gma/intel_bios.h @@ -1,6 +1,4 @@ /* - * Copyright © 2006 Intel Corporation - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation @@ -19,7 +17,8 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * + */ +/* * Authors: * Eric Anholt * diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c index aac330415b..5c55597ecc 100644 --- a/src/drivers/intel/gma/intel_ddi.c +++ b/src/drivers/intel/gma/intel_ddi.c @@ -1,7 +1,4 @@ /* - * Copyright 2013 Google Inc. - * Copyright © 2012 Intel Corporation - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation @@ -20,10 +17,6 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. - * - * Authors: - * Eugeni Dodonov - * */ #include diff --git a/src/lib/edid.c b/src/lib/edid.c index 048cc6ad5a..748f3d63fd 100644 --- a/src/lib/edid.c +++ b/src/lib/edid.c @@ -1,7 +1,4 @@ /* - * Copyright 2013 Google Inc. - * Copyright 2006-2012 Red Hat, Inc. - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation @@ -20,7 +17,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* Author: Adam Jackson */ /* this is a pretty robust parser for EDID, and we're tasked with parsing * an arbitrary panel. We will pass it a raw EDID block and a struct which diff --git a/src/lib/edid_fill_fb.c b/src/lib/edid_fill_fb.c index 1b38ead596..31ee6d1f8f 100644 --- a/src/lib/edid_fill_fb.c +++ b/src/lib/edid_fill_fb.c @@ -1,6 +1,4 @@ /* - * Copyright 2013 Google Inc. - * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation diff --git a/src/lib/ubsan.c b/src/lib/ubsan.c index 128340092f..b91dac2636 100644 --- a/src/lib/ubsan.c +++ b/src/lib/ubsan.c @@ -1,6 +1,4 @@ /* - * Copyright (c) 2014, 2015 Jonas 'Sortie' Termansen. - * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. @@ -12,8 +10,8 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * ubsan/ubsan.c + */ +/* ubsan/ubsan.c * Undefined behavior sanitizer runtime support. * * Adapted from: diff --git a/src/northbridge/intel/haswell/pei_data.h b/src/northbridge/intel/haswell/pei_data.h index 643b830c24..4619fb0f87 100644 --- a/src/northbridge/intel/haswell/pei_data.h +++ b/src/northbridge/intel/haswell/pei_data.h @@ -1,9 +1,4 @@ /* - * coreboot UEFI PEI wrapper - * - * Copyright (c) 2011, Google Inc. - * All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright diff --git a/src/soc/intel/baytrail/include/soc/efi_wrapper.h b/src/soc/intel/baytrail/include/soc/efi_wrapper.h index acff4b4f6f..6974662fb0 100644 --- a/src/soc/intel/baytrail/include/soc/efi_wrapper.h +++ b/src/soc/intel/baytrail/include/soc/efi_wrapper.h @@ -1,5 +1,4 @@ /* - * PEI EFI entry point * * * Redistribution and use in source and binary forms, with or without diff --git a/src/soc/intel/baytrail/include/soc/mrc_wrapper.h b/src/soc/intel/baytrail/include/soc/mrc_wrapper.h index 8651aa4098..afdf5b24c6 100644 --- a/src/soc/intel/baytrail/include/soc/mrc_wrapper.h +++ b/src/soc/intel/baytrail/include/soc/mrc_wrapper.h @@ -1,5 +1,4 @@ /* - * MRC wrapper definitions * * * Redistribution and use in source and binary forms, with or without diff --git a/src/soc/intel/broadwell/include/soc/pei_data.h b/src/soc/intel/broadwell/include/soc/pei_data.h index b73abe6c22..d69c9c6beb 100644 --- a/src/soc/intel/broadwell/include/soc/pei_data.h +++ b/src/soc/intel/broadwell/include/soc/pei_data.h @@ -1,5 +1,4 @@ /* - * Broadwell UEFI PEI wrapper * * * Redistribution and use in source and binary forms, with or without diff --git a/src/soc/intel/quark/bootblock/esram_init.S b/src/soc/intel/quark/bootblock/esram_init.S index 24cd57330b..7e3bfe1829 100644 --- a/src/soc/intel/quark/bootblock/esram_init.S +++ b/src/soc/intel/quark/bootblock/esram_init.S @@ -1,4 +1,4 @@ -/** @file +/* * * * Redistribution and use in source and binary forms, with or without diff --git a/src/soc/intel/quark/include/soc/pei_wrapper.h b/src/soc/intel/quark/include/soc/pei_wrapper.h index 671bc4204e..3b6c330907 100644 --- a/src/soc/intel/quark/include/soc/pei_wrapper.h +++ b/src/soc/intel/quark/include/soc/pei_wrapper.h @@ -1,5 +1,4 @@ /* - * UEFI PEI wrapper * * * Redistribution and use in source and binary forms, with or without diff --git a/src/soc/qualcomm/ipq40xx/include/soc/clock.h b/src/soc/qualcomm/ipq40xx/include/soc/clock.h index 0355598751..7692330dd1 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/clock.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/clock.h @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK Boot */ /* - * Source : APQ8064 LK Boot - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: diff --git a/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h b/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h index 9be3dc29e1..6e4a981a52 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/ebi2.h @@ -1,7 +1,5 @@ +/* Taken from U-Boot. */ /* - * - * Taken from U-Boot. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: diff --git a/src/soc/qualcomm/ipq40xx/include/soc/gpio.h b/src/soc/qualcomm/ipq40xx/include/soc/gpio.h index 350a0805a7..02ec2ab20b 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/gpio.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/gpio.h @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK Boot */ /* - * Source : APQ8064 LK Boot - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: diff --git a/src/soc/qualcomm/ipq40xx/include/soc/spi.h b/src/soc/qualcomm/ipq40xx/include/soc/spi.h index 7c110759db..42c9247b5d 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/spi.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/spi.h @@ -1,6 +1,5 @@ +/* Register definitions for the IPQ BLSP SPI Controller */ /* - * Register definitions for the IPQ BLSP SPI Controller - * * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c index 9e20776bdb..ed1e0db6fd 100644 --- a/src/soc/qualcomm/ipq40xx/uart.c +++ b/src/soc/qualcomm/ipq40xx/uart.c @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK boot */ /* - * Source : APQ8064 LK boot - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: diff --git a/src/soc/qualcomm/ipq806x/include/soc/clock.h b/src/soc/qualcomm/ipq806x/include/soc/clock.h index 4f37c0e3ce..a2efa025b8 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/clock.h +++ b/src/soc/qualcomm/ipq806x/include/soc/clock.h @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK Boot */ /* - * Source : APQ8064 LK Boot - * * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/soc/qualcomm/ipq806x/include/soc/gpio.h b/src/soc/qualcomm/ipq806x/include/soc/gpio.h index f756ad8096..0aa58e6ed3 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/gpio.h +++ b/src/soc/qualcomm/ipq806x/include/soc/gpio.h @@ -1,7 +1,5 @@ +/* Source : APQ8064 LK Boot */ /* - Source : APQ8064 LK Boot - - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c index a1948863dc..7519fe2ad8 100644 --- a/src/soc/qualcomm/ipq806x/uart.c +++ b/src/soc/qualcomm/ipq806x/uart.c @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK boot */ /* - * Source : APQ8064 LK boot - * * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/soc/qualcomm/qcs405/include/soc/spi.h b/src/soc/qualcomm/qcs405/include/soc/spi.h index dc7ecd31a7..0d491604f7 100644 --- a/src/soc/qualcomm/qcs405/include/soc/spi.h +++ b/src/soc/qualcomm/qcs405/include/soc/spi.h @@ -1,6 +1,5 @@ +/* Register definitions for the IPQ BLSP SPI Controller */ /* - * Register definitions for the IPQ BLSP SPI Controller - * * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are diff --git a/src/soc/qualcomm/qcs405/uart.c b/src/soc/qualcomm/qcs405/uart.c index c9c1b3906b..deb9ab0f51 100644 --- a/src/soc/qualcomm/qcs405/uart.c +++ b/src/soc/qualcomm/qcs405/uart.c @@ -1,6 +1,5 @@ +/* Source : APQ8064 LK boot */ /* - * Source : APQ8064 LK boot - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: -- cgit v1.2.3