summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /include
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
-rw-r--r--include/ACEX1K.h3
-rw-r--r--include/MCD_dma.h3
-rw-r--r--include/MCD_progCheck.h3
-rw-r--r--include/MCD_tasksInit.h3
-rw-r--r--include/adc.h3
-rw-r--r--include/addr_map.h3
-rw-r--r--include/ahci.h3
-rw-r--r--include/ali512x.h3
-rw-r--r--include/altera.h3
-rw-r--r--include/andestech/andes_pcu.h3
-rw-r--r--include/android_image.h3
-rw-r--r--include/ansi.h3
-rw-r--r--include/api.h3
-rw-r--r--include/armcoremodule.h3
-rw-r--r--include/asm-generic/global_data.h3
-rw-r--r--include/asm-generic/gpio.h2
-rw-r--r--include/asm-generic/io.h3
-rw-r--r--include/asm-generic/sections.h3
-rw-r--r--include/asm-generic/u-boot.h3
-rw-r--r--include/ata.h3
-rw-r--r--include/atf_common.h3
-rw-r--r--include/atmel_hlcdc.h3
-rw-r--r--include/atmel_lcd.h3
-rw-r--r--include/atmel_lcdc.h3
-rw-r--r--include/atmel_mci.h3
-rw-r--r--include/autoboot.h3
-rw-r--r--include/axp152.h3
-rw-r--r--include/axp209.h3
-rw-r--r--include/axp221.h3
-rw-r--r--include/axp809.h3
-rw-r--r--include/axp818.h3
-rw-r--r--include/axp_pmic.h3
-rw-r--r--include/backlight.h3
-rw-r--r--include/binman_sym.h3
-rw-r--r--include/bios_emul.h3
-rw-r--r--include/bitfield.h3
-rw-r--r--include/blk.h3
-rw-r--r--include/bmp_layout.h3
-rw-r--r--include/boot_fit.h3
-rw-r--r--include/bootcount.h3
-rw-r--r--include/bootm.h3
-rw-r--r--include/bootretry.h3
-rw-r--r--include/bootstage.h3
-rw-r--r--include/bouncebuf.h3
-rw-r--r--include/btrfs.h3
-rw-r--r--include/bus_vcxk.h3
-rw-r--r--include/cavium/atf.h3
-rw-r--r--include/cavium/atf_part.h3
-rw-r--r--include/cavium/thunderx_svc.h3
-rw-r--r--include/cbfs.h3
-rw-r--r--include/circbuf.h3
-rw-r--r--include/cli.h3
-rw-r--r--include/cli_hush.h3
-rw-r--r--include/clk-uclass.h3
-rw-r--r--include/clk.h3
-rw-r--r--include/cmd_spl.h3
-rw-r--r--include/command.h3
-rw-r--r--include/common.h3
-rw-r--r--include/common_timing_params.h3
-rw-r--r--include/config_distro_bootcmd.h3
-rw-r--r--include/config_fsl_chain_trust.h3
-rw-r--r--include/config_uncmd_spl.h3
-rw-r--r--include/configs/10m50_devboard.h3
-rw-r--r--include/configs/3c120_devboard.h3
-rw-r--r--include/configs/B4860QDS.h3
-rw-r--r--include/configs/BSC9131RDB.h3
-rw-r--r--include/configs/BSC9132QDS.h3
-rw-r--r--include/configs/C29XPCIE.h3
-rw-r--r--include/configs/M5208EVBE.h3
-rw-r--r--include/configs/M52277EVB.h3
-rw-r--r--include/configs/M5235EVB.h3
-rw-r--r--include/configs/M5249EVB.h3
-rw-r--r--include/configs/M5253DEMO.h3
-rw-r--r--include/configs/M5253EVBE.h3
-rw-r--r--include/configs/M5272C3.h3
-rw-r--r--include/configs/M5275EVB.h3
-rw-r--r--include/configs/M5282EVB.h3
-rw-r--r--include/configs/M53017EVB.h3
-rw-r--r--include/configs/M5329EVB.h3
-rw-r--r--include/configs/M5373EVB.h3
-rw-r--r--include/configs/M54418TWR.h3
-rw-r--r--include/configs/M54451EVB.h3
-rw-r--r--include/configs/M54455EVB.h3
-rw-r--r--include/configs/M5475EVB.h3
-rw-r--r--include/configs/M5485EVB.h3
-rw-r--r--include/configs/MCR3000.h3
-rw-r--r--include/configs/MPC8308RDB.h3
-rw-r--r--include/configs/MPC8313ERDB.h3
-rw-r--r--include/configs/MPC8315ERDB.h3
-rw-r--r--include/configs/MPC832XEMDS.h3
-rw-r--r--include/configs/MPC8349EMDS.h3
-rw-r--r--include/configs/MPC8349ITX.h3
-rw-r--r--include/configs/MPC837XEMDS.h3
-rw-r--r--include/configs/MPC837XERDB.h3
-rw-r--r--include/configs/MPC8536DS.h3
-rw-r--r--include/configs/MPC8540ADS.h3
-rw-r--r--include/configs/MPC8541CDS.h3
-rw-r--r--include/configs/MPC8544DS.h3
-rw-r--r--include/configs/MPC8548CDS.h3
-rw-r--r--include/configs/MPC8555CDS.h3
-rw-r--r--include/configs/MPC8560ADS.h3
-rw-r--r--include/configs/MPC8568MDS.h3
-rw-r--r--include/configs/MPC8569MDS.h3
-rw-r--r--include/configs/MPC8572DS.h3
-rw-r--r--include/configs/MPC8610HPCD.h3
-rw-r--r--include/configs/MPC8641HPCN.h3
-rw-r--r--include/configs/MigoR.h3
-rw-r--r--include/configs/P1010RDB.h3
-rw-r--r--include/configs/P1022DS.h3
-rw-r--r--include/configs/P1023RDB.h3
-rw-r--r--include/configs/P2041RDB.h3
-rw-r--r--include/configs/P3041DS.h3
-rw-r--r--include/configs/P4080DS.h3
-rw-r--r--include/configs/P5020DS.h3
-rw-r--r--include/configs/P5040DS.h3
-rw-r--r--include/configs/T102xQDS.h3
-rw-r--r--include/configs/T102xRDB.h3
-rw-r--r--include/configs/T104xRDB.h7
-rw-r--r--include/configs/T208xQDS.h3
-rw-r--r--include/configs/T208xRDB.h3
-rw-r--r--include/configs/T4240QDS.h3
-rw-r--r--include/configs/T4240RDB.h3
-rw-r--r--include/configs/TQM834x.h3
-rw-r--r--include/configs/UCP1020.h3
-rw-r--r--include/configs/adp-ae3xx.h3
-rw-r--r--include/configs/adp-ag101p.h3
-rw-r--r--include/configs/advantech_dms-ba16.h3
-rw-r--r--include/configs/alt.h3
-rw-r--r--include/configs/am335x_shc.h3
-rw-r--r--include/configs/am335x_sl50.h3
-rw-r--r--include/configs/am3517_crane.h3
-rw-r--r--include/configs/am3517_evm.h3
-rw-r--r--include/configs/am43xx_evm.h3
-rw-r--r--include/configs/am57xx_evm.h3
-rw-r--r--include/configs/amcore.h3
-rw-r--r--include/configs/ap121.h3
-rw-r--r--include/configs/ap143.h3
-rw-r--r--include/configs/ap325rxa.h3
-rw-r--r--include/configs/ap_sh4a_4a.h3
-rw-r--r--include/configs/apalis-tk1.h3
-rw-r--r--include/configs/apalis_imx6.h3
-rw-r--r--include/configs/apalis_t30.h3
-rw-r--r--include/configs/apf27.h3
-rw-r--r--include/configs/apx4devkit.h3
-rw-r--r--include/configs/aristainetos-common.h3
-rw-r--r--include/configs/aristainetos.h3
-rw-r--r--include/configs/aristainetos2.h3
-rw-r--r--include/configs/aristainetos2b.h3
-rw-r--r--include/configs/armadillo-800eva.h3
-rw-r--r--include/configs/arndale.h3
-rw-r--r--include/configs/aspeed-common.h3
-rw-r--r--include/configs/aspenite.h3
-rw-r--r--include/configs/astro_mcf5373l.h3
-rw-r--r--include/configs/at91-sama5_common.h3
-rw-r--r--include/configs/at91rm9200ek.h3
-rw-r--r--include/configs/at91sam9260ek.h3
-rw-r--r--include/configs/at91sam9261ek.h3
-rw-r--r--include/configs/at91sam9263ek.h3
-rw-r--r--include/configs/at91sam9m10g45ek.h3
-rw-r--r--include/configs/at91sam9n12ek.h3
-rw-r--r--include/configs/at91sam9rlek.h3
-rw-r--r--include/configs/at91sam9x5ek.h3
-rw-r--r--include/configs/axs10x.h3
-rw-r--r--include/configs/bayleybay.h3
-rw-r--r--include/configs/bcm23550_w1d.h3
-rw-r--r--include/configs/bcm28155_ap.h3
-rw-r--r--include/configs/bcm_ep_board.h3
-rw-r--r--include/configs/bcm_northstar2.h3
-rw-r--r--include/configs/beaver.h3
-rw-r--r--include/configs/bg0900.h3
-rw-r--r--include/configs/bk4r1.h3
-rw-r--r--include/configs/blanche.h3
-rw-r--r--include/configs/bmips_bcm3380.h3
-rw-r--r--include/configs/bmips_bcm6318.h3
-rw-r--r--include/configs/bmips_bcm63268.h3
-rw-r--r--include/configs/bmips_bcm6328.h3
-rw-r--r--include/configs/bmips_bcm6338.h3
-rw-r--r--include/configs/bmips_bcm6348.h3
-rw-r--r--include/configs/bmips_bcm6358.h3
-rw-r--r--include/configs/bmips_bcm6362.h3
-rw-r--r--include/configs/bmips_bcm6368.h3
-rw-r--r--include/configs/bmips_common.h3
-rw-r--r--include/configs/boston.h3
-rw-r--r--include/configs/brppt1.h3
-rw-r--r--include/configs/brxre1.h3
-rw-r--r--include/configs/bur_am335x_common.h3
-rw-r--r--include/configs/bur_cfg_common.h3
-rw-r--r--include/configs/calimain.h3
-rw-r--r--include/configs/cardhu.h3
-rw-r--r--include/configs/cei-tk1-som.h3
-rw-r--r--include/configs/cgtqmx6eval.h3
-rw-r--r--include/configs/cherryhill.h3
-rw-r--r--include/configs/chiliboard.h3
-rw-r--r--include/configs/chromebook_link.h3
-rw-r--r--include/configs/chromebook_samus.h3
-rw-r--r--include/configs/chromebox_panther.h3
-rw-r--r--include/configs/cl-som-am57x.h3
-rw-r--r--include/configs/cl-som-imx7.h3
-rw-r--r--include/configs/clearfog.h3
-rw-r--r--include/configs/cm_fx6.h3
-rw-r--r--include/configs/cm_t335.h3
-rw-r--r--include/configs/cm_t35.h3
-rw-r--r--include/configs/cm_t3517.h3
-rw-r--r--include/configs/cm_t43.h3
-rw-r--r--include/configs/cm_t54.h3
-rw-r--r--include/configs/cobra5272.h3
-rw-r--r--include/configs/colibri_imx6.h3
-rw-r--r--include/configs/colibri_imx7.h3
-rw-r--r--include/configs/colibri_pxa270.h3
-rw-r--r--include/configs/colibri_t20.h3
-rw-r--r--include/configs/colibri_t30.h3
-rw-r--r--include/configs/colibri_vf.h3
-rw-r--r--include/configs/comtrend_ar5315u.h3
-rw-r--r--include/configs/comtrend_ar5387un.h3
-rw-r--r--include/configs/comtrend_ct5361.h3
-rw-r--r--include/configs/comtrend_vr3032u.h3
-rw-r--r--include/configs/comtrend_wap5813n.h3
-rw-r--r--include/configs/conga-qeval20-qa3-e3845.h3
-rw-r--r--include/configs/controlcenterdc.h3
-rw-r--r--include/configs/corenet_ds.h3
-rw-r--r--include/configs/corvus.h3
-rw-r--r--include/configs/cougarcanyon2.h3
-rw-r--r--include/configs/crownbay.h3
-rw-r--r--include/configs/cyrus.h3
-rw-r--r--include/configs/da850evm.h3
-rw-r--r--include/configs/dalmore.h3
-rw-r--r--include/configs/db-88f6720.h3
-rw-r--r--include/configs/db-88f6820-amc.h3
-rw-r--r--include/configs/db-88f6820-gp.h3
-rw-r--r--include/configs/db-mv784mp-gp.h3
-rw-r--r--include/configs/dbau1x00.h3
-rw-r--r--include/configs/devkit3250.h3
-rw-r--r--include/configs/devkit8000.h3
-rw-r--r--include/configs/dfi-bt700.h3
-rw-r--r--include/configs/dh_imx6.h3
-rw-r--r--include/configs/display5.h3
-rw-r--r--include/configs/dns325.h3
-rw-r--r--include/configs/dockstar.h3
-rw-r--r--include/configs/dra7xx_evm.h3
-rw-r--r--include/configs/draak.h3
-rw-r--r--include/configs/draco.h3
-rw-r--r--include/configs/dragonboard410c.h3
-rw-r--r--include/configs/dragonboard820c.h3
-rw-r--r--include/configs/dreamplug.h3
-rw-r--r--include/configs/ds109.h3
-rw-r--r--include/configs/ds414.h3
-rw-r--r--include/configs/duovero.h3
-rw-r--r--include/configs/e2220-1170.h3
-rw-r--r--include/configs/ea20.h3
-rw-r--r--include/configs/eagle.h3
-rw-r--r--include/configs/eb_cpu5282.h3
-rw-r--r--include/configs/eco5pk.h3
-rw-r--r--include/configs/ecovec.h3
-rw-r--r--include/configs/edison.h3
-rw-r--r--include/configs/edminiv2.h3
-rw-r--r--include/configs/efi-x86.h3
-rw-r--r--include/configs/el6x_common.h3
-rw-r--r--include/configs/embestmx6boards.h3
-rw-r--r--include/configs/espresso7420.h3
-rw-r--r--include/configs/espt.h3
-rw-r--r--include/configs/etamin.h3
-rw-r--r--include/configs/ethernut5.h3
-rw-r--r--include/configs/evb_ast2500.h3
-rw-r--r--include/configs/evb_px5.h3
-rw-r--r--include/configs/evb_rk3036.h3
-rw-r--r--include/configs/evb_rk3128.h3
-rw-r--r--include/configs/evb_rk3229.h3
-rw-r--r--include/configs/evb_rk3288.h3
-rw-r--r--include/configs/evb_rk3328.h3
-rw-r--r--include/configs/evb_rk3399.h3
-rw-r--r--include/configs/evb_rv1108.h3
-rw-r--r--include/configs/exynos-common.h3
-rw-r--r--include/configs/exynos4-common.h3
-rw-r--r--include/configs/exynos5-common.h3
-rw-r--r--include/configs/exynos5-dt-common.h3
-rw-r--r--include/configs/exynos5250-common.h3
-rw-r--r--include/configs/exynos5420-common.h3
-rw-r--r--include/configs/exynos7420-common.h3
-rw-r--r--include/configs/fennec_rk3288.h3
-rw-r--r--include/configs/firefly-rk3288.h3
-rw-r--r--include/configs/flea3.h3
-rw-r--r--include/configs/galileo.h3
-rw-r--r--include/configs/ge_bx50v3.h3
-rw-r--r--include/configs/geekbox.h3
-rw-r--r--include/configs/goflexhome.h3
-rw-r--r--include/configs/gose.h3
-rw-r--r--include/configs/gplugd.h3
-rw-r--r--include/configs/guruplug.h3
-rw-r--r--include/configs/gw_ventana.h3
-rw-r--r--include/configs/h2200.h3
-rw-r--r--include/configs/harmony.h3
-rw-r--r--include/configs/highbank.h3
-rw-r--r--include/configs/hikey.h3
-rw-r--r--include/configs/hrcon.h3
-rw-r--r--include/configs/hsdk.h3
-rw-r--r--include/configs/huawei_hg556a.h3
-rw-r--r--include/configs/ib62x0.h3
-rw-r--r--include/configs/iconnect.h3
-rw-r--r--include/configs/ids8313.h3
-rw-r--r--include/configs/imgtec_xilfpga.h3
-rw-r--r--include/configs/imx27lite-common.h3
-rw-r--r--include/configs/imx6-engicam.h3
-rw-r--r--include/configs/imx6_logic.h3
-rw-r--r--include/configs/imx6_spl.h3
-rw-r--r--include/configs/imx7_spl.h3
-rw-r--r--include/configs/integrator-common.h3
-rw-r--r--include/configs/integratorap.h3
-rw-r--r--include/configs/integratorcp.h3
-rw-r--r--include/configs/ipam390.h3
-rw-r--r--include/configs/jetson-tk1.h3
-rw-r--r--include/configs/k2e_evm.h3
-rw-r--r--include/configs/k2g_evm.h3
-rw-r--r--include/configs/k2hk_evm.h3
-rw-r--r--include/configs/k2l_evm.h3
-rw-r--r--include/configs/kc1.h3
-rw-r--r--include/configs/khadas-vim.h3
-rw-r--r--include/configs/km/keymile-common.h3
-rw-r--r--include/configs/km/km-powerpc.h3
-rw-r--r--include/configs/km/km8309-common.h3
-rw-r--r--include/configs/km/km8321-common.h3
-rw-r--r--include/configs/km/km83xx-common.h3
-rw-r--r--include/configs/km/km_arm.h3
-rw-r--r--include/configs/km/kmp204x-common.h3
-rw-r--r--include/configs/km8360.h3
-rw-r--r--include/configs/km_kirkwood.h3
-rw-r--r--include/configs/kmp204x.h3
-rw-r--r--include/configs/koelsch.h3
-rw-r--r--include/configs/kp_imx6q_tpc.h3
-rw-r--r--include/configs/kylin_rk3036.h3
-rw-r--r--include/configs/kzm9g.h3
-rw-r--r--include/configs/lacie_kw.h3
-rw-r--r--include/configs/lager.h3
-rw-r--r--include/configs/legoev3.h3
-rw-r--r--include/configs/libretech-cc.h3
-rw-r--r--include/configs/lion_rk3368.h3
-rw-r--r--include/configs/liteboard.h3
-rw-r--r--include/configs/ls1012a2g5rdb.h3
-rw-r--r--include/configs/ls1012a_common.h3
-rw-r--r--include/configs/ls1012afrdm.h3
-rw-r--r--include/configs/ls1012aqds.h3
-rw-r--r--include/configs/ls1012ardb.h3
-rw-r--r--include/configs/ls1021aiot.h3
-rw-r--r--include/configs/ls1021aqds.h3
-rw-r--r--include/configs/ls1021atwr.h3
-rw-r--r--include/configs/ls1043a_common.h3
-rw-r--r--include/configs/ls1043aqds.h3
-rw-r--r--include/configs/ls1043ardb.h3
-rw-r--r--include/configs/ls1046a_common.h3
-rw-r--r--include/configs/ls1046aqds.h3
-rw-r--r--include/configs/ls1046ardb.h3
-rw-r--r--include/configs/ls1088a_common.h3
-rw-r--r--include/configs/ls1088aqds.h3
-rw-r--r--include/configs/ls1088ardb.h3
-rw-r--r--include/configs/ls2080a_common.h3
-rw-r--r--include/configs/ls2080a_emu.h3
-rw-r--r--include/configs/ls2080a_simu.h3
-rw-r--r--include/configs/ls2080aqds.h3
-rw-r--r--include/configs/ls2080ardb.h3
-rw-r--r--include/configs/lsxl.h3
-rw-r--r--include/configs/m28evk.h3
-rw-r--r--include/configs/m53evk.h3
-rw-r--r--include/configs/ma5d4evk.h3
-rw-r--r--include/configs/malta.h3
-rw-r--r--include/configs/maxbcm.h3
-rw-r--r--include/configs/mccmon6.h3
-rw-r--r--include/configs/mcx.h3
-rw-r--r--include/configs/medcom-wide.h3
-rw-r--r--include/configs/meesc.h3
-rw-r--r--include/configs/meson-gxbb-common.h3
-rw-r--r--include/configs/microblaze-generic.h3
-rw-r--r--include/configs/minnowmax.h3
-rw-r--r--include/configs/miqi_rk3288.h3
-rw-r--r--include/configs/mpc8308_p1m.h3
-rw-r--r--include/configs/mpr2.h3
-rw-r--r--include/configs/ms7720se.h3
-rw-r--r--include/configs/ms7722se.h3
-rw-r--r--include/configs/ms7750se.h3
-rw-r--r--include/configs/mt_ventoux.h3
-rw-r--r--include/configs/mv-common.h3
-rw-r--r--include/configs/mv-plug-common.h3
-rw-r--r--include/configs/mvebu_armada-37xx.h3
-rw-r--r--include/configs/mvebu_armada-8k.h3
-rw-r--r--include/configs/mx23_olinuxino.h3
-rw-r--r--include/configs/mx23evk.h3
-rw-r--r--include/configs/mx25pdk.h3
-rw-r--r--include/configs/mx28evk.h3
-rw-r--r--include/configs/mx31pdk.h3
-rw-r--r--include/configs/mx35pdk.h3
-rw-r--r--include/configs/mx51evk.h3
-rw-r--r--include/configs/mx53ard.h3
-rw-r--r--include/configs/mx53cx9020.h3
-rw-r--r--include/configs/mx53evk.h3
-rw-r--r--include/configs/mx53loco.h3
-rw-r--r--include/configs/mx53ppd.h3
-rw-r--r--include/configs/mx53smd.h3
-rw-r--r--include/configs/mx6_common.h3
-rw-r--r--include/configs/mx6cuboxi.h3
-rw-r--r--include/configs/mx6memcal.h3
-rw-r--r--include/configs/mx6qarm2.h3
-rw-r--r--include/configs/mx6sabre_common.h3
-rw-r--r--include/configs/mx6sabreauto.h3
-rw-r--r--include/configs/mx6sabresd.h3
-rw-r--r--include/configs/mx6slevk.h3
-rw-r--r--include/configs/mx6sllevk.h3
-rw-r--r--include/configs/mx6sxsabreauto.h3
-rw-r--r--include/configs/mx6sxsabresd.h3
-rw-r--r--include/configs/mx6ul_14x14_evk.h3
-rw-r--r--include/configs/mx6ullevk.h3
-rw-r--r--include/configs/mx7_common.h3
-rw-r--r--include/configs/mx7dsabresd.h3
-rw-r--r--include/configs/mx7ulp_evk.h3
-rw-r--r--include/configs/nas220.h3
-rw-r--r--include/configs/netgear_cg3100d.h3
-rw-r--r--include/configs/netgear_dgnd3700v2.h3
-rw-r--r--include/configs/nitrogen6x.h3
-rw-r--r--include/configs/nokia_rx51.h3
-rw-r--r--include/configs/novena.h3
-rw-r--r--include/configs/nsa310s.h3
-rw-r--r--include/configs/nsim.h3
-rw-r--r--include/configs/nx25-ae250.h3
-rw-r--r--include/configs/nyan-big.h3
-rw-r--r--include/configs/odroid-c2.h3
-rw-r--r--include/configs/odroid.h3
-rw-r--r--include/configs/odroid_xu3.h3
-rw-r--r--include/configs/omap3_beagle.h3
-rw-r--r--include/configs/omap3_cairo.h3
-rw-r--r--include/configs/omap3_evm.h3
-rw-r--r--include/configs/omap3_igep00x0.h3
-rw-r--r--include/configs/omap3_logic.h3
-rw-r--r--include/configs/omap3_overo.h3
-rw-r--r--include/configs/omap3_pandora.h3
-rw-r--r--include/configs/omap3_zoom1.h3
-rw-r--r--include/configs/omap4_panda.h3
-rw-r--r--include/configs/omap4_sdp4430.h3
-rw-r--r--include/configs/omap5_uevm.h3
-rw-r--r--include/configs/omapl138_lcdk.h3
-rw-r--r--include/configs/openrd.h3
-rw-r--r--include/configs/opos6uldev.h3
-rw-r--r--include/configs/origen.h3
-rw-r--r--include/configs/ot1200.h3
-rw-r--r--include/configs/p1_p2_rdb_pc.h3
-rw-r--r--include/configs/p1_twr.h3
-rw-r--r--include/configs/p212.h3
-rw-r--r--include/configs/p2371-0000.h3
-rw-r--r--include/configs/p2371-2180.h3
-rw-r--r--include/configs/p2571.h3
-rw-r--r--include/configs/p2771-0000.h3
-rw-r--r--include/configs/paz00.h3
-rw-r--r--include/configs/pb1x00.h3
-rw-r--r--include/configs/pcm052.h3
-rw-r--r--include/configs/pcm058.h3
-rw-r--r--include/configs/pdu001.h3
-rw-r--r--include/configs/peach-pi.h3
-rw-r--r--include/configs/peach-pit.h3
-rw-r--r--include/configs/pengwyn.h3
-rw-r--r--include/configs/pepper.h3
-rw-r--r--include/configs/pfla02.h3
-rw-r--r--include/configs/phycore_rk3288.h3
-rw-r--r--include/configs/pic32mzdask.h3
-rw-r--r--include/configs/pico-imx6ul.h3
-rw-r--r--include/configs/pico-imx7d.h3
-rw-r--r--include/configs/picosam9g45.h3
-rw-r--r--include/configs/platinum.h3
-rw-r--r--include/configs/platinum_picon.h3
-rw-r--r--include/configs/platinum_titanium.h3
-rw-r--r--include/configs/plutux.h3
-rw-r--r--include/configs/pm9261.h3
-rw-r--r--include/configs/pm9263.h3
-rw-r--r--include/configs/pm9g45.h3
-rw-r--r--include/configs/pogo_e02.h3
-rw-r--r--include/configs/poplar.h3
-rw-r--r--include/configs/popmetal_rk3288.h3
-rw-r--r--include/configs/porter.h3
-rw-r--r--include/configs/puma_rk3399.h3
-rw-r--r--include/configs/pxa-common.h3
-rw-r--r--include/configs/pxm2.h3
-rw-r--r--include/configs/qemu-arm.h3
-rw-r--r--include/configs/qemu-mips.h3
-rw-r--r--include/configs/qemu-mips64.h3
-rw-r--r--include/configs/qemu-ppce500.h3
-rw-r--r--include/configs/qemu-x86.h3
-rw-r--r--include/configs/r0p7734.h3
-rw-r--r--include/configs/r7780mp.h3
-rw-r--r--include/configs/rastaban.h3
-rw-r--r--include/configs/rcar-gen2-common.h3
-rw-r--r--include/configs/rcar-gen3-common.h3
-rw-r--r--include/configs/rk3036_common.h3
-rw-r--r--include/configs/rk3128_common.h3
-rw-r--r--include/configs/rk3188_common.h3
-rw-r--r--include/configs/rk322x_common.h3
-rw-r--r--include/configs/rk3288_common.h3
-rw-r--r--include/configs/rk3328_common.h3
-rw-r--r--include/configs/rk3368_common.h3
-rw-r--r--include/configs/rk3399_common.h3
-rw-r--r--include/configs/rock.h3
-rw-r--r--include/configs/rock2.h3
-rw-r--r--include/configs/rockchip-common.h3
-rw-r--r--include/configs/rpi.h3
-rw-r--r--include/configs/rsk7203.h3
-rw-r--r--include/configs/rsk7264.h3
-rw-r--r--include/configs/rsk7269.h3
-rw-r--r--include/configs/rut.h3
-rw-r--r--include/configs/rv1108_common.h3
-rw-r--r--include/configs/s32v234evb.h3
-rw-r--r--include/configs/s5p_goni.h3
-rw-r--r--include/configs/s5pc210_universal.h3
-rw-r--r--include/configs/sagem_f@st1704.h3
-rw-r--r--include/configs/salvator-x.h3
-rw-r--r--include/configs/sama5d27_som1_ek.h3
-rw-r--r--include/configs/sama5d2_ptc_ek.h3
-rw-r--r--include/configs/sama5d2_xplained.h3
-rw-r--r--include/configs/sama5d3_xplained.h3
-rw-r--r--include/configs/sama5d3xek.h3
-rw-r--r--include/configs/sama5d4_xplained.h3
-rw-r--r--include/configs/sama5d4ek.h3
-rw-r--r--include/configs/sandbox.h2
-rw-r--r--include/configs/sandbox_spl.h2
-rw-r--r--include/configs/sansa_fuze_plus.h3
-rw-r--r--include/configs/sbc8349.h3
-rw-r--r--include/configs/sbc8548.h3
-rw-r--r--include/configs/sbc8641d.h3
-rw-r--r--include/configs/sc_sps_1.h3
-rw-r--r--include/configs/seaboard.h3
-rw-r--r--include/configs/secomx6quq7.h3
-rw-r--r--include/configs/sfr_nb4_ser.h3
-rw-r--r--include/configs/sh7752evb.h3
-rw-r--r--include/configs/sh7753evb.h3
-rw-r--r--include/configs/sh7757lcr.h3
-rw-r--r--include/configs/sh7763rdp.h3
-rw-r--r--include/configs/sh7785lcr.h3
-rw-r--r--include/configs/sheep_rk3368.h3
-rw-r--r--include/configs/sheevaplug.h3
-rw-r--r--include/configs/shmin.h3
-rw-r--r--include/configs/siemens-am33x-common.h3
-rw-r--r--include/configs/silk.h3
-rw-r--r--include/configs/sksimx6.h3
-rw-r--r--include/configs/smartweb.h3
-rw-r--r--include/configs/smdk5250.h3
-rw-r--r--include/configs/smdk5420.h3
-rw-r--r--include/configs/smdkc100.h3
-rw-r--r--include/configs/smdkv310.h3
-rw-r--r--include/configs/snapper9260.h3
-rw-r--r--include/configs/snapper9g45.h3
-rw-r--r--include/configs/sniper.h3
-rw-r--r--include/configs/snow.h3
-rw-r--r--include/configs/socfpga_arria10_socdk.h3
-rw-r--r--include/configs/socfpga_arria5_socdk.h3
-rw-r--r--include/configs/socfpga_common.h3
-rw-r--r--include/configs/socfpga_cyclone5_socdk.h3
-rw-r--r--include/configs/socfpga_dbm_soc1.h3
-rw-r--r--include/configs/socfpga_de0_nano_soc.h3
-rw-r--r--include/configs/socfpga_de10_nano.h3
-rw-r--r--include/configs/socfpga_de1_soc.h3
-rw-r--r--include/configs/socfpga_is1.h3
-rw-r--r--include/configs/socfpga_mcvevk.h3
-rw-r--r--include/configs/socfpga_sockit.h3
-rw-r--r--include/configs/socfpga_socrates.h3
-rw-r--r--include/configs/socfpga_sr1500.h3
-rw-r--r--include/configs/socfpga_vining_fpga.h3
-rw-r--r--include/configs/socrates.h3
-rw-r--r--include/configs/som-6896.h3
-rw-r--r--include/configs/som-db5800-som-6867.h3
-rw-r--r--include/configs/spear-common.h3
-rw-r--r--include/configs/spear3xx_evb.h3
-rw-r--r--include/configs/spear6xx_evb.h3
-rw-r--r--include/configs/spring.h3
-rw-r--r--include/configs/stih410-b2260.h3
-rw-r--r--include/configs/stm32f429-discovery.h3
-rw-r--r--include/configs/stm32f429-evaluation.h3
-rw-r--r--include/configs/stm32f469-discovery.h3
-rw-r--r--include/configs/stm32f746-disco.h3
-rw-r--r--include/configs/stm32h743-disco.h3
-rw-r--r--include/configs/stm32h743-eval.h3
-rw-r--r--include/configs/stmark2.h3
-rw-r--r--include/configs/stout.h3
-rw-r--r--include/configs/strider.h3
-rw-r--r--include/configs/stv0991.h3
-rw-r--r--include/configs/sun4i.h3
-rw-r--r--include/configs/sun50i.h3
-rw-r--r--include/configs/sun5i.h3
-rw-r--r--include/configs/sun6i.h3
-rw-r--r--include/configs/sun7i.h3
-rw-r--r--include/configs/sun8i.h3
-rw-r--r--include/configs/sun9i.h3
-rw-r--r--include/configs/sunxi-common.h3
-rw-r--r--include/configs/suvd3.h3
-rw-r--r--include/configs/syzygy_hub.h3
-rw-r--r--include/configs/t4qds.h3
-rw-r--r--include/configs/tam3517-common.h3
-rw-r--r--include/configs/tao3530.h3
-rw-r--r--include/configs/taurus.h3
-rw-r--r--include/configs/tb100.h3
-rw-r--r--include/configs/tbs2910.h3
-rw-r--r--include/configs/tec-ng.h3
-rw-r--r--include/configs/tec.h3
-rw-r--r--include/configs/tegra-common-post.h3
-rw-r--r--include/configs/tegra-common-usb-gadget.h3
-rw-r--r--include/configs/tegra-common.h3
-rw-r--r--include/configs/tegra114-common.h3
-rw-r--r--include/configs/tegra124-common.h3
-rw-r--r--include/configs/tegra186-common.h3
-rw-r--r--include/configs/tegra20-common.h3
-rw-r--r--include/configs/tegra210-common.h3
-rw-r--r--include/configs/tegra30-common.h3
-rw-r--r--include/configs/theadorable-x86-common.h3
-rw-r--r--include/configs/theadorable-x86-conga-qa3-e3845.h3
-rw-r--r--include/configs/theadorable-x86-dfi-bt700.h3
-rw-r--r--include/configs/theadorable.h3
-rw-r--r--include/configs/thuban.h3
-rw-r--r--include/configs/thunderx_88xx.h3
-rw-r--r--include/configs/ti816x_evm.h3
-rw-r--r--include/configs/ti_am335x_common.h3
-rw-r--r--include/configs/ti_armv7_common.h3
-rw-r--r--include/configs/ti_armv7_keystone2.h3
-rw-r--r--include/configs/ti_armv7_omap.h3
-rw-r--r--include/configs/ti_omap3_common.h3
-rw-r--r--include/configs/ti_omap4_common.h3
-rw-r--r--include/configs/ti_omap5_common.h3
-rw-r--r--include/configs/tinker_rk3288.h3
-rw-r--r--include/configs/titanium.h3
-rw-r--r--include/configs/topic_miami.h3
-rw-r--r--include/configs/tplink_wdr4300.h3
-rw-r--r--include/configs/tqma6.h3
-rw-r--r--include/configs/tqma6_mba6.h3
-rw-r--r--include/configs/tqma6_wru4.h3
-rw-r--r--include/configs/trats.h3
-rw-r--r--include/configs/trats2.h3
-rw-r--r--include/configs/tricorder.h3
-rw-r--r--include/configs/trimslice.h3
-rw-r--r--include/configs/ts4600.h3
-rw-r--r--include/configs/ts4800.h3
-rw-r--r--include/configs/turris_omnia.h3
-rw-r--r--include/configs/tuxx1.h3
-rw-r--r--include/configs/twister.h3
-rw-r--r--include/configs/udoo.h3
-rw-r--r--include/configs/udoo_neo.h3
-rw-r--r--include/configs/ulcb.h3
-rw-r--r--include/configs/uniphier.h3
-rw-r--r--include/configs/usb_a9263.h3
-rw-r--r--include/configs/usbarmory.h3
-rw-r--r--include/configs/vct.h3
-rw-r--r--include/configs/ve8313.h3
-rw-r--r--include/configs/venice2.h3
-rw-r--r--include/configs/ventana.h3
-rw-r--r--include/configs/vexpress_aemv8a.h3
-rw-r--r--include/configs/vexpress_ca15_tc2.h3
-rw-r--r--include/configs/vexpress_ca5x2.h3
-rw-r--r--include/configs/vexpress_ca9x4.h3
-rw-r--r--include/configs/vexpress_common.h3
-rw-r--r--include/configs/veyron.h3
-rw-r--r--include/configs/vf610twr.h3
-rw-r--r--include/configs/vinco.h3
-rw-r--r--include/configs/vining_2000.h3
-rw-r--r--include/configs/vme8349.h3
-rw-r--r--include/configs/vyasa-rk3288.h3
-rw-r--r--include/configs/wandboard.h3
-rw-r--r--include/configs/warp.h3
-rw-r--r--include/configs/warp7.h3
-rw-r--r--include/configs/wb45n.h3
-rw-r--r--include/configs/wb50n.h3
-rw-r--r--include/configs/woodburn.h3
-rw-r--r--include/configs/woodburn_common.h3
-rw-r--r--include/configs/woodburn_sd.h3
-rw-r--r--include/configs/work_92105.h3
-rw-r--r--include/configs/x600.h3
-rw-r--r--include/configs/x86-chromebook.h3
-rw-r--r--include/configs/x86-common.h3
-rw-r--r--include/configs/xfi3.h3
-rw-r--r--include/configs/xilinx_zynqmp.h3
-rw-r--r--include/configs/xilinx_zynqmp_mini.h3
-rw-r--r--include/configs/xilinx_zynqmp_mini_emmc.h3
-rw-r--r--include/configs/xilinx_zynqmp_mini_nand.h3
-rw-r--r--include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h3
-rw-r--r--include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h3
-rw-r--r--include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h3
-rw-r--r--include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h3
-rw-r--r--include/configs/xilinx_zynqmp_zcu100.h3
-rw-r--r--include/configs/xilinx_zynqmp_zcu102.h3
-rw-r--r--include/configs/xilinx_zynqmp_zcu104.h3
-rw-r--r--include/configs/xilinx_zynqmp_zcu106.h3
-rw-r--r--include/configs/xilinx_zynqmp_zcu111.h3
-rw-r--r--include/configs/xpedite517x.h3
-rw-r--r--include/configs/xpedite520x.h3
-rw-r--r--include/configs/xpedite537x.h3
-rw-r--r--include/configs/xpedite550x.h3
-rw-r--r--include/configs/xpress.h3
-rw-r--r--include/configs/xtfpga.h3
-rw-r--r--include/configs/zc5202.h3
-rw-r--r--include/configs/zc5601.h3
-rw-r--r--include/configs/zipitz2.h3
-rw-r--r--include/configs/zmx25.h3
-rw-r--r--include/configs/zynq-common.h3
-rw-r--r--include/configs/zynq_cse.h3
-rw-r--r--include/configs/zynq_zc70x.h3
-rw-r--r--include/configs/zynq_zybo.h3
-rw-r--r--include/console.h3
-rw-r--r--include/cortina.h3
-rw-r--r--include/cpu.h3
-rw-r--r--include/crc.h2
-rw-r--r--include/cros_ec.h3
-rw-r--r--include/cros_ec_message.h3
-rw-r--r--include/ddr_spd.h3
-rw-r--r--include/debug_uart.h3
-rw-r--r--include/dfu.h3
-rw-r--r--include/dialog_pmic.h3
-rw-r--r--include/display.h3
-rw-r--r--include/display_options.h3
-rw-r--r--include/dm-demo.h3
-rw-r--r--include/dm.h3
-rw-r--r--include/dm/device-internal.h3
-rw-r--r--include/dm/device.h3
-rw-r--r--include/dm/fdtaddr.h3
-rw-r--r--include/dm/lists.h3
-rw-r--r--include/dm/of.h3
-rw-r--r--include/dm/of_access.h3
-rw-r--r--include/dm/of_addr.h3
-rw-r--r--include/dm/of_extra.h3
-rw-r--r--include/dm/ofnode.h3
-rw-r--r--include/dm/pinctrl.h3
-rw-r--r--include/dm/platdata.h3
-rw-r--r--include/dm/platform_data/lpc32xx_hsuart.h2
-rw-r--r--include/dm/platform_data/net_ethoc.h3
-rw-r--r--include/dm/platform_data/pfe_dm_eth.h3
-rw-r--r--include/dm/platform_data/serial_bcm283x_mu.h3
-rw-r--r--include/dm/platform_data/serial_coldfire.h3
-rw-r--r--include/dm/platform_data/serial_mxc.h2
-rw-r--r--include/dm/platform_data/serial_pl01x.h2
-rw-r--r--include/dm/platform_data/serial_pxa.h3
-rw-r--r--include/dm/platform_data/serial_sh.h3
-rw-r--r--include/dm/platform_data/serial_stm32.h3
-rw-r--r--include/dm/read.h3
-rw-r--r--include/dm/root.h3
-rw-r--r--include/dm/test.h3
-rw-r--r--include/dm/uclass-id.h3
-rw-r--r--include/dm/uclass-internal.h3
-rw-r--r--include/dm/uclass.h3
-rw-r--r--include/dm/util.h3
-rw-r--r--include/dm9000.h3
-rw-r--r--include/dma.h3
-rw-r--r--include/dp83848.h3
-rw-r--r--include/ds1722.h4
-rw-r--r--include/dt-bindings/clock/ast2500-scu.h3
-rw-r--r--include/dt-bindings/clock/bcm3380-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6318-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm63268-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6328-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6338-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6348-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6358-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6362-clock.h3
-rw-r--r--include/dt-bindings/clock/bcm6368-clock.h3
-rw-r--r--include/dt-bindings/clock/boston-clock.h3
-rw-r--r--include/dt-bindings/clock/microchip,clock.h3
-rw-r--r--include/dt-bindings/clock/rk3036-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3066a-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3128-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3188-cru-common.h3
-rw-r--r--include/dt-bindings/clock/rk3188-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3228-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3288-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3328-cru.h3
-rw-r--r--include/dt-bindings/clock/rk3399-cru.h3
-rw-r--r--include/dt-bindings/clock/rv1108-cru.h2
-rw-r--r--include/dt-bindings/clock/stm32mp1-clksrc.h2
-rw-r--r--include/dt-bindings/comphy/comphy_data.h3
-rw-r--r--include/dt-bindings/gpio/tegra186-gpio.h3
-rw-r--r--include/dt-bindings/interrupt-router/intel-irq.h3
-rw-r--r--include/dt-bindings/mrc/quark.h3
-rw-r--r--include/dt-bindings/net/ti-dp83867.h3
-rw-r--r--include/dt-bindings/pinctrl/omap.h3
-rw-r--r--include/dt-bindings/pinctrl/pinctrl-tegra.h3
-rw-r--r--include/dt-bindings/pinctrl/rockchip.h3
-rw-r--r--include/dt-bindings/pmic/sandbox_pmic.h3
-rw-r--r--include/dt-bindings/power-domain/bcm6318-power-domain.h3
-rw-r--r--include/dt-bindings/power-domain/bcm63268-power-domain.h3
-rw-r--r--include/dt-bindings/power-domain/bcm6328-power-domain.h3
-rw-r--r--include/dt-bindings/power-domain/bcm6362-power-domain.h3
-rw-r--r--include/dt-bindings/power/tegra186-powergate.h3
-rw-r--r--include/dt-bindings/reset/altr,rst-mgr-s10.h3
-rw-r--r--include/dt-bindings/reset/altr,rst-mgr.h3
-rw-r--r--include/dt-bindings/reset/ast2500-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm3380-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6318-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm63268-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6328-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6338-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6348-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6358-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6362-reset.h3
-rw-r--r--include/dt-bindings/reset/bcm6368-reset.h3
-rw-r--r--include/dt-bindings/reset/tegra186-reset.h3
-rw-r--r--include/dt-structs.h3
-rw-r--r--include/dw_hdmi.h3
-rw-r--r--include/dwc3-omap-uboot.h3
-rw-r--r--include/dwc3-sti-glue.h3
-rw-r--r--include/dwc3-uboot.h3
-rw-r--r--include/dwc_ahsata.h3
-rw-r--r--include/dwmmc.h3
-rw-r--r--include/edid.h3
-rw-r--r--include/eeprom_field.h3
-rw-r--r--include/eeprom_layout.h3
-rw-r--r--include/elf.h3
-rw-r--r--include/env_attr.h3
-rw-r--r--include/env_callback.h3
-rw-r--r--include/env_default.h3
-rw-r--r--include/env_flags.h3
-rw-r--r--include/environment.h3
-rw-r--r--include/environment/ti/boot.h3
-rw-r--r--include/environment/ti/dfu.h3
-rw-r--r--include/environment/ti/mmc.h3
-rw-r--r--include/environment/ti/spi.h3
-rw-r--r--include/errno.h3
-rw-r--r--include/ethsw.h3
-rw-r--r--include/ext_common.h3
-rw-r--r--include/exynos_lcd.h3
-rw-r--r--include/faraday/ftahbc020s.h3
-rw-r--r--include/faraday/ftpci100.h3
-rw-r--r--include/faraday/ftpmu010.h3
-rw-r--r--include/faraday/ftsdc010.h3
-rw-r--r--include/faraday/ftsdmc020.h3
-rw-r--r--include/faraday/ftsdmc021.h3
-rw-r--r--include/faraday/ftsmc020.h3
-rw-r--r--include/faraday/fttmr010.h3
-rw-r--r--include/faraday/ftwdt010_wdt.h3
-rw-r--r--include/fastboot.h3
-rw-r--r--include/fat.h3
-rw-r--r--include/fb_mmc.h3
-rw-r--r--include/fb_nand.h3
-rw-r--r--include/fdt_simplefb.h3
-rw-r--r--include/fdt_support.h3
-rw-r--r--include/fdtdec.h2
-rw-r--r--include/fis.h3
-rw-r--r--include/flash.h3
-rw-r--r--include/fm_eth.h3
-rw-r--r--include/fpga.h3
-rw-r--r--include/fs.h3
-rw-r--r--include/fs_internal.h3
-rw-r--r--include/fsl-mc/fsl_dpaa_fd.h3
-rw-r--r--include/fsl-mc/fsl_dpbp.h3
-rw-r--r--include/fsl-mc/fsl_dpio.h3
-rw-r--r--include/fsl-mc/fsl_dpmac.h3
-rw-r--r--include/fsl-mc/fsl_dpmng.h3
-rw-r--r--include/fsl-mc/fsl_dpni.h3
-rw-r--r--include/fsl-mc/fsl_dprc.h3
-rw-r--r--include/fsl-mc/fsl_mc.h3
-rw-r--r--include/fsl-mc/fsl_mc_cmd.h3
-rw-r--r--include/fsl-mc/fsl_mc_private.h3
-rw-r--r--include/fsl-mc/fsl_mc_sys.h3
-rw-r--r--include/fsl-mc/fsl_qbman_base.h3
-rw-r--r--include/fsl-mc/fsl_qbman_portal.h3
-rw-r--r--include/fsl-mc/ldpaa_wriop.h3
-rw-r--r--include/fsl_csu.h3
-rw-r--r--include/fsl_dcu_fb.h3
-rw-r--r--include/fsl_ddr.h3
-rw-r--r--include/fsl_ddr_dimm_params.h3
-rw-r--r--include/fsl_ddr_sdram.h3
-rw-r--r--include/fsl_ddrc_version.h3
-rw-r--r--include/fsl_devdis.h3
-rw-r--r--include/fsl_diu_fb.h3
-rw-r--r--include/fsl_dspi.h3
-rw-r--r--include/fsl_dtsec.h3
-rw-r--r--include/fsl_errata.h3
-rw-r--r--include/fsl_esdhc.h3
-rw-r--r--include/fsl_fman.h3
-rw-r--r--include/fsl_ifc.h3
-rw-r--r--include/fsl_immap.h3
-rw-r--r--include/fsl_lpuart.h3
-rw-r--r--include/fsl_mdio.h3
-rw-r--r--include/fsl_memac.h3
-rw-r--r--include/fsl_mmdc.h3
-rw-r--r--include/fsl_pmic.h3
-rw-r--r--include/fsl_qbman.h3
-rw-r--r--include/fsl_qe.h3
-rw-r--r--include/fsl_sec.h3
-rw-r--r--include/fsl_sec_mon.h2
-rw-r--r--include/fsl_secboot_err.h3
-rw-r--r--include/fsl_sfp.h3
-rw-r--r--include/fsl_tgec.h3
-rw-r--r--include/fsl_usb.h3
-rw-r--r--include/fsl_validate.h3
-rw-r--r--include/fsl_wdog.h3
-rw-r--r--include/fuse.h3
-rw-r--r--include/g_dnl.h3
-rw-r--r--include/gdsys_fpga.h3
-rw-r--r--include/generic-phy.h3
-rw-r--r--include/gt64120.h3
-rw-r--r--include/hash.h2
-rw-r--r--include/hw_sha.h3
-rw-r--r--include/hwconfig.h3
-rw-r--r--include/i2c.h3
-rw-r--r--include/i2c_eeprom.h3
-rw-r--r--include/i2s.h3
-rw-r--r--include/i8042.h3
-rw-r--r--include/ide.h3
-rw-r--r--include/image-sparse.h3
-rw-r--r--include/image.h3
-rw-r--r--include/imx_sip.h3
-rw-r--r--include/imx_thermal.h3
-rw-r--r--include/imximage.h3
-rw-r--r--include/init.h3
-rw-r--r--include/initcall.h3
-rw-r--r--include/input.h3
-rw-r--r--include/inttypes.h3
-rw-r--r--include/iomux.h3
-rw-r--r--include/iotrace.h3
-rw-r--r--include/ipu_pixfmt.h3
-rw-r--r--include/jffs2/load_kernel.h4
-rw-r--r--include/jffs2/mini_inflate.h4
-rw-r--r--include/key_matrix.h3
-rw-r--r--include/lattice.h3
-rw-r--r--include/lcd.h3
-rw-r--r--include/lcd_console.h3
-rw-r--r--include/ld9040.h3
-rw-r--r--include/led-display.h3
-rw-r--r--include/led.h3
-rw-r--r--include/libata.h3
-rw-r--r--include/libtizen.h3
-rw-r--r--include/linker_lists.h3
-rw-r--r--include/linux/apm_bios.h3
-rw-r--r--include/linux/arm-smccc.h3
-rw-r--r--include/linux/bch.h3
-rw-r--r--include/linux/bitrev.h3
-rw-r--r--include/linux/crc8.h3
-rw-r--r--include/linux/delay.h4
-rw-r--r--include/linux/edd.h3
-rw-r--r--include/linux/immap_qe.h3
-rw-r--r--include/linux/input.h3
-rw-r--r--include/linux/io.h4
-rw-r--r--include/linux/iopoll.h3
-rw-r--r--include/linux/linkage.h3
-rw-r--r--include/linux/log2.h3
-rw-r--r--include/linux/mtd/bbm.h3
-rw-r--r--include/linux/mtd/concat.h3
-rw-r--r--include/linux/mtd/doc2000.h3
-rw-r--r--include/linux/mtd/flashchip.h3
-rw-r--r--include/linux/mtd/fsl_upm.h3
-rw-r--r--include/linux/mtd/fsmc_nand.h3
-rw-r--r--include/linux/mtd/mtd.h3
-rw-r--r--include/linux/mtd/nand_ecc.h3
-rw-r--r--include/linux/mtd/omap_elm.h3
-rw-r--r--include/linux/mtd/omap_gpmc.h3
-rw-r--r--include/linux/mtd/rawnand.h3
-rw-r--r--include/linux/mtd/samsung_onenand.h3
-rw-r--r--include/linux/mtd/st_smi.h3
-rw-r--r--include/linux/mtd/ubi.h3
-rw-r--r--include/linux/netdevice.h3
-rw-r--r--include/linux/rbtree.h3
-rw-r--r--include/linux/rbtree_augmented.h3
-rw-r--r--include/linux/serial_reg.h3
-rw-r--r--include/linux/usb/at91_udc.h3
-rw-r--r--include/linux/usb/atmel_usba_udc.h3
-rw-r--r--include/linux/usb/composite.h3
-rw-r--r--include/linux/usb/dwc3-omap.h3
-rw-r--r--include/linux/usb/dwc3.h3
-rw-r--r--include/linux/usb/otg.h3
-rw-r--r--include/linux/usb/xhci-fsl.h3
-rw-r--r--include/linux/usb/xhci-omap.h3
-rw-r--r--include/lmb.h3
-rw-r--r--include/log.h3
-rw-r--r--include/lxt971a.h3
-rw-r--r--include/lynxkdi.h3
-rw-r--r--include/lzma/LzmaDec.h2
-rw-r--r--include/lzma/LzmaTools.h3
-rw-r--r--include/lzma/LzmaTypes.h3
-rw-r--r--include/mailbox-uclass.h3
-rw-r--r--include/mailbox.h3
-rw-r--r--include/mapmem.h3
-rw-r--r--include/mb862xx.h3
-rw-r--r--include/mc13783.h3
-rw-r--r--include/mc13892.h3
-rw-r--r--include/mc34704.h3
-rw-r--r--include/mc9sdz60.h3
-rw-r--r--include/memalign.h3
-rw-r--r--include/membuff.h3
-rw-r--r--include/menu.h3
-rw-r--r--include/misc.h3
-rw-r--r--include/mk48t59.h3
-rw-r--r--include/mmc.h3
-rw-r--r--include/mpc106.h3
-rw-r--r--include/mpc83xx.h3
-rw-r--r--include/mpc8xx.h3
-rw-r--r--include/msc01.h3
-rw-r--r--include/mtd.h3
-rw-r--r--include/mtd/cfi_flash.h3
-rw-r--r--include/mtd/mtd-abi.h3
-rw-r--r--include/mtd/ubi-user.h3
-rw-r--r--include/mv88e6352.h3
-rw-r--r--include/mvebu_mmc.h3
-rw-r--r--include/mvmfp.h3
-rw-r--r--include/nand.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/bmu.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/class_csr.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/emac.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/gpi.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/hif.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/hif_nocpy.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/tmu_csr.h3
-rw-r--r--include/net/pfe_eth/pfe/cbus/util_csr.h3
-rw-r--r--include/net/pfe_eth/pfe/pfe_hw.h3
-rw-r--r--include/net/pfe_eth/pfe_driver.h3
-rw-r--r--include/net/pfe_eth/pfe_eth.h3
-rw-r--r--include/net/pfe_eth/pfe_firmware.h3
-rw-r--r--include/net/pfe_eth/pfe_mdio.h3
-rw-r--r--include/netdev.h3
-rw-r--r--include/ns87308.h3
-rw-r--r--include/nuvoton_nct6102d.h3
-rw-r--r--include/nvme.h3
-rw-r--r--include/of_live.h3
-rw-r--r--include/os.h2
-rw-r--r--include/palmas.h3
-rw-r--r--include/panel.h3
-rw-r--r--include/part.h3
-rw-r--r--include/part_efi.h3
-rw-r--r--include/pca953x.h3
-rw-r--r--include/pca9564.h3
-rw-r--r--include/pca9698.h3
-rw-r--r--include/pch.h3
-rw-r--r--include/pci.h3
-rw-r--r--include/pci_gt64120.h3
-rw-r--r--include/pci_msc01.h3
-rw-r--r--include/pci_rom.h3
-rw-r--r--include/pcmcia.h3
-rw-r--r--include/phy.h3
-rw-r--r--include/phys2bus.h3
-rw-r--r--include/post.h3
-rw-r--r--include/power-domain-uclass.h3
-rw-r--r--include/power-domain.h3
-rw-r--r--include/power/act8846_pmic.h3
-rw-r--r--include/power/as3722.h3
-rw-r--r--include/power/battery.h3
-rw-r--r--include/power/fg_battery_cell_params.h3
-rw-r--r--include/power/hi6553_pmic.h3
-rw-r--r--include/power/ltc3676_pmic.h3
-rw-r--r--include/power/max17042_fg.h3
-rw-r--r--include/power/max77686_pmic.h3
-rw-r--r--include/power/max77693_fg.h3
-rw-r--r--include/power/max77693_muic.h3
-rw-r--r--include/power/max77693_pmic.h3
-rw-r--r--include/power/max77696_pmic.h3
-rw-r--r--include/power/max8997_muic.h3
-rw-r--r--include/power/max8997_pmic.h3
-rw-r--r--include/power/max8998_pmic.h3
-rw-r--r--include/power/mc34vr500_pmic.h3
-rw-r--r--include/power/pfuze100_pmic.h3
-rw-r--r--include/power/pfuze3000_pmic.h3
-rw-r--r--include/power/pmic.h3
-rw-r--r--include/power/power_chrg.h3
-rw-r--r--include/power/regulator.h3
-rw-r--r--include/power/rk8xx_pmic.h3
-rw-r--r--include/power/rn5t567_pmic.h3
-rw-r--r--include/power/s5m8767.h3
-rw-r--r--include/power/sandbox_pmic.h3
-rw-r--r--include/power/tps62362.h3
-rw-r--r--include/power/tps65090.h3
-rw-r--r--include/power/tps65217.h3
-rw-r--r--include/power/tps65218.h3
-rw-r--r--include/power/tps65910.h3
-rw-r--r--include/power/tps65910_pmic.h3
-rw-r--r--include/ppc_asm.tmpl3
-rw-r--r--include/ppc_defs.h3
-rw-r--r--include/pwm.h3
-rw-r--r--include/pwrseq.h3
-rw-r--r--include/pxa_lcd.h3
-rw-r--r--include/qfw.h3
-rw-r--r--include/ram.h3
-rw-r--r--include/rc4.h3
-rw-r--r--include/regmap.h3
-rw-r--r--include/reiserfs.h3
-rw-r--r--include/relocate.h3
-rw-r--r--include/remoteproc.h2
-rw-r--r--include/reset-uclass.h3
-rw-r--r--include/reset.h3
-rw-r--r--include/rtc.h3
-rw-r--r--include/rtc_def.h3
-rw-r--r--include/s_record.h3
-rw-r--r--include/samsung-usb-phy-uboot.h3
-rw-r--r--include/sandbox-adc.h3
-rw-r--r--include/sandboxblockdev.h3
-rw-r--r--include/scf0403_lcd.h3
-rw-r--r--include/scsi.h3
-rw-r--r--include/sdhci.h3
-rw-r--r--include/sdp.h3
-rw-r--r--include/search.h3
-rw-r--r--include/sja1000.h3
-rw-r--r--include/smbios.h3
-rw-r--r--include/smsc_lpc47m.h3
-rw-r--r--include/smsc_sio1007.h3
-rw-r--r--include/sound.h3
-rw-r--r--include/sparse_defs.h3
-rw-r--r--include/sparse_format.h3
-rw-r--r--include/spartan2.h3
-rw-r--r--include/spartan3.h3
-rw-r--r--include/spd.h3
-rw-r--r--include/spi.h3
-rw-r--r--include/spi_flash.h3
-rw-r--r--include/spl.h3
-rw-r--r--include/st_logo_data.h3
-rw-r--r--include/status_led.h3
-rw-r--r--include/stdio_dev.h3
-rw-r--r--include/stdlib.h3
-rw-r--r--include/stm32_rcc.h3
-rw-r--r--include/stratixII.h3
-rw-r--r--include/sy8106a.h3
-rw-r--r--include/sym53c8xx.h3
-rw-r--r--include/synopsys/dwcddr21mctl.h3
-rw-r--r--include/syscon.h3
-rw-r--r--include/sysreset.h3
-rw-r--r--include/tables_csum.h3
-rw-r--r--include/tee/optee.h3
-rw-r--r--include/test/compression.h3
-rw-r--r--include/test/env.h3
-rw-r--r--include/test/overlay.h3
-rw-r--r--include/test/suites.h3
-rw-r--r--include/test/test.h3
-rw-r--r--include/test/ut.h3
-rw-r--r--include/thermal.h3
-rw-r--r--include/thor.h3
-rw-r--r--include/ti-usb-phy-uboot.h3
-rw-r--r--include/time.h4
-rw-r--r--include/timer.h3
-rw-r--r--include/timestamp.h3
-rw-r--r--include/tpm.h3
-rw-r--r--include/tps6586x.h3
-rw-r--r--include/trace.h3
-rw-r--r--include/tsec.h3
-rw-r--r--include/tsi108.h3
-rw-r--r--include/tsi148.h3
-rw-r--r--include/twl4030.h3
-rw-r--r--include/twl6030.h3
-rw-r--r--include/u-boot/crc.h3
-rw-r--r--include/u-boot/rsa-checksum.h5
-rw-r--r--include/u-boot/rsa-mod-exp.h5
-rw-r--r--include/u-boot/rsa.h3
-rw-r--r--include/u-boot/sha1.h3
-rw-r--r--include/u-boot/variadic-macro.h3
-rw-r--r--include/ubifs_uboot.h3
-rw-r--r--include/uboot_aes.h3
-rw-r--r--include/universe.h3
-rw-r--r--include/usb.h3
-rw-r--r--include/usb/ci_udc.h3
-rw-r--r--include/usb/designware_udc.h3
-rw-r--r--include/usb/dwc2_udc.h3
-rw-r--r--include/usb/ehci-ci.h3
-rw-r--r--include/usb/fotg210.h3
-rw-r--r--include/usb/fusbh200.h3
-rw-r--r--include/usb/lin_gadget_compat.h3
-rw-r--r--include/usb/pxa27x_udc.h3
-rw-r--r--include/usb/udc.h4
-rw-r--r--include/usb/ulpi.h3
-rw-r--r--include/usb_cdc_acm.h3
-rw-r--r--include/usb_defs.h3
-rw-r--r--include/usb_ether.h3
-rw-r--r--include/usb_mass_storage.h3
-rw-r--r--include/usbdescriptors.h3
-rw-r--r--include/usbdevice.h3
-rw-r--r--include/usbroothubdes.h3
-rw-r--r--include/uuid.h3
-rw-r--r--include/vbe.h3
-rw-r--r--include/version.h3
-rw-r--r--include/video_bridge.h3
-rw-r--r--include/video_console.h3
-rw-r--r--include/video_fb.h3
-rw-r--r--include/video_font.h3
-rw-r--r--include/video_font_data.h3
-rw-r--r--include/virtex2.h3
-rw-r--r--include/vsc9953.h3
-rw-r--r--include/vsprintf.h3
-rw-r--r--include/vxworks.h3
-rw-r--r--include/w83c553f.h3
-rw-r--r--include/wait_bit.h3
-rw-r--r--include/watchdog.h3
-rw-r--r--include/wdt.h3
-rw-r--r--include/winbond_w83627.h3
-rw-r--r--include/xilinx.h3
-rw-r--r--include/xyzModem.h3
-rw-r--r--include/zfs/dmu.h3
-rw-r--r--include/zfs/dmu_objset.h3
-rw-r--r--include/zfs/dnode.h3
-rw-r--r--include/zfs/dsl_dataset.h3
-rw-r--r--include/zfs/dsl_dir.h3
-rw-r--r--include/zfs/sa_impl.h3
-rw-r--r--include/zfs/spa.h3
-rw-r--r--include/zfs/uberblock_impl.h3
-rw-r--r--include/zfs/vdev_impl.h3
-rw-r--r--include/zfs/zap_impl.h3
-rw-r--r--include/zfs/zap_leaf.h3
-rw-r--r--include/zfs/zfs.h3
-rw-r--r--include/zfs/zfs_acl.h3
-rw-r--r--include/zfs/zfs_znode.h3
-rw-r--r--include/zfs/zil.h3
-rw-r--r--include/zfs/zio.h3
-rw-r--r--include/zfs/zio_checksum.h3
-rw-r--r--include/zynqmppl.h3
-rw-r--r--include/zynqpl.h3
1195 files changed, 1199 insertions, 2386 deletions
diff --git a/include/ACEX1K.h b/include/ACEX1K.h
index 3df605a433..9814bba284 100644
--- a/include/ACEX1K.h
+++ b/include/ACEX1K.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Steven Scholz, imc Measurement & Control, steven.scholz@imc-berlin.de
*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ACEX1K_H_
diff --git a/include/MCD_dma.h b/include/MCD_dma.h
index d7a4191358..2f16c89044 100644
--- a/include/MCD_dma.h
+++ b/include/MCD_dma.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MCD_API_H
diff --git a/include/MCD_progCheck.h b/include/MCD_progCheck.h
index faccdbba27..1ec8fbfbd2 100644
--- a/include/MCD_progCheck.h
+++ b/include/MCD_progCheck.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* This file is autogenerated. Do not change */
diff --git a/include/MCD_tasksInit.h b/include/MCD_tasksInit.h
index a05f305148..9f582beb51 100644
--- a/include/MCD_tasksInit.h
+++ b/include/MCD_tasksInit.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef MCD_TSK_INIT_H
diff --git a/include/adc.h b/include/adc.h
index 4b14017849..d04c9c4926 100644
--- a/include/adc.h
+++ b/include/adc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ADC_H_
diff --git a/include/addr_map.h b/include/addr_map.h
index 63b24cded0..d322dd222a 100644
--- a/include/addr_map.h
+++ b/include/addr_map.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __ADDR_MAP_H
#define __ADDR_MAP_H
/*
* Copyright 2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#include <asm/types.h>
diff --git a/include/ahci.h b/include/ahci.h
index cc36d81f98..b42df6c77e 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006.
* Author: Jason Jin<Jason.jin@freescale.com>
* Zhang Wei<wei.zhang@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _AHCI_H_
#define _AHCI_H_
diff --git a/include/ali512x.h b/include/ali512x.h
index 47c75bdd00..6bb67009c1 100644
--- a/include/ali512x.h
+++ b/include/ali512x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB <daniel@omicron.se>.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_IC_ALI512X_H_
diff --git a/include/altera.h b/include/altera.h
index 48d3eb73c9..ead5d3d810 100644
--- a/include/altera.h
+++ b/include/altera.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <fpga.h>
diff --git a/include/andestech/andes_pcu.h b/include/andestech/andes_pcu.h
index 1e6c9bae56..d24b82d18e 100644
--- a/include/andestech/andes_pcu.h
+++ b/include/andestech/andes_pcu.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Andes Technology Corp
* Macpaul Lin <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/android_image.h b/include/android_image.h
index dfd4d9d72c..d78db9e2b7 100644
--- a/include/android_image.h
+++ b/include/android_image.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
/*
* This is from the Android Project,
* Repository: https://android.googlesource.com/platform/system/core/
@@ -5,8 +6,6 @@
* Commit: d162828814b08ada310846a33205befb69ef5799
*
* Copyright (C) 2008 The Android Open Source Project
- *
- * SPDX-License-Identifier: BSD-2-Clause
*/
#ifndef _ANDROID_IMAGE_H_
diff --git a/include/ansi.h b/include/ansi.h
index 5f646344c8..e90a697eaf 100644
--- a/include/ansi.h
+++ b/include/ansi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Pali Rohár <pali.rohar@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/api.h b/include/api.h
index 85817f3400..84d81dc817 100644
--- a/include/api.h
+++ b/include/api.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __API_H
diff --git a/include/armcoremodule.h b/include/armcoremodule.h
index cc6f2b4d3b..613b884270 100644
--- a/include/armcoremodule.h
+++ b/include/armcoremodule.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005
* ARM Ltd.
@@ -5,8 +6,6 @@
* Configuration for ARM Core Modules.
* No standalonw port yet available
* - this file is included by both integratorap.h & integratorcp.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARMCOREMODULE_H
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index c16ad73864..2d451f8a1b 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 The Chromium OS Authors.
* (C) Copyright 2002-2010
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_GENERIC_GBL_DATA_H
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index bf230c15ba..d03602696f 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -1,7 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
* Copyright (c) 2011, NVIDIA Corp. All rights reserved.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ASM_GENERIC_GPIO_H_
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 0f5160c6f1..7a2f0dba31 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Generic I/O functions.
*
* Copyright (c) 2016 Imagination Technologies Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_GENERIC_IO_H__
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index b6535705a5..296c0cf9b8 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* Taken from Linux kernel, commit f56c3196 */
diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h
index f734d53eec..eee84f49bb 100644
--- a/include/asm-generic/u-boot.h
+++ b/include/asm-generic/u-boot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
*
* (C) Copyright 2000 - 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
********************************************************************
* NOTE: This header file defines an interface to U-Boot. Including
* this (unmodified) header file in another file is considered normal
diff --git a/include/ata.h b/include/ata.h
index dde377c99e..3f4e4a0234 100644
--- a/include/ata.h
+++ b/include/ata.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/atf_common.h b/include/atf_common.h
index 8c513e7c3e..3a7d40e5f0 100644
--- a/include/atf_common.h
+++ b/include/atf_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* This is from the ARM TF Project,
* Repository: https://github.com/ARM-software/arm-trusted-firmware.git
@@ -5,8 +6,6 @@
* Portions copyright (c) 2013-2016, ARM Limited and Contributors. All rights
* reserved.
* Copyright (C) 2016-2017 Rockchip Electronic Co.,Ltd
- *
- * SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __BL_COMMON_H__
diff --git a/include/atmel_hlcdc.h b/include/atmel_hlcdc.h
index a9ba3ef2d0..5e339f50f2 100644
--- a/include/atmel_hlcdc.h
+++ b/include/atmel_hlcdc.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Header file for AT91/AT32 MULTI LAYER LCD Controller
*
* Data structure and register user interface
*
* Copyright (C) 2012 Atmel Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ATMEL_HLCDC_H__
#define __ATMEL_HLCDC_H__
diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index ee7ba27798..4aa955b6b2 100644
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* atmel_lcd.h - Atmel LCD Controller structures
*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ATMEL_LCD_H_
diff --git a/include/atmel_lcdc.h b/include/atmel_lcdc.h
index ba62180f5d..759f8da31c 100644
--- a/include/atmel_lcdc.h
+++ b/include/atmel_lcdc.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Header file for AT91/AT32 LCD Controller
*
* Data structure and register user interface
*
* Copyright (C) 2007 Atmel Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ATMEL_LCDC_H__
#define __ATMEL_LCDC_H__
diff --git a/include/atmel_mci.h b/include/atmel_mci.h
index de2414806b..c7591166ee 100644
--- a/include/atmel_mci.h
+++ b/include/atmel_mci.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2005-2006 Atmel Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ATMEL_MCI_H__
#define __ATMEL_MCI_H__
diff --git a/include/autoboot.h b/include/autoboot.h
index c175f91c5a..3ebd6f90e3 100644
--- a/include/autoboot.h
+++ b/include/autoboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -5,8 +6,6 @@
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AUTOBOOT_H
diff --git a/include/axp152.h b/include/axp152.h
index 1643266f9a..c81f172502 100644
--- a/include/axp152.h
+++ b/include/axp152.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
enum axp152_reg {
diff --git a/include/axp209.h b/include/axp209.h
index e1b22e3442..b7de6ed73c 100644
--- a/include/axp209.h
+++ b/include/axp209.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
enum axp209_reg {
diff --git a/include/axp221.h b/include/axp221.h
index b4b64b0e87..caffb910f4 100644
--- a/include/axp221.h
+++ b/include/axp221.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>
*
* X-Powers AXP221 Power Management IC driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* Page 0 addresses */
diff --git a/include/axp809.h b/include/axp809.h
index d27fb978d2..86b2925330 100644
--- a/include/axp809.h
+++ b/include/axp809.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Chen-Yu Tsai <wens@csie.org>
*
* X-Powers AXP809 Power Management IC driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#define AXP809_CHIP_ID 0x03
diff --git a/include/axp818.h b/include/axp818.h
index 959774c76f..b16fe0b152 100644
--- a/include/axp818.h
+++ b/include/axp818.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Vishnu Patekar <vishnupatekar0510@gmail.com>
*
* X-Powers AXP818 Power Management IC driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#define AXP818_CHIP_ID 0x03
diff --git a/include/axp_pmic.h b/include/axp_pmic.h
index d789ad8086..10091d0bb2 100644
--- a/include/axp_pmic.h
+++ b/include/axp_pmic.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
*
* X-Powers AX Power Management IC support header
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _AXP_PMIC_H_
diff --git a/include/backlight.h b/include/backlight.h
index 90e1d981e1..a304c36e01 100644
--- a/include/backlight.h
+++ b/include/backlight.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BACKLIGHT_H
diff --git a/include/binman_sym.h b/include/binman_sym.h
index 87d03d5294..ffb7c15798 100644
--- a/include/binman_sym.h
+++ b/include/binman_sym.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Symbol access for symbols set up by binman as part of the build.
*
@@ -5,8 +6,6 @@
* assembled by binman.
*
* Copyright (c) 2017 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BINMAN_SYM_H
diff --git a/include/bios_emul.h b/include/bios_emul.h
index 7571263688..158e0f223d 100644
--- a/include/bios_emul.h
+++ b/include/bios_emul.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 1996-1999 SciTech Software, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _BIOS_EMUL_H
diff --git a/include/bitfield.h b/include/bitfield.h
index a59f3c279a..579a69c856 100644
--- a/include/bitfield.h
+++ b/include/bitfield.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/blk.h b/include/blk.h
index 636eed9de9..fc0c239e46 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef BLK_H
diff --git a/include/bmp_layout.h b/include/bmp_layout.h
index 55db8b86ea..a5c9498dc9 100644
--- a/include/bmp_layout.h
+++ b/include/bmp_layout.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* (C) Copyright 2002
* Detlev Zundel, DENX Software Engineering, dzu@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/************************************************************************/
diff --git a/include/boot_fit.h b/include/boot_fit.h
index e16ae5bafa..f75fed66bc 100644
--- a/include/boot_fit.h
+++ b/include/boot_fit.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Texas Instruments
* Written by Franklin Cooper Jr. <fcooper@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/**
diff --git a/include/bootcount.h b/include/bootcount.h
index 06fb4d3578..3eb802470a 100644
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Stefan Roese, DENX Software Engineering, sr@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/include/bootm.h b/include/bootm.h
index 49813772ce..9e42e17987 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BOOTM_H
diff --git a/include/bootretry.h b/include/bootretry.h
index 2ecd7a48b0..0cedd300c3 100644
--- a/include/bootretry.h
+++ b/include/bootretry.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BOOTRETRY_H
diff --git a/include/bootstage.h b/include/bootstage.h
index 7a524782ba..c9408e7b12 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* This file implements recording of each stage of the boot process. It is
* intended to implement timing of each stage, reporting this information
@@ -5,8 +6,6 @@
* Note that it requires timer_get_boot_us() to be defined by the board
*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BOOTSTAGE_H
diff --git a/include/bouncebuf.h b/include/bouncebuf.h
index 5ffa99bc13..fd9b0f3b28 100644
--- a/include/bouncebuf.h
+++ b/include/bouncebuf.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Generic bounce buffer implementation
*
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __INCLUDE_BOUNCEBUF_H__
diff --git a/include/btrfs.h b/include/btrfs.h
index 7390975ea7..5be61e3264 100644
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* BTRFS filesystem implementation for U-Boot
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __U_BOOT_BTRFS_H__
diff --git a/include/bus_vcxk.h b/include/bus_vcxk.h
index 131f33835d..eecba407bf 100644
--- a/include/bus_vcxk.h
+++ b/include/bus_vcxk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005-2009
* Jens Scharsig @ BuS Elektronik GmbH & Co. KG, <esw@bus-elektronik.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BUS_VCXK_H_
diff --git a/include/cavium/atf.h b/include/cavium/atf.h
index 0a53c2f1de..3cf05c43d7 100644
--- a/include/cavium/atf.h
+++ b/include/cavium/atf.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/**
* (C) Copyright 2014, Cavium Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
**/
#ifndef __ATF_H__
#define __ATF_H__
diff --git a/include/cavium/atf_part.h b/include/cavium/atf_part.h
index 182f6f4b88..6c00b019cf 100644
--- a/include/cavium/atf_part.h
+++ b/include/cavium/atf_part.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/**
* (C) Copyright 2014, Cavium Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
**/
#ifndef __ATF_PART_H__
diff --git a/include/cavium/thunderx_svc.h b/include/cavium/thunderx_svc.h
index 416ce3cfec..de36d66230 100644
--- a/include/cavium/thunderx_svc.h
+++ b/include/cavium/thunderx_svc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/**
* (C) Copyright 2014, Cavium Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
**/
#ifndef __THUNDERX_SVC_H__
diff --git a/include/cbfs.h b/include/cbfs.h
index f50280107b..1b88ec04ae 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CBFS_H
diff --git a/include/circbuf.h b/include/circbuf.h
index 34d0f85f26..e8ec127635 100644
--- a/include/circbuf.h
+++ b/include/circbuf.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Gerry Hamel, geh@ti.com, Texas Instruments
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CIRCBUF_H__
diff --git a/include/cli.h b/include/cli.h
index 4c39b9e2b1..39b913743b 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014 Google, Inc
* Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CLI_H
diff --git a/include/cli_hush.h b/include/cli_hush.h
index 57c870dfe9..2bd35670c7 100644
--- a/include/cli_hush.h
+++ b/include/cli_hush.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CLI_HUSH_H_
diff --git a/include/clk-uclass.h b/include/clk-uclass.h
index 75933eb884..e76d98e2f6 100644
--- a/include/clk-uclass.h
+++ b/include/clk-uclass.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CLK_UCLASS_H
diff --git a/include/clk.h b/include/clk.h
index b3a9fcecb0..9a357646ff 100644
--- a/include/clk.h
+++ b/include/clk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CLK_H_
diff --git a/include/cmd_spl.h b/include/cmd_spl.h
index c7615debfb..51ec12edb9 100644
--- a/include/cmd_spl.h
+++ b/include/cmd_spl.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _NAND_SPL_H_
#define _NAND_SPL_H_
diff --git a/include/command.h b/include/command.h
index 56499b8ad5..04cd1e745c 100644
--- a/include/command.h
+++ b/include/command.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/common.h b/include/common.h
index 795206aa0b..60c79137e2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __COMMON_H_
diff --git a/include/common_timing_params.h b/include/common_timing_params.h
index 070010728b..96704cd2fc 100644
--- a/include/common_timing_params.h
+++ b/include/common_timing_params.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef COMMON_TIMING_PARAMS_H
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index f567cebd38..8d5feb3ac7 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* NVIDIA Corporation <www.nvidia.com>
*
* Copyright 2014 Red Hat, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_CMD_DISTRO_BOOTCMD_H
diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h
index 4bbcd13158..4f522dbecc 100644
--- a/include/config_fsl_chain_trust.h
+++ b/include/config_fsl_chain_trust.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_FSL_CHAIN_TRUST_H
diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h
index 3c1499c6fb..c2f9735ce7 100644
--- a/include/config_uncmd_spl.h
+++ b/include/config_uncmd_spl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Ilya Yanok, ilya.yanok@gmail.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_UNCMD_SPL_H__
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index b737e461c7..9479f91c57 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005, Psyent Corporation <www.psyent.com>
* Scott McNutt <smcnutt@psyent.com>
* (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index e64f6d8503..07a44c88c7 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005, Psyent Corporation <www.psyent.com>
* Scott McNutt <smcnutt@psyent.com>
* (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 3bbb18abdc..1c67153ece 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index f81f0de7a5..026e9df6d7 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index fb4762d3cf..0756488d8e 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 9c4d2d1a5f..0ae43fa355 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 4a1a8ffafb..116df265fd 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5208EVBe.
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _M5208EVBE_H
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 2e2e512814..1f79c1505a 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF52277 EVB board.
*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index e507ad92bf..2099f6809b 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5329 FireEngine board.
*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 6b37e46c56..1f8182074f 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the esd TASREG board.
*
* (C) Copyright 2004
* Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index b9f30ccc0a..ce2af4ed0f 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* Hayden Fraser (Hayden.Fraser@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _M5253DEMO_H
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index daa44b315b..f7bac2bf0e 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* Hayden Fraser (Hayden.Fraser@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _M5253EVBE_H
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index ab5ebbd5b8..86d5cfce9d 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Motorola MC5272C3 board.
*
* (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 1babb72fd0..2569cdf0b2 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Motorola MC5275EVB board.
*
@@ -6,8 +7,6 @@
*
* Based off of M5272C3 board code by Josef Baumgartner
* <josef.baumgartner@telex.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 26b9ef3e53..76bd05df1d 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Motorola MC5282EVB board.
*
* (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 69b7d8644b..d4fb1e5146 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF53017EVB.
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 6dcd41a4c7..c0e42a3595 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5329 FireEngine board.
*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index faf098e2b8..93789b3257 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5373 FireEngine board.
*
* Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index c614193963..c252fb6312 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF54418 TWR board.
*
* Copyright 2010-2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index bec0ca0ce1..5c6dcd3f69 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF54451 EVB board.
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index fb3fee6103..28009cd86b 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF54455 EVB board.
*
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 5c53e82f55..4ad3849582 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5475 board.
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index bc10284376..2eb96be1d2 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Freescale MCF5485 FireEngine board.
*
* Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index aeda4742aa..20e601dab5 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010-2017 CS Systemes d'Information
* Christophe Leroy <christophe.leroy@c-s.fr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index b62b11c9e5..34fbe0d91a 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009-2010 Freescale Semiconductor, Inc.
* Copyright (C) 2010 Ilya Yanok, Emcraft Systems, yanok@emcraft.com
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index ef6d820d7d..794d045d37 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006, 2010.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* mpc8313epb board configuration file
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 9e01ae4475..1daf9102f4 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2007-2010 Freescale Semiconductor, Inc.
*
* Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 617e527b36..e92a8c0148 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index c40ba469b0..cf2a6bda7e 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006-2010
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 0948d0d987..7dc0377178 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 69e8a1db67..c7d10f7e9a 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2007 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 7ebd6175a6..bb5e49a65e 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2007 Freescale Semiconductor, Inc.
* Kevin Lam <kevin.lam@freescale.com>
* Joe D'Abbraccio <joe.d'abbraccio@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 6843ef2866..7265598164 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007-2009,2010-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index a43210f4c8..6fdab33487 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004, 2011 Freescale Semiconductor.
* (C) Copyright 2002,2003 Motorola,Inc.
* Xianghua Xiao <X.Xiao@motorola.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index d4753c4277..3daa4f916b 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004, 2011 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index b2943fa622..7973f3ceae 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007, 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 0c44c16e66..c85ad5d3d8 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004, 2007, 2010-2011 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index a74b24c390..c708e924ad 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004, 2011 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 13567e48af..cea24d1484 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004, 2011 Freescale Semiconductor.
* (C) Copyright 2002,2003 Motorola,Inc.
* Xianghua Xiao <X.Xiao@motorola.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 7fb4054566..21735e5e52 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2004-2007, 2010-2011 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 6d0970582b..d3367280a0 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index c04b3a2af2..c04037720e 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 3fd432e5c0..24f9fca53c 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2007-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
/*
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 9ede6dd9b1..dcc78b1e58 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2006, 2010-2011 Freescale Semiconductor.
*
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 4b880e1833..5cb23482fe 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Solutions Migo-R board
*
* Copyright (C) 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MIGO_R_H
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 9d07742065..b29a5113aa 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 8dd4f91efb..1b347541c0 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2012 Freescale Semiconductor, Inc.
* Authors: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
* Timur Tabi <timur@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index aa12863b91..44e99ab368 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
* Authors: Roy Zang <tie-fei.zang@freescale.com>
* Chunhe Lan <Chunhe.Lan@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 3901a720ff..730082ee3d 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h
index e32cddec59..2f6cc5d8e1 100644
--- a/include/configs/P3041DS.h
+++ b/include/configs/P3041DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index 117def9dc2..ed88b41844 100644
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h
index 0a8c38767f..873d39a10c 100644
--- a/include/configs/P5020DS.h
+++ b/include/configs/P5020DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/P5040DS.h b/include/configs/P5040DS.h
index 5933fc0860..12666d6ee6 100644
--- a/include/configs/P5040DS.h
+++ b/include/configs/P5040DS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index ea9be7d67d..e457135e56 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index e2dcca7f26..07ba1cfaeb 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index e1f911a561..f34f5187ee 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
-+ * Copyright 2014 Freescale Semiconductor, Inc.
-+ *
-+ * SPDX-License-Identifier: GPL-2.0+
-+ */
+ * Copyright 2014 Freescale Semiconductor, Inc.
+ */
#ifndef __CONFIG_H
#define __CONFIG_H
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 492d12b867..f5d454b002 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 5fe4c96b04..934e6e4741 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 56f0a4e19e..9714e44699 100644
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 5f743a9114..43ae30960b 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index b90f1cf603..bde8c3b882 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 489e4e35f9..6231a1e4ae 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013-2015 Arcturus Networks, Inc.
* http://www.arcturusnetworks.com/products/ucp1020/
* based on include/configs/p1_p2_rdb_pc.h
* original copyright follows:
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h
index 1ebbc4c9e2..e0da9e8b5f 100644
--- a/include/configs/adp-ae3xx.h
+++ b/include/configs/adp-ae3xx.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Andes Technology Corporation
* Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index ff365c464e..d04a85cff5 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Andes Technology Corporation
* Shawn Lin, Andes Technology Corporation <nobuhiro@andestech.com>
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index bcc7a6d168..a6e99192ba 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Timesys Corporation
* Copyright (C) 2016 Advantech Corporation
* Copyright (C) 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ADVANTECH_DMSBA16_CONFIG_H
diff --git a/include/configs/alt.h b/include/configs/alt.h
index ba0b2fd671..d44a0b3007 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/alt.h
* This file is alt board configuration.
*
* Copyright (C) 2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __ALT_H
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index e29de0e15c..ca6580f297 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_AM335X_SHC_H
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 9687f3765a..381c75e6ef 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* am335x_sl50.h
*
* Copyright (C) 2015 Toby Churchill Ltd - http://www.toby-churchill.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_AM335X_EVM_H
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index b97a761389..ffe40a4160 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* am3517_crane.h - Default configuration for AM3517 CraneBoard.
*
@@ -6,8 +7,6 @@
* Based on include/configs/am3517evm.h
*
* Copyright (C) 2011 Mistral Solutions pvt Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 214d9c54c2..066110370e 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* am3517_evm.h - Default configuration for AM3517 EVM board.
*
@@ -6,8 +7,6 @@
* Based on omap3_evm_config.h
*
* Copyright (C) 2010 Texas Instruments Incorporated
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index d2c1810bfd..a8560619bc 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* am43xx_evm.h
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_AM43XX_EVM_H
diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index d1f73f76a4..d91d08e8eb 100644
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* Texas Instruments Incorporated.
@@ -5,8 +6,6 @@
*
* Configuration settings for the TI Beagle x15 board.
* See ti_omap5_common.h for omap5 common settings.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_AM57XX_EVM_H
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 58c77deac7..ea04f91d0c 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Sysam AMCORE board configuration
*
* (C) Copyright 2016 Angelo Dureghello <angelo@sysam.it>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AMCORE_CONFIG_H
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index 247f44bbad..96850b5761 100644
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 00588ab5ed..4dbca917e3 100644
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 098bafe592..8680eb6ef5 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Solutions AP-325RXA board
*
* Copyright (C) 2008 Renesas Solutions Corp.
* Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AP325RXA_H
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 6df2ff9822..a4bdd44a9e 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Alpha Project AP-SH4A-4A board
*
* Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AP_SH4A_4A_H
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index f9970b81dc..fe8168458f 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Toradex, Inc.
*
* Configuration settings for the Toradex Apalis TK1 modules.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index eb8ffda67e..00255c80d6 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013-2015 Toradex, Inc.
*
* Configuration settings for the Toradex Apalis iMX6
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 9d59e69cba..646086a956 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014-2016 Marcel Ziswiler
*
* Configuration settings for the Toradex Apalis T30 modules.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index ceca5ba949..a930307a14 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
*
* Configuration settings for the Armadeus Project motherboard APF27
*
* Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index cd65b75250..ebebec07fc 100644
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Bluegiga Technologies Oy
*
@@ -8,8 +9,6 @@
* Based on m28evk.h:
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_APX4DEVKIT_H__
#define __CONFIGS_APX4DEVKIT_H__
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index e730601728..209b378191 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* (C) Copyright 2014
@@ -7,8 +8,6 @@
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARISTAINETOS_COMMON_CONFIG_H
#define __ARISTAINETOS_COMMON_CONFIG_H
diff --git a/include/configs/aristainetos.h b/include/configs/aristainetos.h
index a671611cd8..c53ba89838 100644
--- a/include/configs/aristainetos.h
+++ b/include/configs/aristainetos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* (C) Copyright 2014
@@ -7,8 +8,6 @@
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARISTAINETOS_CONFIG_H
#define __ARISTAINETOS_CONFIG_H
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 3584c27a61..67b2e5879c 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6DL aristainetos2 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARISTAINETOS2_CONFIG_H
#define __ARISTAINETOS2_CONFIG_H
diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
index 9befb89b37..91069a2c98 100644
--- a/include/configs/aristainetos2b.h
+++ b/include/configs/aristainetos2b.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6DL aristainetos2 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARISTAINETOS2B_CONFIG_H
#define __ARISTAINETOS2B_CONFIG_H
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index b49407a8b2..1433067e15 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the bonito board
*
* Copyright (C) 2012 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ARMADILLO_800EVA_H
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 8f0422943b..06b02ce90a 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Configuration settings for the SAMSUNG Arndale board.
*/
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index f219349ae9..be7dcecb85 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012-2020 ASPEED Technology Inc.
* Ryan Chen <ryan_chen@aspeedtech.com>
*
* Copyright 2016 IBM Corporation
* (C) Copyright 2016 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AST_COMMON_CONFIG_H
diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
index d2f4c441c8..bb6c8fe48f 100644
--- a/include/configs/aspenite.h
+++ b/include/configs/aspenite.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
* Contributor: Mahavir Jain <mjain@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ASPENITE_H
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 4a62bce40f..873154bead 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the Sentec Cobra Board.
*
* (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 8e1334284a..5af7d1d1d2 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common part of configuration settings for the AT91 SAMA5 board.
*
* Copyright (C) 2015 Atmel Corporation
* Josh Wu <josh.wu@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AT91_SAMA5_COMMON_H
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 8c27122c00..fa7e9ee241 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Andreas Bießmann <biessmann.devel@googlemail.com>
*
@@ -7,8 +8,6 @@
* Rick Bronson <rick@efn.org>
*
* Configuration settings for the AT91RM9200EK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AT91RM9200EK_CONFIG_H__
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 912abd50b3..433e4a8029 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the AT91SAM9260EK & AT91SAM9G20EK boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 6f3f2eb882..6a085dd3e9 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the AT91SAM9261EK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 7fe51c2c0b..f37ef594e5 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the AT91SAM9263EK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index d93cdafb14..25970666c8 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the AT91SAM9M10G45EK board(and AT91SAM9G45EKES).
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 90dbc0eac4..b284db36da 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Atmel Corporation.
* Josh Wu <josh.wu@atmel.com>
*
* Configuation settings for the AT91SAM9N12-EK boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __AT91SAM9N12_CONFIG_H_
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 6f8fd2a035..f805c7590f 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the AT91SAM9RLEK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 0af0127cd4..de10fadfbd 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Atmel Corporation
*
* Configuation settings for the AT91SAM9X5EK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H__
diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h
index 5f11f42e32..f044158265 100644
--- a/include/configs/axs10x.h
+++ b/include/configs/axs10x.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_AXS10X_H_
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index f9ea907e01..288bb8e425 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h
index 2062e9ac58..b8920d21ce 100644
--- a/include/configs/bcm23550_w1d.h
+++ b/include/configs/bcm23550_w1d.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BCM23550_W1D_H
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index f15b94c5fc..4b0d599dfb 100644
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BCM28155_AP_H
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h
index ed3c427961..4423e8613f 100644
--- a/include/configs/bcm_ep_board.h
+++ b/include/configs/bcm_ep_board.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BCM_EP_BOARD_H
diff --git a/include/configs/bcm_northstar2.h b/include/configs/bcm_northstar2.h
index f0eba6bd8f..5a288fc45c 100644
--- a/include/configs/bcm_northstar2.h
+++ b/include/configs/bcm_northstar2.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Broadcom NS2.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BCM_NORTHSTAR2_H
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index f16e7eb447..73629ddeb0 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 0043050b60..98cd7b6f28 100644
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_BG0900_H__
#define __CONFIGS_BG0900_H__
diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index c8631ce939..a012705870 100644
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 3ADEV <http://3adev.com>
* Written-by: Albert ARIBAUD <albert.aribaud@3adev.fr>
*
* Configuration settings for the phytec PCM-052 SoM-based BK4R1.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* Define the BK4r1-specific env commands */
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index a978f728c9..8ff82d3489 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/blanche.h
* This file is blanche board configuration.
*
* Copyright (C) 2016 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __BLANCHE_H
diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h
index 0c3f7f5285..813a14cf29 100644
--- a/include/configs/bmips_bcm3380.h
+++ b/include/configs/bmips_bcm3380.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM3380_H
diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h
index 5541cc5cf6..5cc0ebe8ba 100644
--- a/include/configs/bmips_bcm6318.h
+++ b/include/configs/bmips_bcm6318.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6318_H
diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h
index 042479b515..e244cd02f8 100644
--- a/include/configs/bmips_bcm63268.h
+++ b/include/configs/bmips_bcm63268.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM63268_H
diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h
index 2cb9b5540e..42e9215dc8 100644
--- a/include/configs/bmips_bcm6328.h
+++ b/include/configs/bmips_bcm6328.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6328_H
diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h
index 52d72c87e5..66e731c01c 100644
--- a/include/configs/bmips_bcm6338.h
+++ b/include/configs/bmips_bcm6338.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6338_H
diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h
index 6c9c33b822..3d4e219302 100644
--- a/include/configs/bmips_bcm6348.h
+++ b/include/configs/bmips_bcm6348.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6348_H
diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h
index e3113ee309..a38903e248 100644
--- a/include/configs/bmips_bcm6358.h
+++ b/include/configs/bmips_bcm6358.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6358_H
diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h
index 2f92ac1135..29518e6d6c 100644
--- a/include/configs/bmips_bcm6362.h
+++ b/include/configs/bmips_bcm6362.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6362_H
diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h
index ad8877b7d3..8f8134d32e 100644
--- a/include/configs/bmips_bcm6368.h
+++ b/include/configs/bmips_bcm6368.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_BCM6368_H
diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h
index 38bf7a272b..39ca2e0bf3 100644
--- a/include/configs/bmips_common.h
+++ b/include/configs/bmips_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BMIPS_COMMON_H
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 9e841574f7..e19c94be68 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIGS_BOSTON_H__
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 2a3a1f99d4..eb45331033 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* brtpp1.h
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BRPPT1_H__
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 09042d4451..f78a4e10a9 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* brxre1.h
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_BRXRE1_H__
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 37d6aa5f4c..bdcbee4fc1 100644
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* bur_am335x_common.h
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 2016 Hannes Schmelzer <oe5hpm@oevsv.at> -
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BUR_AM335X_COMMON_H__
diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h
index a832b2b254..0f293849ab 100644
--- a/include/configs/bur_cfg_common.h
+++ b/include/configs/bur_cfg_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* bur_cfg_common.h
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 2016 Hannes Schmelzer <oe5hpm@oevsv.at> -
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __BUR_CFG_COMMON_H__
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index d55ef3e897..ab4a9e6ddc 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011-2014 OMICRON electronics GmbH
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 1fb4d98fe8..dcb66a6f9a 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index a3ae559fef..14008440da 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (c) Copyright 2016, Data61
* Commonwealth Scientific and Industrial Research Organisation (CSIRO)
@@ -5,8 +6,6 @@
* Based on jetson-tk1.h which is:
* (C) Copyright 2013-2014
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index a0a9ec8af3..03b17840e5 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
*
* Congatec Conga-QEVAl board configuration file.
@@ -6,8 +7,6 @@
* Based on Freescale i.MX6Q Sabre Lite board configuration file.
* Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
* Leo Sartre, <lsartre@adeneo-embedded.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CGTQMX6EVAL_H
diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h
index 14da9caade..77ace93b96 100644
--- a/include/configs/cherryhill.h
+++ b/include/configs/cherryhill.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index 5a69f3c4dd..4372280d2b 100644
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Grinn - http://grinn-global.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CHILIBOARD_H
diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index be166a81ce..ee546d8f89 100644
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
* (C) Copyright 2008
* Graeme Russ, graeme.russ@gmail.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h
index 1234bff74c..ccb2fe8caa 100644
--- a/include/configs/chromebook_samus.h
+++ b/include/configs/chromebook_samus.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
* (C) Copyright 2008
* Graeme Russ, graeme.russ@gmail.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h
index 05266e8ab3..a7c2606244 100644
--- a/include/configs/chromebox_panther.h
+++ b/include/configs/chromebox_panther.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 9c70cf0b37..58bf0a6aa4 100644
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for CompuLab CL-SOM-AM57x board
*
* (C) Copyright 2016 CompuLab, Ltd. http://compulab.co.il/
*
* Author: Dmitry Lifshitz <lifshitz@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CL_SOM_AM57X_H
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 73a701a383..faea6c6b93 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 CompuLab, Ltd.
*
* Configuration settings for the CompuLab CL-SOM-iMX7 System-on-Module.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CL_SOM_IMX7_CONFIG_H
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 059c302173..86f2bd9fb2 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_CLEARFOG_H
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 787025bfa8..5bdc76dceb 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Config file for Compulab CM-FX6 board
*
* Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
*
* Author: Nikita Kiryanov <nikita@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CM_FX6_H
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index aa54e55352..282b0747e1 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Config file for Compulab CM-T335 board
*
* Copyright (C) 2013, Compulab Ltd - http://compulab.co.il/
*
* Author: Ilya Ledvich <ilya@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CM_T335_H
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index e464e40772..e1bb24c00c 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 CompuLab, Ltd.
* Mike Rapoport <mike@compulab.co.il>
@@ -10,8 +11,6 @@
* Syed Mohammed Khasim <x0khasim@ti.com>
*
* Configuration settings for the CompuLab CM-T35 and CM-T3730 boards
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h
index a57715e77c..5c45c00a3d 100644
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 CompuLab, Ltd.
* Author: Igor Grinberg <grinberg@compulab.co.il>
*
* Configuration settings for the CompuLab CM-T3517 board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index a118f0ee36..fdaf68c6fd 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* cm_t43.h
*
* Copyright (C) 2015 Compulab, Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CM_T43_H
diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
index 6123cd374d..3787cdc9d4 100644
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Config file for Compulab CM-T54 board
*
* Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
*
* Author: Dmitry Lifshitz <lifshitz@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_CM_T54_H
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index ee870f916f..24a3d1b76c 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Sentec Cobra Board.
*
* (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* ---
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 0c372c5e00..49ec0bf108 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013-2015 Toradex, Inc.
*
* Configuration settings for the Toradex Colibri iMX6
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index daa085966b..b0389794bd 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Toradex AG
*
@@ -5,8 +6,6 @@
*
* based on mx7dsabresd.h:
* Copyright (C) 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __COLIBRI_IMX7_CONFIG_H
diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index f5f648d7aa..61256e233b 100644
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Toradex Colibri PXA270 configuration file
*
* Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
* Copyright (C) 2015-2016 Marcel Ziswiler <marcel@ziswiler.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 4bd825eedb..49d6263672 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Lucas Stach
*
* Configuration settings for the Toradex Colibri T20 modules.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 3ec91d6b9c..908b3bde3e 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013-2016 Stefan Agner
*
* Configuration settings for the Toradex Colibri T30 modules.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 4d55c0119a..a7b647c6a2 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Toradex, Inc.
*
@@ -5,8 +6,6 @@
*
* Based on vf610twr.h:
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h
index b008682d85..a5eb3aea19 100644
--- a/include/configs/comtrend_ar5315u.h
+++ b/include/configs/comtrend_ar5315u.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h
index 790cb245dd..71c5ba45be 100644
--- a/include/configs/comtrend_ar5387un.h
+++ b/include/configs/comtrend_ar5387un.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h
index 7923e63f8f..565141cf33 100644
--- a/include/configs/comtrend_ct5361.h
+++ b/include/configs/comtrend_ct5361.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h
index 152faa9525..e183288c5d 100644
--- a/include/configs/comtrend_vr3032u.h
+++ b/include/configs/comtrend_vr3032u.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h
index addd75e891..811672b598 100644
--- a/include/configs/comtrend_wap5813n.h
+++ b/include/configs/comtrend_wap5813n.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 4bf3dc5c4c..94aa2736ab 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 89e5730191..da0cc78738 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
* Copyright (C) 2016 Mario Six <mario.six@gdsys.cc>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_CONTROLCENTERDC_H
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 2f3c4978ef..7551273dea 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 2c6a1bf665..61b014638e 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common board functions for siemens AT91SAM9G45 based boards
* (C) Copyright 2013 Siemens AG
@@ -7,8 +8,6 @@
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index 66e8006c94..8070af780a 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 4181c068ed..75f677fe6d 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index f0844a47ed..6ce2bc0042 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Based on corenet_ds.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index ce27a88642..d2cd440311 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
*
* Based on davinci_dvevm.h. Original Copyrights follow:
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h
index 89aa3ef5ea..9a8b5a7357 100644
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index a0eab2dcae..c9d8282212 100644
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DB_88F6720_H
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index cc54efec99..6056cb8fed 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DB_88F6820_AMC_H
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 8ea039efc2..c37182dd30 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DB_88F6820_GP_H
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index f69d997c11..567a4a7b94 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014-2015 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DB_MV7846MP_GP_H
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index f00111a8c4..82860bbaa8 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 23841e0cad..d12f37150b 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Embest/Timll DevKit3250 board configuration file
*
* Copyright (C) 2011-2015 Vladimir Zapolskiy <vz@mleia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_DEVKIT3250_H__
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 4edef66be6..748e456c39 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006-2008
* Texas Instruments.
@@ -8,8 +9,6 @@
* Frederik Kriewitz <frederik@kriewitz.eu>
*
* Configuration settings for the DevKit8000 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 3901fb672b..f7bad8e1e9 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 9fce261d2e..24b35161b6 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* DHCOM DH-iMX6 PDK board configuration
*
* Copyright (C) 2017 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DH_IMX6_CONFIG_H
diff --git a/include/configs/display5.h b/include/configs/display5.h
index cda03d9f9b..cff689420e 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index cb0d2413f9..5b78785ee2 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011
* Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
@@ -6,8 +7,6 @@
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DNS325_H
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 72386a671e..896bca2f98 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Eric C. Cooper <ecc@cmu.edu>
*
@@ -5,8 +6,6 @@
* Prafulla Wadaskar <prafulla@marvell.com>
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DOCKSTAR_H
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 917a05d701..339f4f5939 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Texas Instruments Incorporated.
@@ -5,8 +6,6 @@
*
* Configuration settings for the TI DRA7XX board.
* See ti_omap5_common.h for omap5 common settings.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_DRA7XX_EVM_H
diff --git a/include/configs/draak.h b/include/configs/draak.h
index a5c2210cc9..e0a5344fbe 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/configs/draak.h
* This file is Draak board configuration.
*
* Copyright (C) 2015 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DRAAK_H
diff --git a/include/configs/draco.h b/include/configs/draco.h
index 02e935e649..7b2794826f 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Siemens Schweiz AG
* (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_DRACO_H
diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index 85ed72c40e..86fa735470 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Board configuration file for Dragonboard 410C
*
* (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_DRAGONBOARD410C_H
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index d62c0321b0..12ae6bc884 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Board configuration file for Dragonboard 410C
*
* (C) Copyright 2017 Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_DRAGONBOARD820C_H
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index c0f5b31550..1c94bf9fa1 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Jason Cooper <u-boot@lakedaemon.net>
@@ -5,8 +6,6 @@
* Based on work by:
* Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DREAMPLUG_H
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index 0040fbb427..c06f0058de 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Jason Cooper <u-boot@lakedaemon.net>
@@ -5,8 +6,6 @@
* Based on work by:
* Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DS109_H
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 1ac6ccad25..0c23657ea9 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_SYNOLOGY_DS414_H
diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index 1fecac2bc8..dccb369991 100644
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright: 2013
* Gumstix, Inc - http://www.gumstix.com
@@ -5,8 +6,6 @@
*
* Configuration settings for the Gumstix DuoVero board.
* See omap4_common.h for OMAP4 common part
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_DUOVERO_H
diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index c610981dc6..dd7a01290a 100644
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2015
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _E2220_1170_H
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 7d8dd09eb7..c84cd962d7 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
*
* Based on davinci_dvevm.h. Original Copyrights follow:
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/eagle.h b/include/configs/eagle.h
index b570ef9115..f0e4bcaa29 100644
--- a/include/configs/eagle.h
+++ b/include/configs/eagle.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/configs/eagle.h
* This file is Eagle board configuration.
*
* Copyright (C) 2015 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EAGLE_H
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index d79cbf7791..d8e647ec96 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the BuS EB+CPU5283 boards (aka EB+MCF-EV123)
*
* (C) Copyright 2005-2009 BuS Elektronik GmbH & Co.KG <esw@bus-elektonik.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_EB_CPU5282_H_
diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h
index 16382f6f26..182066d4d4 100644
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 8D Technologies inc.
* Based on mt_ventoux.h, original banner below:
@@ -6,8 +7,6 @@
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
* Copyright (C) 2009 TechNexion Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 35eaec6a46..e99564dbdf 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Solutions ECOVEC board
*
* Copyright (C) 2009 - 2011 Renesas Solutions Corp.
* Copyright (C) 2009 Kuninori Morimoto <morimoto.kuninori@renesas.com>
* Copyright (C) 2010, 2011 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ECOVEC_H
diff --git a/include/configs/edison.h b/include/configs/edison.h
index 3233f6653c..93ab900f11 100644
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Intel Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 6a92e7fde8..a1731d653b 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Albert ARIBAUD <albert.u.boot@aribaud.net>
*
@@ -5,8 +6,6 @@
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_EDMINIV2_H
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
index b027615139..33418cfbec 100644
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 9c145200a2..f5e92d6718 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
*
* Configuration settings for the E+L i.MX6Q DO82 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EL6Q_COMMON_CONFIG_H
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 5a9c48f8d0..03926bcef6 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Eukréa Electromatique
* Author: Eric Bénard <eric@eukrea.com>
@@ -6,8 +7,6 @@
*
* based on mx6*sabre*.h which are :
* Copyright (C) 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RIOTBOARD_CONFIG_H
diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h
index 7fd1f5add6..977ff45ff0 100644
--- a/include/configs/espresso7420.h
+++ b/include/configs/espresso7420.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the SAMSUNG ESPRESSO7420 board.
* Copyright (C) 2016 Samsung Electronics
* Thomas Abraham <thomas.ab@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ESPRESSO7420_H
diff --git a/include/configs/espt.h b/include/configs/espt.h
index ba90dcc2c3..978a9e006b 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the ESPT-GIGA board
*
* Copyright (C) 2008 Renesas Solutions Corp.
* Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ESPT_H
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index a605f8d73e..a13be398d5 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Siemens Schweiz AG
* (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ETAMIN_H
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index e93d0a12eb..ca5c65fe5a 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* egnite GmbH <info@egnite.de>
*
* Configuation settings for Ethernut 5 with AT91SAM9XE.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
index 552cd366bc..e4b07e3bd6 100644
--- a/include/configs/evb_ast2500.h
+++ b/include/configs/evb_ast2500.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012-2020 ASPEED Technology Inc.
* Ryan Chen <ryan_chen@aspeedtech.com>
*
* Copyright 2016 Google Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/evb_px5.h b/include/configs/evb_px5.h
index 4160187d50..e67bee1721 100644
--- a/include/configs/evb_px5.h
+++ b/include/configs/evb_px5.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_PX5_EVB_H
diff --git a/include/configs/evb_rk3036.h b/include/configs/evb_rk3036.h
index aa07889ff2..b03612cfcf 100644
--- a/include/configs/evb_rk3036.h
+++ b/include/configs/evb_rk3036.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/evb_rk3128.h b/include/configs/evb_rk3128.h
index a34153aac5..73ceab0373 100644
--- a/include/configs/evb_rk3128.h
+++ b/include/configs/evb_rk3128.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EVB_RK3128_H
diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h
index ae981f7610..369b0bc68a 100644
--- a/include/configs/evb_rk3229.h
+++ b/include/configs/evb_rk3229.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h
index 15a374cca7..ddd7012c8f 100644
--- a/include/configs/evb_rk3288.h
+++ b/include/configs/evb_rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h
index 93b18b8c46..ed5888bfd3 100644
--- a/include/configs/evb_rk3328.h
+++ b/include/configs/evb_rk3328.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EVB_RK3328_H
diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h
index 66ead6c117..a99eeab484 100644
--- a/include/configs/evb_rk3399.h
+++ b/include/configs/evb_rk3399.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EVB_RK3399_H
diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h
index ff3531b321..34739c7474 100644
--- a/include/configs/evb_rv1108.h
+++ b/include/configs/evb_rv1108.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index ec46754116..f3f194ff7a 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Common configuration settings for the SAMSUNG EXYNOS boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EXYNOS_COMMON_H
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 996dbed99d..005f65d4ed 100644
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Samsung Electronics
*
* Configuration settings for the SAMSUNG EXYNOS5 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_EXYNOS4_COMMON_H
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 57101b671d..a7621fc701 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Configuration settings for the SAMSUNG EXYNOS5 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_EXYNOS5_COMMON_H
diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index 11aa6b8a9a..696f009de9 100644
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Google, Inc
*
* Configuration settings for generic Exynos 5 board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_EXYNOS5_DT_COMMON_H
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index cc6f7328ff..eaf40a0e7d 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
*
* Configuration settings for the SAMSUNG EXYNOS5250 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_5250_H
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index e13092515a..3738c78d25 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Configuration settings for the SAMSUNG EXYNOS5420 SoC
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_EXYNOS5420_H
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index 4e104718be..2885cd7092 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the Espresso7420 board.
* Copyright (C) 2016 Samsung Electronics
* Thomas Abraham <thomas.ab@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_EXYNOS7420_COMMON_H
diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h
index 15a374cca7..ddd7012c8f 100644
--- a/include/configs/fennec_rk3288.h
+++ b/include/configs/fennec_rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index 2b0ac9ec5f..9e4a66902b 100644
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 6ca69fb996..cda5f4d6eb 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011, Stefano Babic <sbabic@denx.de>
*
@@ -6,8 +7,6 @@
* Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
*
* Configuration for the flea3 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index cf798d07e7..507d08cb11 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 44c92f9d48..32631a20c3 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Timesys Corporation
* Copyright (C) 2015 General Electric Company
@@ -5,8 +6,6 @@
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the GE MX6Q Bx50v3 boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __GE_BX50V3_CONFIG_H
diff --git a/include/configs/geekbox.h b/include/configs/geekbox.h
index bb2ef9a31b..91f4feb737 100644
--- a/include/configs/geekbox.h
+++ b/include/configs/geekbox.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Andreas Färber
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_GEEKBOX_H
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 0dc8ed143e..1d9fe29f9e 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Suriyan Ramasami <suriyan.r@gmail.com>
*
@@ -8,8 +9,6 @@
* Prafulla Wadaskar <prafulla@marvell.com>
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_GOFLEXHOME_H
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 3c5c00ae6b..00523d2fc4 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/gose.h
*
* Copyright (C) 2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __GOSE_H
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index fd26fef7b9..4a6da951c8 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* eInfochips Ltd. <www.einfochips.com>
@@ -8,8 +9,6 @@
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
* Contributor: Mahavir Jain <mjain@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_GPLUGD_H
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index dcb2a698f8..d59cddb002 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2014
* Gerald Kerma <dreagle@doukki.net>
* Marvell Semiconductor <www.marvell.com>
* Written-by: Siddarth Gore <gores@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_GURUPLUG_H
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index a470bd8f4c..b8eefe3b11 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Gateworks Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index a657db956b..69100d3d2a 100644
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* iPAQ h2200 board configuration
*
* Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 9a0b1aff24..3ec9e87fb0 100644
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 038ffcd999..4d2f1f0aa8 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 6f5b50f764..c451f63cfb 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Linaro
*
@@ -5,8 +6,6 @@
*
* Configuration for HiKey 96boards CE. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __HIKEY_H
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index d6761ddad1..941684425f 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h
index f476f5bed7..3684f4d6d6 100644
--- a/include/configs/hsdk.h
+++ b/include/configs/hsdk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_HSDK_H_
diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h
index f994219009..0a33220ea7 100644
--- a/include/configs/huawei_hg556a.h
+++ b/include/configs/huawei_hg556a.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 57f56b5bc2..5f071d02b7 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011-2012
* Gerald Kerma <dreagle@doukki.net>
* Luka Perkov <luka@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_IB62x0_H
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index d528d3f0d4..66131cca62 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2012
* Wojciech Dubowik <wojciech.dubowik@neratec.com>
* Luka Perkov <luka@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_ICONNECT_H
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 835789528d..020d29072f 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -5,8 +6,6 @@
* Based on:
* Copyright (c) 2011 IDS GmbH, Germany
* Sergej Stepanov <ste@ids.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h
index 75bb98c3d3..29b23fa40e 100644
--- a/include/configs/imgtec_xilfpga.h
+++ b/include/configs/imgtec_xilfpga.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016, Imagination Technologies Ltd.
*
* Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Imagination Technologies Ltd. MIPSfpga
*/
diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index ad9aca4cf3..7cf5e0bd70 100644
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Heiko Schocher <hs@denx.de>
*
* based on:
* Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMX27LITE_COMMON_CONFIG_H
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 86604d6706..28c982a528 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Amarula Solutions B.V.
* Copyright (C) 2016 Engicam S.r.l.
*
* Configuration settings for the Engicam i.MX6 SOM Starter Kits.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMX6_ENGICAM_CONFIG_H
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index bfc9b33e8c..0226510b2e 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Logic PD, Inc.
*
* Configuration settings for the LogicPD i.MX6 SOM.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMX6LOGIC_CONFIG_H
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 5a062260fe..720ff045a7 100644
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Gateworks Corporation
* Author: Tim Harvey <tharvey@gateworks.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMX6_SPL_CONFIG_H
#define __IMX6_SPL_CONFIG_H
diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h
index 2495486c09..1eb6cd894d 100644
--- a/include/configs/imx7_spl.h
+++ b/include/configs/imx7_spl.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* SPL definitions for the i.MX7 SPL
*
* (C) Copyright 2017 CompuLab, Ltd. http://www.compulab.com
*
* Author: Uri Mashiach <uri.mashiach@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMX7_SPL_CONFIG_H
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index cf74052d70..811384ebbe 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Linaro
* Linus Walleij <linus.walleij@linaro.org>
* Common ARM Integrator configuration settings
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#define CONFIG_SYS_MEMTEST_START 0x100000
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 4669f39fc4..4a9c60d758 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Texas Instruments.
@@ -8,8 +9,6 @@
* ARM Ltd.
* Philippe Robin, <philippe.robin@arm.com>
* Configuration for Integrator AP board.
- *.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index b1f98ee050..56931b78a6 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Texas Instruments.
@@ -8,8 +9,6 @@
* ARM Ltd.
* Philippe Robin, <philippe.robin@arm.com>
* Configuration for Compact Integrator board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 28e5d53951..faf21ddb08 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
* Based on:
@@ -8,8 +9,6 @@
* Based on davinci_dvevm.h. Original Copyrights follow:
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index f7836c83b0..93fcdd6bcc 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2013-2014
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index a438a1a429..2c0e4cbe92 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2e-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2E_EVM_H
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index b14f6c5422..90f9a9922c 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2g-evm
*
* (C) Copyright 2015
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2G_EVM_H
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index dc0ac7d8bc..0b909a1bf6 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2hk-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2HK_EVM_H
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 87639dff58..59e6b09673 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration header file for TI's k2l-evm
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_K2L_EVM_H
diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index b7d510e6b0..56a4b84ef8 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Amazon Kindle Fire (first generation) codename kc1 config
*
* Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/khadas-vim.h b/include/configs/khadas-vim.h
index f44b388b32..db65f71d43 100644
--- a/include/configs/khadas-vim.h
+++ b/include/configs/khadas-vim.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Khadas VIM
*
* Copyright (C) 2017 Baylibre, SAS
* Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index cf3fc438df..92511193f6 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008-2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KEYMILE_H
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index c4d4b0c0fa..3b45e27bf5 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KEYMILE_POWERPC_H
diff --git a/include/configs/km/km8309-common.h b/include/configs/km/km8309-common.h
index f9fed79127..0e0b1b4605 100644
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Keymile AG
* Gerlando Falauto <gerlando.falauto@keymile.com>
*
* Based on km8321-common.h, see respective copyright notice for credits
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KM8309_COMMON_H
diff --git a/include/configs/km/km8321-common.h b/include/configs/km/km8321-common.h
index 5bc546c23d..41b3ba2842 100644
--- a/include/configs/km/km8321-common.h
+++ b/include/configs/km/km8321-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
@@ -16,8 +17,6 @@
*
* (C) Copyright 2010-2011
* Thomas Reufer, KEYMILE Ltd, thomas.reufer@keymile.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KM8321_COMMON_H
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index f31506238e..330c252f7d 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KM83XX_H
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index c6761921c7..9245d32ba9 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
@@ -8,8 +9,6 @@
*
* (C) Copyright 2010-2011
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 05a4e86511..04371f94f8 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Keymile AG
* Valentin Longchamp <valentin.longchamp@keymile.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_KMP204X_H
diff --git a/include/configs/km8360.h b/include/configs/km8360.h
index 280da9d6cc..feb8a9a16d 100644
--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Holger Brunck, Keymile GmbH Hannover, <holger.brunck@keymile.com>
* Christian Herzig, Keymile AG Switzerland, <christian.herzig@keymile.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index 15e4b46625..e7b12d0dca 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
@@ -9,8 +10,6 @@
* (C) Copyright 2011-2012
* Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com
* Valentin Longchamp, Keymile AG, valentin.longchamp@keymile.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h
index 37a33e5ae0..c50026d71e 100644
--- a/include/configs/kmp204x.h
+++ b/include/configs/kmp204x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Keymile AG
* Valentin Longchamp <valentin.longchamp@keymile.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 41cab6d0ef..e5e667ce33 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/koelsch.h
*
* Copyright (C) 2013 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __KOELSCH_H
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index fae2faec2f..d243fc675f 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* K+P iMX6Q KP_IMX6Q_TPC board configuration
*
* Copyright (C) 2018 Lukasz Majewski <lukma@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __KP_IMX6Q_TPC_IMX6_CONFIG_H_
diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index d2d630d610..1ef7633633 100644
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index dc05db1baf..016c2fd9ea 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* Copyright (C) 2012 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __KZM9G_H
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 41b41077e2..ac9ac4aeaa 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Simon Guinot <sguinot@lacie.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_LACIE_KW_H
diff --git a/include/configs/lager.h b/include/configs/lager.h
index d5d76c2404..ebcd179ffd 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/lager.h
* This file is lager board configuration.
*
* Copyright (C) 2013, 2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __LAGER_H
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 0431d05a4b..542b8f072c 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 David Lechner <david@lechnology.com>
*
@@ -8,8 +9,6 @@
* Based on davinci_dvevm.h. Original Copyrights follow:
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/libretech-cc.h b/include/configs/libretech-cc.h
index 08dfb30de0..dc778dc66a 100644
--- a/include/configs/libretech-cc.h
+++ b/include/configs/libretech-cc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for LibreTech CC
*
* Copyright (C) 2017 Baylibre, SAS
* Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/lion_rk3368.h b/include/configs/lion_rk3368.h
index c40dbadc15..b9c6bf8954 100644
--- a/include/configs/lion_rk3368.h
+++ b/include/configs/lion_rk3368.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_LION_RK3368_H
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 1e1fb77076..6af8e70be6 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
* Copyright (C) 2016 Grinn
*
* Configuration settings for the Grinn liteBoard (i.MX6UL).
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LITEBOARD_CONFIG_H
#define __LITEBOARD_CONFIG_H
diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index 9a28fd27eb..d6baf166e4 100644
--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1012A2G5RDB_H__
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 35ecb3ce56..787adbc382 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1012A_COMMON_H
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 6bb6927039..73ac162ffb 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1012ARDB_H__
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 3829f1ad28..d508bf9055 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1012AQDS_H__
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index e24d261d88..24980f8bbf 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1012ARDB_H__
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index dc1206f012..0c900eb134 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index d0924109d5..0b4a6a47f4 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index c11f454b20..cf23c33d85 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 5ab29a14db..1faed4e69a 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1043A_COMMON_H
diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 43be0cd7f9..f4a0cc070e 100644
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1043AQDS_H__
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 06e24502a5..9b24056985 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1043ARDB_H__
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 2851c84b02..c687c9ec64 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1046A_COMMON_H
diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 39b52ddccb..e873682766 100644
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1046AQDS_H__
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index d63badf3b1..2d45bbcd4d 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1046ARDB_H__
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 814760ebe9..0df90161d7 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1088_COMMON_H
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 88c58163fe..d2c80fc3b6 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1088A_QDS_H
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index c92cb72601..4459994eb4 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS1088A_RDB_H
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h
index 258a6f1a04..f1717ce579 100644
--- a/include/configs/ls2080a_common.h
+++ b/include/configs/ls2080a_common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS2_COMMON_H
diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h
index c2fdc4daf6..76ac5363c5 100644
--- a/include/configs/ls2080a_emu.h
+++ b/include/configs/ls2080a_emu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS2_EMU_H
diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index d4da91fcfe..f44b9e49c1 100644
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS2_SIMU_H
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 213a5a5b91..81a092b0db 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
* Copyright 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS2_QDS_H
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 012c24f88e..73a405f8d9 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
* Copyright 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LS2_RDB_H
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 624356afd3..8d1f0aac1d 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 Michael Walle
* Michael Walle <michael@walle.cc>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_LSXL_H
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 9c4d01e1d1..bb1d6b4f5d 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_M28EVK_H__
#define __CONFIGS_M28EVK_H__
diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 0ef9929b88..9eaafc538c 100644
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Aries M53 configuration
* Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __M53EVK_CONFIG_H__
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 1781db8cb5..5e3d6e80a8 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Aries MA5D4 configuration
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MA5D4EVK_CONFIG_H__
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 17951bf75b..363a2a6494 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _MALTA_CONFIG_H
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 0f97b4c1e0..565a4c18ac 100644
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_DB_MV7846MP_GP_H
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 0aa797aa60..bd61471799 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016-2017
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 27098eca73..a6fdb1c11d 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Ilya Yanok, Emcraft Systems
*
* Based on omap3_evm_config.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 2efdc52ac5..b290df5891 100644
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
* (C) Copyright 2011-2012
* Avionic Design GmbH <www.avionic-design.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index 6914f0eb88..004b2b3330 100644
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
@@ -8,8 +9,6 @@
* esd electronic system design gmbh <www.esd.eu>
*
* Configuation settings for the esd MEESC board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 5794bc0d7a..068e36e8d5 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Amlogic Meson GXBB SoCs
* (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MESON_GXBB_COMMON_CONFIG_H
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index fbf09025f3..966feeeafd 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2010 Michal Simek
*
* Michal SIMEK <monstr@monstr.eu>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 5b1660cb5b..459eae820a 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h
index 0c43a2343d..c9691a0392 100644
--- a/include/configs/miqi_rk3288.h
+++ b/include/configs/miqi_rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 2b7b600cf7..e978734bab 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009-2010 Freescale Semiconductor, Inc.
* Copyright (C) 2010 Ilya Yanok, Emcraft Systems, yanok@emcraft.com
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index f1600b2a3b..c6023a1e1b 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for MPR2
*
* Copyright (C) 2008
* Mark Jonas <mark.jonas@de.bosch.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MPR2_H
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 8a1a7ee208..e7179705c9 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Hitachi Solution Engine 7720
*
* Copyright (C) 2007 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MS7720SE_H
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 687f8ff1ef..12327641fb 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Hitachi Solution Engine 7722
*
* Copyright (C) 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MS7722SE_H
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index c70191a4fd..b2cb6bab7c 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Hitachi Solution Engine 7750
*
* Copyright (C) 2007 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MS7750SE_H
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 3810fd948f..3b11cc0e50 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
@@ -6,8 +7,6 @@
* Configuration settings for the Teejet mt_ventoux board.
*
* Copyright (C) 2009 TechNexion Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 62a303c492..fa9b5bcf3a 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
index f6ac035549..df686dbe4f 100644
--- a/include/configs/mv-plug-common.h
+++ b/include/configs/mv-plug-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2015
* Marvell Semiconductor <www.marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_MARVELL_PLUG_H
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index f4647b0b03..621b3722d6 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_MVEBU_ARMADA_37XX_H
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 44ec7025fb..9205bd9632 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_MVEBU_ARMADA_8K_H
diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h
index bca62efd57..abebda4292 100644
--- a/include/configs/mx23_olinuxino.h
+++ b/include/configs/mx23_olinuxino.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_MX23_OLINUXINO_H__
#define __CONFIGS_MX23_OLINUXINO_H__
diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h
index 16723968f0..b7ac9c2534 100644
--- a/include/configs/mx23evk.h
+++ b/include/configs/mx23evk.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale i.MX23 EVK board config
*
* Copyright (C) 2013 Otavio Salvador <otavio@ossystems.com.br>
* on behalf of O.S. Systems Software LTDA.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_MX23EVK_H__
#define __CONFIGS_MX23EVK_H__
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index a929d9f731..166f3d1861 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 79d4c9b2ce..f373b1e24e 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Freescale Semiconductor, Inc.
* Author: Fabio Estevam <fabio.estevam@freescale.com>
@@ -5,8 +6,6 @@
* Based on m28evk.h:
* Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_MX28EVK_H__
#define __CONFIGS_MX28EVK_H__
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 899f477ca9..583892fed2 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008 Magnus Lilja <lilja.magnus@gmail.com>
*
@@ -7,8 +8,6 @@
* Kshitij Gupta <kshitij@ti.com>
*
* Configuration settings for the Freescale i.MX31 PDK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 3aefe5b862..ad5fe82dfc 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010, Stefano Babic <sbabic@denx.de>
*
@@ -6,8 +7,6 @@
* Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
*
* Configuration for the MX35pdk Freescale board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 173cb5c48f..7cccca018a 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2007, Guennadi Liakhovetski <lg@denx.de>
*
* (C) Copyright 2009 Freescale Semiconductor, Inc.
*
* Configuration settings for the MX51EVK Board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 733f59cdad..d15a4cab3c 100644
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Freescale Semiconductor, Inc.
*
* Configuration settings for the MX53ARD Freescale board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 091443933c..5752bf1790 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Beckhoff Automation GmbH & Co. KG
* Patrick Bruenn <p.bruenn@beckhoff.com>
@@ -6,8 +7,6 @@
*
* Based on Freescale's Linux i.MX mx53loco.h file:
* Copyright (C) 2010-2011 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 087fc5f3e0..3bfba35afc 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Freescale Semiconductor, Inc.
*
* Configuration settings for the MX53-EVK Freescale board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index b96483b2b4..0c74e563a0 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Freescale Semiconductor, Inc.
* Jason Liu <r64343@freescale.com>
*
* Configuration settings for Freescale MX53 low cost board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index e2ce79671d..d8a724c71a 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Freescale Semiconductor, Inc.
* Jason Liu <r64343@freescale.com>
*
* Configuration settings for Freescale MX53 low cost board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 0a3578f27c..0887fe7d61 100644
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Freescale Semiconductor, Inc.
*
* Configuration settings for the MX53SMD Freescale board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index fadadb3d1b..a8182b3434 100644
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __MX6_COMMON_H
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 9fbd162d8f..6e21377698 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
*
* Configuration settings for the SolidRun mx6 based boards
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6CUBOXI_CONFIG_H
#define __MX6CUBOXI_CONFIG_H
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index 5325ec1310..fea0cada2a 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010-2018 Freescale Semiconductor, Inc.
*
* Configuration settings for the virtual mx6memcal board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 610d643712..7664b22476 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q Armadillo2 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 6f970a41ef..99ecc412a6 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6QSABRE_COMMON_CONFIG_H
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index bba15a7943..143e9ed5ee 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreAuto board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6SABREAUTO_CONFIG_H
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 8c06512dc7..555942a2c2 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6Q SabreSD board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6SABRESD_CONFIG_H
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index aa2952084a..4eac330a5c 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6SL EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index 0cf34c477b..4d095361e0 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013-2016 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6SL EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 06e416bb59..4510ebfe36 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6SX Sabreauto board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 713ebf6ac1..f5ca2fcf04 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6SX Sabresd board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 733538f2ee..31305aab1b 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6UL_14X14_EVK_CONFIG_H
#define __MX6UL_14X14_EVK_CONFIG_H
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index cf9f8abedf..10d0969ac3 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX6ULLEVK_CONFIG_H
#define __MX6ULLEVK_CONFIG_H
diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 3544ffc516..da5a92502b 100644
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX7.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX7_COMMON_H
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 3a9eaf9f4c..87d2b52ef1 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX7D SABRESD board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX7D_SABRESD_CONFIG_H
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 3dcda9ea77..9f8c0641d0 100644
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale i.MX7ULP EVK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MX7ULP_EVK_CONFIG_H
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 99cf4d8e75..b9449a4a40 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Evgeni Dobrev <evgeni@studio-punkt.com>
*
@@ -5,8 +6,6 @@
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_NAS220_H
diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h
index 86d983eaad..d541e9cee8 100644
--- a/include/configs/netgear_cg3100d.h
+++ b/include/configs/netgear_cg3100d.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/netgear_dgnd3700v2.h b/include/configs/netgear_dgnd3700v2.h
index 0c3823b143..9edaec9bff 100644
--- a/include/configs/netgear_dgnd3700v2.h
+++ b/include/configs/netgear_dgnd3700v2.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 7d2cf0bd8c..5ed88d2654 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
*
* Configuration settings for the Boundary Devices Nitrogen6X
* and Freescale i.MX6Q Sabre Lite boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 3cf78d415c..70bb5b6c2d 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011-2012
* Pali Rohár <pali.rohar@gmail.com>
@@ -12,8 +13,6 @@
* Syed Mohammed Khasim <x0khasim@ti.com>
*
* Configuration settings for the Nokia RX-51 aka N900.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 121d339a16..81f7d471aa 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the Novena U-Boot.
*
* Copyright (C) 2014 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 35cb5b057c..4c320522d2 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015
* Gerald Kerma <dreagle@doukki.net>
* Tony Dinh <mibodhi@gmail.com>
* Luka Perkov <luka.perkov@sartura.hr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_NSA310S_H
diff --git a/include/configs/nsim.h b/include/configs/nsim.h
index 58d3e5f7de..0f22606fee 100644
--- a/include/configs/nsim.h
+++ b/include/configs/nsim.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_NSIM_H_
diff --git a/include/configs/nx25-ae250.h b/include/configs/nx25-ae250.h
index 0e4c431cab..930cdbd4e4 100644
--- a/include/configs/nx25-ae250.h
+++ b/include/configs/nx25-ae250.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Andes Technology Corporation
* Rick Chen, Andes Technology Corporation <rick@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index ddc36df4cd..dd76829e91 100644
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h
index ff30a8ab6b..a8ad21edf6 100644
--- a/include/configs/odroid-c2.h
+++ b/include/configs/odroid-c2.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for ODROID-C2
* (C) Copyright 2016 Beniamino Galvani <b.galvani@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 8faa7a33fc..92811cfc54 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Samsung Electronics
* Sanghee Kim <sh0130.kim@samsung.com>
@@ -5,8 +6,6 @@
* Przemyslaw Marczak <p.marczak@samsung.com>
*
* Configuation settings for the Odroid-U3 (EXYNOS4412) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ODROID_U3_H
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 53edd23bdb..9898c42b8e 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
* Hyungwon Hwang <human.hwang@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ODROID_XU3_H
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 85b83521e7..bbc860dfc0 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006-2008
* Texas Instruments.
@@ -5,8 +6,6 @@
* Syed Mohammed Khasim <x0khasim@ti.com>
*
* Configuration settings for the TI OMAP3530 Beagle board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 1fa02a5281..5081f3200e 100644
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the QUIPOS Cairo board.
*
@@ -13,8 +14,6 @@
* Syed Mohammed Khasim <khasim@ti.com>
*
* Also derived from include/configs/omap3_beagle.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __OMAP3_CAIRO_CONFIG_H
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 048c8307a4..41c0579567 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the TI OMAP3 EVM board.
*
@@ -10,8 +11,6 @@
* Syed Mohammed Khasim <khasim@ti.com>
*
* Manikandan Pillai <mani.pillai@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index e2a7f63e4f..0ea1490819 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common configuration settings for IGEP technology based boards
*
* (C) Copyright 2012
* ISEE 2007 SL, <www.iseebcn.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IGEP00X0_H
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 162b05d505..cde61f2fd7 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Logic Product Development <www.logicpd.com>
* Peter Barada <peter.barada@logicpd.com>
*
* Configuration settings for the Logic OMAP35x/DM37x SOM LV/Torpedo
* reference boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 55190a5368..666ec47284 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the Gumstix Overo board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index ce4863c6f7..c4e99e08b1 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008-2010
* Gražvydas Ignotas <notasas@gmail.com>
*
* Configuration settings for the OMAP3 Pandora.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 6d3cd3f4ff..c62b373de3 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006-2008
* Texas Instruments.
@@ -6,8 +7,6 @@
* Nishanth Menon <nm@ti.com>
*
* Configuration settings for the TI OMAP3430 Zoom MDK board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 8cded9996e..835b7c299e 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Texas Instruments Incorporated.
@@ -5,8 +6,6 @@
*
* Configuration settings for the TI OMAP4 Panda board.
* See ti_omap4_common.h for OMAP4 common part
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PANDA_H
diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index c7f7131cbc..1a0f9cace0 100644
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Texas Instruments Incorporated.
@@ -6,8 +7,6 @@
*
* Configuration settings for the TI SDP4430 board.
* See ti_omap4_common.h for OMAP4 common part
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SDP4430_H
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 266dac91a2..23dc0893f9 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Texas Instruments Incorporated.
@@ -5,8 +6,6 @@
*
* Configuration settings for the TI EVM5430 board.
* See ti_omap5_common.h for omap5 common settings.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_OMAP5_EVM_H
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 7bdc33df62..58624ec581 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
*
* Based on davinci_dvevm.h. Original Copyrights follow:
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 0165d9cf0e..dfdad56dcc 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Net Insight <www.netinsight.net>
@@ -7,8 +8,6 @@
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_OPENRD_H
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 9e853f3d84..b634d9eb03 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Armadeus Systems
*
* Configuration settings for the OPOS6ULDev board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __OPOS6ULDEV_CONFIG_H
diff --git a/include/configs/origen.h b/include/configs/origen.h
index 27191381f8..65e1c7c0c7 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electronics
*
* Configuration settings for the SAMSUNG ORIGEN (EXYNOS4210) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ORIGEN_H
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index ffd5bcd611..a4be49707b 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
* Copyright (C) 2014 Bachmann electronic GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a9752ad7f6..115ad7ff7a 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 623b238d4c..32b5c62985 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/p212.h b/include/configs/p212.h
index a087d86a65..0e49437209 100644
--- a/include/configs/p212.h
+++ b/include/configs/p212.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Amlogic P212
*
* Copyright (C) 2017 Baylibre, SAS
* Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index 71bee208b2..6654a1b4df 100644
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2015
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _P2371_0000_H
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index cf4dd195ff..0e37511daf 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2015
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _P2371_2180_H
diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 73a50b14a2..1daf49a453 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2015
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _P2571_H
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 29940a63de..eddb201d4a 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2013-2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _P2771_0000_H
diff --git a/include/configs/paz00.h b/include/configs/paz00.h
index 904b7f3afc..447f99af68 100644
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2012 NVIDIA CORPORATION. All rights reserved.
*
* See file CREDITS for list of people who contributed to this
* project.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 8adb7d7cfa..01296e08c3 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 17600f5550..b8012b1af3 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
* Configuration settings for the phytec PCM-052 SoM.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 3b8239052e..87bb47383b 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index 6fccae5e6a..7b809e2329 100644
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* pdu001.h
*
* Copyright (C) 2018 EETS GmbH - http://www.eets.ch/
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PDU001_H
diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index 10af572b4a..d90eb14f6f 100644
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Samsung Electronics
*
* Configuration settings for the SAMSUNG/GOOGLE PEACH-PI board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PEACH_PI_H
diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index cb5937eb81..b87b36a9c6 100644
--- a/include/configs/peach-pit.h
+++ b/include/configs/peach-pit.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Configuration settings for the SAMSUNG/GOOGLE PEACH-PIT board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PEACH_PIT_H
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 863b6e7eb4..c54d50096f 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* pengwyn.h
*
* Copyright (C) 2013 Lothar Felten <lothar.felten@gmail.com>
*
* based on am335x_evm.h, Copyright (C) 2011 Texas Instruments Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PENGWYN_H
diff --git a/include/configs/pepper.h b/include/configs/pepper.h
index 44dcfba673..9ce45f2777 100644
--- a/include/configs/pepper.h
+++ b/include/configs/pepper.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Gumstix, Inc. - http://www.gumstix.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PEPPER_H
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 072cd3454a..dbcda61168 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/configs/phycore_rk3288.h b/include/configs/phycore_rk3288.h
index 7a977a8e5e..9135aa6b7a 100644
--- a/include/configs/phycore_rk3288.h
+++ b/include/configs/phycore_rk3288.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 PHYTEC Messtechnik GmbH
* Author: Wadim Egorov <w.egorov@phytec.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index d81c11b737..d3775023d0 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (c) 2015 Purna Chandra Mandal <purna.mandal@microchip.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Microchip PIC32MZ[DA] Starter Kit.
*/
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 88c74bd7d1..038b0a4778 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Technexion Ltd.
*
* Configuration settings for the Technexion PICO-IMX6UL-EMMC board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PICO_IMX6UL_CONFIG_H
#define __PICO_IMX6UL_CONFIG_H
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index a81548cb00..b208d7f4d9 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 NXP Semiconductors
*
* Configuration settings for the i.MX7D Pico board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PICO_IMX7D_CONFIG_H
diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 0d4fc119ac..585db0ef53 100644
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the mini-box PICOSAM9G45 board.
* (C) Copyright 2015 Inter Act B.V.
@@ -7,8 +8,6 @@
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 339ff913b7..734918a2bb 100644
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Barco (www.barco.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PLATINUM_CONFIG_H__
diff --git a/include/configs/platinum_picon.h b/include/configs/platinum_picon.h
index 148e561ed0..1b55e73979 100644
--- a/include/configs/platinum_picon.h
+++ b/include/configs/platinum_picon.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Barco (www.barco.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PLATINUM_PICON_CONFIG_H__
diff --git a/include/configs/platinum_titanium.h b/include/configs/platinum_titanium.h
index 362d3a4143..b4028832e9 100644
--- a/include/configs/platinum_titanium.h
+++ b/include/configs/platinum_titanium.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Barco (www.barco.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PLATINUM_TITANIUM_CONFIG_H__
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
index eef2062fd0..125a1f1f43 100644
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
* (C) Copyright 2011-2012
* Avionic Design GmbH <www.avionic-design.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index e1e9af07ec..1d9d2c575e 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
@@ -5,8 +6,6 @@
* Ilko Iliev <www.ronetix.at>
*
* Configuation settings for the RONETIX PM9261 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 880c3f118d..8fd1dc48c6 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
@@ -5,8 +6,6 @@
* Ilko Iliev <www.ronetix.at>
*
* Configuation settings for the RONETIX PM9263 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 5612f5f358..1feb8d9a7d 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Ilko Iliev <iliev@ronetix.at>
@@ -9,8 +10,6 @@
* Lead Tech Design <www.leadtechdesign.com>
*
* Configuation settings for the PM9G45 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index 809005e289..0416baef45 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012
* David Purdy <david.c.purdy@gmail.com>
@@ -6,8 +7,6 @@
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_POGO_E02_H
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 9a16eabce3..be4c20a7c7 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Linaro
*
@@ -5,8 +6,6 @@
*
* Configuration for Poplar 96boards CE. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _POPLAR_H_
diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h
index 15a374cca7..ddd7012c8f 100644
--- a/include/configs/popmetal_rk3288.h
+++ b/include/configs/popmetal_rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 491adcdde1..42b9073006 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/porter.h
* This file is Porter board configuration.
*
* Copyright (C) 2015 Renesas Electronics Corporation
* Copyright (C) 2015 Cogent Embedded, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __PORTER_H
diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h
index 6523a7c34a..c949a23b8b 100644
--- a/include/configs/puma_rk3399.h
+++ b/include/configs/puma_rk3399.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PUMA_RK3399_H
diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index 345e6d6db4..e25800a095 100644
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Toradex Colibri PXA270 configuration file
*
* Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PXA_COMMON_H__
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 2ad0c3018e..543eb2d6fb 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* siemens pxm2
* (C) Copyright 2013 Siemens Schweiz AG
@@ -7,8 +8,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PXM2_H
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index f306b41635..095aec28b1 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Tuomas Tynkkynen
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index c133a33b69..e55f3080e7 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index 24ddfe0c79..44c3af5e24 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 7b97ad56a5..424235e777 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 8218837e07..4b9ddd6f25 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index c5cb657afb..523764d8e9 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Solutions r0p7734 board
*
* Copyright (C) 2010, 2011 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __R0P7734_H
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index e5da8f2476..8068ca7957 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas R7780MP board
*
* Copyright (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Copyright (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __R7780RP_H
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index a9304e8d77..75e6e1976b 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Siemens Schweiz AG
* (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RASTABAN_H
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 6069220406..eadf5594c8 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/rcar-gen2-common.h
*
* Copyright (C) 2013,2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __RCAR_GEN2_COMMON_H
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index da82e4442a..af7b196dc1 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/configs/rcar-gen3-common.h
* This file is R-Car Gen3 common configuration file.
*
* Copyright (C) 2015-2017 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RCAR_GEN3_COMMON_H
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index ec4b88adb5..2009c2dd29 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3036_COMMON_H
#define __CONFIG_RK3036_COMMON_H
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index a71c6c0bcc..cb07466088 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3128_COMMON_H
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index ff6dfd5a44..d4ffa041f8 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3188_COMMON_H
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index 0fb72214f4..1bfcda6701 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK322X_COMMON_H
#define __CONFIG_RK322X_COMMON_H
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index d95254b25d..f8c793f154 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3288_COMMON_H
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 09b50368bd..3bca0f8388 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3328_COMMON_H
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 10f643f7ce..0b07f8dc7a 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Andreas Färber
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3368_COMMON_H
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index bdba19eeae..a61e74bc03 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RK3399_COMMON_H
diff --git a/include/configs/rock.h b/include/configs/rock.h
index 468dfdbff9..d9177576ad 100644
--- a/include/configs/rock.h
+++ b/include/configs/rock.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index bd39111710..917caf4d53 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 2c94319d78..dee82ca99d 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ROCKCHIP_COMMON_H_
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 325e52a019..69a22e1700 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2012-2016 Stephen Warren
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_H
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index b6641e9863..a40b7bae21 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Technology RSK 7203
*
* Copyright (C) 2008 Nobuhiro Iwamatsu
* Copyright (C) 2008 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RSK7203_H
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 1599267ae1..b936b13df1 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas RSK2+SH7264 board
*
* Copyright (C) 2011 Renesas Electronics Europe Ltd.
* Copyright (C) 2008 Nobuhiro Iwamatsu
* Copyright (C) 2008 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RSK7264_H
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 908bdb1947..0c0b773858 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas RSK2+SH7269 board
*
* Copyright (C) 2012 Renesas Electronics Europe Ltd.
* Copyright (C) 2012 Phil Edworthy
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RSK7269_H
diff --git a/include/configs/rut.h b/include/configs/rut.h
index a608214c0f..296bdc26ff 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* siemens rut
* (C) Copyright 2013 Siemens Schweiz AG
@@ -7,8 +8,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RUT_H
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index cd204e9718..dc93775fb4 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_RV1108_COMMON_H
#define __CONFIG_RV1108_COMMON_H
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 127443f882..48c979f97b 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015-2016 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Configuration settings for the Freescale S32V234 EVB board.
*/
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 40f037e06d..80bd8b845e 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
* Kyungmin Park <kyungmin.park@samsung.com>
*
* Configuation settings for the SAMSUNG Universal (s5pc100) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 410d20bd89..4f0b58570c 100644
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2010 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
*
* Configuation settings for the SAMSUNG Universal (EXYNOS4210) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_UNIVERSAL_H
diff --git a/include/configs/sagem_f@st1704.h b/include/configs/sagem_f@st1704.h
index 73b2832f57..7171dc6760 100644
--- a/include/configs/sagem_f@st1704.h
+++ b/include/configs/sagem_f@st1704.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 89e1b20c29..ecc6c5d80d 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/configs/salvator-x.h
* This file is Salvator-X board configuration.
*
* Copyright (C) 2015 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SALVATOR_X_H
diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h
index 71dbc10430..0cae301da2 100644
--- a/include/configs/sama5d27_som1_ek.h
+++ b/include/configs/sama5d27_som1_ek.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration file for the SAMA5D27 SOM1 EK Board.
*
* Copyright (C) 2017 Microchip Corporation
* Wenyou Yang <wenyou.yang@microchip.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d2_ptc_ek.h b/include/configs/sama5d2_ptc_ek.h
index d99eaee18f..6bc4846f57 100644
--- a/include/configs/sama5d2_ptc_ek.h
+++ b/include/configs/sama5d2_ptc_ek.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration file for the SAMA5D2 PTC EK Board.
*
* Copyright (C) 2017 Microchip Technology Inc.
* Wenyou Yang <wenyou.yang@microchip.com>
* Ludovic Desroches <ludovic.desroches@microchip.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index 7f27f7a5ee..f70ca83b25 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration file for the SAMA5D2 Xplained Board.
*
* Copyright (C) 2015 Atmel Corporation
* Wenyou Yang <wenyou.yang@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index edb553142c..5cbddf30d7 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the SAMA5D3 Xplained board.
*
* Copyright (C) 2014 Atmel Corporation
* Bo Shen <voice.shen@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 51db135940..d5e6b7f4e2 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the SAMA5D3xEK board.
*
@@ -6,8 +7,6 @@
* based on at91sam9m10g45ek.h by:
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index fb1e74019d..ec6602cf45 100644
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the SAMA5D4 Xplained ultra board.
*
* Copyright (C) 2014 Atmel
* Bo Shen <voice.shen@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 2ac47fdb24..19ce833861 100644
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the SAMA5D4EK board.
*
* Copyright (C) 2014 Atmel
* Bo Shen <voice.shen@atmel.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 4961301765..1a49d1dab5 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h
index 82ccc5ddd9..f53688268e 100644
--- a/include/configs/sandbox_spl.h
+++ b/include/configs/sandbox_spl.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Google, Inc
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SANDBOX_SPL_CONFIG_H
diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h
index 3bf1601a7d..ddbb5a27e0 100644
--- a/include/configs/sansa_fuze_plus.h
+++ b/include/configs/sansa_fuze_plus.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_SANSA_FUZE_PLUS_H__
#define __CONFIGS_SANSA_FUZE_PLUS_H__
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 73a2d190af..9c5d05de3e 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* WindRiver SBC8349 U-Boot configuration file.
* Copyright (c) 2006, 2007 Wind River Systems, Inc.
*
* Paul Gortmaker <paul.gortmaker@windriver.com>
* Based on the MPC8349EMDS config.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 51c0ad65b1..0289d1b267 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007,2009 Wind River Systems <www.windriver.com>
* Copyright 2007 Embedded Specialties, Inc.
* Copyright 2004, 2007 Freescale Semiconductor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 5f0a955632..1b2e416181 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007 Wind River Systems <www.windriver.com>
* Copyright 2007 Embedded Specialties, Inc.
@@ -6,8 +7,6 @@
* Copyright 2006 Freescale Semiconductor.
*
* Srikanth Srinivasan (srikanth.srinivasan@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
index 7eae0cc51e..fbd977abf5 100644
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* SchulerControl GmbH, SC_SPS_1 module config
*
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
* on behalf of DENX Software Engineering GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_SC_SPS_1_H__
#define __CONFIGS_SC_SPS_1_H__
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index c0b80905cf..b8d02f0397 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h
index 3fb7e5e768..ead9bddf7f 100644
--- a/include/configs/secomx6quq7.h
+++ b/include/configs/secomx6quq7.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Seco S.r.l
*
* Configuration settings for the Seco Boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h
index f994219009..0a33220ea7 100644
--- a/include/configs/sfr_nb4_ser.h
+++ b/include/configs/sfr_nb4_ser.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <configs/bmips_common.h>
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index ff1208f196..9b40e0f063 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the sh7752evb board
*
* Copyright (C) 2012 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SH7752EVB_H
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 9a1d2e3368..080b4055cf 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the sh7753evb board
*
* Copyright (C) 2012 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SH7753EVB_H
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 94b4119c58..95d70bc6e7 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the sh7757lcr board
*
* Copyright (C) 2011 Renesas Solutions Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SH7757LCR_H
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 3c8a766a11..4015fb2d2a 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas SH7763RDP board
*
* Copyright (C) 2008 Renesas Solutions Corp.
* Copyright (C) 2008 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SH7763RDP_H
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 8d36262338..38ae66b90c 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the Renesas Technology R0P7785LC0011RL board
*
* Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SH7785LCR_H
diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h
index 4eb4fb0e2f..238838fd7d 100644
--- a/include/configs/sheep_rk3368.h
+++ b/include/configs/sheep_rk3368.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_PX5_EVB_H
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index ebed1d526c..656db45adf 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2014
* Gerald Kerma <dreagle@doukki.net>
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_SHEEVAPLUG_H
diff --git a/include/configs/shmin.h b/include/configs/shmin.h
index 3af460d735..aada22df5c 100644
--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for shmin (T-SH7706LAN, T-SH7706LSR)
*
* Copyright (C) 2010, 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SHMIN_H
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 2062647f7e..470387df8c 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* siemens am33x common board options
* (C) Copyright 2013 Siemens Schweiz AG
@@ -7,8 +8,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SIEMENS_AM33X_COMMON_H
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 8eac7b8c9b..549aa79233 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/silk.h
* This file is silk board configuration.
*
* Copyright (C) 2015 Renesas Electronics Corporation
* Copyright (C) 2015 Cogent Embedded, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __SILK_H
diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index 3c30077340..6f6cb1ecea 100644
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 0b5fdc8074..c6a2f8a8d1 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
@@ -16,8 +17,6 @@
* DENX Software Engineering GmbH
*
* Configuation settings for the smartweb.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index c152459c44..82251b3615 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
*
* Configuration settings for the SAMSUNG SMDK5250 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SMDK_H
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 2727d656f1..dd7ded6d7a 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Configuration settings for the SAMSUNG SMDK5420 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SMDK5420_H
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 5b3be6d532..671e4479f5 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
@@ -5,8 +6,6 @@
* Inki Dae <inki.dae@samsung.com>
*
* Configuation settings for the SAMSUNG SMDKC100 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index d7e73c33e7..3446489e14 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electronics
*
* Configuration settings for the SAMSUNG SMDKV310 (EXYNOS4210) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index ca3d9c20f7..bcdc1f0db0 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Bluewater Systems Snapper 9260 and 9G20 modules
*
* (C) Copyright 2011 Bluewater Systems
* Author: Andre Renaud <andre@bluewatersys.com>
* Author: Ryan Mallon <ryan@bluewatersys.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 0da3b3b055..8a2858c47d 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Bluewater Systems Snapper 9G45 module
*
* (C) Copyright 2011 Bluewater Systems
* Author: Andre Renaud <andre@bluewatersys.com>
* Author: Ryan Mallon <ryan@bluewatersys.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 29b5e6ef0c..7a665f64e1 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* LG Optimus Black codename sniper config
*
* Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/snow.h b/include/configs/snow.h
index 01d9db8e60..3b0db32ece 100644
--- a/include/configs/snow.h
+++ b/include/configs/snow.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
*
* Configuration settings for the SAMSUNG EXYNOS5 Snow board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SNOW_H
diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h
index 82bb48b277..58e446b60a 100644
--- a/include/configs/socfpga_arria10_socdk.h
+++ b/include/configs/socfpga_arria10_socdk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2015-2017 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __CONFIG_SOCFGPA_ARRIA10_H__
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index cd5aac65e9..24fcdd8b5a 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_ARRIA5_H__
#define __CONFIG_SOCFPGA_ARRIA5_H__
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 025c7de2d1..4de2aa7929 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_COMMON_H__
#define __CONFIG_SOCFPGA_COMMON_H__
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 9c5bd648e3..18da8496ef 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_CYCLONE5_H__
#define __CONFIG_SOCFPGA_CYCLONE5_H__
diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h
index 1a35c9d73f..b36d7e56fb 100644
--- a/include/configs/socfpga_dbm_soc1.h
+++ b/include/configs/socfpga_dbm_soc1.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_DEVBOARDS_DBM_SOC1_H__
#define __CONFIG_DEVBOARDS_DBM_SOC1_H__
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index e5db00e366..d3224d5bd3 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TERASIC_DE0_H__
#define __CONFIG_TERASIC_DE0_H__
diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h
index 656af1104d..2fcabff8af 100644
--- a/include/configs/socfpga_de10_nano.h
+++ b/include/configs/socfpga_de10_nano.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, Intel Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TERASIC_DE10_H__
#define __CONFIG_TERASIC_DE10_H__
diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index f57b950425..f37099c58f 100644
--- a/include/configs/socfpga_de1_soc.h
+++ b/include/configs/socfpga_de1_soc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TERASIC_DE1_SOC_H__
#define __CONFIG_TERASIC_DE1_SOC_H__
diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index 88f9d4a46d..c233c208a5 100644
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Marek Vasut <marex@denx.de>
* Copyright (C) 2016 Pavel Machek <pavel@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_IS1_H__
#define __CONFIG_SOCFPGA_IS1_H__
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index f13463b8b0..4d1c4f2c2b 100644
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ARIES_MCVEVK_H__
#define __CONFIG_ARIES_MCVEVK_H__
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 0bbc7e0105..3a7f354914 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TERASIC_SOCKIT_H__
#define __CONFIG_TERASIC_SOCKIT_H__
diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index b66108d0cc..f0d9347891 100644
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_SOCRATES_H__
#define __CONFIG_SOCFPGA_SOCRATES_H__
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index 492869bd37..c835d23235 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SOCFPGA_SR1500_H__
#define __CONFIG_SOCFPGA_SR1500_H__
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 1d8aed90ce..e39147e979 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SAMTEC_VINING_FPGA_H__
#define __CONFIG_SAMTEC_VINING_FPGA_H__
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 2ec55c1315..2c897cdf29 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
@@ -6,8 +7,6 @@
* Copyright 2004 Freescale Semiconductor.
* (C) Copyright 2002,2003 Motorola,Inc.
* Xianghua Xiao <X.Xiao@motorola.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
index 509f23a502..f0e8d612fa 100644
--- a/include/configs/som-6896.h
+++ b/include/configs/som-6896.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the SOM-6896
*
* Copyright (C) 2015 NovaTech LLC
* George McCollister <george.mccollister@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index 927e1b68f1..cfcc9c866d 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index ae6a216a6b..7edd3b6489 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPEAR_COMMON_H
diff --git a/include/configs/spear3xx_evb.h b/include/configs/spear3xx_evb.h
index 4dbf919cfa..5c8626e6cf 100644
--- a/include/configs/spear3xx_evb.h
+++ b/include/configs/spear3xx_evb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/spear6xx_evb.h b/include/configs/spear6xx_evb.h
index 4bd989e2f0..cfadfc8e48 100644
--- a/include/configs/spear6xx_evb.h
+++ b/include/configs/spear6xx_evb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/spring.h b/include/configs/spring.h
index d8c9b4a783..272622a5ed 100644
--- a/include/configs/spring.h
+++ b/include/configs/spring.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SPRING_H
diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 23a66bb7b7..b4e4619266 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h
index 4c4e72763e..4fd9c23e4e 100644
--- a/include/configs/stm32f429-discovery.h
+++ b/include/configs/stm32f429-discovery.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Kamil Lulko, <kamil.lulko@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h
index 7b3115997d..67cb584165 100644
--- a/include/configs/stm32f429-evaluation.h
+++ b/include/configs/stm32f429-evaluation.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) STMicroelectronics SA 2017
* Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h
index 990653beb8..b5259ee214 100644
--- a/include/configs/stm32f469-discovery.h
+++ b/include/configs/stm32f469-discovery.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) STMicroelectronics SA 2017
* Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 8b8a73d0f9..567e7f2a00 100644
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016, STMicroelectronics - All Rights Reserved
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h
index d6d35472ff..5b6ee76e7c 100644
--- a/include/configs/stm32h743-disco.h
+++ b/include/configs/stm32h743-disco.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h
index d6d35472ff..5b6ee76e7c 100644
--- a/include/configs/stm32h743-eval.h
+++ b/include/configs/stm32h743-eval.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index c02fe2a963..36b7f288e0 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Sysam stmark2 board configuration
*
* (C) Copyright 2017 Angelo Dureghello <angelo@sysam.it>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __STMARK2_CONFIG_H
diff --git a/include/configs/stout.h b/include/configs/stout.h
index ceed06f13e..eab0ef213a 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* include/configs/stout.h
* This file is Stout board configuration.
@@ -5,8 +6,6 @@
* Copyright (C) 2015 Renesas Electronics Europe GmbH
* Copyright (C) 2015 Renesas Electronics Corporation
* Copyright (C) 2015 Cogent Embedded, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __STOUT_H
diff --git a/include/configs/strider.h b/include/configs/strider.h
index b56a03e4e6..0757c89f7e 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index 2401dbd619..9ce610ab18 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, STMicroelectronics - All Rights Reserved
* Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_STV0991_H
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index bd349694c6..63c84b1ceb 100644
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
*
* Configuration settings for the Allwinner A10 (sun4i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
#define __CONFIG_H
diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h
index b7b67a1ddc..5ce2cde388 100644
--- a/include/configs/sun50i.h
+++ b/include/configs/sun50i.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the Allwinner A64 (sun50i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h
index 0535d6a7f3..cb33d01e16 100644
--- a/include/configs/sun5i.h
+++ b/include/configs/sun5i.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
*
* Configuration settings for the Allwinner A13 (sun5i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
#define __CONFIG_H
diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index 8b9adb1be6..a3f768f936 100644
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
* (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
* (C) Copyright 2013 Maxime Ripard <maxime.ripard@free-electrons.com>
*
* Configuration settings for the Allwinner A31 (sun6i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index 12c96230c2..d3c4c7dbcf 100644
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013 Henrik Nordstrom <henrik@henriknordstrom.net>
* (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl@lkcl.net>
*
* Configuration settings for the Allwinner A20 (sun7i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
#define __CONFIG_H
diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index 47f2813240..4fdf68a491 100644
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014 Chen-Yu Tsai <wens@csie.org>
*
* Configuration settings for the Allwinner A23 (sun8i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h
index cd9e08d8b1..6ee08cf0d9 100644
--- a/include/configs/sun9i.h
+++ b/include/configs/sun9i.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
*
* Configuration settings for the Allwinner A80 (sun9i) CPU
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 9d9e9ce173..b515e9bb1f 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2012 Henrik Nordstrom <henrik@henriknordstrom.net>
*
@@ -6,8 +7,6 @@
* Tom Cubie <tangliang@allwinnertech.com>
*
* Configuration settings for the Allwinner sunxi series of boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SUNXI_COMMON_CONFIG_H
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index a1d03acf25..3e88c9000c 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
@@ -10,8 +11,6 @@
*
* (C) Copyright 2010
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h
index 73c9189b73..88ee772848 100644
--- a/include/configs/syzygy_hub.h
+++ b/include/configs/syzygy_hub.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Xilinx
* (C) Copyright 2017 Opal Kelly Inc.
*
* Configuration settings for the SYZYGY Hub development board
* See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_SYZYGY_HUB_H
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index aed72ff8a6..3e1a07f6ef 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 7f5a3cadcb..5ebd5cdef9 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
* Copyright (C) 2009 TechNexion Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TAM3517_H
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 6e04e6b509..061610d4c1 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the TechNexion TAO-3530 SOM
* equipped on Thunder baseboard.
@@ -6,8 +7,6 @@
* Tapani Utriainen <linuxfae@technexion.com>
*
* Copyright (C) 2013 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 3112231b0b..d21d575cb0 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common board functions for Siemens TAURUS (AT91SAM9G20) based boards
* (C) Copyright 2013 Siemens AG
@@ -8,8 +9,6 @@
* (C) Copyright 2007-2008
* Stelian Pop <stelian@popies.net>
* Lead Tech Design <www.leadtechdesign.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/tb100.h b/include/configs/tb100.h
index 8216d6e54b..96e5b6315c 100644
--- a/include/configs/tb100.h
+++ b/include/configs/tb100.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011-2014 Pierrick Hascoet, Abilis Systems
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_TB100_H_
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 18208b1fd9..092eef81cb 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Soeren Moch <smoch@web.de>
*
* Configuration settings for the TBS2910 MatrixARM board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TBS2910_CONFIG_H
diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index 3ca55ef936..dd3e026b14 100644
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Avionic Design GmbH <www.avionic-design.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/tec.h b/include/configs/tec.h
index 0febe466ce..a40212190a 100644
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
* (C) Copyright 2011-2012
* Avionic Design GmbH <www.avionic-design.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 3eb9dd2af9..1c0046ac0d 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEGRA_COMMON_POST_H
diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h
index 502ba7d8f2..e6b61c4e8f 100644
--- a/include/configs/tegra-common-usb-gadget.h
+++ b/include/configs/tegra-common-usb-gadget.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2014
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _TEGRA_COMMON_USB_GADGET_H_
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index cd3db1a0e5..d8ae9d1e0d 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA_COMMON_H_
diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index aab9d01147..ccfc516a82 100644
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _TEGRA114_COMMON_H_
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 4f098a8abc..b275f795a3 100644
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA124_COMMON_H_
diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
index b0ab2d72cf..b4936cc731 100644
--- a/include/configs/tegra186-common.h
+++ b/include/configs/tegra186-common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2013-2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _TEGRA186_COMMON_H_
diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 217de62fed..7f0a5292c2 100644
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA20_COMMON_H_
diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index 7dc590edb5..16b962db64 100644
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2015
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA210_COMMON_H_
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 0b69776315..70964a90ce 100644
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TEGRA30_COMMON_H_
diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index c20803c535..a9aef12c30 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h
index bc0e078cff..1c4362db51 100644
--- a/include/configs/theadorable-x86-conga-qa3-e3845.h
+++ b/include/configs/theadorable-x86-conga-qa3-e3845.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/theadorable-x86-dfi-bt700.h b/include/configs/theadorable-x86-dfi-bt700.h
index 2e15d74ced..bb3186e219 100644
--- a/include/configs/theadorable-x86-dfi-bt700.h
+++ b/include/configs/theadorable-x86-dfi-bt700.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index c487642e89..ac4e139ddc 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_THEADORABLE_H
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 88dce5472a..91cfba7e07 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Siemens Schweiz AG
* (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,8 +7,6 @@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_THUBAN_H
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 67b00eb81b..d71d207621 100644
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/**
* (C) Copyright 2014, Cavium Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
**/
#ifndef __THUNDERX_88XX_H__
diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index e4249838ee..68400a86fc 100644
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ti816x_evm.h
*
* Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
* Antoine Tenart, <atenart@adeneo-embedded.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TI816X_EVM_H
diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 83e26dbb6e..f1c297ca93 100644
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ti_am335x_common.h
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* For more details, please see the technical documents listed at
* http://www.ti.com/product/am3359#technicaldocuments
*/
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 18cd6afa91..9257e2b0a4 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ti_armv7_common.h
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* The various ARMv7 SoCs from TI all share a number of IP blocks when
* implementing a given feature. Rather than define these in every
* board or even SoC common file, we define a common file to be re-used
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index 6f2a33e187..b4e0b8050d 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common configuration header file for all Keystone II EVM platforms
*
* (C) Copyright 2012-2014
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_KS2_EVM_H
diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h
index 9da6ea8643..98b5839154 100644
--- a/include/configs/ti_armv7_omap.h
+++ b/include/configs/ti_armv7_omap.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ti_armv7_omap.h
*
* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* The various ARMv7 SoCs from TI all share a number of IP blocks when
* implementing a given feature. This is meant to isolate the features
* that are based on OMAP architecture.
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 3439a27a4c..7cd4272ce5 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ti_omap3_common.h
*
* Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* For more details, please see the technical documents listed at
* http://www.ti.com/product/omap3530
* http://www.ti.com/product/omap3630
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 3a871924af..33761c65e9 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Texas Instruments Incorporated.
@@ -5,8 +6,6 @@
* Steve Sakoman <steve@sakoman.com>
*
* TI OMAP4 common configuration settings
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TI_OMAP4_COMMON_H
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index d6ea17bec4..8bf4a6b7e9 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Texas Instruments Incorporated.
@@ -8,8 +9,6 @@
*
* TI OMAP5 AND DRA7XX common configuration settings
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* For more details, please see the technical documents listed at
* http://www.ti.com/product/omap5432
*/
diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
index 58eea3c405..5adae68c91 100644
--- a/include/configs/tinker_rk3288.h
+++ b/include/configs/tinker_rk3288.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index b53ddacd88..2470855463 100644
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Stefan Roese <sr@denx.de>
*
@@ -6,8 +7,6 @@
*
* Based on mx6qsabrelite.h which is:
* Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 38be08632f..9ab2b2da20 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014 Topic Embedded Products
*
* Configuration for Zynq Evaluation and Development Board - Miami
* See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TOPIC_MIAMI_H
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index ad90beed97..0982d3e611 100644
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 1a1f5e3e03..f0b5c42c64 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013, 2014, 2017 Markus Niebel <Markus.Niebel@tq-group.com>
*
* Configuration settings for the TQ Systems TQMa6<Q,D,DL,S> module.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 9c7e5a4878..bee6d2f33b 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 - 2017 Markus Niebel <Markus.Niebel@tq-group.com>
*
* Configuration settings for the TQ Systems TQMa6<Q,D,DL,S> module on
* MBa6 starter kit
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TQMA6_MBA6_H
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 24b62e701c..2e9292eb55 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TQMA6_WRU4_H
diff --git a/include/configs/trats.h b/include/configs/trats.h
index e892b59311..f68a70e4b1 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electronics
* Heungjun Kim <riverful.kim@samsung.com>
*
* Configuation settings for the SAMSUNG TRATS (EXYNOS4210) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TRATS_H
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index aecac077e4..020dd76eb7 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
* Sanghee Kim <sh0130.kim@samsung.com>
* Piotr Wilczek <p.wilczek@samsung.com>
*
* Configuation settings for the SAMSUNG TRATS2 (EXYNOS4412) board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_TRATS2_H
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 9e7fadb2fa..3a2a420127 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006-2008
* Texas Instruments.
@@ -9,8 +10,6 @@
* Thomas Weber <weber@corscience.de>
*
* Configuration settings for the Tricorder board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 9c70f1b7ea..427da1c1c2 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2012
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h
index bbe268e51c..d314398538 100644
--- a/include/configs/ts4600.h
+++ b/include/configs/ts4600.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Savoir-faire Linux Inc.
*
@@ -8,8 +9,6 @@
* Freescale Semiconductor, Inc.
*
* Configuration settings for the TS4600 Board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_TS4600_H__
#define __CONFIGS_TS4600_H__
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 2a8663f55b..97019c4251 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Savoir-faire Linux Inc.
*
@@ -6,8 +7,6 @@
* Freescale Semiconductor, Inc.
*
* Configuration settings for the TS4800 Board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 1df806b60a..3d5a1fa6b5 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Marek Behun <marek.behun@nic.cz>
* Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CONFIG_TURRIS_OMNIA_H
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index bb1d1dbffa..f22d73b8d3 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2006 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
@@ -14,8 +15,6 @@
* (C) Copyright 2010-2013
* Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com
* Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/twister.h b/include/configs/twister.h
index 032559633b..63930e1aff 100644
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
@@ -5,8 +6,6 @@
* Copyright (C) 2009 TechNexion Ltd.
*
* Configuration for the Technexion twister board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index dd86deeb12..23bdff3348 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Freescale Semiconductor, Inc.
*
* Configuration settings for Udoo board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 7e6b98041e..2924e3143a 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014-2015 Freescale Semiconductor, Inc.
* Copyright Jasbir Matharu
* Copyright 2015 UDOO Team
*
* Configuration settings for the UDOO NEO board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index 4d76fd69e5..86c6ed3a36 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/configs/ulcb.h
* This file is ULCB board configuration.
*
* Copyright (C) 2017 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ULCB_H
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index c39f13bf6b..f710c8fe2a 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012-2015 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* U-Boot - Common settings for UniPhier Family */
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index c8cbd34cdb..bc102eecf2 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007-2013
* Stelian Pop <stelian.pop@leadtechdesign.com>
@@ -9,8 +10,6 @@
*
* U-Boot image has to be less than 200704 bytes, otherwise at91bootstrap
* installed on board will not be able to load it properly.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 1c44f76b17..e17514cd49 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* USB armory MkI board configuration settings
* http://inversepath.com/usbarmory
*
* Copyright (C) 2015, Inverse Path
* Andrej Rosano <andrej@inversepath.com>
- *
- * SPDX-License-Identifier:|____GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 4780c2ca3a..db96d81a2f 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index bbd8ec5e3c..90554dacf8 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Freescale Semiconductor, Inc. 2006.
*
* (C) Copyright 2010
* Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* ve8313 board configuration file
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 207370b3f9..e542187efc 100644
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013-2014
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index e8457aa02b..3f9db3303f 100644
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 208a3156b0..7184aefd42 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Versatile Express. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VEXPRESS_AEMV8A_H
diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index b509a9cfd4..4f8e63574d 100644
--- a/include/configs/vexpress_ca15_tc2.h
+++ b/include/configs/vexpress_ca15_tc2.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Linaro
* Andre Przywara, <andre.przywara@linaro.org>
*
* Configuration for Versatile Express. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VEXPRESS_CA15X2_TC2_h
diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h
index 20b92dc888..b8079e63d6 100644
--- a/include/configs/vexpress_ca5x2.h
+++ b/include/configs/vexpress_ca5x2.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Linaro
* Ryan Harkin, <ryan.harkin@linaro.org>
*
* Configuration for Versatile Express. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VEXPRESS_CA5X2_h
diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
index 993398ccc6..8157a5868d 100644
--- a/include/configs/vexpress_ca9x4.h
+++ b/include/configs/vexpress_ca9x4.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Linaro
* Ryan Harkin, <ryan.harkin@linaro.org>
*
* Configuration for Versatile Express. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VEXPRESS_CA9X4_H
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 3e2d410f14..30dda0c085 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 ARM Limited
* (C) Copyright 2010 Linaro
@@ -5,8 +6,6 @@
*
* Configuration for Versatile Express. Parts were derived from other ARM
* configurations.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VEXPRESS_COMMON_H
diff --git a/include/configs/veyron.h b/include/configs/veyron.h
index 49522559d4..0761de3ad2 100644
--- a/include/configs/veyron.h
+++ b/include/configs/veyron.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 267b274541..d08d42371c 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
* Configuration settings for the Freescale Vybrid vf610twr board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 9a63b3f76e..e8dd5cf07c 100644
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration settings for the VInCo platform.
*
@@ -6,8 +7,6 @@
* Bo Shen <voice.shen@atmel.com>
* Copyright (C) 2015 Free Electrons
* Gregory CLEMENT gregory.clement@free-electrons.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 45d1c35faa..0b5f940341 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 samtec automotive software & electronics gmbh
*
* Configuration settings for the Samtec VIN|ING 2000 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 9559b503db..0d8ae0b099 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* esd vme8349 U-Boot configuration file
* Copyright (c) 2008, 2009 esd gmbh Hannover Germany
@@ -7,8 +8,6 @@
*
* reinhard.arlt@esd-electronics.de
* Based on the MPC8349EMDS config.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h
index c8c7fc7f3e..382fdac4c0 100644
--- a/include/configs/vyasa-rk3288.h
+++ b/include/configs/vyasa-rk3288.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Amarula Solutions
*
* Configuration settings for Amarula Vyasa RK3288.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 7b502840cb..1edd7a8827 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Freescale Semiconductor, Inc.
*
* Configuration settings for the Wandboard.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 77af0d46e7..1fc35c1a0e 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 O.S. Systems Software LTDA.
* Copyright (C) 2014 Kynetics LLC.
@@ -6,8 +7,6 @@
* Author: Otavio Salvador <otavio@ossystems.com.br>
*
* Configuration settings for the WaRP Board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index f340bff3e7..2a7789baa2 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 NXP Semiconductors
*
* Configuration settings for the i.MX7S Warp board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __WARP7_CONFIG_H
diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h
index b6c2a4aba0..58c36e0d56 100644
--- a/include/configs/wb45n.h
+++ b/include/configs/wb45n.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the WB45N CPU Module.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H__
diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h
index 093cc32a6e..3ca1820342 100644
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuation settings for the WB50N CPU Module.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/woodburn.h b/include/configs/woodburn.h
index d38ebfb77d..7f9ddb5b8e 100644
--- a/include/configs/woodburn.h
+++ b/include/configs/woodburn.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011, Stefano Babic <sbabic@denx.de>
*
* (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
*
* Configuration for the woodburn board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 7e993b8298..7135e1972e 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011, Stefano Babic <sbabic@denx.de>
*
* (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
*
* Configuration for the woodburn board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __WOODBURN_COMMON_CONFIG_H
diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h
index acb5ea49a4..06433d0e71 100644
--- a/include/configs/woodburn_sd.h
+++ b/include/configs/woodburn_sd.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011, Stefano Babic <sbabic@denx.de>
*
* (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
*
* Configuration for the woodburn board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index ee82816cd9..73a107e3c3 100644
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* WORK Microwave work_92105 board configuration file
*
* (C) Copyright 2014 DENX Software Engineering GmbH
* Written-by: Albert ARIBAUD <albert.aribaud@3adev.fr>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_WORK_92105_H__
diff --git a/include/configs/x600.h b/include/configs/x600.h
index a6fb9889be..204e019d4f 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009, STMicroelectronics - All Rights Reserved
* Author(s): Vipin Kumar, <vipin.kumar@st.com> for STMicroelectronics.
*
* Copyright (C) 2012, 2015 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 27ba9ee229..b507a0699e 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _X86_CHROMEBOOK_H
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 5c71168279..098703064c 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
* (C) Copyright 2008
* Graeme Russ, graeme.russ@gmail.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <asm/ibmpc.h>
diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
index 2f77accda2..eda9164820 100644
--- a/include/configs/xfi3.h
+++ b/include/configs/xfi3.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIGS_XFI3_H__
#define __CONFIGS_XFI3_H__
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 5827911c4e..e9086f9906 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP
* (C) Copyright 2014 - 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
*
* Based on Configuration for Versatile Express
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __XILINX_ZYNQMP_H
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 4fbf85a9ed..947d3083da 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP Flash utility
*
* (C) Copyright 2018 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
* Siva Durga Prasad Paladugu <sivadur@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_MINI_H
diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h
index e4d8be63e5..dc81c66c64 100644
--- a/include/configs/xilinx_zynqmp_mini_emmc.h
+++ b/include/configs/xilinx_zynqmp_mini_emmc.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP eMMC Flash utility
*
* (C) Copyright 2018 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
* Siva Durga Prasad Paladugu <sivadur@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_MINI_EMMC_H
diff --git a/include/configs/xilinx_zynqmp_mini_nand.h b/include/configs/xilinx_zynqmp_mini_nand.h
index 8c13f4742d..4434e6ab32 100644
--- a/include/configs/xilinx_zynqmp_mini_nand.h
+++ b/include/configs/xilinx_zynqmp_mini_nand.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP Nand Flash utility
*
* (C) Copyright 2018 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
* Siva Durga Prasad Paladugu <sivadur@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_MINI_NAND_H
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
index e3797a8efd..852c2238de 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zc1751 XM015 DC1
*
* (C) Copyright 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
index 0714d72911..2533ab8609 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zc1751 XM016 DC2
*
* (C) Copyright 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
index cdc0062c3b..f7d4ab2800 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zc1751 XM017 DC3
*
* (C) Copyright 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZC1751_XM017_DC3_H
diff --git a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
index 6a0e3975b9..f39eeb9bfc 100644
--- a/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zc1751 XM019 DC5
*
* (C) Copyright 2015 Xilinx, Inc.
* Siva Durga Prasad <siva.durga.paladugu@xilinx.com>
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h
index bfb85d6b75..029347da47 100644
--- a/include/configs/xilinx_zynqmp_zcu100.h
+++ b/include/configs/xilinx_zynqmp_zcu100.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zcu100
*
* (C) Copyright 2015 - 2016 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZCU100_H
diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index 27d9d6a06f..c61e1b5e27 100644
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zcu102
*
* (C) Copyright 2015 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZCU102_H
diff --git a/include/configs/xilinx_zynqmp_zcu104.h b/include/configs/xilinx_zynqmp_zcu104.h
index f8cdade763..8d417f45e0 100644
--- a/include/configs/xilinx_zynqmp_zcu104.h
+++ b/include/configs/xilinx_zynqmp_zcu104.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zcu104
*
* (C) Copyright 2017 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZCU104_H
diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h
index 0f0d8c6d42..01ac12a53c 100644
--- a/include/configs/xilinx_zynqmp_zcu106.h
+++ b/include/configs/xilinx_zynqmp_zcu106.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zcu106
*
* (C) Copyright 2016 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZCU106_H
diff --git a/include/configs/xilinx_zynqmp_zcu111.h b/include/configs/xilinx_zynqmp_zcu111.h
index c488c2133c..3233b37979 100644
--- a/include/configs/xilinx_zynqmp_zcu111.h
+++ b/include/configs/xilinx_zynqmp_zcu111.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Configuration for Xilinx ZynqMP zcu111
*
* (C) Copyright 2017 Xilinx, Inc.
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQMP_ZCU111_H
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index e05ec5421a..e9ef46050e 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009 Extreme Engineering Solutions, Inc.
* Copyright 2007-2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 63479533dc..426af47aa3 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2008 Extreme Engineering Solutions, Inc.
* Copyright 2004-2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index d0d21c43f0..bafb8c5445 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2008 Extreme Engineering Solutions, Inc.
* Copyright 2007-2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index f7ac2f49f0..372df752fd 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010 Extreme Engineering Solutions, Inc.
* Copyright 2007-2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 46e50b3d4a..405ff46268 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Stefan Roese <sr@denx.de>
*
* Configuration settings for the CCV xPress board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __XPRESS_CONFIG_H
#define __XPRESS_CONFIG_H
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 8a920facca..3e4b7cb00b 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2007-2013 Tensilica, Inc.
* Copyright (C) 2014 - 2016 Cadence Design Systems Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
index b1afde9ba0..22a7fe6e77 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
*
* Configuration settings for the E+L i.MX6Q DO82 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EL_ZC5202_H
diff --git a/include/configs/zc5601.h b/include/configs/zc5601.h
index f71cdfbdd3..37d5d6ee77 100644
--- a/include/configs/zc5601.h
+++ b/include/configs/zc5601.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) Stefano Babic <sbabic@denx.de>
*
* Configuration settings for the E+L i.MX6Q DO82 board.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EL_ZC5601_H
diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 0860a500c0..e48896a511 100644
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Aeronix Zipit Z2 configuration file
*
* Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 1dafda3801..576a73feb0 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (c) 2011 Graf-Syteco, Matthias Weisser
* <weisserm@arcor.de>
*
* Configuation settings for the zmx25 board
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e503617178..55b983fc16 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Michal Simek <monstr@monstr.eu>
* (C) Copyright 2013 - 2018 Xilinx, Inc.
*
* Common configuration options for all Zynq boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_COMMON_H
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index 2ca36757e3..2f5843f9ec 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 - 2017 Xilinx.
*
* Configuration settings for the Xilinx Zynq CSE board.
* See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_CSE_H
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 720f953344..b5a28dab87 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013 Xilinx, Inc.
*
* Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
* See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_ZC70X_H
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index 8f4e088502..547ecb68fd 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Xilinx
* (C) Copyright 2014 Digilent Inc.
*
* Configuration for Zynq Development Board - ZYBO
* See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_ZYNQ_ZYBO_H
diff --git a/include/console.h b/include/console.h
index cea29ed6dc..e935c601f1 100644
--- a/include/console.h
+++ b/include/console.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONSOLE_H
diff --git a/include/cortina.h b/include/cortina.h
index 6cadd28811..4cb0985519 100644
--- a/include/cortina.h
+++ b/include/cortina.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Cortina PHY drivers
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Copyright 2014 Freescale Semiconductor, Inc.
*/
diff --git a/include/cpu.h b/include/cpu.h
index 954257715a..5cc7c5abd7 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CPU_H
diff --git a/include/crc.h b/include/crc.h
index 111cb4adb7..2a00af5be4 100644
--- a/include/crc.h
+++ b/include/crc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: eCos-2.0 */
/*
*==========================================================================
*
@@ -6,7 +7,6 @@
* Interface for the CRC algorithms.
*
*==========================================================================
- * SPDX-License-Identifier: eCos-2.0
*==========================================================================
*#####DESCRIPTIONBEGIN####
*
diff --git a/include/cros_ec.h b/include/cros_ec.h
index 771a176eea..60ecefbd40 100644
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Chromium OS cros_ec driver
*
* Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CROS_EC_H
diff --git a/include/cros_ec_message.h b/include/cros_ec_message.h
index 36e2d83ce1..977951b30d 100644
--- a/include/cros_ec_message.h
+++ b/include/cros_ec_message.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Chromium OS Matrix Keyboard Message Protocol definitions
*
* Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CROS_MESSAGE_H
diff --git a/include/ddr_spd.h b/include/ddr_spd.h
index 20dc9ea1a6..fe163da43e 100644
--- a/include/ddr_spd.h
+++ b/include/ddr_spd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _DDR_SPD_H_
diff --git a/include/debug_uart.h b/include/debug_uart.h
index 6f0b0c5e15..34e8b2fc81 100644
--- a/include/debug_uart.h
+++ b/include/debug_uart.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Early debug UART support
*
* (C) Copyright 2014 Google, Inc
* Writte by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DEBUG_UART_H
diff --git a/include/dfu.h b/include/dfu.h
index 7e322d9d27..fbe978abdc 100644
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* dfu.h - DFU flashable area description
*
* Copyright (C) 2012 Samsung Electronics
* authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DFU_ENTITY_H_
diff --git a/include/dialog_pmic.h b/include/dialog_pmic.h
index 8f36bb63b5..fbfc5360d0 100644
--- a/include/dialog_pmic.h
+++ b/include/dialog_pmic.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* da9053 register declarations.
*
* Copyright(c) 2009 Dialog Semiconductor Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DIALOG_PMIC_H__
diff --git a/include/display.h b/include/display.h
index d0a08d4aaa..16f317c9c8 100644
--- a/include/display.h
+++ b/include/display.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Google Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DISPLAY_H
diff --git a/include/display_options.h b/include/display_options.h
index d9c8f6dbd4..a0dabca2b8 100644
--- a/include/display_options.h
+++ b/include/display_options.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
*
* (C) Copyright 2000-2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DISPLAY_OPTIONS_H
diff --git a/include/dm-demo.h b/include/dm-demo.h
index 03722d0c14..c9a82c7e52 100644
--- a/include/dm-demo.h
+++ b/include/dm-demo.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DM_DEMO_H
diff --git a/include/dm.h b/include/dm.h
index f752792c92..bf4b07d28f 100644
--- a/include/dm.h
+++ b/include/dm.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_H_
diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index eaeadd48d2..5a4d50cbbe 100644
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
* Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_DEVICE_INTERNAL_H
diff --git a/include/dm/device.h b/include/dm/device.h
index 7786b1cf4e..49078bc6b3 100644
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
* Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_DEVICE_H
diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h
index c46f0e91d0..db4c11e083 100644
--- a/include/dm/fdtaddr.h
+++ b/include/dm/fdtaddr.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
* Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_FDTADDR_H
diff --git a/include/dm/lists.h b/include/dm/lists.h
index d4d82d2fc4..13d1516a12 100644
--- a/include/dm/lists.h
+++ b/include/dm/lists.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_LISTS_H_
diff --git a/include/dm/of.h b/include/dm/of.h
index d4d941e75c..461e25aa19 100644
--- a/include/dm/of.h
+++ b/include/dm/of.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_OF_H
diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index c49d287dd6..74f0606e07 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Originally from Linux v4.9
* Copyright (C) 1996-2005 Paul Mackerras.
@@ -11,8 +12,6 @@
*
* Modified for U-Boot
* Copyright (c) 2017 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_OF_ACCESS_H
diff --git a/include/dm/of_addr.h b/include/dm/of_addr.h
index 25ca05b315..12b1a99a80 100644
--- a/include/dm/of_addr.h
+++ b/include/dm/of_addr.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Taken from Linux v4.9 drivers/of/address.c
*
* Modified for U-Boot
* Copyright (c) 2017 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_OF_ADDR_H
diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h
index 01b6ebedff..6f1529689f 100644
--- a/include/dm/of_extra.h
+++ b/include/dm/of_extra.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_OF_EXTRA_H
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 0d008404f9..be3f25d46d 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_OFNODE_H
diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index c6c8f6158d..80de3f3fed 100644
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PINCTRL_H
diff --git a/include/dm/platdata.h b/include/dm/platdata.h
index b73aa33093..c972fa6936 100644
--- a/include/dm/platdata.h
+++ b/include/dm/platdata.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
* Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_PLATDATA_H
diff --git a/include/dm/platform_data/lpc32xx_hsuart.h b/include/dm/platform_data/lpc32xx_hsuart.h
index fd191b5bd5..9bfd62833c 100644
--- a/include/dm/platform_data/lpc32xx_hsuart.h
+++ b/include/dm/platform_data/lpc32xx_hsuart.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Vladimir Zapolskiy <vz@mleia.com>
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LPC32XX_HSUART_PLAT_H
diff --git a/include/dm/platform_data/net_ethoc.h b/include/dm/platform_data/net_ethoc.h
index 3f94bde7b2..855e9999a0 100644
--- a/include/dm/platform_data/net_ethoc.h
+++ b/include/dm/platform_data/net_ethoc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2016 Cadence Design Systems Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _ETHOC_H
diff --git a/include/dm/platform_data/pfe_dm_eth.h b/include/dm/platform_data/pfe_dm_eth.h
index 7943c67688..100a981a38 100644
--- a/include/dm/platform_data/pfe_dm_eth.h
+++ b/include/dm/platform_data/pfe_dm_eth.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PFE_DM_ETH_H__
diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h
index 57ae6adc05..37f5174dbf 100644
--- a/include/dm/platform_data/serial_bcm283x_mu.h
+++ b/include/dm/platform_data/serial_bcm283x_mu.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Stephen Warren <swarren@wwwdotorg.org>
*
* Derived from pl01x code:
* Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __serial_bcm283x_mu_h
diff --git a/include/dm/platform_data/serial_coldfire.h b/include/dm/platform_data/serial_coldfire.h
index 5d86456f1e..ba916fece3 100644
--- a/include/dm/platform_data/serial_coldfire.h
+++ b/include/dm/platform_data/serial_coldfire.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Angelo Dureghello <angelo@sysam.it>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __serial_coldfire_h
diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h
index 7bcd28049b..86cd3bcf62 100644
--- a/include/dm/platform_data/serial_mxc.h
+++ b/include/dm/platform_data/serial_mxc.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Google, Inc
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __serial_mxc_h
diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h
index ccfa808e23..77d96c49f0 100644
--- a/include/dm/platform_data/serial_pl01x.h
+++ b/include/dm/platform_data/serial_pl01x.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Google, Inc
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __serial_pl01x_h
diff --git a/include/dm/platform_data/serial_pxa.h b/include/dm/platform_data/serial_pxa.h
index b19a4a6521..408c00885d 100644
--- a/include/dm/platform_data/serial_pxa.h
+++ b/include/dm/platform_data/serial_pxa.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Marcel Ziswiler <marcel.ziswiler@toradex.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SERIAL_PXA_H
diff --git a/include/dm/platform_data/serial_sh.h b/include/dm/platform_data/serial_sh.h
index 0271ad67b3..711435d8f6 100644
--- a/include/dm/platform_data/serial_sh.h
+++ b/include/dm/platform_data/serial_sh.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* Copyright (c) 2014 Renesas Electronics Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __serial_sh_h
diff --git a/include/dm/platform_data/serial_stm32.h b/include/dm/platform_data/serial_stm32.h
index d1cfcbe54f..85153df527 100644
--- a/include/dm/platform_data/serial_stm32.h
+++ b/include/dm/platform_data/serial_stm32.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Kamil Lulko, <kamil.lulko@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SERIAL_STM32_H
diff --git a/include/dm/read.h b/include/dm/read.h
index f14c7a7ba8..4a725bc923 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Function to read values from the device tree node attached to a udevice.
*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_READ_H
diff --git a/include/dm/root.h b/include/dm/root.h
index b075eef2c1..2b9c6da416 100644
--- a/include/dm/root.h
+++ b/include/dm/root.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_ROOT_H_
diff --git a/include/dm/test.h b/include/dm/test.h
index cecee26f33..83418eb482 100644
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DM_TEST_H
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h
index d28fb3e23f..d7f9df3583 100644
--- a/include/dm/uclass-id.h
+++ b/include/dm/uclass-id.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_UCLASS_ID_H
diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h
index c086004318..7ba064bd53 100644
--- a/include/dm/uclass-internal.h
+++ b/include/dm/uclass-internal.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_UCLASS_INTERNAL_H
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index a5bf3eb831..9fbaa7d81a 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
*
* (C) Copyright 2012
* Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DM_UCLASS_H
diff --git a/include/dm/util.h b/include/dm/util.h
index 0d4ce8f4e6..898822e445 100644
--- a/include/dm/util.h
+++ b/include/dm/util.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DM_UTIL_H
diff --git a/include/dm9000.h b/include/dm9000.h
index 42b04fac3f..f780e513f6 100644
--- a/include/dm9000.h
+++ b/include/dm9000.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* NOTE: DAVICOM DM9000 ethernet driver interface
*
* Authors: Remy Bohmer <linux@bohmer.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DM9000_H__
#define __DM9000_H__
diff --git a/include/dma.h b/include/dma.h
index 71fa77f2ea..50e965241c 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DMA_H_
diff --git a/include/dp83848.h b/include/dp83848.h
index c74ce0efb3..f1bc3d86f2 100644
--- a/include/dp83848.h
+++ b/include/dp83848.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* DP83848 ethernet Physical layer
*
* Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/ds1722.h b/include/ds1722.h
index 1b63e86b14..e115696cea 100644
--- a/include/ds1722.h
+++ b/include/ds1722.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _DS1722_H_
#define _DS1722_H_
diff --git a/include/dt-bindings/clock/ast2500-scu.h b/include/dt-bindings/clock/ast2500-scu.h
index e2d7aaf9fe..4803abe9f6 100644
--- a/include/dt-bindings/clock/ast2500-scu.h
+++ b/include/dt-bindings/clock/ast2500-scu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Google Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* Core Clocks */
diff --git a/include/dt-bindings/clock/bcm3380-clock.h b/include/dt-bindings/clock/bcm3380-clock.h
index 00add2f226..998d08f5bb 100644
--- a/include/dt-bindings/clock/bcm3380-clock.h
+++ b/include/dt-bindings/clock/bcm3380-clock.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from Broadcom GPL Source Code:
* Copyright (C) Broadcom Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM3380_H
diff --git a/include/dt-bindings/clock/bcm6318-clock.h b/include/dt-bindings/clock/bcm6318-clock.h
index 1e3dc16f90..d5e13c5c2d 100644
--- a/include/dt-bindings/clock/bcm6318-clock.h
+++ b/include/dt-bindings/clock/bcm6318-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6318_H
diff --git a/include/dt-bindings/clock/bcm63268-clock.h b/include/dt-bindings/clock/bcm63268-clock.h
index 23818da1a0..2725dcd06b 100644
--- a/include/dt-bindings/clock/bcm63268-clock.h
+++ b/include/dt-bindings/clock/bcm63268-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM63268_H
diff --git a/include/dt-bindings/clock/bcm6328-clock.h b/include/dt-bindings/clock/bcm6328-clock.h
index 5d0fc115e7..6f1e018a74 100644
--- a/include/dt-bindings/clock/bcm6328-clock.h
+++ b/include/dt-bindings/clock/bcm6328-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6328_H
diff --git a/include/dt-bindings/clock/bcm6338-clock.h b/include/dt-bindings/clock/bcm6338-clock.h
index 3439c10062..489aa1f95a 100644
--- a/include/dt-bindings/clock/bcm6338-clock.h
+++ b/include/dt-bindings/clock/bcm6338-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6338_H
diff --git a/include/dt-bindings/clock/bcm6348-clock.h b/include/dt-bindings/clock/bcm6348-clock.h
index 5af066bb16..c67a7fea2f 100644
--- a/include/dt-bindings/clock/bcm6348-clock.h
+++ b/include/dt-bindings/clock/bcm6348-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6348_H
diff --git a/include/dt-bindings/clock/bcm6358-clock.h b/include/dt-bindings/clock/bcm6358-clock.h
index ff2232123b..a7529bcc03 100644
--- a/include/dt-bindings/clock/bcm6358-clock.h
+++ b/include/dt-bindings/clock/bcm6358-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6358_H
diff --git a/include/dt-bindings/clock/bcm6362-clock.h b/include/dt-bindings/clock/bcm6362-clock.h
index 6b11a9f5ac..fed04e6b5f 100644
--- a/include/dt-bindings/clock/bcm6362-clock.h
+++ b/include/dt-bindings/clock/bcm6362-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6362_H
diff --git a/include/dt-bindings/clock/bcm6368-clock.h b/include/dt-bindings/clock/bcm6368-clock.h
index 9d41c0f131..0c85782632 100644
--- a/include/dt-bindings/clock/bcm6368-clock.h
+++ b/include/dt-bindings/clock/bcm6368-clock.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_CLOCK_BCM6368_H
diff --git a/include/dt-bindings/clock/boston-clock.h b/include/dt-bindings/clock/boston-clock.h
index 25f9cd25f2..0b3906247c 100644
--- a/include/dt-bindings/clock/boston-clock.h
+++ b/include/dt-bindings/clock/boston-clock.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __DT_BINDINGS_CLOCK_BOSTON_CLOCK_H__
diff --git a/include/dt-bindings/clock/microchip,clock.h b/include/dt-bindings/clock/microchip,clock.h
index 93c222d74f..ea6f161f97 100644
--- a/include/dt-bindings/clock/microchip,clock.h
+++ b/include/dt-bindings/clock/microchip,clock.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (c) 2015 Purna Chandra Mandal <purna.mandal@microchip.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __CLK_MICROCHIP_PIC32
diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h
index 87acf4af7f..2c0552d1a9 100644
--- a/include/dt-bindings/clock/rk3036-cru.h
+++ b/include/dt-bindings/clock/rk3036-cru.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3036_H
diff --git a/include/dt-bindings/clock/rk3066a-cru.h b/include/dt-bindings/clock/rk3066a-cru.h
index 549ae6a3f3..014eec5866 100644
--- a/include/dt-bindings/clock/rk3066a-cru.h
+++ b/include/dt-bindings/clock/rk3066a-cru.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3066A_H
diff --git a/include/dt-bindings/clock/rk3128-cru.h b/include/dt-bindings/clock/rk3128-cru.h
index 476268a78b..cfb3afbb28 100644
--- a/include/dt-bindings/clock/rk3128-cru.h
+++ b/include/dt-bindings/clock/rk3128-cru.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3128_H
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h
index 8fc818b1d9..1e7931da0c 100644
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3188_COMMON_H
diff --git a/include/dt-bindings/clock/rk3188-cru.h b/include/dt-bindings/clock/rk3188-cru.h
index b6960b07bc..1da306e178 100644
--- a/include/dt-bindings/clock/rk3188-cru.h
+++ b/include/dt-bindings/clock/rk3188-cru.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3188_H
diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h
index 13f9c864ca..1217d5239f 100644
--- a/include/dt-bindings/clock/rk3228-cru.h
+++ b/include/dt-bindings/clock/rk3228-cru.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2017 Rockchip Electronics Co., Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3228_H
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
index e37113a72d..e368d76750 100644
--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* core clocks */
diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h
index cdc0b338aa..cde61ed883 100644
--- a/include/dt-bindings/clock/rk3328-cru.h
+++ b/include/dt-bindings/clock/rk3328-cru.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3328_H
diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h
index d4bdcc663f..211faf8fa8 100644
--- a/include/dt-bindings/clock/rk3399-cru.h
+++ b/include/dt-bindings/clock/rk3399-cru.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Rockchip Electronics Co. Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RK3399_H
diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h
index 7defc6b282..9219a50a24 100644
--- a/include/dt-bindings/clock/rv1108-cru.h
+++ b/include/dt-bindings/clock/rv1108-cru.h
@@ -1,7 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Rockchip Electronics Co. Ltd.
* Author: Shawn Lin <shawn.lin@rock-chips.com>
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_CLK_ROCKCHIP_RV1108_H
diff --git a/include/dt-bindings/clock/stm32mp1-clksrc.h b/include/dt-bindings/clock/stm32mp1-clksrc.h
index 19fd959af9..002ad53512 100644
--- a/include/dt-bindings/clock/stm32mp1-clksrc.h
+++ b/include/dt-bindings/clock/stm32mp1-clksrc.h
@@ -1,7 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
*/
#ifndef _DT_BINDINGS_CLOCK_STM32MP1_CLKSRC_H_
diff --git a/include/dt-bindings/comphy/comphy_data.h b/include/dt-bindings/comphy/comphy_data.h
index 0983116038..4f7e2821b8 100644
--- a/include/dt-bindings/comphy/comphy_data.h
+++ b/include/dt-bindings/comphy/comphy_data.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015-2016 Marvell International Ltd.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _COMPHY_DATA_H_
diff --git a/include/dt-bindings/gpio/tegra186-gpio.h b/include/dt-bindings/gpio/tegra186-gpio.h
index 7e6fb95da1..83a19dc7ed 100644
--- a/include/dt-bindings/gpio/tegra186-gpio.h
+++ b/include/dt-bindings/gpio/tegra186-gpio.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
*
- * SPDX-License-Identifier: GPL-2.0
- *
* This header provides constants for binding nvidia,tegra186-gpio*.
*
* The first cell in Tegra's GPIO specifier is the GPIO ID. The macros below
diff --git a/include/dt-bindings/interrupt-router/intel-irq.h b/include/dt-bindings/interrupt-router/intel-irq.h
index 5092f33dfa..2d1e671c1c 100644
--- a/include/dt-bindings/interrupt-router/intel-irq.h
+++ b/include/dt-bindings/interrupt-router/intel-irq.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_INTEL_IRQ_H_
diff --git a/include/dt-bindings/mrc/quark.h b/include/dt-bindings/mrc/quark.h
index e3ca8a25a3..c763e74b5d 100644
--- a/include/dt-bindings/mrc/quark.h
+++ b/include/dt-bindings/mrc/quark.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Intel Quark MRC bindings include several properties
* as part of an Intel Quark MRC node. In most cases,
* the value of these properties uses the standard values
diff --git a/include/dt-bindings/net/ti-dp83867.h b/include/dt-bindings/net/ti-dp83867.h
index 1843757a5c..b8e5df615d 100644
--- a/include/dt-bindings/net/ti-dp83867.h
+++ b/include/dt-bindings/net/ti-dp83867.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* TI DP83867 PHY drivers
*
- * SPDX-License-Identifier: GPL-2.0
- *
*/
#ifndef _DT_BINDINGS_TI_DP83867_H
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
index 672a1369af..58fe28f159 100644
--- a/include/dt-bindings/pinctrl/omap.h
+++ b/include/dt-bindings/pinctrl/omap.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* This header provides constants for OMAP pinctrl bindings.
*
* Copyright (C) 2009 Nokia
* Copyright (C) 2009-2010 Texas Instruments
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _DT_BINDINGS_PINCTRL_OMAP_H
diff --git a/include/dt-bindings/pinctrl/pinctrl-tegra.h b/include/dt-bindings/pinctrl/pinctrl-tegra.h
index 638b114e4f..c9b57408de 100644
--- a/include/dt-bindings/pinctrl/pinctrl-tegra.h
+++ b/include/dt-bindings/pinctrl/pinctrl-tegra.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* This header provides constants for Tegra pinctrl bindings.
*
* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
*
* Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _DT_BINDINGS_PINCTRL_TEGRA_H
diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h
index 0798287e6f..1c28d6cb1f 100644
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ b/include/dt-bindings/pinctrl/rockchip.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Header providing constants for Rockchip pinctrl bindings.
*
* Copyright (c) 2013 MundoReader S.L.
* Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__
diff --git a/include/dt-bindings/pmic/sandbox_pmic.h b/include/dt-bindings/pmic/sandbox_pmic.h
index c3d839bf01..749c0d1f60 100644
--- a/include/dt-bindings/pmic/sandbox_pmic.h
+++ b/include/dt-bindings/pmic/sandbox_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DT_BINDINGS_SANDBOX_PMIC_H_
diff --git a/include/dt-bindings/power-domain/bcm6318-power-domain.h b/include/dt-bindings/power-domain/bcm6318-power-domain.h
index fb075d2c1c..b213cae9ac 100644
--- a/include/dt-bindings/power-domain/bcm6318-power-domain.h
+++ b/include/dt-bindings/power-domain/bcm6318-power-domain.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_POWER_DOMAIN_BCM6318_H
diff --git a/include/dt-bindings/power-domain/bcm63268-power-domain.h b/include/dt-bindings/power-domain/bcm63268-power-domain.h
index d9eba4418e..7208506d5b 100644
--- a/include/dt-bindings/power-domain/bcm63268-power-domain.h
+++ b/include/dt-bindings/power-domain/bcm63268-power-domain.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_POWER_DOMAIN_BCM63268_H
diff --git a/include/dt-bindings/power-domain/bcm6328-power-domain.h b/include/dt-bindings/power-domain/bcm6328-power-domain.h
index 006806c935..6b4b19988f 100644
--- a/include/dt-bindings/power-domain/bcm6328-power-domain.h
+++ b/include/dt-bindings/power-domain/bcm6328-power-domain.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_POWER_DOMAIN_BCM6328_H
diff --git a/include/dt-bindings/power-domain/bcm6362-power-domain.h b/include/dt-bindings/power-domain/bcm6362-power-domain.h
index 3178b00b57..ddc123ea88 100644
--- a/include/dt-bindings/power-domain/bcm6362-power-domain.h
+++ b/include/dt-bindings/power-domain/bcm6362-power-domain.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_POWER_DOMAIN_BCM6362_H
diff --git a/include/dt-bindings/power/tegra186-powergate.h b/include/dt-bindings/power/tegra186-powergate.h
index 70630c6ea7..17e7549856 100644
--- a/include/dt-bindings/power/tegra186-powergate.h
+++ b/include/dt-bindings/power/tegra186-powergate.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2015-2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _DT_BINDINGS_POWER_TEGRA186_POWERGATE_H
diff --git a/include/dt-bindings/reset/altr,rst-mgr-s10.h b/include/dt-bindings/reset/altr,rst-mgr-s10.h
index e3cae08e0e..1fdcf8ae15 100644
--- a/include/dt-bindings/reset/altr,rst-mgr-s10.h
+++ b/include/dt-bindings/reset/altr,rst-mgr-s10.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2016-2018 Intel Corporation. All rights reserved
* Copyright (C) 2016 Altera Corporation. All rights reserved
- *
- * SPDX-License-Identifier: GPL-2.0
* derived from Steffen Trumtrar's "altr,rst-mgr-a10.h"
*/
diff --git a/include/dt-bindings/reset/altr,rst-mgr.h b/include/dt-bindings/reset/altr,rst-mgr.h
index 351d8cdc6f..5b7ad73965 100644
--- a/include/dt-bindings/reset/altr,rst-mgr.h
+++ b/include/dt-bindings/reset/altr,rst-mgr.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2014, Steffen Trumtrar <s.trumtrar@pengutronix.de>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _DT_BINDINGS_RESET_ALTR_RST_MGR_H
diff --git a/include/dt-bindings/reset/ast2500-reset.h b/include/dt-bindings/reset/ast2500-reset.h
index eb5e1db97b..d1b6b23fc1 100644
--- a/include/dt-bindings/reset/ast2500-reset.h
+++ b/include/dt-bindings/reset/ast2500-reset.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ABI_MACH_ASPEED_AST2500_RESET_H_
diff --git a/include/dt-bindings/reset/bcm3380-reset.h b/include/dt-bindings/reset/bcm3380-reset.h
index ddc575d92b..4cbf4d289d 100644
--- a/include/dt-bindings/reset/bcm3380-reset.h
+++ b/include/dt-bindings/reset/bcm3380-reset.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from Broadcom GPL Source Code:
* Copyright (C) Broadcom Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM3380_H
diff --git a/include/dt-bindings/reset/bcm6318-reset.h b/include/dt-bindings/reset/bcm6318-reset.h
index 781d7fbc4d..1422500f8f 100644
--- a/include/dt-bindings/reset/bcm6318-reset.h
+++ b/include/dt-bindings/reset/bcm6318-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6318_H
diff --git a/include/dt-bindings/reset/bcm63268-reset.h b/include/dt-bindings/reset/bcm63268-reset.h
index 1373884b36..a45abed1ce 100644
--- a/include/dt-bindings/reset/bcm63268-reset.h
+++ b/include/dt-bindings/reset/bcm63268-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM63268_H
diff --git a/include/dt-bindings/reset/bcm6328-reset.h b/include/dt-bindings/reset/bcm6328-reset.h
index c144ad2a78..f2dd4f79cc 100644
--- a/include/dt-bindings/reset/bcm6328-reset.h
+++ b/include/dt-bindings/reset/bcm6328-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6328_H
diff --git a/include/dt-bindings/reset/bcm6338-reset.h b/include/dt-bindings/reset/bcm6338-reset.h
index 17a5e121e8..4aec7a4b59 100644
--- a/include/dt-bindings/reset/bcm6338-reset.h
+++ b/include/dt-bindings/reset/bcm6338-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6338_H
diff --git a/include/dt-bindings/reset/bcm6348-reset.h b/include/dt-bindings/reset/bcm6348-reset.h
index 173937b9ef..b298c18316 100644
--- a/include/dt-bindings/reset/bcm6348-reset.h
+++ b/include/dt-bindings/reset/bcm6348-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6348_H
diff --git a/include/dt-bindings/reset/bcm6358-reset.h b/include/dt-bindings/reset/bcm6358-reset.h
index 4b3cff3e49..075706eff7 100644
--- a/include/dt-bindings/reset/bcm6358-reset.h
+++ b/include/dt-bindings/reset/bcm6358-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6358_H
diff --git a/include/dt-bindings/reset/bcm6362-reset.h b/include/dt-bindings/reset/bcm6362-reset.h
index ffa46a62f6..6e257ce78f 100644
--- a/include/dt-bindings/reset/bcm6362-reset.h
+++ b/include/dt-bindings/reset/bcm6362-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2018 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6362_H
diff --git a/include/dt-bindings/reset/bcm6368-reset.h b/include/dt-bindings/reset/bcm6368-reset.h
index afa6a81d4c..0038a7ccf5 100644
--- a/include/dt-bindings/reset/bcm6368-reset.h
+++ b/include/dt-bindings/reset/bcm6368-reset.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
*
* Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_BINDINGS_RESET_BCM6368_H
diff --git a/include/dt-bindings/reset/tegra186-reset.h b/include/dt-bindings/reset/tegra186-reset.h
index 26b4ba9b0a..7efec92005 100644
--- a/include/dt-bindings/reset/tegra186-reset.h
+++ b/include/dt-bindings/reset/tegra186-reset.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2015, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _ABI_MACH_T186_RESET_T186_H_
diff --git a/include/dt-structs.h b/include/dt-structs.h
index c0f56951b5..924d51fc52 100644
--- a/include/dt-structs.h
+++ b/include/dt-structs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DT_STRUCTS
diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h
index 902abd4d44..23088ec768 100644
--- a/include/dw_hdmi.h
+++ b/include/dw_hdmi.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Copyright 2014 Rockchip Inc.
* Copyright (C) 2011 Freescale Semiconductor, Inc.
* (C) Copyright 2017 Jernej Skrabec <jernej.skrabec@siol.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DW_HDMI_H
diff --git a/include/dwc3-omap-uboot.h b/include/dwc3-omap-uboot.h
index db002b9b6a..7c982e3798 100644
--- a/include/dwc3-omap-uboot.h
+++ b/include/dwc3-omap-uboot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* include/dwc3_omap_uboot.h
*
* Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
*
* Designware SuperSpeed OMAP Glue uboot init
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __DWC3_OMAP_UBOOT_H_
diff --git a/include/dwc3-sti-glue.h b/include/dwc3-sti-glue.h
index e1dc9b8030..e2856f1268 100644
--- a/include/dwc3-sti-glue.h
+++ b/include/dwc3-sti-glue.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWC3_STI_UBOOT_H_
diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h
index 7af2ad11e4..228ab3b102 100644
--- a/include/dwc3-uboot.h
+++ b/include/dwc3-uboot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* include/dwc3-uboot.h
*
* Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
*
* Designware SuperSpeed USB uboot init
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __DWC3_UBOOT_H_
diff --git a/include/dwc_ahsata.h b/include/dwc_ahsata.h
index cae275fe75..2aa93427f6 100644
--- a/include/dwc_ahsata.h
+++ b/include/dwc_ahsata.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWC_AHSATA_H__
diff --git a/include/dwmmc.h b/include/dwmmc.h
index a9058824e0..bc1d6e3abb 100644
--- a/include/dwmmc.h
+++ b/include/dwmmc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 SAMSUNG Electronics
* Jaehoon Chung <jh80.chung@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWMMC_HW_H
diff --git a/include/edid.h b/include/edid.h
index a9f2f3d3ab..f05d2b82f2 100644
--- a/include/edid.h
+++ b/include/edid.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 The Chromium OS Authors.
*
* (C) Copyright 2010
* Petr Stetiar <ynezz@true.cz>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Contains stolen code from ddcprobe project which is:
* Copyright (C) Nalin Dahyabhai <bigfun@pobox.com>
*/
diff --git a/include/eeprom_field.h b/include/eeprom_field.h
index 94e259ff73..05c0d14592 100644
--- a/include/eeprom_field.h
+++ b/include/eeprom_field.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2016 CompuLab, Ltd.
*
* Authors: Nikita Kiryanov <nikita@compulab.co.il>
* Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FIELD_
diff --git a/include/eeprom_layout.h b/include/eeprom_layout.h
index 459b99d861..730d963ab9 100644
--- a/include/eeprom_layout.h
+++ b/include/eeprom_layout.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2016 CompuLab, Ltd.
*
* Authors: Nikita Kiryanov <nikita@compulab.co.il>
* Igor Grinberg <grinberg@compulab.co.il>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LAYOUT_
diff --git a/include/elf.h b/include/elf.h
index 248ba59cd6..0d3845e063 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* Copyright (c) 1995, 1996, 2001, 2002
* Erik Theisen. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
*/
/* This is the ELF ABI header file formerly known as "elf_abi.h" */
diff --git a/include/env_attr.h b/include/env_attr.h
index 7bfb7f30d1..e0846cccb1 100644
--- a/include/env_attr.h
+++ b/include/env_attr.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ENV_ATTR_H__
diff --git a/include/env_callback.h b/include/env_callback.h
index 48da32a67b..3c44ff574b 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ENV_CALLBACK_H__
diff --git a/include/env_default.h b/include/env_default.h
index 7d5988a1a5..54d8124793 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2010
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Andreas Heppel <aheppel@sysgo.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <env_callback.h>
diff --git a/include/env_flags.h b/include/env_flags.h
index 0dcec0689b..cc2c34f939 100644
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ENV_FLAGS_H__
diff --git a/include/environment.h b/include/environment.h
index 2bd0ad12a6..50c62c5645 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ENVIRONMENT_H_
diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
index 24b7783f88..31042fad67 100644
--- a/include/environment/ti/boot.h
+++ b/include/environment/ti/boot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Boot related environment variable definitions on TI boards.
*
* (C) Copyright 2017 Linaro Ltd.
* Sam Protsenko <semen.protsenko@linaro.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TI_BOOT_H
diff --git a/include/environment/ti/dfu.h b/include/environment/ti/dfu.h
index c89005ff4c..9f7ea03226 100644
--- a/include/environment/ti/dfu.h
+++ b/include/environment/ti/dfu.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com
*
* Environment variable definitions for DFU on TI boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TI_DFU_H
diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h
index 4305ebdaaf..785fc15345 100644
--- a/include/environment/ti/mmc.h
+++ b/include/environment/ti/mmc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com
*
* Environment variable definitions for MMC/SD on TI boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TI_MMC_H
diff --git a/include/environment/ti/spi.h b/include/environment/ti/spi.h
index 18c857c47d..1681dc8635 100644
--- a/include/environment/ti/spi.h
+++ b/include/environment/ti/spi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com
*
* Environment variable definitions for SPI on TI boards.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TI_SPI_H
diff --git a/include/errno.h b/include/errno.h
index e0c670a16c..ccb7869e17 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ERRNO_H
#define _ERRNO_H
diff --git a/include/ethsw.h b/include/ethsw.h
index 25f358d128..04e002d39f 100644
--- a/include/ethsw.h
+++ b/include/ethsw.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Ethernet Switch commands
*/
diff --git a/include/ext_common.h b/include/ext_common.h
index 07b61fa56b..17c92f1750 100644
--- a/include/ext_common.h
+++ b/include/ext_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 - 2012 Samsung Electronics
* EXT4 filesystem implementation in Uboot by
@@ -14,8 +15,6 @@
* based on code from grub2 fs/ext2.c and fs/fshelp.c by
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __EXT_COMMON__
diff --git a/include/exynos_lcd.h b/include/exynos_lcd.h
index ab92ffb72a..484bd36334 100644
--- a/include/exynos_lcd.h
+++ b/include/exynos_lcd.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* exynos_lcd.h - Exynos LCD Controller structures
*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _EXYNOS_LCD_H_
diff --git a/include/faraday/ftahbc020s.h b/include/faraday/ftahbc020s.h
index ccae39095a..e628156c15 100644
--- a/include/faraday/ftahbc020s.h
+++ b/include/faraday/ftahbc020s.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Andes Technology Corporation
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* FTAHBC020S - AHB Controller (Arbiter/Decoder) definitions */
diff --git a/include/faraday/ftpci100.h b/include/faraday/ftpci100.h
index 43152aae2b..b4a43f82e5 100644
--- a/include/faraday/ftpci100.h
+++ b/include/faraday/ftpci100.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Faraday FTPCI100 PCI Bridge Controller Device Driver Implementation
*
* Copyright (C) 2010 Andes Technology Corporation
* Gavin Guo, Andes Technology Corporation <gavinguo@andestech.com>
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FTPCI100_H
diff --git a/include/faraday/ftpmu010.h b/include/faraday/ftpmu010.h
index b1131e5ae6..8fc81f902d 100644
--- a/include/faraday/ftpmu010.h
+++ b/include/faraday/ftpmu010.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Faraday Technology
* Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/faraday/ftsdc010.h b/include/faraday/ftsdc010.h
index 9bfdef90ea..d3a359ab75 100644
--- a/include/faraday/ftsdc010.h
+++ b/include/faraday/ftsdc010.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Faraday FTSDC010 Secure Digital Memory Card Host Controller
*
* Copyright (C) 2011 Andes Technology Corporation
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FTSDC010_H
diff --git a/include/faraday/ftsdmc020.h b/include/faraday/ftsdmc020.h
index 8e296c0568..d74da16ef2 100644
--- a/include/faraday/ftsdmc020.h
+++ b/include/faraday/ftsdmc020.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Faraday Technology
* Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/faraday/ftsdmc021.h b/include/faraday/ftsdmc021.h
index b893b5e3e1..3c979ced27 100644
--- a/include/faraday/ftsdmc021.h
+++ b/include/faraday/ftsdmc021.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Faraday Technology
* Po-Yu Chuang <ratbert@faraday-tech.com>
*
* (C) Copyright 2011 Andes Technology Corp
* Macpaul Lin <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/faraday/ftsmc020.h b/include/faraday/ftsmc020.h
index 54120ab416..f902a791ef 100644
--- a/include/faraday/ftsmc020.h
+++ b/include/faraday/ftsmc020.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Faraday Technology
* Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/faraday/fttmr010.h b/include/faraday/fttmr010.h
index 2ab68d1021..ec1c9895f5 100644
--- a/include/faraday/fttmr010.h
+++ b/include/faraday/fttmr010.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Faraday Technology
* Po-Yu Chuang <ratbert@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/faraday/ftwdt010_wdt.h b/include/faraday/ftwdt010_wdt.h
index 2c5a36628b..20bf6d3125 100644
--- a/include/faraday/ftwdt010_wdt.h
+++ b/include/faraday/ftwdt010_wdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Watchdog driver for the FTWDT010 Watch Dog Driver
*
@@ -8,8 +9,6 @@
* Copyright (C) 2011 Andes Technology Corporation
* Macpaul Lin, Andes Technology Corporation <macpaul@andestech.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* 27/11/2004 Initial release, Faraday.
* 12/01/2011 Port to u-boot, Macpaul Lin.
*/
diff --git a/include/fastboot.h b/include/fastboot.h
index 616631e9aa..009f1a72e1 100644
--- a/include/fastboot.h
+++ b/include/fastboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008 - 2009
* Windriver, <www.windriver.com>
@@ -7,8 +8,6 @@
*
* Copyright 2014 Linaro, Ltd.
* Rob Herring <robh@kernel.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FASTBOOT_H_
#define _FASTBOOT_H_
diff --git a/include/fat.h b/include/fat.h
index fa956441c6..7dada411e5 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* R/O (V)FAT 12/16/32 filesystem implementation by Marcus Sundberg
*
* 2002-07-28 - rjones@nexus-tech.net - ported to ppcboot v1.1.6
* 2003-03-10 - kharris@nexus-tech.net - ported to u-boot
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FAT_H_
diff --git a/include/fb_mmc.h b/include/fb_mmc.h
index 12b99cb5ee..a2d7c4895f 100644
--- a/include/fb_mmc.h
+++ b/include/fb_mmc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
void fb_mmc_flash_write(const char *cmd, void *download_buffer,
diff --git a/include/fb_nand.h b/include/fb_nand.h
index aaf7cf7ae8..3daae8c4ca 100644
--- a/include/fb_nand.h
+++ b/include/fb_nand.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Broadcom Corporation.
* Copyright 2015 Free Electrons.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
void fb_nand_flash_write(const char *cmd, void *download_buffer,
diff --git a/include/fdt_simplefb.h b/include/fdt_simplefb.h
index 8c89a19b8e..7cc305e1fd 100644
--- a/include/fdt_simplefb.h
+++ b/include/fdt_simplefb.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Simplefb device tree support
*
* (C) Copyright 2015
* Stephen Warren <swarren@wwwdotorg.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FDT_SIMPLEFB_H_
diff --git a/include/fdt_support.h b/include/fdt_support.h
index 76ef5b70d7..e6c43ea983 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FDT_SUPPORT_H
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 2941a2ea71..eca6e98b33 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __fdtdec_h
diff --git a/include/fis.h b/include/fis.h
index 0d80c1cb5d..419807f1fe 100644
--- a/include/fis.h
+++ b/include/fis.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2008 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FIS_H__
diff --git a/include/flash.h b/include/flash.h
index 1a4e879009..70ab435199 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FLASH_H_
diff --git a/include/fm_eth.h b/include/fm_eth.h
index d43f801fdc..2e2ba756a0 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FM_ETH_H__
diff --git a/include/fpga.h b/include/fpga.h
index 4d6da790b7..f444093353 100644
--- a/include/fpga.h
+++ b/include/fpga.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/types.h> /* for ulong typedef */
diff --git a/include/fs.h b/include/fs.h
index 32fc480135..d703ed5027 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _FS_H
#define _FS_H
diff --git a/include/fs_internal.h b/include/fs_internal.h
index 9d6dddd841..96d26032ac 100644
--- a/include/fs_internal.h
+++ b/include/fs_internal.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* 2017 by Marek Behun <marek.behun@nic.cz>
*
* Derived from code in ext4/dev.c, which was based on reiserfs/dev.c
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __U_BOOT_FS_INTERNAL_H__
diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h
index 6d0ffa8265..159756f71a 100644
--- a/include/fsl-mc/fsl_dpaa_fd.h
+++ b/include/fsl-mc/fsl_dpaa_fd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DPAA_FD_H
#define __FSL_DPAA_FD_H
diff --git a/include/fsl-mc/fsl_dpbp.h b/include/fsl-mc/fsl_dpbp.h
index 5401e861f0..8d7c14d97d 100644
--- a/include/fsl-mc/fsl_dpbp.h
+++ b/include/fsl-mc/fsl_dpbp.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale Layerscape MC I/O wrapper
*
* Copyright (C) 2013-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*!
* @file fsl_dpbp.h
diff --git a/include/fsl-mc/fsl_dpio.h b/include/fsl-mc/fsl_dpio.h
index 86251e222f..c300c94e20 100644
--- a/include/fsl-mc/fsl_dpio.h
+++ b/include/fsl-mc/fsl_dpio.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013-2016 Freescale Semiconductor
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_DPIO_H
diff --git a/include/fsl-mc/fsl_dpmac.h b/include/fsl-mc/fsl_dpmac.h
index 36a5cca69c..66cf3bf6a2 100644
--- a/include/fsl-mc/fsl_dpmac.h
+++ b/include/fsl-mc/fsl_dpmac.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale Layerscape MC I/O wrapper
*
* Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
* Author: Prabhakar Kushwaha <prabhakar@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DPMAC_H
diff --git a/include/fsl-mc/fsl_dpmng.h b/include/fsl-mc/fsl_dpmng.h
index 023b5bbdb4..2148601e8a 100644
--- a/include/fsl-mc/fsl_dpmng.h
+++ b/include/fsl-mc/fsl_dpmng.h
@@ -1,6 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright 2013-2015 Freescale Semiconductor Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DPMNG_H
#define __FSL_DPMNG_H
diff --git a/include/fsl-mc/fsl_dpni.h b/include/fsl-mc/fsl_dpni.h
index 5b80b6f8e0..309d323acf 100644
--- a/include/fsl-mc/fsl_dpni.h
+++ b/include/fsl-mc/fsl_dpni.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013-2016 Freescale Semiconductor
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_DPNI_H
#define _FSL_DPNI_H
diff --git a/include/fsl-mc/fsl_dprc.h b/include/fsl-mc/fsl_dprc.h
index 8ad01d4f51..779d6f9567 100644
--- a/include/fsl-mc/fsl_dprc.h
+++ b/include/fsl-mc/fsl_dprc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale Layerscape MC I/O wrapper
*
* Copyright (C) 2013-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_DPRC_H
#define _FSL_DPRC_H
diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h
index 60088ecf83..7f4859b004 100644
--- a/include/fsl-mc/fsl_mc.h
+++ b/include/fsl-mc/fsl_mc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_MC_H__
diff --git a/include/fsl-mc/fsl_mc_cmd.h b/include/fsl-mc/fsl_mc_cmd.h
index 1ec67b5491..179f669828 100644
--- a/include/fsl-mc/fsl_mc_cmd.h
+++ b/include/fsl-mc/fsl_mc_cmd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Copyright 2013-2016 Freescale Semiconductor Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_MC_CMD_H
#define __FSL_MC_CMD_H
diff --git a/include/fsl-mc/fsl_mc_private.h b/include/fsl-mc/fsl_mc_private.h
index 2932d9d561..f4b5a99e15 100644
--- a/include/fsl-mc/fsl_mc_private.h
+++ b/include/fsl-mc/fsl_mc_private.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014-2016 Freescale Semiconductor
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_MC_PRIVATE_H_
diff --git a/include/fsl-mc/fsl_mc_sys.h b/include/fsl-mc/fsl_mc_sys.h
index c0befe01d2..9fb8164f50 100644
--- a/include/fsl-mc/fsl_mc_sys.h
+++ b/include/fsl-mc/fsl_mc_sys.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale Layerscape Management Complex (MC) Environment-specific code
*
* Copyright (C) 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_MC_SYS_H
diff --git a/include/fsl-mc/fsl_qbman_base.h b/include/fsl-mc/fsl_qbman_base.h
index c92cbe1323..7818fc28e6 100644
--- a/include/fsl-mc/fsl_qbman_base.h
+++ b/include/fsl-mc/fsl_qbman_base.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_QBMAN_BASE_H
diff --git a/include/fsl-mc/fsl_qbman_portal.h b/include/fsl-mc/fsl_qbman_portal.h
index 2aadad888b..ee0e4aa50d 100644
--- a/include/fsl-mc/fsl_qbman_portal.h
+++ b/include/fsl-mc/fsl_qbman_portal.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_QBMAN_PORTAL_H
diff --git a/include/fsl-mc/ldpaa_wriop.h b/include/fsl-mc/ldpaa_wriop.h
index 0ca49564a9..07e5130264 100644
--- a/include/fsl-mc/ldpaa_wriop.h
+++ b/include/fsl-mc/ldpaa_wriop.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LDPAA_WRIOP_H
diff --git a/include/fsl_csu.h b/include/fsl_csu.h
index 027a811aaf..0e59ac3c32 100644
--- a/include/fsl_csu.h
+++ b/include/fsl_csu.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __FSL_CSU_H__
diff --git a/include/fsl_dcu_fb.h b/include/fsl_dcu_fb.h
index 67e29e74e6..2dd5f54c3e 100644
--- a/include/fsl_dcu_fb.h
+++ b/include/fsl_dcu_fb.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*
* FSL DCU Framebuffer driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/fb.h>
diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 261b94e984..2476f40c56 100644
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef FSL_DDR_MAIN_H
diff --git a/include/fsl_ddr_dimm_params.h b/include/fsl_ddr_dimm_params.h
index 1632a8fd36..58b42b875c 100644
--- a/include/fsl_ddr_dimm_params.h
+++ b/include/fsl_ddr_dimm_params.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef DDR2_DIMM_PARAMS_H
diff --git a/include/fsl_ddr_sdram.h b/include/fsl_ddr_sdram.h
index d4275e694b..56c9db2594 100644
--- a/include/fsl_ddr_sdram.h
+++ b/include/fsl_ddr_sdram.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008-2016 Freescale Semiconductor, Inc.
* Copyright 2017-2018 NXP Semiconductor
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef FSL_DDR_MEMCTL_H
diff --git a/include/fsl_ddrc_version.h b/include/fsl_ddrc_version.h
index 60ba98bf81..7c1d0419de 100644
--- a/include/fsl_ddrc_version.h
+++ b/include/fsl_ddrc_version.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DDRC_VER_H
diff --git a/include/fsl_devdis.h b/include/fsl_devdis.h
index 02415feed8..1f1b033317 100644
--- a/include/fsl_devdis.h
+++ b/include/fsl_devdis.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_DEVDIS_H_
diff --git a/include/fsl_diu_fb.h b/include/fsl_diu_fb.h
index 7898b2bb2f..139851ba1a 100644
--- a/include/fsl_diu_fb.h
+++ b/include/fsl_diu_fb.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2007, 2011 Freescale Semiconductor, Inc.
* Authors: York Sun <yorksun@freescale.com>
* Timur Tabi <timur@freescale.com>
*
* FSL DIU Framebuffer driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix);
diff --git a/include/fsl_dspi.h b/include/fsl_dspi.h
index b569b4d2b6..114f63bce3 100644
--- a/include/fsl_dspi.h
+++ b/include/fsl_dspi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale DSPI Module Defines
*
@@ -5,8 +6,6 @@
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* Chao Fu (B44548@freesacle.com)
* Haikun Wang (B53464@freescale.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_DSPI_H_
diff --git a/include/fsl_dtsec.h b/include/fsl_dtsec.h
index 41b8398ecd..ccd6572ae2 100644
--- a/include/fsl_dtsec.h
+++ b/include/fsl_dtsec.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DTSEC_H__
diff --git a/include/fsl_errata.h b/include/fsl_errata.h
index 89051aa741..88f4268658 100644
--- a/include/fsl_errata.h
+++ b/include/fsl_errata.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013 - 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_ERRATA_H
diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h
index b341e018f2..acd8dd06f8 100644
--- a/include/fsl_esdhc.h
+++ b/include/fsl_esdhc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* FSL SD/MMC Defines
*-------------------------------------------------------------------
*
* Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_ESDHC_H__
diff --git a/include/fsl_fman.h b/include/fsl_fman.h
index f3e35f8c6b..74acdb2569 100644
--- a/include/fsl_fman.h
+++ b/include/fsl_fman.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* MPC85xx Internal Memory Map
*
* Copyright 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_FMAN_H__
diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
index 29aa687507..d051e92ce4 100644
--- a/include/fsl_ifc.h
+++ b/include/fsl_ifc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Freescale Semiconductor, Inc.
* Author: Dipen Dudhat <dipen.dudhat@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_IFC_H
diff --git a/include/fsl_immap.h b/include/fsl_immap.h
index 4f5a19cdc1..5297c0b3f9 100644
--- a/include/fsl_immap.h
+++ b/include/fsl_immap.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common internal memory map for some Freescale SoCs
*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_IMMAP_H
diff --git a/include/fsl_lpuart.h b/include/fsl_lpuart.h
index 4643ee79ee..02ebfefc74 100644
--- a/include/fsl_lpuart.h
+++ b/include/fsl_lpuart.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifdef CONFIG_ARCH_MX7ULP
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index 25678a9988..b87346ce7c 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2012, 2013 Freescale Semiconductor, Inc.
* Jun-jie Zhang <b18070@freescale.com>
* Mingkai Hu <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_PHY_H__
diff --git a/include/fsl_memac.h b/include/fsl_memac.h
index 431c2a0ccc..d067f1511c 100644
--- a/include/fsl_memac.h
+++ b/include/fsl_memac.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2012 Freescale Semiconductor, Inc.
* Roy Zang <tie-fei.zang@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MEMAC_H__
diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
index d5c4f8d59a..05fb41f403 100644
--- a/include/fsl_mmdc.h
+++ b/include/fsl_mmdc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef FSL_MMDC_H
diff --git a/include/fsl_pmic.h b/include/fsl_pmic.h
index e8a67d552a..6cab77ecb5 100644
--- a/include/fsl_pmic.h
+++ b/include/fsl_pmic.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
* (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_PMIC_H__
diff --git a/include/fsl_qbman.h b/include/fsl_qbman.h
index 06262ec00f..4687eb9bb1 100644
--- a/include/fsl_qbman.h
+++ b/include/fsl_qbman.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_QBMAN_H__
diff --git a/include/fsl_qe.h b/include/fsl_qe.h
index 77b18e928f..d4eba82436 100644
--- a/include/fsl_qe.h
+++ b/include/fsl_qe.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
*
* Dave Liu <daveliu@freescale.com>
* based on source code of Shlomi Gridish
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __QE_H__
diff --git a/include/fsl_sec.h b/include/fsl_sec.h
index 4cbdb2d65a..16e3fcb5a1 100644
--- a/include/fsl_sec.h
+++ b/include/fsl_sec.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common internal memory map for some Freescale SoCs
*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_SEC_H
diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h
index 1f31f8865c..fb838db0b5 100644
--- a/include/fsl_sec_mon.h
+++ b/include/fsl_sec_mon.h
@@ -1,8 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common internal memory map for some Freescale SoCs
*
* Copyright 2015 Freescale Semiconductor, Inc.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSL_SEC_MON_H
diff --git a/include/fsl_secboot_err.h b/include/fsl_secboot_err.h
index 95d890ba49..bc9dab230b 100644
--- a/include/fsl_secboot_err.h
+++ b/include/fsl_secboot_err.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_SECBOOT_ERR_H
diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index d3a2813470..613814d905 100644
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_SFP_SNVS_
diff --git a/include/fsl_tgec.h b/include/fsl_tgec.h
index 92fb777c25..59cd856ba0 100644
--- a/include/fsl_tgec.h
+++ b/include/fsl_tgec.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009-2011 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TGEC_H__
diff --git a/include/fsl_usb.h b/include/fsl_usb.h
index 73235b8c73..e9e1dd6905 100644
--- a/include/fsl_usb.h
+++ b/include/fsl_usb.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Freescale USB Controller
*
* Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ASM_FSL_USB_H_
diff --git a/include/fsl_validate.h b/include/fsl_validate.h
index 452c6df83f..c7b3ffc67c 100644
--- a/include/fsl_validate.h
+++ b/include/fsl_validate.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FSL_VALIDATE_H_
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index 683c3f3bac..655f22ed9a 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
struct watchdog_regs {
diff --git a/include/fuse.h b/include/fuse.h
index 87ee17d346..d48dcdfa64 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009-2013 ADVANSEE
* Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
@@ -5,8 +6,6 @@
* Based on the mpc512x iim code:
* Copyright 2008 Silicon Turnkey Express, Inc.
* Martha Marx <mmarx@silicontkx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FUSE_H_
diff --git a/include/g_dnl.h b/include/g_dnl.h
index bd29a9f83a..6d461c73d3 100644
--- a/include/g_dnl.h
+++ b/include/g_dnl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __G_DOWNLOAD_H_
diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h
index 10290509f5..db4424d3f8 100644
--- a/include/gdsys_fpga.h
+++ b/include/gdsys_fpga.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __GDSYS_FPGA_H
diff --git a/include/generic-phy.h b/include/generic-phy.h
index eac5adc893..3d26249fae 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
* Written by Jean-Jacques Hiblot <jjhiblot@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __GENERIC_PHY_H
diff --git a/include/gt64120.h b/include/gt64120.h
index 938966db5a..0b577f3f44 100644
--- a/include/gt64120.h
+++ b/include/gt64120.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2000, 2004, 2005 MIPS Technologies, Inc.
* All rights reserved.
* Authors: Carsten Langgaard <carstenl@mips.com>
* Maciej W. Rozycki <macro@mips.com>
* Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _ASM_GT64120_H
#define _ASM_GT64120_H
diff --git a/include/hash.h b/include/hash.h
index 4f9a8cf1db..f4019a9791 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 The Chromium OS Authors.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _HASH_H
diff --git a/include/hw_sha.h b/include/hw_sha.h
index ab19a99188..991e496a3c 100644
--- a/include/hw_sha.h
+++ b/include/hw_sha.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Header file for SHA hardware acceleration
*
* Copyright (c) 2012 Samsung Electronics
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __HW_SHA_H
#define __HW_SHA_H
diff --git a/include/hwconfig.h b/include/hwconfig.h
index d30421d267..cf47210756 100644
--- a/include/hwconfig.h
+++ b/include/hwconfig.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* An inteface for configuring a hardware via u-boot environment.
*
@@ -5,8 +6,6 @@
* Copyright 2011 Freescale Semiconductor, Inc.
*
* Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _HWCONFIG_H
diff --git a/include/i2c.h b/include/i2c.h
index 695cb7655f..d33f827500 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009 Sergey Kubushyn <ksi@koi8.net>
* Copyright (C) 2009 - 2013 Heiko Schocher <hs@denx.de>
@@ -6,8 +7,6 @@
* (C) Copyright 2001
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* The original I2C interface was
* (C) 2000 by Paolo Scaffardi (arsenio@tin.it)
* AIRVENT SAM s.p.a - RIMINI(ITALY)
diff --git a/include/i2c_eeprom.h b/include/i2c_eeprom.h
index bb5c6b118b..0fcdf3831b 100644
--- a/include/i2c_eeprom.h
+++ b/include/i2c_eeprom.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __I2C_EEPROM
diff --git a/include/i2s.h b/include/i2s.h
index 8dd2cc388a..e6d45ec26d 100644
--- a/include/i2s.h
+++ b/include/i2s.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* R. Chandrasekar <rcsekar@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __I2S_H__
diff --git a/include/i8042.h b/include/i8042.h
index 0766488acb..2b9e5c4d37 100644
--- a/include/i8042.h
+++ b/include/i8042.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002 ELTEC Elektronik AG
* Frank Gottschling <fgottschling@eltec.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* i8042.h - Intel 8042 keyboard driver header */
diff --git a/include/ide.h b/include/ide.h
index 4d788912f2..1b37d67992 100644
--- a/include/ide.h
+++ b/include/ide.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IDE_H
diff --git a/include/image-sparse.h b/include/image-sparse.h
index b0cc5007f7..4d1f910487 100644
--- a/include/image-sparse.h
+++ b/include/image-sparse.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <part.h>
diff --git a/include/image.h b/include/image.h
index a579c5f509..6a22c98b4a 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008 Semihalf
*
* (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
********************************************************************
* NOTE: This header file defines an interface to U-Boot. Including
* this (unmodified) header file in another file is considered normal
diff --git a/include/imx_sip.h b/include/imx_sip.h
index 48ab878749..fbb6c5ecdc 100644
--- a/include/imx_sip.h
+++ b/include/imx_sip.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IMX_SIP_H__
diff --git a/include/imx_thermal.h b/include/imx_thermal.h
index 8ce333cd56..6f32cb50b3 100644
--- a/include/imx_thermal.h
+++ b/include/imx_thermal.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
*
* (C) Copyright 2014 Freescale Semiconductor, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IMX_THERMAL_H_
diff --git a/include/imximage.h b/include/imximage.h
index 800fd6383b..6f7ca7f5e3 100644
--- a/include/imximage.h
+++ b/include/imximage.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IMXIMAGE_H_
diff --git a/include/init.h b/include/init.h
index 147ae6bb8e..f114a88963 100644
--- a/include/init.h
+++ b/include/init.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* Copy the startup prototype, previously defined in common.h
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __INIT_H_
diff --git a/include/initcall.h b/include/initcall.h
index fe7e90388e..01f3f2833f 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __INITCALL_H
diff --git a/include/input.h b/include/input.h
index 2902b079b2..3285a3ffa2 100644
--- a/include/input.h
+++ b/include/input.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Keyboard input helper functions (too small to be called a layer)
*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _INPUT_H
diff --git a/include/inttypes.h b/include/inttypes.h
index e2e569d0ac..ea731ec868 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 1997-2001, 2004, 2007 Free Software Foundation, Inc.
*
* This file is taken from the GNU C Library v2.15, with the unimplemented
* functions removed and a few style fixes.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/iomux.h b/include/iomux.h
index d104baf028..e6e1097db5 100644
--- a/include/iomux.h
+++ b/include/iomux.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _IO_MUX_H
diff --git a/include/iotrace.h b/include/iotrace.h
index e4ceb61805..9fe5733f87 100644
--- a/include/iotrace.h
+++ b/include/iotrace.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2014 Google, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IOTRACE_H
diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h
index f7a237c808..866ead0ec7 100644
--- a/include/ipu_pixfmt.h
+++ b/include/ipu_pixfmt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Stefano Babic, DENX Software Engineering, sbabic@denx.de
@@ -5,8 +6,6 @@
* Based on Linux IPU driver for MX51 (ipu.h):
*
* (C) Copyright 2005-2010 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IPU_PIXFMT_H__
diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h
index dd0d23fa52..1ddff062ad 100644
--- a/include/jffs2/load_kernel.h
+++ b/include/jffs2/load_kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef load_kernel_h
#define load_kernel_h
/*-------------------------------------------------------------------------
@@ -7,9 +8,6 @@
* Author: Russ Dill <Russ.Dill@asu.edu>
* Description: header for load kernel modules
*-----------------------------------------------------------------------*/
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
#include <linux/list.h>
diff --git a/include/jffs2/mini_inflate.h b/include/jffs2/mini_inflate.h
index 1cf129167c..52eb30b4ec 100644
--- a/include/jffs2/mini_inflate.h
+++ b/include/jffs2/mini_inflate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*-------------------------------------------------------------------------
* Filename: mini_inflate.h
* Version: $Id: mini_inflate.h,v 1.2 2002/01/17 00:53:20 nyet Exp $
@@ -5,9 +6,6 @@
* Author: Russ Dill <Russ.Dill@asu.edu>
* Description: Mini deflate implementation
*-----------------------------------------------------------------------*/
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
typedef __SIZE_TYPE__ size;
diff --git a/include/key_matrix.h b/include/key_matrix.h
index 8dfa44de13..519722f2d8 100644
--- a/include/key_matrix.h
+++ b/include/key_matrix.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Keyboard matrix helper functions
*
* Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _KEY_MATRIX_H
diff --git a/include/lattice.h b/include/lattice.h
index ea4b5303a7..80fafc00dc 100644
--- a/include/lattice.h
+++ b/include/lattice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Porting to U-Boot:
*
@@ -7,8 +8,6 @@
* Lattice's ispVME Embedded Tool to load Lattice's FPGA:
*
* Lattice Semiconductor Corp. Copyright 2009
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _VME_OPCODE_H
diff --git a/include/lcd.h b/include/lcd.h
index 797d0b0de1..cb6b6a4d12 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* MPC823 and PXA LCD Controller
*
@@ -6,8 +7,6 @@
*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LCD_H_
diff --git a/include/lcd_console.h b/include/lcd_console.h
index eac227f498..061a6a41bb 100644
--- a/include/lcd_console.h
+++ b/include/lcd_console.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* By default we scroll by a single line */
diff --git a/include/ld9040.h b/include/ld9040.h
index 9d527e2de2..58413d0a3d 100644
--- a/include/ld9040.h
+++ b/include/ld9040.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* ld9040 AMOLED LCD panel driver.
*
* Copyright (C) 2012 Samsung Electronics
* Donghwa Lee <dh09.lee@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LD9040_H_
diff --git a/include/led-display.h b/include/led-display.h
index ffc262dc93..b21f3b0570 100644
--- a/include/led-display.h
+++ b/include/led-display.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2005-2010
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* (C) Copyright 2010
* Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _led_display_h_
#define _led_display_h_
diff --git a/include/led.h b/include/led.h
index c67af22591..940b97f58c 100644
--- a/include/led.h
+++ b/include/led.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LED_H
diff --git a/include/libata.h b/include/libata.h
index 5b7d7b3022..25296ac66d 100644
--- a/include/libata.h
+++ b/include/libata.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2003-2004 Red Hat, Inc. All rights reserved.
* Copyright 2003-2004 Jeff Garzik
* Copyright (C) 2008 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
* port from libata of linux kernel
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LIBATA_H__
diff --git a/include/libtizen.h b/include/libtizen.h
index 55dccff715..655d4cb28c 100644
--- a/include/libtizen.h
+++ b/include/libtizen.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Samsung Electronics
* Donghwa Lee <dh09.lee@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LIBTIZEN_H_
diff --git a/include/linker_lists.h b/include/linker_lists.h
index 6ef89a2090..e0759d446f 100644
--- a/include/linker_lists.h
+++ b/include/linker_lists.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/linker_lists.h
*
* Implementation of linker-generated arrays
*
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINKER_LISTS_H__
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index d18ca719fc..3dabc3f770 100644
--- a/include/linux/apm_bios.h
+++ b/include/linux/apm_bios.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _LINUX_APM_H
#define _LINUX_APM_H
/*
* Include file for the interface to an APM BIOS
* Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/types.h>
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 28e61ce83b..2d1e6cc156 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2015, Linaro Limited
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __LINUX_ARM_SMCCC_H
#define __LINUX_ARM_SMCCC_H
diff --git a/include/linux/bch.h b/include/linux/bch.h
index 28da402f46..1305d2ca19 100644
--- a/include/linux/bch.h
+++ b/include/linux/bch.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Generic binary BCH encoding/decoding library
*
- * SPDX-License-Identifier: GPL-2.0
- *
* Copyright © 2011 Parrot S.A.
*
* Author: Ivan Djelic <ivan.djelic@parrot.com>
diff --git a/include/linux/bitrev.h b/include/linux/bitrev.h
index 6876e1b2ec..cc5abd7396 100644
--- a/include/linux/bitrev.h
+++ b/include/linux/bitrev.h
@@ -1,6 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Based on bitrev from the Linux kernel, by Akinobu Mita
*/
diff --git a/include/linux/crc8.h b/include/linux/crc8.h
index f7c300a9b1..0ab5b9ab21 100644
--- a/include/linux/crc8.h
+++ b/include/linux/crc8.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/linux/delay.h b/include/linux/delay.h
index 3dcd435d0d..193603451a 100644
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _LINUX_DELAY_H
#define _LINUX_DELAY_H
diff --git a/include/linux/edd.h b/include/linux/edd.h
index a83742fc7a..992ce7cf9f 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* linux/include/linux/edd.h
* Copyright (C) 2002, 2003, 2004 Dell Inc.
@@ -16,8 +17,6 @@
* transferred into the edd structure, and in drivers/firmware/edd.c, that
* information is used to identify BIOS boot disk. The code in setup.S
* is very sensitive to the size of these structures.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _LINUX_EDD_H
#define _LINUX_EDD_H
diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h
index d952efa8f4..51800096b2 100644
--- a/include/linux/immap_qe.h
+++ b/include/linux/immap_qe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* QUICC Engine (QE) Internal Memory Map.
* The Internal Memory Map for devices with QE on them. This
@@ -5,8 +6,6 @@
*
* Copyright (c) 2006-2009, 2011 Freescale Semiconductor, Inc.
* Author: Shlomi Gridih <gridish@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __IMMAP_QE_H__
diff --git a/include/linux/input.h b/include/linux/input.h
index 3662c9f0a7..c7ee22acab 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 1999-2002 Vojtech Pavlik
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _LINUX_INPUT_H
diff --git a/include/linux/io.h b/include/linux/io.h
index bf1ddbbaa6..d1b3efed9d 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _LINUX_IO_H
#define _LINUX_IO_H
diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h
index 31c55ae076..ab0ae1969a 100644
--- a/include/linux/iopoll.h
+++ b/include/linux/iopoll.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _LINUX_IOPOLL_H
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 8e2f15a635..0b24111d6a 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* U-Boot - linkage.h
*
* Copyright (c) 2005-2007 Analog Devices Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LINUX_LINKAGE_H
diff --git a/include/linux/log2.h b/include/linux/log2.h
index aa1de63090..4ded5ee68a 100644
--- a/include/linux/log2.h
+++ b/include/linux/log2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* Integer base 2 logarithm calculation
*
* Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
* Written by David Howells (dhowells@redhat.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _LINUX_LOG2_H
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index be81d3824a..7239eb1125 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* linux/include/linux/mtd/bbm.h
*
@@ -10,8 +11,6 @@
* Copyright © 2000-2005
* Thomas Gleixner <tglx@linuxtronix.de>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __LINUX_MTD_BBM_H
#define __LINUX_MTD_BBM_H
diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h
index a374ca98e8..c57e973775 100644
--- a/include/linux/mtd/concat.h
+++ b/include/linux/mtd/concat.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* MTD device concatenation layer definitions
*
* Copyright © 2002 Robert Kaiser <rkaiser@sysgo.de>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef MTD_CONCAT_H
diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h
index a3cfe6bdd9..d57f8da810 100644
--- a/include/linux/mtd/doc2000.h
+++ b/include/linux/mtd/doc2000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Linux driver for Disk-On-Chip devices
*
@@ -6,8 +7,6 @@
* Copyright © 2002-2003 Greg Ungerer <gerg@snapgear.com>
* Copyright © 2002-2003 SnapGear Inc
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __MTD_DOC2000_H__
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index e5c7d1cf0d..666480db93 100644
--- a/include/linux/mtd/flashchip.h
+++ b/include/linux/mtd/flashchip.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright © 2000 Red Hat UK Limited
* Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __MTD_FLASHCHIP_H__
diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h
index a023860e7b..9999993543 100644
--- a/include/linux/mtd/fsl_upm.h
+++ b/include/linux/mtd/fsl_upm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* FSL UPM NAND driver
*
* Copyright (C) 2007 MontaVista Software, Inc.
* Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINUX_MTD_NAND_FSL_UPM
diff --git a/include/linux/mtd/fsmc_nand.h b/include/linux/mtd/fsmc_nand.h
index bc3db030d0..6079f9e260 100644
--- a/include/linux/mtd/fsmc_nand.h
+++ b/include/linux/mtd/fsmc_nand.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FSMC_NAND_H__
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index ba4cbba949..0c41140465 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __MTD_MTD_H__
diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h
index 02ba9f7e63..397836384c 100644
--- a/include/linux/mtd/nand_ecc.h
+++ b/include/linux/mtd/nand_ecc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* drivers/mtd/nand_ecc.h
*
@@ -5,8 +6,6 @@
* David Woodhouse <dwmw2@infradead.org>
* Thomas Gleixner <tglx@linutronix.de>
*
- * SPDX-License-Identifier: GPL-2.0
- *
* This file is the header for the ECC algorithm.
*/
diff --git a/include/linux/mtd/omap_elm.h b/include/linux/mtd/omap_elm.h
index b8096b02e3..f3db00d55d 100644
--- a/include/linux/mtd/omap_elm.h
+++ b/include/linux/mtd/omap_elm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2011 Texas Instruments, <www.ti.com>
* Mansoor Ahamed <mansoor.ahamed@ti.com>
*
* Derived from work done by Rohit Choraria <rohitkc@ti.com> for omap3
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_ARCH_ELM_H
#define __ASM_ARCH_ELM_H
diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h
index be3ce9d203..864b05e432 100644
--- a/include/linux/mtd/omap_gpmc.h
+++ b/include/linux/mtd/omap_gpmc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2004-2008 Texas Instruments, <www.ti.com>
* Rohit Choraria <rohitkc@ti.com>
*
* (C) Copyright 2013 Andreas Bießmann <andreas@biessmann.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_OMAP_GPMC_H
#define __ASM_OMAP_GPMC_H
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index 6c3e838d80..7fe553fc51 100644
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
* Steven J. Hill <sjhill@realitydiluted.com>
* Thomas Gleixner <tglx@linutronix.de>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Info:
* Contains standard defines and IDs for NAND flash devices
*
diff --git a/include/linux/mtd/samsung_onenand.h b/include/linux/mtd/samsung_onenand.h
index 246bcf8f3c..7774fecdf8 100644
--- a/include/linux/mtd/samsung_onenand.h
+++ b/include/linux/mtd/samsung_onenand.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2005-2009 Samsung Electronics
* Minkyu Kang <mk7.kang@samsung.com>
* Kyungmin Park <kyungmin.park@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SAMSUNG_ONENAND_H__
diff --git a/include/linux/mtd/st_smi.h b/include/linux/mtd/st_smi.h
index 645c6a31eb..6058969787 100644
--- a/include/linux/mtd/st_smi.h
+++ b/include/linux/mtd/st_smi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef ST_SMI_H
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index 036779b347..badf6a0c6c 100644
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) International Business Machines Corp., 2006
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Author: Artem Bityutskiy (Битюцкий Артём)
*/
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 12e8cc19be..40dad25e40 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* INET An implementation of the TCP/IP protocol suite for the LINUX
* operating system. INET is implemented using the BSD Socket
@@ -15,8 +16,6 @@
* Bjorn Ekwall. <bj0rn@blox.se>
* Pekka Riikonen <priikone@poseidon.pspt.fi>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Moved to /usr/include/linux for NET3
*/
#ifndef _LINUX_NETDEVICE_H
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 2cc16a3e7d..1d2b1768c1 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
Red Black Trees
(C) 1999 Andrea Arcangeli <andrea@suse.de>
- * SPDX-License-Identifier: GPL-2.0+
-
linux/include/linux/rbtree.h
To use rbtrees you'll have to implement your own insert and search cores.
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
index a86797edb6..da04156e8a 100644
--- a/include/linux/rbtree_augmented.h
+++ b/include/linux/rbtree_augmented.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
Red Black Trees
(C) 1999 Andrea Arcangeli <andrea@suse.de>
(C) 2002 David Woodhouse <dwmw2@infradead.org>
(C) 2012 Michel Lespinasse <walken@google.com>
- * SPDX-License-Identifier: GPL-2.0+
-
linux/include/linux/rbtree_augmented.h
*/
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 9214b67b11..29c3b5b9a5 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* include/linux/serial_reg.h
*
* Copyright (C) 1992, 1994 by Theodore Ts'o.
- *
- * SPDX-License-Identifier: GPL-2.0+
*
* These are the UART port assignments, expressed as offsets from the base
* register. These assignments should hold for any serial port based on
diff --git a/include/linux/usb/at91_udc.h b/include/linux/usb/at91_udc.h
index cd0d00f5a5..541e2ba62c 100644
--- a/include/linux/usb/at91_udc.h
+++ b/include/linux/usb/at91_udc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Platform data definitions for Atmel USBA gadget driver
* pieces copied from linux:include/linux/platform_data/atmel.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINUX_USB_AT91_UDC_H__
#define __LINUX_USB_AT91_UDC_H__
diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h
index be29ef0c5c..c1c810759c 100644
--- a/include/linux/usb/atmel_usba_udc.h
+++ b/include/linux/usb/atmel_usba_udc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Platform data definitions for Atmel USBA gadget driver
* [Original from Linux kernel: include/linux/usb/atmel_usba_udc.h]
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINUX_USB_USBA_H__
#define __LINUX_USB_USBA_H__
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 86e1ceac3c..30c464ce39 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* composite.h -- framework for usb gadgets which are composite devices
*
* Copyright (C) 2006-2008 David Brownell
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINUX_USB_COMPOSITE_H
diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h
index 8bf7b55d87..62180e3973 100644
--- a/include/linux/usb/dwc3-omap.h
+++ b/include/linux/usb/dwc3-omap.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* include/linux/usb/dwc3-omap.h
*
* Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com
*
* Designware SuperSpeed Glue
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWC3_OMAP_H_
diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h
index c1b23b2f1b..9ceee0a1c9 100644
--- a/include/linux/usb/dwc3.h
+++ b/include/linux/usb/dwc3.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* include/linux/usb/dwc3.h
*
* Copyright (c) 2012 Samsung Electronics Co. Ltd
*
* Designware SuperSpeed USB 3.0 DRD Controller global and OTG registers
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWC3_H_
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 8f8ac6aeef..0b273d8e2e 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* include/linux/usb/otg.h
*
* Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com
*
* USB OTG (On The Go) defines
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LINUX_USB_OTG_H
diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h
index a916afb885..1367149c4b 100644
--- a/include/linux/usb/xhci-fsl.h
+++ b/include/linux/usb/xhci-fsl.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Freescale Semiconductor, Inc.
*
* FSL USB HOST xHCI Controller
*
* Author: Ramneek Mehresh<ramneek.mehresh@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ASM_ARCH_XHCI_FSL_H_
diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h
index f038ddb669..ce9c074b23 100644
--- a/include/linux/usb/xhci-omap.h
+++ b/include/linux/usb/xhci-omap.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2013
* Texas Instruments Inc, <www.ti.com>
*
* Author: Dan Murphy <dmurphy@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ASM_ARCH_XHCI_OMAP_H_
diff --git a/include/lmb.h b/include/lmb.h
index 6b6959fd86..f04d058093 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _LINUX_LMB_H
#define _LINUX_LMB_H
#ifdef __KERNEL__
@@ -7,8 +8,6 @@
* Logical memory blocks.
*
* Copyright (C) 2001 Peter Bergner, IBM Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#define MAX_LMB_REGIONS 8
diff --git a/include/log.h b/include/log.h
index 3cf08de6d0..a3edd25546 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Logging support
*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LOG_H
diff --git a/include/lxt971a.h b/include/lxt971a.h
index 2a3f66041f..a5dd82b62a 100644
--- a/include/lxt971a.h
+++ b/include/lxt971a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/***********************************************************************
*
* Copyright (C) 2004 by FS Forth-Systeme GmbH.
@@ -8,8 +9,6 @@
* @References: [1] NS9750 Hardware Reference, December 2003
* [2] Intel LXT971 Datasheet #249414 Rev. 02
* [3] NS7520 Linux Ethernet Driver
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LXT971A_H__
diff --git a/include/lynxkdi.h b/include/lynxkdi.h
index 8e45a81f92..38640277b2 100644
--- a/include/lynxkdi.h
+++ b/include/lynxkdi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Orbacom Systems, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LYNXKDI_H__
diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h
index c41804b34f..b96cf1d444 100644
--- a/include/lzma/LzmaDec.h
+++ b/include/lzma/LzmaDec.h
@@ -1,10 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Fake include for LzmaDec.h
*
* Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
*
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LZMADEC_H__FAKE__
diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h
index 994e412ee5..4629e6b428 100644
--- a/include/lzma/LzmaTools.h
+++ b/include/lzma/LzmaTools.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Fake include for LzmaTools.h
*
* Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LZMATOOLS_H__FAKE__
diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h
index 31ef31c83c..3670c3ff91 100644
--- a/include/lzma/LzmaTypes.h
+++ b/include/lzma/LzmaTypes.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Fake include for Types.h
*
* Copyright (C) 2007-2009 Industrie Dial Face S.p.A.
* Luigi 'Comio' Mantellini (luigi.mantellini@idf-hit.com)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TYPES_H__FAKE__
diff --git a/include/mailbox-uclass.h b/include/mailbox-uclass.h
index 8a638b04c5..e0618aad97 100644
--- a/include/mailbox-uclass.h
+++ b/include/mailbox-uclass.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _MAILBOX_UCLASS_H
diff --git a/include/mailbox.h b/include/mailbox.h
index a92a1a590d..c64951b2f7 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _MAILBOX_H
diff --git a/include/mapmem.h b/include/mapmem.h
index 42ef3e8c2a..2134c8004d 100644
--- a/include/mapmem.h
+++ b/include/mapmem.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2015 National Instruments
*
* (C) Copyright 2015
* Joe Hershberger <joe.hershberger@ni.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __MAPMEM_H
diff --git a/include/mb862xx.h b/include/mb862xx.h
index 3521f044bf..54c8c757c0 100644
--- a/include/mb862xx.h
+++ b/include/mb862xx.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007
* DENX Software Engineering, Anatolij Gustschin, agust@denx.de
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/mc13783.h b/include/mc13783.h
index 3b20591a88..47345f006f 100644
--- a/include/mc13783.h
+++ b/include/mc13783.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Helmut Raiger, HALE electronic GmbH, helmut.raiger@hale.at
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/mc13892.h b/include/mc13892.h
index 218f36f084..8e8b63e769 100644
--- a/include/mc13892.h
+++ b/include/mc13892.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Stefano Babic, DENX Software Engineering, sbabic@denx.de.
*
* (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/mc34704.h b/include/mc34704.h
index 482d51ab2f..b837ddaa1d 100644
--- a/include/mc34704.h
+++ b/include/mc34704.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MC34704_H__
diff --git a/include/mc9sdz60.h b/include/mc9sdz60.h
index 7b11181388..ffe376bf50 100644
--- a/include/mc9sdz60.h
+++ b/include/mc9sdz60.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2009 Marc Kleine-Budde <mkl@pengutronix.de>
*
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ASM_ARCH_MC9SDZ60_H
diff --git a/include/memalign.h b/include/memalign.h
index a960039083..44f4a86241 100644
--- a/include/memalign.h
+++ b/include/memalign.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ALIGNMEM_H
diff --git a/include/membuff.h b/include/membuff.h
index 78918e7264..c992067133 100644
--- a/include/membuff.h
+++ b/include/membuff.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
*
* Copyright (c) 1992 Simon Glass
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MEMBUFF_H
diff --git a/include/menu.h b/include/menu.h
index 063cd196bd..fbff429c89 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MENU_H__
diff --git a/include/misc.h b/include/misc.h
index 03ef55cdc8..68f8e64d61 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MISC_H_
diff --git a/include/mk48t59.h b/include/mk48t59.h
index 3ddc034c9b..5d863ef941 100644
--- a/include/mk48t59.h
+++ b/include/mk48t59.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Andreas Heppel <aheppel@sysgo.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/mmc.h b/include/mmc.h
index 86f885b504..d9611a0e9b 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2008,2010 Freescale Semiconductor, Inc
* Andy Fleming
*
* Based (loosely) on the Linux code
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MMC_H_
diff --git a/include/mpc106.h b/include/mpc106.h
index 32f5350f13..2157b32407 100644
--- a/include/mpc106.h
+++ b/include/mpc106.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Andreas Heppel <aheppel@sysgo.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MPC106_PCI_H
diff --git a/include/mpc83xx.h b/include/mpc83xx.h
index b5a0bbf847..e1e50ab6b5 100644
--- a/include/mpc83xx.h
+++ b/include/mpc83xx.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2004-2007, 2010 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MPC83XX_H__
diff --git a/include/mpc8xx.h b/include/mpc8xx.h
index daa874ccf5..0e0e0cb70d 100644
--- a/include/mpc8xx.h
+++ b/include/mpc8xx.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/msc01.h b/include/msc01.h
index 7ee243bec3..ec18a724eb 100644
--- a/include/msc01.h
+++ b/include/msc01.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@mips.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MSC01_H__
diff --git a/include/mtd.h b/include/mtd.h
index 3f8c293b00..548e7f191b 100644
--- a/include/mtd.h
+++ b/include/mtd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _MTD_H_
diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h
index 095725a805..4963c89642 100644
--- a/include/mtd/cfi_flash.h
+++ b/include/mtd/cfi_flash.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Stefan Roese, DENX Software Engineering, sr@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CFI_FLASH_H__
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 0ef582aeec..8d9761050f 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __MTD_ABI_H__
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h
index 22d90040f8..cd81ef965c 100644
--- a/include/mtd/ubi-user.h
+++ b/include/mtd/ubi-user.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright © International Business Machines Corp., 2006
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Author: Artem Bityutskiy (Битюцкий Артём)
*/
diff --git a/include/mv88e6352.h b/include/mv88e6352.h
index a34b434662..2e810c8183 100644
--- a/include/mv88e6352.h
+++ b/include/mv88e6352.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Valentin Lontgchamp, Keymile AG, valentin.longchamp@keymile.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MV886352_H
diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h
index 7fb71f7219..d51b1fe467 100644
--- a/include/mvebu_mmc.h
+++ b/include/mvebu_mmc.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Marvell MMC/SD/SDIO driver
*
* (C) Copyright 2012
* Marvell Semiconductor <www.marvell.com>
* Written-by: Maen Suleiman, Gerald Kerma
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MVEBU_MMC_H__
diff --git a/include/mvmfp.h b/include/mvmfp.h
index e61e92d4d5..16f26841e2 100644
--- a/include/mvmfp.h
+++ b/include/mvmfp.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MVMFP_H
diff --git a/include/nand.h b/include/nand.h
index cead563553..93cbe1e25d 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2005
* 2N Telekomunikace, a.s. <www.2n.cz>
* Ladislav Michl <michl@2n.cz>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _NAND_H_
diff --git a/include/net/pfe_eth/pfe/cbus.h b/include/net/pfe_eth/pfe/cbus.h
index 002041c3cd..e8e9f34cbc 100644
--- a/include/net/pfe_eth/pfe/cbus.h
+++ b/include/net/pfe_eth/pfe/cbus.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CBUS_H_
diff --git a/include/net/pfe_eth/pfe/cbus/bmu.h b/include/net/pfe_eth/pfe/cbus/bmu.h
index f707cc3097..3a83e4dc1c 100644
--- a/include/net/pfe_eth/pfe/cbus/bmu.h
+++ b/include/net/pfe_eth/pfe/cbus/bmu.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BMU_H_
diff --git a/include/net/pfe_eth/pfe/cbus/class_csr.h b/include/net/pfe_eth/pfe/cbus/class_csr.h
index eeca751a9d..e2fece7aa1 100644
--- a/include/net/pfe_eth/pfe/cbus/class_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/class_csr.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _CLASS_CSR_H_
diff --git a/include/net/pfe_eth/pfe/cbus/emac.h b/include/net/pfe_eth/pfe/cbus/emac.h
index f74bd96f23..53db8cc08f 100644
--- a/include/net/pfe_eth/pfe/cbus/emac.h
+++ b/include/net/pfe_eth/pfe/cbus/emac.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _EMAC_H_
diff --git a/include/net/pfe_eth/pfe/cbus/gpi.h b/include/net/pfe_eth/pfe/cbus/gpi.h
index f86f3f9cff..6b5ba5d233 100644
--- a/include/net/pfe_eth/pfe/cbus/gpi.h
+++ b/include/net/pfe_eth/pfe/cbus/gpi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _GPI_H_
diff --git a/include/net/pfe_eth/pfe/cbus/hif.h b/include/net/pfe_eth/pfe/cbus/hif.h
index 4b5cb3c5e0..36722c5e07 100644
--- a/include/net/pfe_eth/pfe/cbus/hif.h
+++ b/include/net/pfe_eth/pfe/cbus/hif.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _HIF_H_
diff --git a/include/net/pfe_eth/pfe/cbus/hif_nocpy.h b/include/net/pfe_eth/pfe/cbus/hif_nocpy.h
index c2d6f6d66e..21aa133860 100644
--- a/include/net/pfe_eth/pfe/cbus/hif_nocpy.h
+++ b/include/net/pfe_eth/pfe/cbus/hif_nocpy.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _HIF_NOCPY_H_
diff --git a/include/net/pfe_eth/pfe/cbus/tmu_csr.h b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
index e810b792ae..1e1abe26ca 100644
--- a/include/net/pfe_eth/pfe/cbus/tmu_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/tmu_csr.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TMU_CSR_H_
diff --git a/include/net/pfe_eth/pfe/cbus/util_csr.h b/include/net/pfe_eth/pfe/cbus/util_csr.h
index bac4114277..40476cd9e5 100644
--- a/include/net/pfe_eth/pfe/cbus/util_csr.h
+++ b/include/net/pfe_eth/pfe/cbus/util_csr.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _UTIL_CSR_H_
diff --git a/include/net/pfe_eth/pfe/pfe_hw.h b/include/net/pfe_eth/pfe/pfe_hw.h
index 992454f305..5da676bf8b 100644
--- a/include/net/pfe_eth/pfe/pfe_hw.h
+++ b/include/net/pfe_eth/pfe/pfe_hw.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PFE_H_
diff --git a/include/net/pfe_eth/pfe_driver.h b/include/net/pfe_eth/pfe_driver.h
index da7d2470b5..fa9f2fa65d 100644
--- a/include/net/pfe_eth/pfe_driver.h
+++ b/include/net/pfe_eth/pfe_driver.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PFE_DRIVER_H__
diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h
index f319365dc4..68b2e381b9 100644
--- a/include/net/pfe_eth/pfe_eth.h
+++ b/include/net/pfe_eth/pfe_eth.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PFE_ETH_H__
diff --git a/include/net/pfe_eth/pfe_firmware.h b/include/net/pfe_eth/pfe_firmware.h
index 588b2ae934..b4fe313eeb 100644
--- a/include/net/pfe_eth/pfe_firmware.h
+++ b/include/net/pfe_eth/pfe_firmware.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/** @file
diff --git a/include/net/pfe_eth/pfe_mdio.h b/include/net/pfe_eth/pfe_mdio.h
index ab27ec3215..972b87956f 100644
--- a/include/net/pfe_eth/pfe_mdio.h
+++ b/include/net/pfe_eth/pfe_mdio.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015-2016 Freescale Semiconductor, Inc.
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PFE_MDIO_H_
diff --git a/include/netdev.h b/include/netdev.h
index 68c6d49cbf..79fcee56d4 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008
* Benjamin Warren, biggerbadderben@gmail.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/ns87308.h b/include/ns87308.h
index 00b1916395..d5ccd3ba3b 100644
--- a/include/ns87308.h
+++ b/include/ns87308.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Rob Taylor, Flying Pig Systems. robt@flyingpig.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _NS87308_H_
diff --git a/include/nuvoton_nct6102d.h b/include/nuvoton_nct6102d.h
index a122550a2c..a02f3927d7 100644
--- a/include/nuvoton_nct6102d.h
+++ b/include/nuvoton_nct6102d.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _NUVOTON_NCT6102D_H_
diff --git a/include/nvme.h b/include/nvme.h
index 8375d61e02..2c3d14d241 100644
--- a/include/nvme.h
+++ b/include/nvme.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2017 NXP Semiconductors
* Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __NVME_H__
diff --git a/include/of_live.h b/include/of_live.h
index f5303bb018..b8561f5b1f 100644
--- a/include/of_live.h
+++ b/include/of_live.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Support for a 'live' (as opposed to flat) device tree
*/
diff --git a/include/os.h b/include/os.h
index 049b248c5b..64e89a06c9 100644
--- a/include/os.h
+++ b/include/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Operating System Interface
*
@@ -5,7 +6,6 @@
* They are kept in a separate file so we can include system headers.
*
* Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __OS_H__
diff --git a/include/palmas.h b/include/palmas.h
index d366c98d22..229de53715 100644
--- a/include/palmas.h
+++ b/include/palmas.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013
* Texas Instruments, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef PALMAS_H
#define PALMAS_H
diff --git a/include/panel.h b/include/panel.h
index 57fccf222e..46dca48bf7 100644
--- a/include/panel.h
+++ b/include/panel.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PANEL_H
diff --git a/include/part.h b/include/part.h
index 0caceafc5f..0750aee907 100644
--- a/include/part.h
+++ b/include/part.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PART_H
#define _PART_H
diff --git a/include/part_efi.h b/include/part_efi.h
index 4c8f6cc473..6065c571f3 100644
--- a/include/part_efi.h
+++ b/include/part_efi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2008 RuggedCom, Inc.
* Richard Retanubun <RichardRetanubun@RuggedCom.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/pca953x.h b/include/pca953x.h
index 8ed2d1875d..aa4401acf0 100644
--- a/include/pca953x.h
+++ b/include/pca953x.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright 2008 Extreme Engineering Solutions, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __PCA953X_H_
diff --git a/include/pca9564.h b/include/pca9564.h
index 4b4b695c4e..99e8bcd9ad 100644
--- a/include/pca9564.h
+++ b/include/pca9564.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* File: include/pca9564.h
* Author:
@@ -9,8 +10,6 @@
* Copyright 2009 CJSC "NII STT", http://www.niistt.ru/
*
* Bugs:
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PCA9564_H
diff --git a/include/pca9698.h b/include/pca9698.h
index c7f3ddd50a..48a5f756e2 100644
--- a/include/pca9698.h
+++ b/include/pca9698.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PCA9698_H_
diff --git a/include/pch.h b/include/pch.h
index 222e9081c3..73994b8343 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __pch_h
diff --git a/include/pci.h b/include/pci.h
index 31dc7608a7..cda6907688 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Andreas Heppel <aheppel@sysgo.de>
*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PCI_H
diff --git a/include/pci_gt64120.h b/include/pci_gt64120.h
index b086024f09..c9fb9fa8d5 100644
--- a/include/pci_gt64120.h
+++ b/include/pci_gt64120.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _PCI_GT64120_H
diff --git a/include/pci_msc01.h b/include/pci_msc01.h
index 066c6622da..cdfd066f6b 100644
--- a/include/pci_msc01.h
+++ b/include/pci_msc01.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Imagination Technologies
* Author: Paul Burton <paul.burton@mips.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PCI_MSC01_H__
diff --git a/include/pci_rom.h b/include/pci_rom.h
index 95c6d079fb..895c9627f4 100644
--- a/include/pci_rom.h
+++ b/include/pci_rom.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* From coreboot file of same name
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PCI_ROM_H
diff --git a/include/pcmcia.h b/include/pcmcia.h
index 8df90ee2b7..89e528efb9 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PCMCIA_H
diff --git a/include/phy.h b/include/phy.h
index 0543ec10c2..52bf99717c 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011 Freescale Semiconductor, Inc.
* Andy Fleming <afleming@gmail.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* This file pretty much stolen from Linux's mii.h/ethtool.h/phy.h
*/
diff --git a/include/phys2bus.h b/include/phys2bus.h
index 87b6d69aa6..dc9b8e5a25 100644
--- a/include/phys2bus.h
+++ b/include/phys2bus.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2015 Stephen Warren
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _BUS_ADDR_H
diff --git a/include/post.h b/include/post.h
index b41a6c8127..08a771e405 100644
--- a/include/post.h
+++ b/include/post.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -5,8 +6,6 @@
* (C) Copyright 2010
* Michael Zaidman, Kodak, michael.zaidman@kodak.com
* post_word_{load|store} cleanup.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _POST_H
#define _POST_H
diff --git a/include/power-domain-uclass.h b/include/power-domain-uclass.h
index 802233d17f..bd9906b2e7 100644
--- a/include/power-domain-uclass.h
+++ b/include/power-domain-uclass.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _POWER_DOMAIN_UCLASS_H
diff --git a/include/power-domain.h b/include/power-domain.h
index 10999790b5..aba8c0f65c 100644
--- a/include/power-domain.h
+++ b/include/power-domain.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _POWER_DOMAIN_H
diff --git a/include/power/act8846_pmic.h b/include/power/act8846_pmic.h
index a811f28e63..acd0fd671e 100644
--- a/include/power/act8846_pmic.h
+++ b/include/power/act8846_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PMIC_ACT8846_H_
diff --git a/include/power/as3722.h b/include/power/as3722.h
index cb4b188bcf..9f045d5ab6 100644
--- a/include/power/as3722.h
+++ b/include/power/as3722.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 NVIDIA Corporation
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __POWER_AS3722_H__
diff --git a/include/power/battery.h b/include/power/battery.h
index dc8d153c19..1e3d59d76e 100644
--- a/include/power/battery.h
+++ b/include/power/battery.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __POWER_BATTERY_H_
diff --git a/include/power/fg_battery_cell_params.h b/include/power/fg_battery_cell_params.h
index d18e2d6731..b8c895bbab 100644
--- a/include/power/fg_battery_cell_params.h
+++ b/include/power/fg_battery_cell_params.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FG_BATTERY_CELL_PARAMS_H_
diff --git a/include/power/hi6553_pmic.h b/include/power/hi6553_pmic.h
index fcd131a718..d0abe20755 100644
--- a/include/power/hi6553_pmic.h
+++ b/include/power/hi6553_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Linaro
* Peter Griffin <peter.griffin@linaro.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __HI6553_PMIC_H__
diff --git a/include/power/ltc3676_pmic.h b/include/power/ltc3676_pmic.h
index dcaa985193..36c79716fa 100644
--- a/include/power/ltc3676_pmic.h
+++ b/include/power/ltc3676_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Gateworks Corporation
* Tim Harvey <tharvey@gateworks.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LTC3676_PMIC_H_
diff --git a/include/power/max17042_fg.h b/include/power/max17042_fg.h
index ce9605336e..ec8377d370 100644
--- a/include/power/max17042_fg.h
+++ b/include/power/max17042_fg.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX17042_FG_H_
diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
index 2300352496..82fe3509a0 100644
--- a/include/power/max77686_pmic.h
+++ b/include/power/max77686_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX77686_H_
diff --git a/include/power/max77693_fg.h b/include/power/max77693_fg.h
index 42626ed839..c2ae62231e 100644
--- a/include/power/max77693_fg.h
+++ b/include/power/max77693_fg.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
* Piotr Wilczek <p.wilczek@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX77693_FG_H_
diff --git a/include/power/max77693_muic.h b/include/power/max77693_muic.h
index a2c29eb6ce..c9afab218c 100644
--- a/include/power/max77693_muic.h
+++ b/include/power/max77693_muic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
* Piotr Wilczek <p.wilczek@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX77693_MUIC_H_
diff --git a/include/power/max77693_pmic.h b/include/power/max77693_pmic.h
index 3d59e5916e..9e0e05c56a 100644
--- a/include/power/max77693_pmic.h
+++ b/include/power/max77693_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Samsung Electronics
* Piotr Wilczek <p.wilczek@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX77693_PMIC_H_
diff --git a/include/power/max77696_pmic.h b/include/power/max77696_pmic.h
index 71cdf88054..69bb7da349 100644
--- a/include/power/max77696_pmic.h
+++ b/include/power/max77696_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc.
* Fabio Estevam <fabio.estevam@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX77696_PMIC_H__
diff --git a/include/power/max8997_muic.h b/include/power/max8997_muic.h
index e208549983..e4ceab6f7a 100644
--- a/include/power/max8997_muic.h
+++ b/include/power/max8997_muic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX8997_MUIC_H_
diff --git a/include/power/max8997_pmic.h b/include/power/max8997_pmic.h
index 728d60afa5..956eebb968 100644
--- a/include/power/max8997_pmic.h
+++ b/include/power/max8997_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX8997_PMIC_H_
diff --git a/include/power/max8998_pmic.h b/include/power/max8998_pmic.h
index 03d06e8a53..b1a87d66af 100644
--- a/include/power/max8998_pmic.h
+++ b/include/power/max8998_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MAX8998_PMIC_H_
diff --git a/include/power/mc34vr500_pmic.h b/include/power/mc34vr500_pmic.h
index b0b143a591..d2edda6890 100644
--- a/include/power/mc34vr500_pmic.h
+++ b/include/power/mc34vr500_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2016 Freescale Semiconductor, Inc.
* Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MC34VR500_H_
diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h
index 41cb710d78..f4383ed778 100644
--- a/include/power/pfuze100_pmic.h
+++ b/include/power/pfuze100_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Gateworks Corporation
* Tim Harvey <tharvey@gateworks.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PFUZE100_PMIC_H_
diff --git a/include/power/pfuze3000_pmic.h b/include/power/pfuze3000_pmic.h
index 7d66ba48d4..87ea7cad46 100644
--- a/include/power/pfuze3000_pmic.h
+++ b/include/power/pfuze3000_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Freescale Semiconductor, Inc
* Peng Fan <Peng.Fan@freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PFUZE3000_PMIC_H_
#define __PFUZE3000_PMIC_H_
diff --git a/include/power/pmic.h b/include/power/pmic.h
index f2fe537fb7..2ca9365fc8 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
*
* Copyright (C) 2011-2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CORE_PMIC_H_
diff --git a/include/power/power_chrg.h b/include/power/power_chrg.h
index 8fa5c66ad7..db19953fb7 100644
--- a/include/power/power_chrg.h
+++ b/include/power/power_chrg.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __POWER_CHARGER_H_
diff --git a/include/power/regulator.h b/include/power/regulator.h
index 2bbc1e51b3..5318ab3ace 100644
--- a/include/power/regulator.h
+++ b/include/power/regulator.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014-2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _INCLUDE_REGULATOR_H_
diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h
index 47a6b36e7e..c06248f751 100644
--- a/include/power/rk8xx_pmic.h
+++ b/include/power/rk8xx_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PMIC_RK8XX_H_
diff --git a/include/power/rn5t567_pmic.h b/include/power/rn5t567_pmic.h
index 9ce601f2ad..93bc7cba5a 100644
--- a/include/power/rn5t567_pmic.h
+++ b/include/power/rn5t567_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Toradex AG
* Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RN5T567_PMIC_H_
#define __RN5T567_PMIC_H_
diff --git a/include/power/s5m8767.h b/include/power/s5m8767.h
index ba88ff75b0..f75ed5d928 100644
--- a/include/power/s5m8767.h
+++ b/include/power/s5m8767.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __S5M8767_H_
diff --git a/include/power/sandbox_pmic.h b/include/power/sandbox_pmic.h
index c5e6fda2ea..1dbd15b523 100644
--- a/include/power/sandbox_pmic.h
+++ b/include/power/sandbox_pmic.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SANDBOX_PMIC_H_
diff --git a/include/power/tps62362.h b/include/power/tps62362.h
index 720c338722..f0fc538463 100644
--- a/include/power/tps62362.h
+++ b/include/power/tps62362.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014 Texas Instruments Incorporated - http://www.ti.com
* Author: Felipe Balbi <balbi@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __POWER_TPS62362_H__
diff --git a/include/power/tps65090.h b/include/power/tps65090.h
index 3a0690b475..2716968a8d 100644
--- a/include/power/tps65090.h
+++ b/include/power/tps65090.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TPS65090_PMIC_H_
diff --git a/include/power/tps65217.h b/include/power/tps65217.h
index cb07ea5ce6..00fbab80cb 100644
--- a/include/power/tps65217.h
+++ b/include/power/tps65217.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011-2013
* Texas Instruments, <www.ti.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* For more details, please see the TRM at http://www.ti.com/product/tps65217a
*/
diff --git a/include/power/tps65218.h b/include/power/tps65218.h
index f5218f9eb2..bb66c3f3ab 100644
--- a/include/power/tps65218.h
+++ b/include/power/tps65218.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2014
* Texas Instruments, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __POWER_TPS65218_H__
diff --git a/include/power/tps65910.h b/include/power/tps65910.h
index 976130dc3e..48e0b2c5ab 100644
--- a/include/power/tps65910.h
+++ b/include/power/tps65910.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011-2013
* Texas Instruments, <www.ti.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* For more details, please see the TRM at http://www.ti.com/product/tps65910
*/
#ifndef __POWER_TPS65910_H__
diff --git a/include/power/tps65910_pmic.h b/include/power/tps65910_pmic.h
index e8d9ffaa9f..66214786d3 100644
--- a/include/power/tps65910_pmic.h
+++ b/include/power/tps65910_pmic.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) EETS GmbH, 2017, Felix Brack <f.brack@eets.ch>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TPS65910_PMIC_H_
diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 4947c77b8d..db7b1668d9 100644
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/ppc_defs.h b/include/ppc_defs.h
index f406c33eef..42ddc3b403 100644
--- a/include/ppc_defs.h
+++ b/include/ppc_defs.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/pwm.h b/include/pwm.h
index ebee227a67..54ae3e64c3 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* header file for pwm driver.
*
* Copyright 2016 Google Inc.
* Copyright (c) 2011 samsung electronics
* Donghwa Lee <dh09.lee@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _pwm_h_
diff --git a/include/pwrseq.h b/include/pwrseq.h
index b934f29fac..fbf6376d24 100644
--- a/include/pwrseq.h
+++ b/include/pwrseq.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __pwrseq_h
diff --git a/include/pxa_lcd.h b/include/pxa_lcd.h
index 1ea3717bf7..11a22abca6 100644
--- a/include/pxa_lcd.h
+++ b/include/pxa_lcd.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* pxa_lcd.h - PXA LCD Controller structures
*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PXA_LCD_H_
diff --git a/include/qfw.h b/include/qfw.h
index b0b3b5945e..2f1a20416f 100644
--- a/include/qfw.h
+++ b/include/qfw.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __FW_CFG__
diff --git a/include/ram.h b/include/ram.h
index e2172a8741..67e22d76c9 100644
--- a/include/ram.h
+++ b/include/ram.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RAM_H
diff --git a/include/rc4.h b/include/rc4.h
index ea409c2f3e..c1ff1349d4 100644
--- a/include/rc4.h
+++ b/include/rc4.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015 Google, Inc
*
* (C) Copyright 2008-2014 Rockchip Electronics
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __RC4_H
diff --git a/include/regmap.h b/include/regmap.h
index 493a5d8eff..8d18b07c30 100644
--- a/include/regmap.h
+++ b/include/regmap.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __REGMAP_H
diff --git a/include/reiserfs.h b/include/reiserfs.h
index ffe4e466d9..de4150024c 100644
--- a/include/reiserfs.h
+++ b/include/reiserfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README
*
@@ -6,8 +7,6 @@
*
* (C) Copyright 2003 Sysgo Real-Time Solutions, AG <www.elinos.com>
* Pavel Bartusek <pba@sysgo.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* An implementation for the ReiserFS filesystem ported from GRUB.
diff --git a/include/relocate.h b/include/relocate.h
index 0d4b27aa2b..9ceeecdbe7 100644
--- a/include/relocate.h
+++ b/include/relocate.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011
* Graeme Russ, <graeme.russ@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _RELOCATE_H_
diff --git a/include/remoteproc.h b/include/remoteproc.h
index c6e044d3b8..c3c3f46a1a 100644
--- a/include/remoteproc.h
+++ b/include/remoteproc.h
@@ -1,7 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2015
* Texas Instruments Incorporated - http://www.ti.com/
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _RPROC_H_
diff --git a/include/reset-uclass.h b/include/reset-uclass.h
index 50fbeb10d6..c17d738b31 100644
--- a/include/reset-uclass.h
+++ b/include/reset-uclass.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _RESET_UCLASS_H
diff --git a/include/reset.h b/include/reset.h
index ae247ceb4f..201bafc67f 100644
--- a/include/reset.h
+++ b/include/reset.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2016, NVIDIA CORPORATION.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _RESET_H
diff --git a/include/rtc.h b/include/rtc.h
index 49142b6e18..746624d799 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/rtc_def.h b/include/rtc_def.h
index 6179797267..6cb490c420 100644
--- a/include/rtc_def.h
+++ b/include/rtc_def.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __rtc_def_h
diff --git a/include/s_record.h b/include/s_record.h
index 81245bab0b..3ece695941 100644
--- a/include/s_record.h
+++ b/include/s_record.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*--------------------------------------------------------------------------
diff --git a/include/samsung-usb-phy-uboot.h b/include/samsung-usb-phy-uboot.h
index 9f37560f11..f2bce578ab 100644
--- a/include/samsung-usb-phy-uboot.h
+++ b/include/samsung-usb-phy-uboot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* include/samsung-usb-phy-uboot.h
*
* Copyright (c) 2015 Samsung Electronics
*
* USB3 (DWC3) PHY uboot init
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SAMSUNG_USB_PHY_UBOOT_H_
diff --git a/include/sandbox-adc.h b/include/sandbox-adc.h
index 79ff01c6ab..2017b9cfc2 100644
--- a/include/sandbox-adc.h
+++ b/include/sandbox-adc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SANDBOX_ADC_H_
diff --git a/include/sandboxblockdev.h b/include/sandboxblockdev.h
index 5174f45f5e..c1f0afb337 100644
--- a/include/sandboxblockdev.h
+++ b/include/sandboxblockdev.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013, Henrik Nordstrom <henrik@henriknordstrom.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SANDBOX_BLOCK_DEV__
diff --git a/include/scf0403_lcd.h b/include/scf0403_lcd.h
index d71896bbda..07f8c643ba 100644
--- a/include/scf0403_lcd.h
+++ b/include/scf0403_lcd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013, Compulab Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef SCF0403_LCD_H_
#define SCF0403_LCD_H_
diff --git a/include/scsi.h b/include/scsi.h
index 7173912de4..81ab43c842 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SCSI_H
#define _SCSI_H
diff --git a/include/sdhci.h b/include/sdhci.h
index ed35f0434a..1e0c92c4cb 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011, Marvell Semiconductor Inc.
* Lei Wen <leiwen@marvell.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Back ported to the 8xx platform (from the 8260 platform) by
* Murray.Jensen@cmst.csiro.au, 27-Jan-01.
*/
diff --git a/include/sdp.h b/include/sdp.h
index f476bab8f1..f6252d027f 100644
--- a/include/sdp.h
+++ b/include/sdp.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* sdp.h - Serial Download Protocol
*
* Copyright (C) 2017 Toradex
* Author: Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SDP_H_
diff --git a/include/search.h b/include/search.h
index df5d61c2eb..5d07b49073 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
/*
* Declarations for System V style searching functions.
* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
* This file is part of the GNU C Library.
- *
- * SPDX-License-Identifier: LGPL-2.1+
*/
/*
diff --git a/include/sja1000.h b/include/sja1000.h
index 07cd9e371e..6ceb6f4d48 100644
--- a/include/sja1000.h
+++ b/include/sja1000.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2009, Matthias Fuchs <matthias.fuchs@esd.eu>
*
* SJA1000 register layout for basic CAN mode
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SJA1000_H_
diff --git a/include/smbios.h b/include/smbios.h
index c24d00e38d..79880ef5b5 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*
* Adapted from coreboot src/include/smbios.h
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SMBIOS_H_
diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h
index 419643f89f..8a972acd4c 100644
--- a/include/smsc_lpc47m.h
+++ b/include/smsc_lpc47m.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SMSC_LPC47M_H_
diff --git a/include/smsc_sio1007.h b/include/smsc_sio1007.h
index 805fa0ebb1..ca3f3f7a71 100644
--- a/include/smsc_sio1007.h
+++ b/include/smsc_sio1007.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SMSC_SIO1007_H_
diff --git a/include/sound.h b/include/sound.h
index 155e1b40e2..3269f2371c 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2012 Samsung Electronics
* R. Chandrasekar < rcsekar@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SOUND_H__
diff --git a/include/sparse_defs.h b/include/sparse_defs.h
index d0612c94e5..4bbdffea56 100644
--- a/include/sparse_defs.h
+++ b/include/sparse_defs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/types.h>
diff --git a/include/sparse_format.h b/include/sparse_format.h
index af67581cde..bcd305961d 100644
--- a/include/sparse_format.h
+++ b/include/sparse_format.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
/*
* This is from the Android Project,
* Repository: https://android.googlesource.com/platform/system/core
* File: libsparse/sparse_format.h
* Commit: 28fa5bc347390480fe190294c6c385b6a9f0d68b
* Copyright (C) 2010 The Android Open Source Project
- *
- * SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef _LIBSPARSE_SPARSE_FORMAT_H_
diff --git a/include/spartan2.h b/include/spartan2.h
index 14606c3031..618eddd838 100644
--- a/include/spartan2.h
+++ b/include/spartan2.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPARTAN2_H_
diff --git a/include/spartan3.h b/include/spartan3.h
index fcb27b01e4..cf98adcb95 100644
--- a/include/spartan3.h
+++ b/include/spartan3.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPARTAN3_H_
diff --git a/include/spd.h b/include/spd.h
index 52e42314ab..2bcf46de6d 100644
--- a/include/spd.h
+++ b/include/spd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2003 Arabella Software Ltd.
* Yuli Barcohen <yuli@arabellasw.com>
@@ -5,8 +6,6 @@
* Serial Presence Detect (SPD) EEPROM format according to the
* Intel's PC SDRAM Serial Presence Detect (SPD) Specification,
* revision 1.2B, November 1999
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPD_H_
diff --git a/include/spi.h b/include/spi.h
index f5bac8d002..9754c53aa1 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Common SPI Interface: Controller-specific definitions
*
* (C) Copyright 2001
* Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPI_H_
diff --git a/include/spi_flash.h b/include/spi_flash.h
index f3c4e83424..22533311c5 100644
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Common SPI flash Interface
*
* Copyright (C) 2008 Atmel Corporation
* Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _SPI_FLASH_H_
diff --git a/include/spl.h b/include/spl.h
index 5754012cd0..8454ea7ad4 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012
* Texas Instruments, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SPL_H_
#define _SPL_H_
diff --git a/include/st_logo_data.h b/include/st_logo_data.h
index 4d3a26e128..d8d1fd3b03 100644
--- a/include/st_logo_data.h
+++ b/include/st_logo_data.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2018 STMicroelectronics - All Rights Reserved
* Author(s): Yannick Fertre <yannick.fertre@st.com> for STMicroelectronics.
* Philippe Cornu <philippe.cornu@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0
*/
/*
diff --git a/include/status_led.h b/include/status_led.h
index 8178e93ebf..5b3570166d 100644
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index c2a88b4fc4..cd0cd601bf 100644
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _STDIO_DEV_H_
diff --git a/include/stdlib.h b/include/stdlib.h
index 6bc7fbb3c4..9c175d4d74 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2013 Google Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __STDLIB_H_
diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h
index 484bc305f9..748c2ebd0c 100644
--- a/include/stm32_rcc.h
+++ b/include/stm32_rcc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) STMicroelectronics SA 2017
* Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __STM32_RCC_H_
diff --git a/include/stratixII.h b/include/stratixII.h
index 5873dd754c..3c06bb2955 100644
--- a/include/stratixII.h
+++ b/include/stratixII.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2007
* Eran Liberty, Extricom, eran.liberty@gmail.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _STRATIXII_H_
#define _STRATIXII_H_
diff --git a/include/sy8106a.h b/include/sy8106a.h
index 32e8c43dc0..36bfdbd308 100644
--- a/include/sy8106a.h
+++ b/include/sy8106a.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2016
* Jelle van der Waa <jelle@vdwaa.nl>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SY8106A_PMIC_H_
diff --git a/include/sym53c8xx.h b/include/sym53c8xx.h
index f992a85523..7628c33195 100644
--- a/include/sym53c8xx.h
+++ b/include/sym53c8xx.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Most of these definitions are derived from
* linux/drivers/scsi/sym53c8xx_defs.h
*/
diff --git a/include/synopsys/dwcddr21mctl.h b/include/synopsys/dwcddr21mctl.h
index 5576dbf2a2..6bb5cff305 100644
--- a/include/synopsys/dwcddr21mctl.h
+++ b/include/synopsys/dwcddr21mctl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2011 Andes Technology Corp
* Macpaul Lin <macpaul@andestech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/syscon.h b/include/syscon.h
index 5d52b1cc3c..d3261aae06 100644
--- a/include/syscon.h
+++ b/include/syscon.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SYSCON_H
diff --git a/include/sysreset.h b/include/sysreset.h
index 393c7be3d8..81318bdbf5 100644
--- a/include/sysreset.h
+++ b/include/sysreset.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __SYSRESET_H
diff --git a/include/tables_csum.h b/include/tables_csum.h
index 27d147b164..5f7edc419b 100644
--- a/include/tables_csum.h
+++ b/include/tables_csum.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TABLES_CSUM_H_
diff --git a/include/tee/optee.h b/include/tee/optee.h
index 4b9e94c175..9446928fd4 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
/*
* OP-TEE related definitions
*
* (C) Copyright 2016 Linaro Limited
* Andrew F. Davis <andrew.davis@linaro.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
*/
#ifndef _OPTEE_H
diff --git a/include/test/compression.h b/include/test/compression.h
index 646f117ed8..02fcfa49f6 100644
--- a/include/test/compression.h
+++ b/include/test/compression.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2017 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEST_COMPRESSION_H__
diff --git a/include/test/env.h b/include/test/env.h
index 2b0cd682e4..f45e33d71a 100644
--- a/include/test/env.h
+++ b/include/test/env.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2015
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __TEST_ENV_H__
diff --git a/include/test/overlay.h b/include/test/overlay.h
index 392f28ff84..c13f4d66e0 100644
--- a/include/test/overlay.h
+++ b/include/test/overlay.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2016 NextThing Co
* Copyright (c) 2016 Free Electrons
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEST_OVERLAY_H__
diff --git a/include/test/suites.h b/include/test/suites.h
index 5f2e519084..b5019a7cd2 100644
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2015
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __TEST_SUITES_H__
diff --git a/include/test/test.h b/include/test/test.h
index 646dbfd486..98fbcd11f6 100644
--- a/include/test/test.h
+++ b/include/test/test.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 Google, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEST_TEST_H
diff --git a/include/test/ut.h b/include/test/ut.h
index d176df58c7..59b23a25a4 100644
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Simple unit test library
*
* Copyright (c) 2013 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TEST_UT_H
diff --git a/include/thermal.h b/include/thermal.h
index b197c0aaa7..11d75256e0 100644
--- a/include/thermal.h
+++ b/include/thermal.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
*
* (C) Copyright 2014 Freescale Semiconductor, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _THERMAL_H_
diff --git a/include/thor.h b/include/thor.h
index 5051be714b..62501bda17 100644
--- a/include/thor.h
+++ b/include/thor.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* thor.h -- USB THOR Downloader protocol
*
* Copyright (C) 2013 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#ifndef __THOR_H_
diff --git a/include/ti-usb-phy-uboot.h b/include/ti-usb-phy-uboot.h
index 93f7101cb1..cd2ba40477 100644
--- a/include/ti-usb-phy-uboot.h
+++ b/include/ti-usb-phy-uboot.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/* include/ti_usb_phy_uboot.h
*
* Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com
*
* USB2 and USB3 PHY uboot init
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TI_USB_PHY_UBOOT_H_
diff --git a/include/time.h b/include/time.h
index 5746ad9d96..825991e222 100644
--- a/include/time.h
+++ b/include/time.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _TIME_H
#define _TIME_H
diff --git a/include/timer.h b/include/timer.h
index dcc803c392..a49b500ce3 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TIMER_H_
diff --git a/include/timestamp.h b/include/timestamp.h
index e2c0f06969..643a5a4d54 100644
--- a/include/timestamp.h
+++ b/include/timestamp.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2008 Extreme Engineering Solutions, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TIMESTAMP_H__
diff --git a/include/tpm.h b/include/tpm.h
index 760d94865c..c6316329f5 100644
--- a/include/tpm.h
+++ b/include/tpm.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013 The Chromium OS Authors.
* Coypright (c) 2013 Guntermann & Drunck GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TPM_H
diff --git a/include/tps6586x.h b/include/tps6586x.h
index eefc95f22e..785eb39229 100644
--- a/include/tps6586x.h
+++ b/include/tps6586x.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010,2011
* NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _TPS6586X_H_
diff --git a/include/trace.h b/include/trace.h
index 09a38d782f..99f34f72bc 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TRACE_H
diff --git a/include/tsec.h b/include/tsec.h
index e99a7fa878..e90095121b 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* tsec.h
*
@@ -7,8 +8,6 @@
* (C) Copyright 2003, Motorola, Inc.
* maintained by Xianghua Xiao (x.xiao@motorola.com)
* author Andy Fleming
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __TSEC_H
diff --git a/include/tsi108.h b/include/tsi108.h
index 34bd424f45..8e246b857e 100644
--- a/include/tsi108.h
+++ b/include/tsi108.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*****************************************************************************
* (C) Copyright 2003; Tundra Semiconductor Corp.
* (C) Copyright 2006; Freescale Semiconductor Corp.
- *
- * SPDX-License-Identifier: GPL-2.0+
*****************************************************************************/
/*
diff --git a/include/tsi148.h b/include/tsi148.h
index 9b635e150a..a9f353b908 100644
--- a/include/tsi148.h
+++ b/include/tsi148.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009 Reinhard Arlt, reinhard.arlt@esd-electronics.com
*
* base on universe.h by
*
* (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _tsi148_h
diff --git a/include/twl4030.h b/include/twl4030.h
index 103137372d..46a9306246 100644
--- a/include/twl4030.h
+++ b/include/twl4030.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2009 Wind River Systems, Inc.
* Tom Rix <Tom.Rix at windriver.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Derived from code on omapzoom, git://git.omapzoom.com/repo/u-boot.git
*
* Copyright (C) 2007-2009 Texas Instruments, Inc.
diff --git a/include/twl6030.h b/include/twl6030.h
index 40e2c111d7..66853439ed 100644
--- a/include/twl6030.h
+++ b/include/twl6030.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010
* Texas Instruments, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef TWL6030_H
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index 6d08f5df98..e98cb46c90 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Marvell Semiconductor <www.marvell.com>
* Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _UBOOT_CRC_H
diff --git a/include/u-boot/rsa-checksum.h b/include/u-boot/rsa-checksum.h
index c240720249..02b814d34e 100644
--- a/include/u-boot/rsa-checksum.h
+++ b/include/u-boot/rsa-checksum.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013, Andreas Oetken.
- *
- * SPDX-License-Identifier: GPL-2.0+
-*/
+ */
#ifndef _RSA_CHECKSUM_H
#define _RSA_CHECKSUM_H
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h
index 45a031b4b6..3253614ede 100644
--- a/include/u-boot/rsa-mod-exp.h
+++ b/include/u-boot/rsa-mod-exp.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
-*/
+ */
#ifndef _RSA_MOD_EXP_H
#define _RSA_MOD_EXP_H
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index 0e96c38711..68bcb14c74 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2013, Google Inc.
*
@@ -5,8 +6,6 @@
*
* (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _RSA_H
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 2634a29c20..283f103293 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1 */
/**
* \file sha1.h
* based from http://xyssl.org/code/source/sha1/
* FIPS-180-1 compliant SHA-1 implementation
*
* Copyright (C) 2003-2006 Christophe Devine
- *
- * SPDX-License-Identifier: LGPL-2.1
*/
/*
* The SHA-1 standard was published by NIST in 1993.
diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h
index 922beafcea..cb815d0fee 100644
--- a/include/u-boot/variadic-macro.h
+++ b/include/u-boot/variadic-macro.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Helper for work with variadic macros
*
* 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VARIADIC_MACRO_H__
diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h
index d86da277b0..015ce12226 100644
--- a/include/ubifs_uboot.h
+++ b/include/ubifs_uboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* UBIFS u-boot wrapper functions header
*
@@ -6,8 +7,6 @@
* (C) Copyright 2008-2009
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Authors: Artem Bityutskiy (Битюцкий Артём)
* Adrian Hunter
*/
diff --git a/include/uboot_aes.h b/include/uboot_aes.h
index b651bca1c9..2fda384e3b 100644
--- a/include/uboot_aes.h
+++ b/include/uboot_aes.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
* (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _AES_REF_H_
diff --git a/include/universe.h b/include/universe.h
index eb81e073d8..c84bb58950 100644
--- a/include/universe.h
+++ b/include/universe.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _universe_h
diff --git a/include/usb.h b/include/usb.h
index 57a7d8d0ea..b6b48a8c60 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland
*
* Adapted for U-Boot driver model
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
* Note: Part of this code has been derived from linux
*
*/
diff --git a/include/usb/ci_udc.h b/include/usb/ci_udc.h
index 0dee50461e..06adb2bb4d 100644
--- a/include/usb/ci_udc.h
+++ b/include/usb/ci_udc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2011, Marvell Semiconductor Inc.
* Lei Wen <leiwen@marvell.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/usb/designware_udc.h b/include/usb/designware_udc.h
index 2e1cdf138f..f874e5c35c 100644
--- a/include/usb/designware_udc.h
+++ b/include/usb/designware_udc.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2009
* Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DW_UDC_H
diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h
index 1a370e0e86..62e32365e2 100644
--- a/include/usb/dwc2_udc.h
+++ b/include/usb/dwc2_udc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* drivers/usb/gadget/dwc2_udc.h
* Designware DWC2 on-chip full/high speed USB device controllers
* Copyright (C) 2005 for Samsung Electronics
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __DWC2_USB_GADGET
diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h
index 4853cb2c71..e4579a5bec 100644
--- a/include/usb/ehci-ci.h
+++ b/include/usb/ehci-ci.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2005, 2009 Freescale Semiconductor, Inc
* Copyright (c) 2005 MontaVista Software
* Copyright (c) 2008 Excito Elektronik i Sk=E5ne AB
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _EHCI_CI_H
diff --git a/include/usb/fotg210.h b/include/usb/fotg210.h
index b83e8f5931..292ce54e0c 100644
--- a/include/usb/fotg210.h
+++ b/include/usb/fotg210.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Faraday USB 2.0 OTG Controller
*
* (C) Copyright 2010 Faraday Technology
* Dante Su <dantesu@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FOTG210_H
diff --git a/include/usb/fusbh200.h b/include/usb/fusbh200.h
index e2d8553653..6ae1d84880 100644
--- a/include/usb/fusbh200.h
+++ b/include/usb/fusbh200.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Faraday USB 2.0 EHCI Controller
*
* (C) Copyright 2010 Faraday Technology
* Dante Su <dantesu@faraday-tech.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FUSBH200_H
diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h
index d0d71f7c32..e5dba473b7 100644
--- a/include/usb/lin_gadget_compat.h
+++ b/include/usb/lin_gadget_compat.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
*
* This is a Linux kernel compatibility layer for USB Gadget
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __LIN_COMPAT_H__
diff --git a/include/usb/pxa27x_udc.h b/include/usb/pxa27x_udc.h
index 7eaa000303..07d14821c3 100644
--- a/include/usb/pxa27x_udc.h
+++ b/include/usb/pxa27x_udc.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* PXA27x register declarations and HCD data structures
*
* Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it>
* Copyright (C) 2007 Eurotech S.p.A. <info@eurotech.it>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
diff --git a/include/usb/udc.h b/include/usb/udc.h
index b2e0c6b6f5..749b3a3f01 100644
--- a/include/usb/udc.h
+++ b/include/usb/udc.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef USB_UDC_H
#define USB_UDC_H
diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h
index 747fb0a9fd..71642d257b 100644
--- a/include/usb/ulpi.h
+++ b/include/usb/ulpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Generic ULPI interface.
*
@@ -12,8 +13,6 @@
*
* Original Copyrights follow:
* Copyright (C) 2010 Nokia Corporation
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef __USB_ULPI_H__
diff --git a/include/usb_cdc_acm.h b/include/usb_cdc_acm.h
index 5709ecac48..0ce6cc3874 100644
--- a/include/usb_cdc_acm.h
+++ b/include/usb_cdc_acm.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2006
* Bryan O'Donoghue, deckard@codehermit.ie, CodeHermit
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* ACM Control Requests */
diff --git a/include/usb_defs.h b/include/usb_defs.h
index b7f2eada07..6dd2c997f9 100644
--- a/include/usb_defs.h
+++ b/include/usb_defs.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Note: Part of this code has been derived from linux
*/
#ifndef _USB_DEFS_H_
diff --git a/include/usb_ether.h b/include/usb_ether.h
index 51fce4e95d..49f47d372a 100644
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __USB_ETHER_H__
diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index 8229f62b97..c7b770fa3e 100644
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2011 Samsung Electrnoics
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __USB_MASS_STORAGE_H__
diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h
index 227b919952..9a50387451 100644
--- a/include/usbdescriptors.h
+++ b/include/usbdescriptors.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Gerry Hamel, geh@ti.com, Texas Instruments
@@ -12,8 +13,6 @@
* Stuart Lynne <sl@lineo.com>,
* Tom Rushworth <tbr@lineo.com>,
* Bruce Balden <balden@lineo.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* USB Descriptors - Create a complete description of all of the
diff --git a/include/usbdevice.h b/include/usbdevice.h
index f27e17f124..f479724e37 100644
--- a/include/usbdevice.h
+++ b/include/usbdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2003
* Gerry Hamel, geh@ti.com, Texas Instruments
@@ -11,8 +12,6 @@
* Stuart Lynne <sl@lineo.com>,
* Tom Rushworth <tbr@lineo.com>,
* Bruce Balden <balden@lineo.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __USBDCORE_H__
diff --git a/include/usbroothubdes.h b/include/usbroothubdes.h
index adb70cd6af..e743555d8e 100644
--- a/include/usbroothubdes.h
+++ b/include/usbroothubdes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* USB virtual root hub descriptors
*
@@ -5,8 +6,6 @@
* Stephen Warren swarren@wwwdotorg.org
*
* Based on ohci-hcd.c
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __USBROOTHUBDES_H__
diff --git a/include/uuid.h b/include/uuid.h
index c3f423fab4..124bbce8a2 100644
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2014 Samsung Electronics
* Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __UUID_H__
#define __UUID_H__
diff --git a/include/vbe.h b/include/vbe.h
index d6980d953f..f420f493ee 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
/******************************************************************************
* Copyright (c) 2004, 2008 IBM Corporation
* Copyright (c) 2009 Pattrick Hueper <phueper@hueper.net>
* All rights reserved.
*
- * SPDX-License-Identifier: BSD-2-Clause
- *
* Contributors:
* IBM Corporation - initial implementation
*****************************************************************************/
diff --git a/include/version.h b/include/version.h
index 049430978f..2d24451569 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2006
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VERSION_H__
diff --git a/include/video_bridge.h b/include/video_bridge.h
index 0699a8dda8..22e93dbb53 100644
--- a/include/video_bridge.h
+++ b/include/video_bridge.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VIDEO_BRIDGE
diff --git a/include/video_console.h b/include/video_console.h
index 7621a189d2..63af741778 100644
--- a/include/video_console.h
+++ b/include/video_console.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __video_console_h
diff --git a/include/video_fb.h b/include/video_fb.h
index b008853f30..e410226594 100644
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 1997-2002 ELTEC Elektronik AG
* Frank Gottschling <fgottschling@eltec.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/video_font.h b/include/video_font.h
index 96b9edb0da..5e23f70f85 100644
--- a/include/video_font.h
+++ b/include/video_font.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _VIDEO_FONT_
diff --git a/include/video_font_data.h b/include/video_font_data.h
index d52526a63c..ed5fd640a8 100644
--- a/include/video_font_data.h
+++ b/include/video_font_data.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* This file contains an 8x16 bitmap font for code page 437.
*/
diff --git a/include/virtex2.h b/include/virtex2.h
index 503df9abae..a48113060e 100644
--- a/include/virtex2.h
+++ b/include/virtex2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
* Keith Outwater, keith_outwater@mvis.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _VIRTEX2_H_
diff --git a/include/vsc9953.h b/include/vsc9953.h
index a2d4554c3b..bb7f8ecde5 100644
--- a/include/vsc9953.h
+++ b/include/vsc9953.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2013, 2015 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+
- *
* Driver for the Vitesse VSC9953 L2 Switch
*/
diff --git a/include/vsprintf.h b/include/vsprintf.h
index 33d05aa0c6..d1740a378e 100644
--- a/include/vsprintf.h
+++ b/include/vsprintf.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2009
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __VSPRINTF_H
diff --git a/include/vxworks.h b/include/vxworks.h
index 39f0a444a2..60c0efaf6e 100644
--- a/include/vxworks.h
+++ b/include/vxworks.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2008
* Niklaus Giger, niklaus.giger@member.fsf.org
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _VXWORKS_H_
diff --git a/include/w83c553f.h b/include/w83c553f.h
index ec872ac24e..2403e3401a 100644
--- a/include/w83c553f.h
+++ b/include/w83c553f.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Rob Taylor, Flying Pig Systems. robt@flyingpig.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* winbond access routines and defines*/
diff --git a/include/wait_bit.h b/include/wait_bit.h
index bd021baa48..82e09da5ca 100644
--- a/include/wait_bit.h
+++ b/include/wait_bit.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Wait for bit with timeout and ctrlc
*
* (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __WAIT_BIT_H
diff --git a/include/watchdog.h b/include/watchdog.h
index 52f4c506b0..14073cfdd2 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/include/wdt.h b/include/wdt.h
index 9b90fbeeb3..e9a7c5355a 100644
--- a/include/wdt.h
+++ b/include/wdt.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2017 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _WDT_H_
diff --git a/include/winbond_w83627.h b/include/winbond_w83627.h
index ac3bec6f9f..a58d816927 100644
--- a/include/winbond_w83627.h
+++ b/include/winbond_w83627.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright (C) 2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _WINBOND_W83627_H_
diff --git a/include/xilinx.h b/include/xilinx.h
index d2a2ea71e1..9429f51b48 100644
--- a/include/xilinx.h
+++ b/include/xilinx.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2002
* Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <fpga.h>
diff --git a/include/xyzModem.h b/include/xyzModem.h
index 4b667f7ba7..6fae634961 100644
--- a/include/xyzModem.h
+++ b/include/xyzModem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: eCos-2.0 */
/*
*==========================================================================
*
@@ -6,8 +7,6 @@
* RedBoot stream handler for xyzModem protocol
*
*==========================================================================
- * SPDX-License-Identifier: eCos-2.0
- *==========================================================================
*#####DESCRIPTIONBEGIN####
*
* Author(s): gthomas
diff --git a/include/zfs/dmu.h b/include/zfs/dmu.h
index f07a1e3a8c..f16982f8c0 100644
--- a/include/zfs/dmu.h
+++ b/include/zfs/dmu.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/dmu_objset.h b/include/zfs/dmu_objset.h
index 2f51fc4e76..43aa5824bd 100644
--- a/include/zfs/dmu_objset.h
+++ b/include/zfs/dmu_objset.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/dnode.h b/include/zfs/dnode.h
index 182dd9b41d..f01772c2f9 100644
--- a/include/zfs/dnode.h
+++ b/include/zfs/dnode.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/dsl_dataset.h b/include/zfs/dsl_dataset.h
index 237c2d7ccc..b05be71aa2 100644
--- a/include/zfs/dsl_dataset.h
+++ b/include/zfs/dsl_dataset.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/dsl_dir.h b/include/zfs/dsl_dir.h
index 7b3ca8af19..7eeb0d8395 100644
--- a/include/zfs/dsl_dir.h
+++ b/include/zfs/dsl_dir.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/sa_impl.h b/include/zfs/sa_impl.h
index e729e59ed1..41c77b0973 100644
--- a/include/zfs/sa_impl.h
+++ b/include/zfs/sa_impl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/spa.h b/include/zfs/spa.h
index eb54d906b3..cd2ddf58e7 100644
--- a/include/zfs/spa.h
+++ b/include/zfs/spa.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
diff --git a/include/zfs/uberblock_impl.h b/include/zfs/uberblock_impl.h
index e19eee5985..8045687ba8 100644
--- a/include/zfs/uberblock_impl.h
+++ b/include/zfs/uberblock_impl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/vdev_impl.h b/include/zfs/vdev_impl.h
index 9acc238347..de0e802f46 100644
--- a/include/zfs/vdev_impl.h
+++ b/include/zfs/vdev_impl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/zap_impl.h b/include/zfs/zap_impl.h
index 431fd2dbf6..6fe9fb66f2 100644
--- a/include/zfs/zap_impl.h
+++ b/include/zfs/zap_impl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
diff --git a/include/zfs/zap_leaf.h b/include/zfs/zap_leaf.h
index 5836f2272d..2a778e2caf 100644
--- a/include/zfs/zap_leaf.h
+++ b/include/zfs/zap_leaf.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h
index 8912732abe..17b93c10c8 100644
--- a/include/zfs/zfs.h
+++ b/include/zfs/zfs.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
diff --git a/include/zfs/zfs_acl.h b/include/zfs/zfs_acl.h
index 265736d599..d6cc408d7f 100644
--- a/include/zfs/zfs_acl.h
+++ b/include/zfs/zfs_acl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/zfs_znode.h b/include/zfs/zfs_znode.h
index 4a5e0f8d72..ed3cde6165 100644
--- a/include/zfs/zfs_znode.h
+++ b/include/zfs/zfs_znode.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/zil.h b/include/zfs/zil.h
index 7391c4628d..b5bd2c8406 100644
--- a/include/zfs/zil.h
+++ b/include/zfs/zil.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zfs/zio.h b/include/zfs/zio.h
index 888a4d3824..959e6e936a 100644
--- a/include/zfs/zio.h
+++ b/include/zfs/zio.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
diff --git a/include/zfs/zio_checksum.h b/include/zfs/zio_checksum.h
index 0c9b17a975..2264374e33 100644
--- a/include/zfs/zio_checksum.h
+++ b/include/zfs/zio_checksum.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
diff --git a/include/zynqmppl.h b/include/zynqmppl.h
index 8b3ce8ef77..a0f4e68a0c 100644
--- a/include/zynqmppl.h
+++ b/include/zynqmppl.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* (C) Copyright 2015 Xilinx, Inc,
* Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#ifndef _ZYNQMPPL_H_
diff --git a/include/zynqpl.h b/include/zynqpl.h
index 5a34a17dae..9c63c016f5 100644
--- a/include/zynqpl.h
+++ b/include/zynqpl.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2012-2013, Xilinx, Michal Simek
*
* (C) Copyright 2012
* Joe Hershberger <joe.hershberger@ni.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _ZYNQPL_H_