diff options
| author | Tom Rini <trini@konsulko.com> | 2024-02-07 08:33:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-07 08:33:47 -0500 |
| commit | 7ebc77fede4bb8f1c0b1239c7093d1fa69ccc5a9 (patch) | |
| tree | 2f48a4a3086f4a92c53f06f4d646682e1b45ff92 /include | |
| parent | daa3100250839dd30626f7f4b7daf041f1114f1c (diff) | |
| parent | b8f1f60c23c9b3edb70159c4e2b1be232a008ee3 (diff) | |
| download | u-boot-7ebc77fede4bb8f1c0b1239c7093d1fa69ccc5a9.zip u-boot-7ebc77fede4bb8f1c0b1239c7093d1fa69ccc5a9.tar.gz u-boot-7ebc77fede4bb8f1c0b1239c7093d1fa69ccc5a9.tar.bz2 | |
Merge tag 'u-boot-rockchip-20240207' of https://source.denx.de/u-boot/custodians/u-boot-rockchipWIP/07Feb2024
- Add board: rv1126 Sonoff iHost board
- rv1126 ddr4 support;
- Enable BOOTSTD_FULL for RK3399 and RK3588;
- rk3036 spl stack addr fix;
- dts sync from linux v6.8-rc1 for rk356x, rk3588, rv1126;
- Enable eMMC HS200 mode by default for rk3568 and rk3588;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/neural-compute-module-2.h | 6 | ||||
| -rw-r--r-- | include/configs/rv1126_common.h | 5 | ||||
| -rw-r--r-- | include/configs/sonoff-ihost.h | 10 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rk3568-cru.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/soc/rockchip,vop2.h | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/include/configs/neural-compute-module-2.h b/include/configs/neural-compute-module-2.h index f0934ae..43a5609 100644 --- a/include/configs/neural-compute-module-2.h +++ b/include/configs/neural-compute-module-2.h @@ -12,10 +12,4 @@ #include <configs/rv1126_common.h> -#undef BOOT_TARGET_DEVICES - -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) - #endif /* __NEURAL_COMPUTE_MODULE_2_H */ diff --git a/include/configs/rv1126_common.h b/include/configs/rv1126_common.h index a64c0c6..ea290f7 100644 --- a/include/configs/rv1126_common.h +++ b/include/configs/rv1126_common.h @@ -26,9 +26,8 @@ "fdt_addr_r=0x08300000\0" \ "fdtoverlay_addr_r=0x02000000\0" \ "kernel_addr_r=0x02008000\0" \ - "ramdisk_addr_r=0x0a200000\0" + "ramdisk_addr_r=0x0a400000\0" -#include <config_distro_bootcmd.h> #define CFG_EXTRA_ENV_SETTINGS \ "fdt_high=0x0fffffff\0" \ "initrd_high=0x0fffffff\0" \ @@ -36,6 +35,6 @@ "partitions=" PARTS_DEFAULT \ ENV_MEM_LAYOUT_SETTINGS \ ROCKCHIP_DEVICE_SETTINGS \ - BOOTENV + "boot_targets=" BOOT_TARGETS "\0" #endif /* __CONFIG_RV1126_COMMON_H */ diff --git a/include/configs/sonoff-ihost.h b/include/configs/sonoff-ihost.h new file mode 100644 index 0000000..affc24d --- /dev/null +++ b/include/configs/sonoff-ihost.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef __SONOFF_IHOST_H +#define __SONOFF_IHOST_H + +#define ROCKCHIP_DEVICE_SETTINGS + +#include <configs/rv1126_common.h> + +#endif /* __SONOFF_IHOST_H */ diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h index c194242..d298908 100644 --- a/include/dt-bindings/clock/rk3568-cru.h +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -478,6 +478,7 @@ #define CPLL_50M 415 #define CPLL_25M 416 #define CPLL_100M 417 +#define SCLK_DDRCLK 418 #define PCLK_CORE_PVTM 450 diff --git a/include/dt-bindings/soc/rockchip,vop2.h b/include/dt-bindings/soc/rockchip,vop2.h index 6e66a80..668f199 100644 --- a/include/dt-bindings/soc/rockchip,vop2.h +++ b/include/dt-bindings/soc/rockchip,vop2.h @@ -10,5 +10,9 @@ #define ROCKCHIP_VOP2_EP_LVDS0 5 #define ROCKCHIP_VOP2_EP_MIPI1 6 #define ROCKCHIP_VOP2_EP_LVDS1 7 +#define ROCKCHIP_VOP2_EP_HDMI1 8 +#define ROCKCHIP_VOP2_EP_EDP1 9 +#define ROCKCHIP_VOP2_EP_DP0 10 +#define ROCKCHIP_VOP2_EP_DP1 11 #endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */ |