GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TI OMAP3: make gpmc_config as const

Browse source 
gpmc_config should not be a variant as it is board specific
hence make it a const parameter

Fixes issues identified by Dirk:
- build issue for zoom2
- warnings for all other OMAP3 platforms using nand/onenand etc

Signed-off-by: Nishanth Menon <nm@ti.com>
This commit is contained in:
Nishanth Menon 2009-10-13 12:49:55 -04:00 • committed by Tom Rix
parent 4e0539d269
commit f8a812aa65
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/logicpd/zoom2/zoom2.c
View file

@ -50,9 +50,6 @@
* The details of the setting of the serial gpmc setup are not available. * The details of the setting of the serial gpmc setup are not available.
* The values were provided by another party. * The values were provided by another party.
*/ */
void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
u32 size);
static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = { static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {
0x00011000, 0x00011000,
0x001F1F01, 0x001F1F01,

8
cpu/arm_cortexa8/omap3/mem.c
View file

@ -44,7 +44,7 @@ volatile unsigned int boot_flash_env_addr;
struct gpmc *gpmc_cfg; struct gpmc *gpmc_cfg;
#if defined(CONFIG_CMD_NAND) #if defined(CONFIG_CMD_NAND)
static u32 gpmc_m_nand[GPMC_MAX_REG] = { static const u32 gpmc_m_nand[GPMC_MAX_REG] = {
M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG1,
M_NAND_GPMC_CONFIG2, M_NAND_GPMC_CONFIG2,
M_NAND_GPMC_CONFIG3, M_NAND_GPMC_CONFIG3,
@ -62,7 +62,7 @@ static u32 gpmc_m_nand[GPMC_MAX_REG] = {
#endif #endif
#if defined(CONFIG_CMD_ONENAND) #if defined(CONFIG_CMD_ONENAND)
static u32 gpmc_onenand[GPMC_MAX_REG] = { static const u32 gpmc_onenand[GPMC_MAX_REG] = {
ONENAND_GPMC_CONFIG1, ONENAND_GPMC_CONFIG1,
ONENAND_GPMC_CONFIG2, ONENAND_GPMC_CONFIG2,
ONENAND_GPMC_CONFIG3, ONENAND_GPMC_CONFIG3,
@ -192,7 +192,7 @@ void do_sdrc_init(u32 cs, u32 early)
writel(0, &sdrc_base->cs[cs].mcfg); writel(0, &sdrc_base->cs[cs].mcfg);
} }
void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base, void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
u32 size) u32 size)
{ {
writel(0, &cs->config7); writel(0, &cs->config7);
@ -220,7 +220,7 @@ void gpmc_init(void)
/* putting a blanket check on GPMC based on ZeBu for now */ /* putting a blanket check on GPMC based on ZeBu for now */
gpmc_cfg = (struct gpmc *)GPMC_BASE; gpmc_cfg = (struct gpmc *)GPMC_BASE;
#if defined(CONFIG_CMD_NAND) || defined(CONFIG_CMD_ONENAND) #if defined(CONFIG_CMD_NAND) || defined(CONFIG_CMD_ONENAND)
u32 *gpmc_config = NULL; const u32 *gpmc_config = NULL;
u32 base = 0; u32 base = 0;
u32 size = 0; u32 size = 0;
#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_ONENAND) #if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_ONENAND)

2
include/asm-arm/arch-omap3/sys_proto.h
View file

@ -34,7 +34,7 @@ void memif_init(void);
void sdrc_init(void); void sdrc_init(void);
void do_sdrc_init(u32, u32); void do_sdrc_init(u32, u32);
void gpmc_init(void); void gpmc_init(void);
void enable_gpmc_cs_config(u32 *gpmc_config, struct gpmc_cs *cs, u32 base, void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
u32 size); u32 size);
void watchdog_init(void); void watchdog_init(void);