diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-16 22:08:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-16 22:08:13 -0400 |
| commit | af8ef2ed21960b894945e37a3217ad67373f3711 (patch) | |
| tree | 203ac289e2df20f5d8892570031f29b3a34888ec /include | |
| parent | 51f866e8da758a27af596af73466bd5f0a450c4d (diff) | |
| parent | 7ee16de58bddaa9619c264313008d7e19300b42a (diff) | |
| download | u-boot-af8ef2ed21960b894945e37a3217ad67373f3711.tar.gz | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/puma_rk3399.h | 27 | ||||
| -rw-r--r-- | include/configs/rk3399_common.h | 4 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 9 | ||||
| -rw-r--r-- | include/configs/tinker_rk3288.h | 5 |
4 files changed, 42 insertions, 3 deletions
diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h new file mode 100644 index 0000000000..fd62c72a20 --- /dev/null +++ b/include/configs/puma_rk3399.h @@ -0,0 +1,27 @@ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __PUMA_RK3399_H +#define __PUMA_RK3399_H + +#include <configs/rk3399_common.h> + +/* + * SPL @ 32kB for ~130kB + * ENV @ 240KB for 8kB + * FIT payload (ATF, U-Boot, FDT) @ 256kB + */ +#undef CONFIG_ENV_OFFSET +#define CONFIG_ENV_OFFSET (240 * 1024) + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 + +#define SDRAM_BANK_SIZE (2UL << 30) + +#define CONFIG_SYS_WHITE_ON_BLACK + +#endif diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 9d22e0cc67..b7b89b08a8 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -57,8 +57,8 @@ #ifndef CONFIG_SPL_BUILD #define ENV_MEM_LAYOUT_SETTINGS \ - "scriptaddr=0x00000000\0" \ - "pxefile_addr_r=0x00100000\0" \ + "scriptaddr=0x00500000\0" \ + "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02000000\0" \ "ramdisk_addr_r=0x04000000\0" diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index fd930c101e..9d183cee6a 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -12,11 +12,20 @@ #include <config_distro_defaults.h> /* First try to boot from SD (index 0), then eMMC (index 1 */ +#ifdef CONFIG_CMD_USB #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ + func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dchp, na) +#else +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(PXE, pxe, na) \ + func(DHCP, dchp, na) +#endif #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 5228528141..402ae2def2 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -13,7 +13,10 @@ #undef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dchp, na) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 |