diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-11 10:38:21 -0500 |
| commit | b16f6804b4378c6d2f6b05ece0d3ae1c36ac4308 (patch) | |
| tree | 741f5604aeb9edc636cdf36f62bed3d83e004f08 /configs | |
| parent | f1cc97764be4383d2aeb56d5ba5415439a1d5c97 (diff) | |
| parent | 6f2797645562e85c407aab3e9a757bfd61a027fe (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/firefly-rk3288_defconfig | 3 | ||||
| -rw-r--r-- | configs/tinker-rk3288_defconfig (renamed from configs/miniarm-rk3288_defconfig) | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 93e9f80ebb..00bfca032a 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_FIREFLY_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly" @@ -28,6 +29,7 @@ CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -70,4 +72,3 @@ CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y -# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/miniarm-rk3288_defconfig b/configs/tinker-rk3288_defconfig index f48bfa97da..7573a2ec6d 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y -CONFIG_TARGET_MINIARM_RK3288=y +CONFIG_TARGET_TINKER_RK3288=y CONFIG_SPL_STACK_R_ADDR=0x80000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm" +CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker" CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set |