diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-02 10:11:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-02 10:11:20 -0500 |
| commit | e5fd39c886485e3dec77f4438a6e364c2987cf5f (patch) | |
| tree | 635a4987f759207efd147ff628d683f7389ab1a1 /include/configs | |
| parent | 544d5e98f3657e4ac1966be8971586aa42dad8c4 (diff) | |
| parent | 73ced87e9af70cba35c4374055dca56e5f9c460d (diff) | |
| download | u-boot-e5fd39c886485e3dec77f4438a6e364c2987cf5f.tar.gz | |
Merge tag 'for-master-20190201' of git://git.denx.de/u-boot-rockchip
u-boot-rockchip changes for 2019.04-rc1:
* support for Chromebook Bob
* full pinctrl driver using DTS properties
* documentation improvements
* I2S support for some Rockchip SoCs
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/gru.h | 18 | ||||
| -rw-r--r-- | include/configs/rk3399_common.h | 5 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/configs/gru.h b/include/configs/gru.h new file mode 100644 index 0000000000..a0d27b6d51 --- /dev/null +++ b/include/configs/gru.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2015 Google, Inc + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + +#include <configs/rk3399_common.h> + +#define CONFIG_SYS_MMC_ENV_DEV 0 + +#endif diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 9a4da395f9..b977b1faa7 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -49,11 +49,16 @@ "kernel_addr_r=0x02080000\0" \ "ramdisk_addr_r=0x04000000\0" +#ifndef ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS +#endif + #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "partitions=" PARTS_DEFAULT \ + ROCKCHIP_DEVICE_SETTINGS \ BOOTENV #endif |