diff options
author | Tom Rini <trini@konsulko.com> | 2020-10-30 22:55:16 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-10-30 23:13:13 -0400 |
commit | 2c31d7e746766f47a007f39c030706e493a9cc77 (patch) | |
tree | be0e2fb0bef7a7b5195817dcaf9a3d025ea34484 /include | |
parent | 63d4607e03e5f1f7ab9a18bc640e31f7d28874b4 (diff) | |
parent | 43ed7a098d62e700ac024ab913f3be17a6974bb2 (diff) |
Merge tag 'u-boot-rockchip-20201031' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- New PX30 board: Engicam PX30.Core;
- Fix USB HID support for rock960;
- Remove host endianness dependency for rockchip mkimage;
- dts update for rk3288-tinker;
- Enable console MUX for some ROCKPi boards;
- Add config-based ddr selection for px30;
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/px30_core.h | 15 | ||||
-rw-r--r-- | include/configs/rock960_rk3399.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/configs/px30_core.h b/include/configs/px30_core.h new file mode 100644 index 00000000000..01b49955983 --- /dev/null +++ b/include/configs/px30_core.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2020 Amarula Solutions(India) + */ + +#ifndef __PX30_CORE_H +#define __PX30_CORE_H + +#include <configs/px30_common.h> + +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +#endif /* __PX30_CORE_H */ diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h index c6f9122154a..2edad710284 100644 --- a/include/configs/rock960_rk3399.h +++ b/include/configs/rock960_rk3399.h @@ -15,4 +15,6 @@ #define SDRAM_BANK_SIZE (2UL << 30) +#define CONFIG_USB_OHCI_NEW +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 #endif |