Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12e36309 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Anatolij Gustschin
Browse files

powerpc: Option FB_FSL_DIU is not really optional for mpc512x 



In powerpc randconfig builds, this keeps showing up:

  CC      arch/powerpc/platforms/512x/mpc512x_shared.o
arch/powerpc/platforms/512x/mpc512x_shared.c:70:9: warning: 'enum fsl_diu_monitor_port' declared inside parameter list
arch/powerpc/platforms/512x/mpc512x_shared.c:70:9: warning: its scope is only this definition or declaration, which is probably not what you want
arch/powerpc/platforms/512x/mpc512x_shared.c:69:56: error: parameter 1 ('port') has incomplete type
arch/powerpc/platforms/512x/mpc512x_shared.c:69:5: warning: function declaration isn't a prototype
arch/powerpc/platforms/512x/mpc512x_shared.c:84:9: warning: 'enum fsl_diu_monitor_port' declared inside parameter list
arch/powerpc/platforms/512x/mpc512x_shared.c:83:56: error: parameter 1 ('port') has incomplete type
arch/powerpc/platforms/512x/mpc512x_shared.c:83:6: warning: function declaration isn't a prototype
arch/powerpc/platforms/512x/mpc512x_shared.c:88:36: warning: 'enum fsl_diu_monitor_port' declared inside parameter list
arch/powerpc/platforms/512x/mpc512x_shared.c:88:57: error: parameter 1 ('port') has incomplete type
arch/powerpc/platforms/512x/mpc512x_shared.c:88:6: warning: function declaration isn't a prototype
arch/powerpc/platforms/512x/mpc512x_shared.c:187:54: error: parameter 1 ('port') has incomplete type
arch/powerpc/platforms/512x/mpc512x_shared.c:187:1: error: return type is an incomplete type
arch/powerpc/platforms/512x/mpc512x_shared.c:187:1: warning: function declaration isn't a prototype
arch/powerpc/platforms/512x/mpc512x_shared.c: In function 'mpc512x_valid_monitor_port':
arch/powerpc/platforms/512x/mpc512x_shared.c:189:9: error: 'FSL_DIU_PORT_DVI' undeclared (first use in this function)
arch/powerpc/platforms/512x/mpc512x_shared.c:189:9: note: each undeclared identifier is reported only once for each function it appears in
arch/powerpc/platforms/512x/mpc512x_shared.c:189:2: warning: 'return' with a value, in function returning void
make[2]: *** [arch/powerpc/platforms/512x/mpc512x_shared.o] Error 1

The reason is that mpc512x_shared.c has a couple token #ifdef
on FB_FSL_DIU/FB_FSL_DIU_MODULE, but they don't come close to
masking all the DIU dependencies, as the above fail shows.

Rather than sprinkle more pointless #ifdef in this file, just
remove the existing two, and make FB_FSL_DIU part of the
dependency.  The mpc512x_defconfig already has the line
"CONFIG_FB_FSL_DIU=y" so this change should be zero impact
on real world configs.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent fca82646

arch/powerpc/platforms/512x/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config PPC_MPC512x 
	bool "512x-based boards"

	depends on 6xx

	select FSL_SOC

	select FB_FSL_DIU

	select IPIC

	select PPC_CLOCK

	select PPC_PCI_CHOICE

arch/powerpc/platforms/512x/mpc512x_shared.c

+0 −6
Original line number Diff line number Diff line
@@ -191,8 +191,6 @@ mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port) 


static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;



#if defined(CONFIG_FB_FSL_DIU) || \

    defined(CONFIG_FB_FSL_DIU_MODULE)

static inline void mpc512x_free_bootmem(struct page *page)

{

	__ClearPageReserved(page);
@@ -220,7 +218,6 @@ void mpc512x_release_bootmem(void) 
	}

	diu_ops.release_bootmem	= NULL;

}

#endif



/*

 * Check if DIU was pre-initialized. If so, perform steps
@@ -323,15 +320,12 @@ void __init mpc512x_setup_diu(void) 
		}

	}



#if defined(CONFIG_FB_FSL_DIU) || \

    defined(CONFIG_FB_FSL_DIU_MODULE)

	diu_ops.get_pixel_format	= mpc512x_get_pixel_format;

	diu_ops.set_gamma_table		= mpc512x_set_gamma_table;

	diu_ops.set_monitor_port	= mpc512x_set_monitor_port;

	diu_ops.set_pixel_clock		= mpc512x_set_pixel_clock;

	diu_ops.valid_monitor_port	= mpc512x_valid_monitor_port;

	diu_ops.release_bootmem		= mpc512x_release_bootmem;

#endif

}



void __init mpc512x_init_IRQ(void)