diff options
| author | Tom Rini | 2024-07-18 07:49:14 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-07-18 07:49:14 -0600 |
| commit | dce89b3bfc5ed2d2f5439474f7edda1a3b085094 (patch) | |
| tree | 2d3fdebd6e4f5b737604be4b15076e2c2ccd1e4e /include/configs/rk3588_common.h | |
| parent | 84ab75fb56337a7c186044850d3f6555bc644df1 (diff) | |
| parent | e8b3f6c1018e1401bcc697a8aed8120061e4f189 (diff) | |
Merge tag 'u-boot-rockchip-20240718' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Add boards:
rk3328: Radxa ROCK Pi E v3;
rk3588s: FriendlyElec NanoPi R6C/S;
- Remove board: Theobroma Systems RK3368 Lion;
- Add rk3588 pcie support;
- Misc updates for board and config;
CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/2163
Diffstat (limited to 'include/configs/rk3588_common.h')
| -rw-r--r-- | include/configs/rk3588_common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h index 70430612eff..e6654c275ac 100644 --- a/include/configs/rk3588_common.h +++ b/include/configs/rk3588_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. @@ -26,11 +26,11 @@ "ramdisk_addr_r=0x12180000\0" \ "kernel_comp_size=0x8000000\0" -#define CFG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "partitions=" PARTS_DEFAULT \ - ENV_MEM_LAYOUT_SETTINGS \ - ROCKCHIP_DEVICE_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ENV_MEM_LAYOUT_SETTINGS \ + ROCKCHIP_DEVICE_SETTINGS \ "boot_targets=" BOOT_TARGETS "\0" #endif /* __CONFIG_RK3588_COMMON_H */ |