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

Commit 651ef18d authored Apr 23, 2012 by Arnd Bergmann

ARM: bcmring: move cfg_global header to mach/



Platforms should not have header files outside of include/mach,
and bcmring is the only one that has one just under include/,
so move that away.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent 69964ea4

arch/arm/mach-bcmring/arch.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@
	#include <mach/csp/chipcHw_def.h>		#include <mach/csp/chipcHw_def.h>
	#include <mach/csp/chipcHw_inline.h>		#include <mach/csp/chipcHw_inline.h>

	#include <cfg_global.h>		#include <mach/cfg_global.h>

	#include "core.h"		#include "core.h"

arch/arm/mach-bcmring/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@
	#include <asm/mach/time.h>		#include <asm/mach/time.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	#include <cfg_global.h>		#include <mach/cfg_global.h>

	#include "clock.h"		#include "clock.h"

arch/arm/mach-bcmring/include/cfg_global.h

deleted100644 → 0

+0 −13

Original line number	Original line	Diff line number	Diff line
	#ifndef _CFG_GLOBAL_H_
	#define _CFG_GLOBAL_H_

	#include <cfg_global_defines.h>

	#define CFG_GLOBAL_CHIP BCM11107
	#define CFG_GLOBAL_CHIP_FAMILY CFG_GLOBAL_CHIP_FAMILY_BCMRING
	#define CFG_GLOBAL_CHIP_REV 0xB0
	#define CFG_GLOBAL_RAM_SIZE 0x10000000
	#define CFG_GLOBAL_RAM_BASE 0x00000000
	#define CFG_GLOBAL_RAM_RESERVED_SIZE 0x000000

	#endif /* _CFG_GLOBAL_H_ */

arch/arm/mach-bcmring/include/cfg_global_defines.h→arch/arm/mach-bcmring/include/mach/cfg_global.h

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,3 +38,14 @@

	#define IMAGE_HEADER_SIZE_CHECKSUM 4		#define IMAGE_HEADER_SIZE_CHECKSUM 4
	#endif		#endif
			#ifndef _CFG_GLOBAL_H_
			#define _CFG_GLOBAL_H_

			#define CFG_GLOBAL_CHIP BCM11107
			#define CFG_GLOBAL_CHIP_FAMILY CFG_GLOBAL_CHIP_FAMILY_BCMRING
			#define CFG_GLOBAL_CHIP_REV 0xB0
			#define CFG_GLOBAL_RAM_SIZE 0x10000000
			#define CFG_GLOBAL_RAM_BASE 0x00000000
			#define CFG_GLOBAL_RAM_RESERVED_SIZE 0x000000

			#endif /* _CFG_GLOBAL_H_ */

arch/arm/mach-bcmring/include/mach/csp/cap_inline.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@

	/* ---- Include Files ---------------------------------------------------- */		/* ---- Include Files ---------------------------------------------------- */
	#include <mach/csp/cap.h>		#include <mach/csp/cap.h>
	#include <cfg_global.h>		#include <mach/cfg_global.h>

	/* ---- Public Constants and Types --------------------------------------- */		/* ---- Public Constants and Types --------------------------------------- */
	#define CAP_CONFIG0_VPM_DIS 0x00000001		#define CAP_CONFIG0_VPM_DIS 0x00000001