diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-03 08:39:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-03 08:39:44 -0500 |
| commit | 7436f5e54d35bcad53befec90e2e67288071f74e (patch) | |
| tree | 19d99b0fa4532bfbfefa2a12274a6079cf10df3f /arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | |
| parent | 695f67b5b3693232406a5cb3590d8fc5860c9f6c (diff) | |
| parent | 77012e79ffc35994e5d6efca458d65bd03842b00 (diff) | |
Merge tag 'for-master-20190103' of git://git.denx.de/u-boot-rockchip
Last-minute fixes for 2019.1:
- clamp DRAM size to below 32bit for 32bit targets to support 4GB
- fix copyright notice on some Rockchip-contributed files
- adjust vdd_log for the RK3399-Q7 to improve stability in some workloads
Diffstat (limited to 'arch/arm/mach-rockchip/rk3036/sdram_rk3036.c')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c index 4e5690eae3..2012d9fe04 100644 --- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c @@ -1,6 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause /* - * (C) Copyright 2015 Google, Inc + * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ #include <common.h> #include <asm/io.h> |