diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
commit | 8b485ba12b0defa0c4ed3559789250238f8331a8 (patch) | |
tree | a1174810bef0d504370272918dca8d485ae2ae3b /test | |
parent | 12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff) | |
parent | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff) | |
download | talos-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz talos-obmc-uboot-8b485ba12b0defa0c4ed3559789250238f8331a8.zip |
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile | 18 | ||||
-rw-r--r-- | test/command_ut.c | 18 | ||||
-rwxr-xr-x | test/image/test-fit.py | 15 | ||||
-rwxr-xr-x | test/trace/test-trace.sh | 15 | ||||
-rwxr-xr-x | test/vboot/vboot_test.sh | 15 |
5 files changed, 5 insertions, 76 deletions
diff --git a/test/Makefile b/test/Makefile index 83594f3290..99ce890e59 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,23 +1,7 @@ # # (C) Copyright 2012 The Chromium Authors # -# See file CREDITS for list of people who contributed to this -# project. -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# SPDX-License-Identifier: GPL-2.0+ # include $(TOPDIR)/config.mk diff --git a/test/command_ut.c b/test/command_ut.c index dfddc22d99..0e83db0cca 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -1,23 +1,7 @@ /* * Copyright (c) 2012, The Chromium Authors * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #define DEBUG diff --git a/test/image/test-fit.py b/test/image/test-fit.py index aad9f59019..7394df740a 100755 --- a/test/image/test-fit.py +++ b/test/image/test-fit.py @@ -4,20 +4,7 @@ # # Sanity check of the FIT handling in U-Boot # -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# SPDX-License-Identifier: GPL-2.0+ # # To run this: # diff --git a/test/trace/test-trace.sh b/test/trace/test-trace.sh index 696a39675b..aa02f09475 100755 --- a/test/trace/test-trace.sh +++ b/test/trace/test-trace.sh @@ -1,19 +1,6 @@ # Copyright (c) 2013 The Chromium OS Authors. # -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# SPDX-License-Identifier: GPL-2.0+ # # Simple test script for tracing with sandbox diff --git a/test/vboot/vboot_test.sh b/test/vboot/vboot_test.sh index c3cfadeb1b..bb2c6051c8 100755 --- a/test/vboot/vboot_test.sh +++ b/test/vboot/vboot_test.sh @@ -4,20 +4,7 @@ # # Simple Verified Boot Test Script # -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# SPDX-License-Identifier: GPL-2.0+ set -e |