Message ID | fd70853df9e7ee66a20df9d42921f1f6608a2bc9.1499955058.git-series.maxime.ripard@free-electrons.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Jul 13, 2017 at 10:12 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Some options were not padded as they should, and the order in the Makefile > was chaotic. Fix that. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > drivers/gpu/drm/sun4i/Makefile | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile > index e29fd3a2ba9c..42871ee7acf6 100644 > --- a/drivers/gpu/drm/sun4i/Makefile > +++ b/drivers/gpu/drm/sun4i/Makefile > @@ -1,23 +1,23 @@ > -sun4i-drm-y += sun4i_drv.o > -sun4i-drm-y += sun4i_framebuffer.o > +sun4i-backend-y += sun4i_backend.o sun4i_layer.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > -sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > -sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o > +sun4i-drm-y += sun4i_drv.o > +sun4i-drm-y += sun4i_framebuffer.o I don't think this applies on top of Jonathan's HDMI I2C patch you already have queued up. Also you might want to leave a comment describe what the ordering should be. Otherwise it will still be messed up down the road. ChenYu > > -sun4i-tcon-y += sun4i_tcon.o > -sun4i-tcon-y += sun4i_rgb.o > -sun4i-tcon-y += sun4i_dotclock.o > -sun4i-tcon-y += sun4i_crtc.o > +sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > +sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > +sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o > > -sun4i-backend-y += sun4i_backend.o sun4i_layer.o > +sun4i-tcon-y += sun4i_tcon.o > +sun4i-tcon-y += sun4i_rgb.o > +sun4i-tcon-y += sun4i_dotclock.o > +sun4i-tcon-y += sun4i_crtc.o > > -sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o > +sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o > > obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o sun4i-tcon.o > obj-$(CONFIG_DRM_SUN4I) += sun6i_drc.o > obj-$(CONFIG_DRM_SUN4I) += sun4i_tv.o > > -obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o > +obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o > obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o > -obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o > +obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o > -- > git-series 0.9.1
On Fri, Jul 14, 2017 at 11:13:53AM +0800, Chen-Yu Tsai wrote: > On Thu, Jul 13, 2017 at 10:12 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Some options were not padded as they should, and the order in the Makefile > > was chaotic. Fix that. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > drivers/gpu/drm/sun4i/Makefile | 26 +++++++++++++------------- > > 1 file changed, 13 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile > > index e29fd3a2ba9c..42871ee7acf6 100644 > > --- a/drivers/gpu/drm/sun4i/Makefile > > +++ b/drivers/gpu/drm/sun4i/Makefile > > @@ -1,23 +1,23 @@ > > -sun4i-drm-y += sun4i_drv.o > > -sun4i-drm-y += sun4i_framebuffer.o > > +sun4i-backend-y += sun4i_backend.o sun4i_layer.o > > > > -sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o > > +sun4i-drm-y += sun4i_drv.o > > +sun4i-drm-y += sun4i_framebuffer.o > > I don't think this applies on top of Jonathan's HDMI I2C patch > you already have queued up. > > Also you might want to leave a comment describe what the > ordering should be. Otherwise it will still be messed up > down the road. Good point, I'll do that, thanks! Maxime
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile index e29fd3a2ba9c..42871ee7acf6 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile @@ -1,23 +1,23 @@ -sun4i-drm-y += sun4i_drv.o -sun4i-drm-y += sun4i_framebuffer.o +sun4i-backend-y += sun4i_backend.o sun4i_layer.o -sun4i-drm-hdmi-y += sun4i_hdmi_enc.o -sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o -sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o +sun4i-drm-y += sun4i_drv.o +sun4i-drm-y += sun4i_framebuffer.o -sun4i-tcon-y += sun4i_tcon.o -sun4i-tcon-y += sun4i_rgb.o -sun4i-tcon-y += sun4i_dotclock.o -sun4i-tcon-y += sun4i_crtc.o +sun4i-drm-hdmi-y += sun4i_hdmi_enc.o +sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o +sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o -sun4i-backend-y += sun4i_backend.o sun4i_layer.o +sun4i-tcon-y += sun4i_tcon.o +sun4i-tcon-y += sun4i_rgb.o +sun4i-tcon-y += sun4i_dotclock.o +sun4i-tcon-y += sun4i_crtc.o -sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o +sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o sun4i-tcon.o obj-$(CONFIG_DRM_SUN4I) += sun6i_drc.o obj-$(CONFIG_DRM_SUN4I) += sun4i_tv.o -obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o +obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o -obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o +obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o
Some options were not padded as they should, and the order in the Makefile was chaotic. Fix that. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)