mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
include/configs: remove references to SMNAND_ENV_OFFSET
In mancy cases both CONFIG_ENV_OFFSET and CONFIG_ENV_ADDR point to an otherwise-unused SMNAND_ENV_OFFSET. This patch will set both CONFIG_ENV_OFFSET and CONFIG_ENV_ADDR to whatever value was defined by SMNAND_ENV_OFFSET. Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
parent
bf1ddfc026
commit
7672d9d582
15 changed files with 28 additions and 44 deletions
|
@ -207,11 +207,10 @@
|
|||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||
|
||||
#define CONFIG_NAND_OMAP_GPMC
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* CFI FLASH driver setup
|
||||
|
|
|
@ -244,9 +244,8 @@
|
|||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_SIZE CONFIG_SYS_ENV_SECT_SIZE
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL_FRAMEWORK
|
||||
|
|
|
@ -207,9 +207,8 @@
|
|||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_SMC911X
|
||||
|
|
|
@ -209,9 +209,8 @@
|
|||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
|
||||
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
#define CONFIG_DRIVER_TI_EMAC
|
||||
|
|
|
@ -174,9 +174,8 @@
|
|||
0x01000000) /* 16MB */
|
||||
|
||||
/* NAND and environment organization */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
|
||||
/* SRAM config */
|
||||
#define CONFIG_SYS_SRAM_START 0x40200000
|
||||
|
|
|
@ -244,12 +244,11 @@
|
|||
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
|
||||
#define CONFIG_NAND_OMAP_GPMC
|
||||
#define CONFIG_NAND_OMAP_GPMC_PREFETCH
|
||||
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
|
||||
|
||||
/* Redundant Environment */
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x180000
|
||||
#define CONFIG_ENV_ADDR 0x180000
|
||||
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
|
||||
2 * CONFIG_SYS_ENV_SECT_SIZE)
|
||||
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
||||
|
|
|
@ -238,11 +238,10 @@
|
|||
|
||||
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/* Defines for SPL */
|
||||
|
||||
|
|
|
@ -170,11 +170,10 @@
|
|||
|
||||
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/* Defines for SPL */
|
||||
|
||||
|
|
|
@ -66,10 +66,9 @@
|
|||
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
|
||||
#define CONFIG_ENV_IS_IN_NAND 1
|
||||
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
|
||||
/* NAND: SPL falcon mode configs */
|
||||
|
|
|
@ -235,11 +235,10 @@
|
|||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||
|
||||
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
/* SMSC922x Ethernet */
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
|
|
|
@ -175,11 +175,9 @@
|
|||
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
||||
|
||||
#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */
|
||||
#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x240000
|
||||
#define CONFIG_ENV_ADDR 0x240000
|
||||
|
||||
/* Configure SMSC9211 ethernet */
|
||||
#if defined(CONFIG_CMD_NET)
|
||||
|
|
|
@ -99,10 +99,9 @@
|
|||
/* Monitor at start of flash */
|
||||
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
|
||||
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
|
@ -149,11 +149,10 @@
|
|||
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
||||
|
||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
|
||||
#ifdef CONFIG_CMD_NET
|
||||
/* Ethernet (LAN9211 from SMSC9118 family) */
|
||||
|
|
|
@ -126,12 +126,11 @@
|
|||
|
||||
/* **** PISMO SUPPORT *** */
|
||||
#define CONFIG_NAND_OMAP_GPMC
|
||||
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
|
||||
|
||||
/* Redundant Environment */
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x180000
|
||||
#define CONFIG_ENV_ADDR 0x180000
|
||||
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
|
||||
2 * CONFIG_SYS_ENV_SECT_SIZE)
|
||||
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
|
||||
|
|
|
@ -192,10 +192,9 @@
|
|||
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
||||
|
||||
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
|
||||
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10)
|
||||
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
|
||||
|
||||
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
|
||||
|
|
Loading…
Add table
Reference in a new issue