From: Adam Ford Date: Tue, 5 Sep 2017 02:08:02 +0000 (-0500) Subject: include/configs: remove references to SMNAND_ENV_OFFSET X-Git-Tag: v2017.11-rc1~140 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7672d9d582abfc380b8160c294b5de5bf97286be;p=u-boot 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 --- diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index edaa384213..c5fe3dcba6 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 89698bac3d..b13381dc72 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index d30b783a4c..30e20b8659 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -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 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 282b7ae10c..c166bf7c62 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -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 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 2bf0983e37..bd325e1305 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 1057b936ce..fb35f97ab3 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ee22f4fc1b..47a50bdaa6 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index b4d7f17131..417d45b582 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index af99e8b5cb..e9a1cad0f7 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 5fba35668b..5b31223b9e 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index d53657f916..cb92bd9c08 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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) diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 7f1b571267..7d5e926d1b 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -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 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c6db88a4a2..cbbe7d4e2f 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.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) */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 05399092fe..2363912de1 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 11b909b7dd..7f4acbae34 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -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