diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-20 22:14:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-20 22:14:29 -0500 |
| commit | 8e51bf746a11d7f67416859da73a83109af4e0a3 (patch) | |
| tree | 95351fb3819745d39c60944412e66529b31170bd /include | |
| parent | 4246fae418f213d13ddd1829367183e94b5a7942 (diff) | |
| parent | f9561d8e3671415c7780df4b5e70f0f1e2d2bf57 (diff) | |
| download | u-boot-8e51bf746a11d7f67416859da73a83109af4e0a3.zip u-boot-8e51bf746a11d7f67416859da73a83109af4e0a3.tar.gz u-boot-8e51bf746a11d7f67416859da73a83109af4e0a3.tar.bz2 | |
Merge tag 'u-boot-rockchip-20200220' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rk3399: split roc-pc-rk3399 out of evb_rk3399
- sync dts from upstream kernel for rk3399,rk3288,px30
- boot_mode: find the saradc device name
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/roc-pc-rk3399.h | 22 | ||||
| -rw-r--r-- | include/configs/tinker_rk3288.h | 6 | ||||
| -rw-r--r-- | include/configs/vyasa-rk3288.h | 6 |
3 files changed, 32 insertions, 2 deletions
diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h new file mode 100644 index 0000000..3fd1062 --- /dev/null +++ b/include/configs/roc-pc-rk3399.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2016 Rockchip Electronics Co., Ltd + */ + +#ifndef __ROC_PC_RK3399_H +#define __ROC_PC_RK3399_H + +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +#include <configs/rk3399_common.h> + +#if defined(CONFIG_ENV_IS_IN_MMC) +# define CONFIG_SYS_MMC_ENV_DEV 0 +#endif + +#define SDRAM_BANK_SIZE (2UL << 30) + +#endif diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index f8a55a2..f1095cc 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -6,7 +6,11 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include <configs/rk3288_common.h> #undef BOOT_TARGET_DEVICES diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 3574a3b..e31dc77 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -8,7 +8,11 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include <configs/rk3288_common.h> #undef BOOT_TARGET_DEVICES |