From 7e8ea96345d58ad4d1f6da1a2c952560fe78fc60 Mon Sep 17 00:00:00 2001 From: Erhan Kurubas Date: Tue, 2 Aug 2022 01:38:09 +0200 Subject: [PATCH] loaders/reset/espressif: replace the GPL-2.0-or-later license tag Replace the FSF boilerplate with the SPDX tag. Signed-off-by: Erhan Kurubas Change-Id: Iddccae2bd8906a3587a2aa2684124356a340fc74 Reviewed-on: https://review.openocd.org/c/openocd/+/7105 Tested-by: jenkins Reviewed-by: Antonio Borneo --- contrib/loaders/reset/espressif/common.mk | 15 +------ contrib/loaders/reset/espressif/esp32/Makefile | 51 +++++++++------------- .../espressif/esp32/esp32_cpu_reset_handler.S | 15 +------ contrib/loaders/reset/espressif/esp32s3/Makefile | 51 +++++++++------------- .../espressif/esp32s3/esp32s3_cpu_reset_handler.S | 15 +------ 5 files changed, 46 insertions(+), 101 deletions(-) rewrite contrib/loaders/reset/espressif/esp32/Makefile (62%) rewrite contrib/loaders/reset/espressif/esp32s3/Makefile (62%) diff --git a/contrib/loaders/reset/espressif/common.mk b/contrib/loaders/reset/espressif/common.mk index 4623583aa..f77efe676 100644 --- a/contrib/loaders/reset/espressif/common.mk +++ b/contrib/loaders/reset/espressif/common.mk @@ -1,18 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + # ESP32 Makefile to compile the SoC reset program # Copyright (C) 2022 Espressif Systems Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see # Pass V=1 to see the commands being executed by make ifneq ("$(V)","1") diff --git a/contrib/loaders/reset/espressif/esp32/Makefile b/contrib/loaders/reset/espressif/esp32/Makefile dissimilarity index 62% index 3551b6a5e..a63178065 100644 --- a/contrib/loaders/reset/espressif/esp32/Makefile +++ b/contrib/loaders/reset/espressif/esp32/Makefile @@ -1,31 +1,20 @@ -# ESP32 Makefile to compile the SoC reset program -# Copyright (C) 2022 Espressif Systems Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -# Prefix for ESP32 cross compilers (can include a directory path) -CROSS ?= xtensa-esp32-elf- - -APP_ARCH := xtensa -APP_CHIP := ESP32 -APP_CHIP_PATH := $(shell pwd) -SRCS := $(APP_CHIP_PATH)/esp32_cpu_reset_handler.S - -CFLAGS := -LDFLAGS := - -INCLUDES := -DEFINES := - -include ../common.mk +# SPDX-License-Identifier: GPL-2.0-or-later + +# ESP32 Makefile to compile the SoC reset program +# Copyright (C) 2022 Espressif Systems Ltd. + +# Prefix for ESP32 cross compilers (can include a directory path) +CROSS ?= xtensa-esp32-elf- + +APP_ARCH := xtensa +APP_CHIP := ESP32 +APP_CHIP_PATH := $(shell pwd) +SRCS := $(APP_CHIP_PATH)/esp32_cpu_reset_handler.S + +CFLAGS := +LDFLAGS := + +INCLUDES := +DEFINES := + +include ../common.mk diff --git a/contrib/loaders/reset/espressif/esp32/esp32_cpu_reset_handler.S b/contrib/loaders/reset/espressif/esp32/esp32_cpu_reset_handler.S index 113254556..506d41e85 100644 --- a/contrib/loaders/reset/espressif/esp32/esp32_cpu_reset_handler.S +++ b/contrib/loaders/reset/espressif/esp32/esp32_cpu_reset_handler.S @@ -1,19 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + /*************************************************************************** * Reset stub used by esp32 target * * Copyright (C) 2017 Espressif Systems Ltd. * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * ***************************************************************************/ #define RTC_CNTL_RESET_STATE_REG 0x3ff48034 diff --git a/contrib/loaders/reset/espressif/esp32s3/Makefile b/contrib/loaders/reset/espressif/esp32s3/Makefile dissimilarity index 62% index 4dab161fd..37d5f8281 100644 --- a/contrib/loaders/reset/espressif/esp32s3/Makefile +++ b/contrib/loaders/reset/espressif/esp32s3/Makefile @@ -1,31 +1,20 @@ -# ESP32 Makefile to compile the SoC reset program -# Copyright (C) 2022 Espressif Systems Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -# Prefix for ESP32 cross compilers (can include a directory path) -CROSS ?= xtensa-esp32s3-elf- - -APP_ARCH := xtensa -APP_CHIP := ESP32S3 -APP_CHIP_PATH := $(shell pwd) -SRCS := $(APP_CHIP_PATH)/esp32s3_cpu_reset_handler.S - -CFLAGS := -LDFLAGS := - -INCLUDES := -DEFINES := - -include ../common.mk +# SPDX-License-Identifier: GPL-2.0-or-later + +# ESP32 Makefile to compile the SoC reset program +# Copyright (C) 2022 Espressif Systems Ltd. + +# Prefix for ESP32 cross compilers (can include a directory path) +CROSS ?= xtensa-esp32s3-elf- + +APP_ARCH := xtensa +APP_CHIP := ESP32S3 +APP_CHIP_PATH := $(shell pwd) +SRCS := $(APP_CHIP_PATH)/esp32s3_cpu_reset_handler.S + +CFLAGS := +LDFLAGS := + +INCLUDES := +DEFINES := + +include ../common.mk diff --git a/contrib/loaders/reset/espressif/esp32s3/esp32s3_cpu_reset_handler.S b/contrib/loaders/reset/espressif/esp32s3/esp32s3_cpu_reset_handler.S index e70ac9ca7..5fc635725 100644 --- a/contrib/loaders/reset/espressif/esp32s3/esp32s3_cpu_reset_handler.S +++ b/contrib/loaders/reset/espressif/esp32s3/esp32s3_cpu_reset_handler.S @@ -1,19 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + /*************************************************************************** * Reset stub used by esp32s3 target * * Copyright (C) 2020 Espressif Systems (Shanghai) Co. Ltd. * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * ***************************************************************************/ #define RTC_CNTL_RESET_STATE_REG 0x60008038 -- 2.11.4.GIT