mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
ARMV7: OMAP3: Cleanup extern variables in mem.c
Removed boot_flash_* extern variables. boot_flash_type was totally unused. The other ones were actually constants, so they have been replaced with #defines in the board config files. Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
This commit is contained in:
parent
f4ef66685a
commit
6cbec7b3ba
12 changed files with 53 additions and 155 deletions
|
@ -31,16 +31,6 @@
|
||||||
#include <asm/arch/sys_proto.h>
|
#include <asm/arch/sys_proto.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* Only One NAND allowed on board at a time.
|
|
||||||
* The GPMC CS Base for the same
|
|
||||||
*/
|
|
||||||
unsigned int boot_flash_base;
|
|
||||||
unsigned int boot_flash_off;
|
|
||||||
unsigned int boot_flash_sec;
|
|
||||||
unsigned int boot_flash_type;
|
|
||||||
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)
|
||||||
|
@ -134,10 +124,6 @@ void gpmc_init(void)
|
||||||
const 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)
|
|
||||||
u32 f_off = CONFIG_SYS_MONITOR_LEN;
|
|
||||||
u32 f_sec = 0;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
u32 config = 0;
|
u32 config = 0;
|
||||||
|
|
||||||
|
@ -162,15 +148,6 @@ void gpmc_init(void)
|
||||||
base = PISMO1_NAND_BASE;
|
base = PISMO1_NAND_BASE;
|
||||||
size = PISMO1_NAND_SIZE;
|
size = PISMO1_NAND_SIZE;
|
||||||
enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
|
enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
|
||||||
#if defined(CONFIG_ENV_IS_IN_NAND)
|
|
||||||
f_off = SMNAND_ENV_OFFSET;
|
|
||||||
f_sec = (128 << 10); /* 128 KiB */
|
|
||||||
/* env setup */
|
|
||||||
boot_flash_base = base;
|
|
||||||
boot_flash_off = f_off;
|
|
||||||
boot_flash_sec = f_sec;
|
|
||||||
boot_flash_env_addr = f_off;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_ONENAND)
|
#if defined(CONFIG_CMD_ONENAND)
|
||||||
|
@ -178,14 +155,5 @@ void gpmc_init(void)
|
||||||
base = PISMO1_ONEN_BASE;
|
base = PISMO1_ONEN_BASE;
|
||||||
size = PISMO1_ONEN_SIZE;
|
size = PISMO1_ONEN_SIZE;
|
||||||
enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
|
enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size);
|
||||||
#if defined(CONFIG_ENV_IS_IN_ONENAND)
|
|
||||||
f_off = ONENAND_ENV_OFFSET;
|
|
||||||
f_sec = (128 << 10); /* 128 KiB */
|
|
||||||
/* env setup */
|
|
||||||
boot_flash_base = base;
|
|
||||||
boot_flash_off = f_off;
|
|
||||||
boot_flash_sec = f_sec;
|
|
||||||
boot_flash_env_addr = f_off;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -294,7 +294,7 @@
|
||||||
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
|
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -304,9 +304,9 @@
|
||||||
#define CONFIG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR boot_flash_env_addr
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* CFI FLASH driver setup
|
* CFI FLASH driver setup
|
||||||
|
@ -323,14 +323,6 @@
|
||||||
#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS
|
#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS
|
||||||
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
|
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
||||||
|
|
|
@ -294,7 +294,9 @@
|
||||||
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
|
#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -304,9 +306,9 @@
|
||||||
#define CONFIG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR boot_flash_env_addr
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* CFI FLASH driver setup
|
* CFI FLASH driver setup
|
||||||
|
@ -323,14 +325,6 @@
|
||||||
#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS
|
#define CONFIG_SYS_JFFS2_FIRST_BANK CONFIG_SYS_MAX_FLASH_BANKS
|
||||||
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
|
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
||||||
|
|
|
@ -312,7 +312,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -322,18 +324,10 @@
|
||||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_NET)
|
#if defined(CONFIG_CMD_NET)
|
||||||
#define CONFIG_NET_MULTI
|
#define CONFIG_NET_MULTI
|
||||||
#define CONFIG_SMC911X
|
#define CONFIG_SMC911X
|
||||||
|
|
|
@ -297,15 +297,7 @@
|
||||||
#define CONFIG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||||
|
|
|
@ -329,7 +329,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -339,18 +341,10 @@
|
||||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||||
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
|
||||||
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
#define CONFIG_SYS_INIT_RAM_SIZE 0x800
|
||||||
|
|
|
@ -298,33 +298,31 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#elif defined(CONFIG_CMD_ONENAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_ONEN_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
||||||
|
|
||||||
|
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_NAND)
|
#if defined(CONFIG_CMD_NAND)
|
||||||
#define CONFIG_NAND_OMAP_GPMC
|
#define CONFIG_NAND_OMAP_GPMC
|
||||||
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
|
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
|
||||||
#define CONFIG_ENV_IS_IN_NAND
|
#define CONFIG_ENV_IS_IN_NAND
|
||||||
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#elif defined(CONFIG_CMD_ONENAND)
|
#elif defined(CONFIG_CMD_ONENAND)
|
||||||
#define CONFIG_ENV_IS_IN_ONENAND 1
|
#define CONFIG_ENV_IS_IN_ONENAND 1
|
||||||
|
#define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET
|
||||||
#endif
|
#endif
|
||||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR boot_flash_env_addr
|
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Support for relocation
|
* Support for relocation
|
||||||
|
|
|
@ -271,7 +271,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -281,18 +283,10 @@
|
||||||
#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */
|
#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */
|
||||||
#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_NET)
|
#if defined(CONFIG_CMD_NET)
|
||||||
/*----------------------------------------------------------------------------
|
/*----------------------------------------------------------------------------
|
||||||
* SMSC9211 Ethernet from SMSC9118 family
|
* SMSC9211 Ethernet from SMSC9118 family
|
||||||
|
|
|
@ -262,7 +262,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -270,16 +272,8 @@
|
||||||
#define CONFIG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -358,14 +358,4 @@
|
||||||
* - rest for filesystem
|
* - rest for filesystem
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -285,7 +285,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -295,16 +297,8 @@
|
||||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
|
@ -254,7 +254,9 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BASE boot_flash_base
|
#if defined(CONFIG_CMD_NAND)
|
||||||
|
#define CONFIG_SYS_FLASH_BASE PISMO1_NAND_BASE
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Monitor at start of flash */
|
/* Monitor at start of flash */
|
||||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||||
|
@ -262,16 +264,8 @@
|
||||||
#define CONFIG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define SMNAND_ENV_OFFSET 0x0c0000 /* environment starts here */
|
#define SMNAND_ENV_OFFSET 0x0c0000 /* environment starts here */
|
||||||
|
|
||||||
#define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec
|
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||||
#define CONFIG_ENV_OFFSET boot_flash_off
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
extern unsigned int boot_flash_base;
|
|
||||||
extern volatile unsigned int boot_flash_env_addr;
|
|
||||||
extern unsigned int boot_flash_off;
|
|
||||||
extern unsigned int boot_flash_sec;
|
|
||||||
extern unsigned int boot_flash_type;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
Loading…
Add table
Reference in a new issue