All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Robinson <pbrobinson@gmail.com>
To: Nikhil M Jain <n-jain1@ti.com>
Cc: u-boot@lists.denx.de, agust@denx.de, devarsht@ti.com,
	trini@konsulko.com,  vigneshr@ti.com, nsekhar@ti.com,
	sjg@chromium.org
Subject: Re: [PATCH 5/9] drivers: video: tidss: Makefile: Add condition to compile TIDSS at SPL
Date: Mon, 13 Mar 2023 10:51:03 +0000	[thread overview]
Message-ID: <CALeDE9NJBZSugF5hYwXfHzpzFFU0hyv5r90pAfWkxfV=+ptzoQ@mail.gmail.com> (raw)
In-Reply-To: <20230313101459.58986-6-n-jain1@ti.com>

On Mon, Mar 13, 2023 at 10:17 AM Nikhil M Jain <n-jain1@ti.com> wrote:
>
> To enable TIDSS driver only at SPL stage add rule to compile the TIDSS
> video driver, for SPL stage only if CONFIG_SPL_VIDEO_TIDSS is
> defined.
>
> Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
> Reviewed-by: Devarsh Thakkar <devarsht@ti.com>
> ---
>  drivers/video/Makefile       | 1 +
>  drivers/video/tidss/Makefile | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/drivers/video/Makefile b/drivers/video/Makefile
> index 4e2d34e675..beec455e3d 100644
> --- a/drivers/video/Makefile
> +++ b/drivers/video/Makefile
> @@ -72,4 +72,5 @@ obj-y += sunxi/
>  ifdef CONFIG_SPL_BUILD
>  obj-$(CONFIG_$(SPL_)VIDEO) += video-uclass.o vidconsole-uclass.o
>  obj-$(CONFIG_$(SPL_)VIDEO) += video_bmp.o
> +<<<<<<< HEAD

I think this artifact is from a bad patch apply and shouldn't be there.

>  endif
> diff --git a/drivers/video/tidss/Makefile b/drivers/video/tidss/Makefile
> index f4f8c6c470..d538d5065b 100644
> --- a/drivers/video/tidss/Makefile
> +++ b/drivers/video/tidss/Makefile
> @@ -10,3 +10,4 @@
>
>
>  obj-${CONFIG_VIDEO_TIDSS} = tidss_drv.o
> +obj-${CONFIG_SPL_VIDEO_TIDSS} = tidss_drv.o
> \ No newline at end of file
> --
> 2.34.1
>

  reply	other threads:[~2023-03-13 10:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-13 10:14 [PATCH 0/9] Enable splash screen Nikhil M Jain
2023-03-13 10:14 ` [PATCH 1/9] drivers: video: Kconfig: Necessary configs for video at SPL Nikhil M Jain
2023-03-13 10:14 ` [PATCH 2/9] drivers: video: tidss: Kconfig: Configs to enable TIDSS " Nikhil M Jain
2023-03-13 10:14 ` [PATCH 3/9] cmd: Kconfig: Add necessary configs for splash screen " Nikhil M Jain
2023-03-13 10:14 ` [PATCH 4/9] drivers: video: Makefile: Compile video driver files " Nikhil M Jain
2023-03-13 10:14 ` [PATCH 5/9] drivers: video: tidss: Makefile: Add condition to compile TIDSS " Nikhil M Jain
2023-03-13 10:51   ` Peter Robinson [this message]
2023-03-13 10:14 ` [PATCH 6/9] cmd: Makefile: Add rules to build bmp.c and read.c " Nikhil M Jain
2023-03-13 10:14 ` [PATCH 7/9] common: splash: Enable splash_display at SPL stage Nikhil M Jain
2023-03-13 10:14 ` [PATCH 8/9] drivers: video: video-uclass: Disable u-boot logo at SPL Nikhil M Jain
2023-03-13 10:14 ` [PATCH 9/9] board: ti: am62x: evm: OSPI support for splash screen Nikhil M Jain
2023-03-14 22:08 ` [PATCH 0/9] Enable " Simon Glass
2023-03-15  6:06   ` Nikhil M Jain
2023-03-15 14:08     ` Simon Glass
2023-03-16  4:40       ` Nikhil M Jain
2023-03-17  8:13         ` Nikhil M Jain
2023-03-18 20:20           ` Simon Glass
2023-03-14  4:50 Nikhil M Jain
2023-03-14  4:50 ` [PATCH 5/9] drivers: video: tidss: Makefile: Add condition to compile TIDSS at SPL Nikhil M Jain
2023-03-27  8:23   ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CALeDE9NJBZSugF5hYwXfHzpzFFU0hyv5r90pAfWkxfV=+ptzoQ@mail.gmail.com' \
    --to=pbrobinson@gmail.com \
    --cc=agust@denx.de \
    --cc=devarsht@ti.com \
    --cc=n-jain1@ti.com \
    --cc=nsekhar@ti.com \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=vigneshr@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.