brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-10-01 00:50:43 +09:00
Code Issues Projects Releases Wiki Activity

include/configs: remove references to SMNAND_ENV_OFFSET

Browse Source 
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:
Adam Ford 2017-09-04 21:08:02 -05:00 committed by Tom Rini
parent bf1ddfc026
commit 7672d9d582
15 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/configs/am3517_crane.h
View File

@ -207,11 +207,10 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_NAND_OMAP_GPMC #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_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* CFI FLASH driver setup * CFI FLASH driver setup

5
include/configs/am3517_evm.h
View File

@ -244,9 +244,8 @@
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_SIZE CONFIG_SYS_ENV_SECT_SIZE #define CONFIG_ENV_SIZE CONFIG_SYS_ENV_SECT_SIZE
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_FRAMEWORK

5
include/configs/cm_t35.h
View File

@ -207,9 +207,8 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define CONFIG_SMC911X #define CONFIG_SMC911X

5
include/configs/cm_t3517.h
View File

@ -209,9 +209,8 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC

3
include/configs/devkit8000.h
View File

@ -174,9 +174,8 @@
0x01000000) /* 16MB */ 0x01000000) /* 16MB */
/* NAND and environment organization */ /* 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 */ /* SRAM config */
#define CONFIG_SYS_SRAM_START 0x40200000 #define CONFIG_SYS_SRAM_START 0x40200000

5
include/configs/mcx.h
View File

@ -244,12 +244,11 @@
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_BUSWIDTH_16BIT
#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC
#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_NAND_OMAP_GPMC_PREFETCH
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
/* Redundant Environment */ /* Redundant Environment */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x180000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x180000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
2 * CONFIG_SYS_ENV_SECT_SIZE) 2 * CONFIG_SYS_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

5
include/configs/omap3_beagle.h
View File

@ -238,11 +238,10 @@
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#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 CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
/* Defines for SPL */ /* Defines for SPL */

5
include/configs/omap3_cairo.h
View File

@ -170,11 +170,10 @@
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#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 CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
/* Defines for SPL */ /* Defines for SPL */

5
include/configs/omap3_evm.h
View File

@ -66,10 +66,9 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #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_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
/* NAND: SPL falcon mode configs */ /* NAND: SPL falcon mode configs */

5
include/configs/omap3_logic.h
View File

@ -235,11 +235,10 @@
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #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_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
/* SMSC922x Ethernet */ /* SMSC922x Ethernet */
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)

6
include/configs/omap3_overo.h
View File

@ -175,11 +175,9 @@
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
#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 CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x240000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x240000
/* Configure SMSC9211 ethernet */ /* Configure SMSC9211 ethernet */
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)

5
include/configs/omap3_pandora.h
View File

@ -99,10 +99,9 @@
/* 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 SMNAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

5
include/configs/omap3_zoom1.h
View File

@ -149,11 +149,10 @@
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
#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 CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x260000
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
/* Ethernet (LAN9211 from SMSC9118 family) */ /* Ethernet (LAN9211 from SMSC9118 family) */

5
include/configs/tam3517-common.h
View File

@ -126,12 +126,11 @@
/* **** PISMO SUPPORT *** */ /* **** PISMO SUPPORT *** */
#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC
#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
/* Redundant Environment */ /* Redundant Environment */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x180000
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR 0x180000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
2 * CONFIG_SYS_ENV_SECT_SIZE) 2 * CONFIG_SYS_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

3
include/configs/tao3530.h
View File

@ -192,10 +192,9 @@
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
#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 CONFIG_SYS_ENV_SECT_SIZE (128 << 10) #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_ENV_ADDR CONFIG_ENV_OFFSET
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1