diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-03 09:09:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-03 09:09:29 -0400 |
| commit | 51b4a639e45bfb592d7019b4e2a8cc72ad206c9b (patch) | |
| tree | 4014fa73958f7ad2b9281c60a8e2253f32099239 /configs | |
| parent | e95b9b4437bcc31107bdc3b7625bd7c11ad24ef7 (diff) | |
| parent | 67171e13a3e0665b18c657a6704a22ca7900f4c3 (diff) | |
| download | u-boot-51b4a639e45bfb592d7019b4e2a8cc72ad206c9b.tar.gz u-boot-51b4a639e45bfb592d7019b4e2a8cc72ad206c9b.tar.bz2 u-boot-51b4a639e45bfb592d7019b4e2a8cc72ad206c9b.zip | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/evb-rk3399_defconfig | 1 | ||||
| -rw-r--r-- | configs/rock2_defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 25e89394f9..97f29669ca 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -23,6 +23,7 @@ CONFIG_ROCKCHIP_SDHCI=y CONFIG_ROCKCHIP_GPIO=y CONFIG_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y +CONFIG_REGULATOR_PWM=y CONFIG_RAM=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_BASE=0xFF1A0000 diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index fc9ff78943..036125689a 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -7,6 +7,8 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square" CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +# CONFIG_SPL_MMC_SUPPORT is not set +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set |