diff options
| author | Tom Rini <[email protected]> | 2020-11-16 09:50:21 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-11-16 09:50:21 -0500 |
| commit | e1fdb2045ad02c9d8bc5972db8f0536518c7330e (patch) | |
| tree | a6605552f6d36c105dd7ebfa78d7fd290c53151b /arch/arm/include | |
| parent | cd0d3749afdad4f4fd03bc005fe5efaad0e09417 (diff) | |
| parent | b197c934b11f611dcc1a083d90e68019d1e010cf (diff) | |
Merge tag 'u-boot-rockchip-20201113' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fix USB support for rk3399 Pinebook Pro;
- Fix SPI boot for rk3399 boards other than Bob;
- Fix 32bit boards firmware build without SPL_OPTEE support;
- Fix rockchip display driver license;
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h index 105a335daba..94e5bb674f2 100644 --- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h index 872a158b714..52446e97c69 100644 --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. |