diff options
| author | Tom Rini <[email protected]> | 2022-06-30 22:36:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-30 22:36:41 -0400 |
| commit | 33938636f0914983554238c983c7429f68224239 (patch) | |
| tree | caeaabbf634be524c0e4f22481fa68a1ace77e30 /include | |
| parent | 05dcb5be507a0580a0fc57dd363c632ac4a6b3c4 (diff) | |
| parent | fce1e9bba263fb5e3e589fdc5c2321f733e3de81 (diff) | |
Merge tag 'u-boot-rockchip-20220630' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Fix for rk3328 nonopi-r2s boot env;
- Fix for rk8xx pmic boot on power plug-in;
- Fix for tee.bin support in fit image;
- rk3288 board dts update or fix;
- Some rk3399 board fix;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rk3036_common.h | 3 | ||||
| -rw-r--r-- | include/configs/rk3188_common.h | 2 | ||||
| -rw-r--r-- | include/configs/rk322x_common.h | 2 | ||||
| -rw-r--r-- | include/power/rk8xx_pmic.h | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index ab2b492d03f..f4f6bcab5ed 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -15,9 +15,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SPL_STACK 0x10081fff -#define CONFIG_ROCKCHIP_MAX_INIT_SIZE (4 << 10) -#define CONFIG_ROCKCHIP_CHIP_TAG "RK30" - #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define SDRAM_BANK_SIZE (512UL << 20UL) #define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE) diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 7449e816b7d..5c4dfa61e05 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -16,8 +16,6 @@ #endif #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_ROCKCHIP_MAX_INIT_SIZE (0x8000 - 0x800) -#define CONFIG_ROCKCHIP_CHIP_TAG "RK31" #define CONFIG_IRAM_BASE 0x10080000 /* spl size 32kb sram - 2kb bootrom */ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 36191ee9c12..f66a7d23be3 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -16,8 +16,6 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x61100000 #define CONFIG_SPL_MAX_SIZE 0x100000 -#define CONFIG_ROCKCHIP_MAX_INIT_SIZE (28 << 10) -#define CONFIG_ROCKCHIP_CHIP_TAG "RK32" #define CONFIG_IRAM_BASE 0x10080000 #define CONFIG_SYS_SDRAM_BASE 0x60000000 diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index 8ff0af35c57..3cbfc021956 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -214,6 +214,9 @@ enum { #define RK817_ON_SOURCE 0xf5 #define RK817_OFF_SOURCE 0xf6 +#define RK8XX_ON_PWRON BIT(7) +#define RK8XX_ON_PLUG_IN BIT(6) + struct reg_data { u8 reg; u8 val; |