diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
| commit | 6d0453d88915feeece6e55748a2476d8509e5fad (patch) | |
| tree | f4564a64f771cb071a74787f11471250fdbdf47b /configs/khadas-edge-captain-rk3399_defconfig | |
| parent | 67edf2553f15e5148efca213af3f41cef3410680 (diff) | |
| parent | 3ef4572110a43acdd7d401b0cb184c6ebd6eaa17 (diff) | |
| download | u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.tar.gz u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.tar.bz2 u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.zip | |
Merge tag 'v2021.07-rc5' into next
Prepare v2021.07-rc5
# gpg: Signature made Mon 28 Jun 2021 03:39:36 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# configs/am64x_evm_r5_defconfig
Diffstat (limited to 'configs/khadas-edge-captain-rk3399_defconfig')
| -rw-r--r-- | configs/khadas-edge-captain-rk3399_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig index ce6b492b3d..c564086704 100644 --- a/configs/khadas-edge-captain-rk3399_defconfig +++ b/configs/khadas-edge-captain-rk3399_defconfig @@ -3,11 +3,11 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-captain" CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3399-khadas-edge-captain" CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-khadas-edge-captain.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y |