diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
| commit | 3a1cb953085ecca1dd2f87288375801ebd580bab (patch) | |
| tree | 3a7bacdbbd6ac9a5d3fe98f1eeb67a30ffac90e4 /arch/arm/dts/imx6sx-pinfunc.h | |
| parent | b62cd976543ae1b90050346c870d8357d749fe2d (diff) | |
| parent | 9f656fbee3b433ae1e9daf5d92d46bbdcc9551eb (diff) | |
Merge tag 'u-boot-imx-20200310' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.04
-----------------
- DM : mx6sabresd
- mx6ul_14x14_evk: fix video
- mx8qxp; fix console for booting
- sync DTS with kernel (imx6sx)
- drop obsolete woodburn (mx35)
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/660550811
Diffstat (limited to 'arch/arm/dts/imx6sx-pinfunc.h')
| -rw-r--r-- | arch/arm/dts/imx6sx-pinfunc.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/dts/imx6sx-pinfunc.h b/arch/arm/dts/imx6sx-pinfunc.h index 42c4c800fe..aa194a2fdd 100644 --- a/arch/arm/dts/imx6sx-pinfunc.h +++ b/arch/arm/dts/imx6sx-pinfunc.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright 2014 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * */ #ifndef __DTS_IMX6SX_PINFUNC_H |