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

Commit 1a5c2265 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: clean up mach header includes 



The main asm/blackfin.h header will pull in mach/blackfin.h to get
all the fun Blackfin defines.  So having any of the sub-mach headers
trying to include asm/blackfin.h makes no sense -- punt it.

The mach/blackfin.h header takes care of including the part-specific
def headers which in turn will include any other needed def file.
Similarly, it takes care of pulling in the part-specific cdef header.
So move this logic out of the blackfin.h when necessary.

Further, make sure the cdef headers do not waste time including the
def headers again.

Since all parts need the common def/cdef headers, move this logic
out of the part-specific headers and into the mach/blackfin.h file.

Finally, we need to split the BF539 def header since the BF538 does
not have MXVR and we don't want to expose those MMRs.

So now all parts should have the same behavior:
	mach/blackfin.h
		asm/def_LPBlackfin.h
		part-specific def.h
		if ! asm
			asm/cdef_LPBlackfin.h
			part-specific cdef.h
And the sub def/cdef headers only tail into what they need.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 51946b10

arch/blackfin/mach-bf518/include/mach/blackfin.h

+30 −33
Original line number Diff line number Diff line 
/*

 * Copyright 2008-2009 Analog Devices Inc.

 * Copyright 2008-2010 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later

 * Licensed under the GPL-2 or later.

 */



#ifndef _MACH_BLACKFIN_H_

#define _MACH_BLACKFIN_H_



#include "bf518.h"

#include "defBF512.h"

#include "anomaly.h"



#if defined(CONFIG_BF518)

#include "defBF518.h"

#endif



#if defined(CONFIG_BF516)

#include "defBF516.h"

#include <asm/def_LPBlackfin.h>

#ifdef CONFIG_BF512

# include "defBF512.h"

#endif



#if defined(CONFIG_BF514)

#ifdef CONFIG_BF514

# include "defBF514.h"

#endif



#if defined(CONFIG_BF512)

#include "defBF512.h"

#ifdef CONFIG_BF516

# include "defBF516.h"

#endif

#ifdef CONFIG_BF518

# include "defBF518.h"

#endif



#if !defined(__ASSEMBLY__)

#ifndef __ASSEMBLY__

# include <asm/cdef_LPBlackfin.h>

# ifdef CONFIG_BF512

#  include "cdefBF512.h"



#if defined(CONFIG_BF518)

#include "cdefBF518.h"

# endif



#if defined(CONFIG_BF516)

# ifdef CONFIG_BF514

#  include "cdefBF514.h"

# endif

# ifdef CONFIG_BF516

#  include "cdefBF516.h"

# endif



#if defined(CONFIG_BF514)

#include "cdefBF514.h"

# ifdef CONFIG_BF518

#  include "cdefBF518.h"

# endif

#endif

arch/blackfin/mach-bf518/include/mach/cdefBF512.h

+1 −9
Original line number Diff line number Diff line 
/*

 * Copyright 2008-2009 Analog Devices Inc.

 * Copyright 2008-2010 Analog Devices Inc.

 *

 * Licensed under the ADI BSD license or the GPL-2 (or later)

 */
@@ -7,14 +7,6 @@ 
#ifndef _CDEF_BF512_H

#define _CDEF_BF512_H



/* include all Core registers and bit definitions */

#include "defBF512.h"



/* include core specific register pointer definitions */

#include <asm/cdef_LPBlackfin.h>



/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF512 */



/* include cdefBF51x_base.h for the set of #defines that are common to all ADSP-BF51x processors */

#include "cdefBF51x_base.h"

arch/blackfin/mach-bf518/include/mach/cdefBF514.h

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2008-2009 Analog Devices Inc.

 * Copyright 2008-2010 Analog Devices Inc.

 *

 * Licensed under the ADI BSD license or the GPL-2 (or later)

 */
@@ -7,9 +7,6 @@ 
#ifndef _CDEF_BF514_H

#define _CDEF_BF514_H



/* include all Core registers and bit definitions */

#include "defBF514.h"



/* BF514 is BF512 + RSI */

#include "cdefBF512.h"

arch/blackfin/mach-bf518/include/mach/cdefBF516.h

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2008-2009 Analog Devices Inc.

 * Copyright 2008-2010 Analog Devices Inc.

 *

 * Licensed under the ADI BSD license or the GPL-2 (or later)

 */
@@ -7,9 +7,6 @@ 
#ifndef _CDEF_BF516_H

#define _CDEF_BF516_H



/* include all Core registers and bit definitions */

#include "defBF516.h"



/* BF516 is BF514 + EMAC */

#include "cdefBF514.h"

arch/blackfin/mach-bf518/include/mach/cdefBF518.h

+1 −4
Original line number Diff line number Diff line 
/*

 * Copyright 2008-2009 Analog Devices Inc.

 * Copyright 2008-2010 Analog Devices Inc.

 *

 * Licensed under the ADI BSD license or the GPL-2 (or later)

 */
@@ -7,9 +7,6 @@ 
#ifndef _CDEF_BF518_H

#define _CDEF_BF518_H



/* include all Core registers and bit definitions */

#include "defBF518.h"



/* BF518 is BF516 + IEEE-1588 */

#include "cdefBF516.h"