diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-22 11:30:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-22 11:30:52 -0400 |
| commit | 95fc1f164723270b2b0bd8d7e2f7ba21bce66381 (patch) | |
| tree | ac7b069cafc1178f6093944ee6a9b747d8b918e6 /include | |
| parent | e9f1f5f48650301bd9e4194c474d19081c54f05b (diff) | |
| parent | 8bedcf0ef9404f7f04da79783ba1ab8be7185cc2 (diff) | |
Merge tag 'u-boot-rockchip-20200722' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- New rk3326 board: Hardkernel Odroid Go2;
- Update board config and dts for RockPI 4/N8/N10;
- Update led boot on support for roc-rk3399-pc;
- Enable SPI Flash suppor for rk3328 rock64 board;
- Update rockchip pcie phy to use generic framework;
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/evb_rk3288.h | 6 | ||||
| -rw-r--r-- | include/configs/odroid_go2.h | 17 | ||||
| -rw-r--r-- | include/configs/rk3399_common.h | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index ddd7012c8f3..e19fa902128 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -6,7 +6,11 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,usbkbd\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #include <configs/rk3288_common.h> #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/odroid_go2.h b/include/configs/odroid_go2.h new file mode 100644 index 00000000000..00eac2d2a8e --- /dev/null +++ b/include/configs/odroid_go2.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + */ + +#ifndef __EVB_PX30_H +#define __EVB_PX30_H + +#include <configs/px30_common.h> + +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +#endif diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index e63ebb14f72..4121d5edc46 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -53,7 +53,9 @@ "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x06000000\0" + "ramdisk_addr_r=0x06000000\0" \ + "kernel_comp_addr_r=0x08000000\0" \ + "kernel_comp_size=0x2000000\0" #ifndef ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS |