From: Tom Rini <trini@konsulko.com>
Date: Tue, 19 Apr 2022 12:50:23 +0000 (-0400)
Subject: Merge tag 'u-boot-rockchip-20220418' of https://source.denx.de/u-boot/custodians... 
X-Git-Tag: v2025.01-rc5-pxa1908~1451
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=9acf3726b654d06c50c07c3f45da9eb1cbbadf34;p=u-boot.git

Merge tag 'u-boot-rockchip-20220418' of https://source.denx.de/u-boot/custodians/u-boot-rockchip

- Add rk3066 SoC support;
- Add rk3066 MK808 board support;
- dts sync from kernel for rk322x, rk3288;
- some other board level config update;
---

9acf3726b654d06c50c07c3f45da9eb1cbbadf34
diff --cc scripts/config_whitelist.txt
index df70ae2264,df70ae2264..4c03ed9499
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -541,7 -541,7 +541,6 @@@ CONFIG_RESTORE_FLAS
  CONFIG_ROCKCHIP_CHIP_TAG
  CONFIG_ROCKCHIP_MAX_INIT_SIZE
  CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
--CONFIG_ROCKCHIP_STIMER_BASE
  CONFIG_ROOTPATH
  CONFIG_RTC_DS1337
  CONFIG_RTC_DS1337_NOOSC