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>
This commit is contained in:
parent
69964ea4c7
commit
651ef18db9
10 changed files with 19 additions and 21 deletions
|
@ -38,7 +38,7 @@
|
|||
#include <mach/csp/chipcHw_def.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
|
||||
#include "core.h"
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include <asm/mach/time.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
|
||||
#include "clock.h"
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
#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_ */
|
|
@ -38,3 +38,14 @@
|
|||
|
||||
#define IMAGE_HEADER_SIZE_CHECKSUM 4
|
||||
#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_ */
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <mach/csp/cap.h>
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
#define CAP_CONFIG0_VPM_DIS 0x00000001
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
#include <mach/csp/cap_inline.h>
|
||||
|
||||
#if defined(__KERNEL__)
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#if !defined(CSP_SIMULATION)
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <mach/csp/mm_addr.h>
|
||||
|
||||
#if !defined(CSP_SIMULATION)
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#define __ASM_ARCH_HARDWARE_H
|
||||
|
||||
#include <asm/sizes.h>
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
#include <mach/csp/mm_io.h>
|
||||
|
||||
/* Hardware addresses of major areas.
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <mach/reg_umi.h>
|
||||
#include <mach/reg_nand.h>
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
|
||||
/* ---- Constants and Types ---------------------------------------------- */
|
||||
#if (CFG_GLOBAL_CHIP_FAMILY == CFG_GLOBAL_CHIP_FAMILY_BCMRING)
|
||||
|
|
Loading…
Reference in a new issue