Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 135a87ef43566cdd592fa9fd899bf435aa14aaa3

Authored by Simon Glass
Committed by Tom Warren
1 parent 3f2997a40c
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

tegra: Allow CONFIG_DM_VIDEO to be used as well as CONFIG_LCD 

While we transition to using driver model for video, we need to support both
options.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

Showing 2 changed files with 14 additions and 4 deletions Side-by-side Diff

arch/arm/mach-tegra/board2.c
Diff comments   View file @ 135a87e
... ... @@ -139,8 +139,10 @@
139 139 if (pwm_init(gd->fdt_blob))
140 140 debug("%s: Failed to init pwm\n", __func__);
141 141 #endif
142   -#ifdef CONFIG_LCD
  142 +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
143 143 pin_mux_display();
  144 +#endif
  145 +#ifdef CONFIG_LCD
144 146 tegra_lcd_check_next_stage(gd->fdt_blob, 0);
145 147 #endif
146 148 /* boot param addr */
147 149  
... ... @@ -169,11 +171,13 @@
169 171 pin_mux_usb();
170 172 #endif
171 173  
172   -#ifdef CONFIG_LCD
  174 +#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
173 175 board_id = tegra_board_id();
174 176 err = tegra_lcd_pmic_init(board_id);
175 177 if (err)
176 178 return err;
  179 +#endif
  180 +#ifdef CONFIG_LCD
177 181 tegra_lcd_check_next_stage(gd->fdt_blob, 0);
178 182 #endif
179 183  
include/configs/tegra-common-post.h
Diff comments   View file @ 135a87e
... ... @@ -53,6 +53,12 @@
53 53 #define STDOUT_LCD ""
54 54 #endif
55 55  
  56 +#ifdef CONFIG_DM_VIDEO
  57 +#define STDOUT_VIDEO ",vidconsole"
  58 +#else
  59 +#define STDOUT_VIDEO ""
  60 +#endif
  61 +
56 62 #ifdef CONFIG_CROS_EC_KEYB
57 63 #define STDOUT_CROS_EC ",cros-ec-keyb"
58 64 #else
... ... @@ -61,8 +67,8 @@
61 67  
62 68 #define TEGRA_DEVICE_SETTINGS \
63 69 "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
64   - "stdout=serial" STDOUT_LCD "\0" \
65   - "stderr=serial" STDOUT_LCD "\0" \
  70 + "stdout=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
  71 + "stderr=serial" STDOUT_LCD STDOUT_VIDEO "\0" \
66 72 ""
67 73  
68 74 #ifndef BOARD_EXTRA_ENV_SETTINGS