diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-17 20:12:37 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-23 18:33:35 -0400 |
| commit | ef26d6039a14c03c516c09a7835b491e671a4b0b (patch) | |
| tree | d9a6957ab0709cb6870f251d718ffb3dd5ed9afa /configs/rock2_defconfig | |
| parent | f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (diff) | |
Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_CONSOLE_MUX
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Re-order, re-migrate]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/rock2_defconfig')
| -rw-r--r-- | configs/rock2_defconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index def639f8e1..fa2ed0d338 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -1,16 +1,16 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +# CONFIG_SPL_MMC_SUPPORT is not set CONFIG_ROCKCHIP_RK3288=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y CONFIG_TARGET_ROCK2=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square" -# CONFIG_DISPLAY_CPUINFO is not set CONFIG_SILENT_CONSOLE=y +# CONFIG_DISPLAY_CPUINFO is not set 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 @@ -50,10 +50,8 @@ CONFIG_ROCKCHIP_RK3288_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y -CONFIG_DM_REGULATOR=y CONFIG_REGULATOR_ACT8846=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_PWM=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y |