This code was introduced in commit 27c7ca7e775,
("SHIX board emulation (Samuel Tardieu)"). Use
the same license.

Cc: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/hw/sh4/sh.h | 12 +++++++++---
 hw/block/tc58128.c  |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
index 93f464bf4cd..33dde7a56dd 100644
--- a/include/hw/sh4/sh.h
+++ b/include/hw/sh4/sh.h
@@ -1,6 +1,12 @@
-#ifndef QEMU_SH_H
-#define QEMU_SH_H
-/* Definitions for SH board emulation.  */
+/*
+ * Definitions for SH board emulation
+ *
+ * Copyright (c) 2005 Samuel Tardieu
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef QEMU_HW_SH_H
+#define QEMU_HW_SH_H
 
 #include "hw/sh4/sh_intc.h"
 #include "target/sh4/cpu-qom.h"
diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 9888f01ac60..1a0fa86d8ea 100644
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -1,3 +1,10 @@
+/*
+ * TC58128 NAND EEPROM emulation
+ *
+ * Copyright (c) 2005 Samuel Tardieu
+ *
+ * SPDX-License-Identifier: MIT
+ */
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/sh4/sh.h"
-- 
2.26.2

On Sun, 21 Feb 2021 at 21:59, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> This code was introduced in commit 27c7ca7e775,
> ("SHIX board emulation (Samuel Tardieu)"). Use
> the same license.
>
> Cc: Samuel Tardieu <sam@rfc1149.net>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  include/hw/sh4/sh.h | 12 +++++++++---
>  hw/block/tc58128.c  |  7 +++++++
>  2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
> index 93f464bf4cd..33dde7a56dd 100644
> --- a/include/hw/sh4/sh.h
> +++ b/include/hw/sh4/sh.h
> @@ -1,6 +1,12 @@
> -#ifndef QEMU_SH_H
> -#define QEMU_SH_H
> -/* Definitions for SH board emulation.  */
> +/*
> + * Definitions for SH board emulation
> + *
> + * Copyright (c) 2005 Samuel Tardieu
> + *
> + * SPDX-License-Identifier: MIT
> + */

I thought it wasn't generally recommended to convert
a license text to a single SPDX line? The sh7750.c file
has a full 3-para license text.

thanks
-- PMM

On 2/22/21 2:55 PM, Peter Maydell wrote:
> On Sun, 21 Feb 2021 at 21:59, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> This code was introduced in commit 27c7ca7e775,
>> ("SHIX board emulation (Samuel Tardieu)"). Use
>> the same license.
>>
>> Cc: Samuel Tardieu <sam@rfc1149.net>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  include/hw/sh4/sh.h | 12 +++++++++---
>>  hw/block/tc58128.c  |  7 +++++++
>>  2 files changed, 16 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/hw/sh4/sh.h b/include/hw/sh4/sh.h
>> index 93f464bf4cd..33dde7a56dd 100644
>> --- a/include/hw/sh4/sh.h
>> +++ b/include/hw/sh4/sh.h
>> @@ -1,6 +1,12 @@
>> -#ifndef QEMU_SH_H
>> -#define QEMU_SH_H
>> -/* Definitions for SH board emulation.  */
>> +/*
>> + * Definitions for SH board emulation
>> + *
>> + * Copyright (c) 2005 Samuel Tardieu
>> + *
>> + * SPDX-License-Identifier: MIT
>> + */
> 
> I thought it wasn't generally recommended to convert
> a license text to a single SPDX line? The sh7750.c file
> has a full 3-para license text.

Yes you are right, sorry. I'll respin.

Phil.

On Mon, 22 Feb 2021 at 14:13, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> On 2/22/21 2:55 PM, Peter Maydell wrote:
> > On Sun, 21 Feb 2021 at 21:59, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> >>
> >> This code was introduced in commit 27c7ca7e775,
> >> ("SHIX board emulation (Samuel Tardieu)"). Use
> >> the same license.

> > I thought it wasn't generally recommended to convert
> > a license text to a single SPDX line? The sh7750.c file
> > has a full 3-para license text.
>
> Yes you are right, sorry. I'll respin.

Also on the subject of sh4 code licenses, hw/sh4/sh7750_regs.h
has
 * The license and distribution terms for this file may be
 * found in the file LICENSE in this distribution or at
 *  http://www.rtems.com/license/LICENSE.
because it's borrowed from RTEMS.
(The license at the URL is gpl-2-or-later with a header exception).

Maybe we should expand the license in-place so we're not dependent
on a 3rd party website to stay up to tell us what the license
on the file is? In particular I assume the comment really
means "the file LICENSE in the rtems distribution"
https://git.rtems.org/rtems/tree/LICENSE (same text as web page)
and not the file LICENSE in QEMU, which is not the same thing,
so that part is actively misleading.

-- PMM