About a quarter of the files in common/ relate to the environment. It seems better to put these into their own subdirectory and remove the prefix.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: None
Kconfig | 2 + Makefile | 1 + arch/sh/cpu/u-boot.lds | 4 +- board/freescale/mx31ads/u-boot.lds | 2 +- common/Kconfig | 69 ------------------------------- common/Makefile | 49 +--------------------- env/Kconfig | 68 ++++++++++++++++++++++++++++++ env/Makefile | 57 +++++++++++++++++++++++++ common/env_attr.c => env/attr.c | 0 common/env_callback.c => env/callback.c | 0 common/env_common.c => env/common.c | 0 common/env_dataflash.c => env/dataflash.c | 0 common/env_eeprom.c => env/eeprom.c | 0 common/env_embedded.c => env/embedded.c | 0 common/env_ext4.c => env/ext4.c | 0 common/env_fat.c => env/fat.c | 0 common/env_flags.c => env/flags.c | 0 common/env_flash.c => env/flash.c | 0 common/env_mmc.c => env/mmc.c | 0 common/env_nand.c => env/nand.c | 0 common/env_nowhere.c => env/nowhere.c | 0 common/env_nvram.c => env/nvram.c | 0 common/env_onenand.c => env/onenand.c | 0 common/env_remote.c => env/remote.c | 0 common/env_sata.c => env/sata.c | 0 common/env_sf.c => env/sf.c | 0 common/env_ubi.c => env/ubi.c | 0 include/configs/M5208EVBE.h | 4 +- include/configs/M5235EVB.h | 2 +- include/configs/M5249EVB.h | 4 +- include/configs/M5253DEMO.h | 4 +- include/configs/M5253EVBE.h | 2 +- include/configs/M5272C3.h | 4 +- include/configs/M5275EVB.h | 4 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 4 +- include/configs/M5373EVB.h | 4 +- include/configs/amcore.h | 4 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/cobra5272.h | 4 +- scripts/Makefile.spl | 4 +- tools/Makefile | 4 +- 43 files changed, 159 insertions(+), 147 deletions(-) create mode 100644 env/Kconfig create mode 100644 env/Makefile rename common/env_attr.c => env/attr.c (100%) rename common/env_callback.c => env/callback.c (100%) rename common/env_common.c => env/common.c (100%) rename common/env_dataflash.c => env/dataflash.c (100%) rename common/env_eeprom.c => env/eeprom.c (100%) rename common/env_embedded.c => env/embedded.c (100%) rename common/env_ext4.c => env/ext4.c (100%) rename common/env_fat.c => env/fat.c (100%) rename common/env_flags.c => env/flags.c (100%) rename common/env_flash.c => env/flash.c (100%) rename common/env_mmc.c => env/mmc.c (100%) rename common/env_nand.c => env/nand.c (100%) rename common/env_nowhere.c => env/nowhere.c (100%) rename common/env_nvram.c => env/nvram.c (100%) rename common/env_onenand.c => env/onenand.c (100%) rename common/env_remote.c => env/remote.c (100%) rename common/env_sata.c => env/sata.c (100%) rename common/env_sf.c => env/sf.c (100%) rename common/env_ubi.c => env/ubi.c (100%)
diff --git a/Kconfig b/Kconfig index bb80adacf4..f48912b7df 100644 --- a/Kconfig +++ b/Kconfig @@ -358,6 +358,8 @@ source "disk/Kconfig"
source "dts/Kconfig"
+source "env/Kconfig" + source "net/Kconfig"
source "drivers/Kconfig" diff --git a/Makefile b/Makefile index 42d80a2ea8..bf2c072b04 100644 --- a/Makefile +++ b/Makefile @@ -687,6 +687,7 @@ libs-y += drivers/usb/phy/ libs-y += drivers/usb/ulpi/ libs-y += cmd/ libs-y += common/ +libs-y += env/ libs-$(CONFIG_API) += api/ libs-$(CONFIG_HAS_POST) += post/ libs-y += test/ diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index bbf9ff485f..7fc91bc4aa 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -33,9 +33,9 @@ SECTIONS KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(*(.spiboot2.text)) . = ALIGN(8192); - common/env_embedded.o (.ppcenv) + env/embedded.o (.ppcenv) . = ALIGN(8192); - common/env_embedded.o (.ppcenvr) + env/embedded.o (.ppcenvr) . = ALIGN(8192); *(.text) . = ALIGN(4); diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 8a4a8a2f07..71a63f188e 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -30,7 +30,7 @@ SECTIONS drivers/mtd/built-in.o (.text*)
. = DEFINED(env_offset) ? env_offset : .; - common/env_embedded.o(.text*) + env/embedded.o(.text*)
*(.text*) } diff --git a/common/Kconfig b/common/Kconfig index 361346b092..5f439bd110 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -174,75 +174,6 @@ config SPI_BOOT
endmenu
-menu "Environment" - -if ARCH_SUNXI - -choice - prompt "Environment Device" - default ENV_IS_IN_MMC if ARCH_SUNXI - -config ENV_IS_IN_MMC - bool "Environment in an MMC device" - depends on CMD_MMC - help - Define this if you have an MMC device which you want to use for the - environment. - -config ENV_IS_IN_NAND - bool "Environment in a NAND device" - depends on CMD_NAND - help - Define this if you have a NAND device which you want to use for the - environment. - -config ENV_IS_IN_UBI - bool "Environment in a UBI volume" - depends on CMD_UBI - depends on CMD_MTDPARTS - help - Define this if you have a UBI volume which you want to use for the - environment. - -config ENV_IS_NOWHERE - bool "Environment is not stored" - help - Define this if you don't want to or can't have an environment stored - on a storage medium - -endchoice - -config ENV_OFFSET - hex "Environment Offset" - depends on !ENV_IS_IN_UBI - depends on !ENV_IS_NOWHERE - default 0x88000 if ARCH_SUNXI - help - Offset from the start of the device (or partition) - -config ENV_SIZE - hex "Environment Size" - depends on !ENV_IS_NOWHERE - default 0x20000 if ARCH_SUNXI - help - Size of the environment storage area - -config ENV_UBI_PART - string "UBI partition name" - depends on ENV_IS_IN_UBI - help - MTD partition containing the UBI device - -config ENV_UBI_VOLUME - string "UBI volume name" - depends on ENV_IS_IN_UBI - help - Name of the volume that you want to store the environment in. - -endif - -endmenu - config BOOTDELAY int "delay in seconds before automatically booting" default 2 diff --git a/common/Makefile b/common/Makefile index 17a92ea2d7..289e491cc5 100644 --- a/common/Makefile +++ b/common/Makefile @@ -19,7 +19,7 @@ ifdef CONFIG_BOOT_RETRY_TIME obj-y += bootretry.o endif
-# boards +# # boards obj-y += board_f.o obj-y += board_r.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o @@ -29,29 +29,6 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o
-# environment -obj-y += env_attr.o -obj-y += env_callback.o -obj-y += env_flags.o -obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o -extra-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o -extra-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o -obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o -obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o -obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o -obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o -obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o -obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o -obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o -obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o -obj-$(CONFIG_ENV_IS_IN_SATA) += env_sata.o -obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o -obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o -obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o -obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o - obj-$(CONFIG_CMD_BEDBUG) += bedbug.o obj-$(CONFIG_$(SPL_)OF_LIBFDT) += fdt_support.o
@@ -92,7 +69,6 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o -obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o @@ -101,28 +77,7 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -# environment -ifdef CONFIG_TPL_BUILD -obj-$(CONFIG_TPL_ENV_SUPPORT) += env_attr.o -obj-$(CONFIG_TPL_ENV_SUPPORT) += env_flags.o -obj-$(CONFIG_TPL_ENV_SUPPORT) += env_callback.o -else -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o -obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o -endif -ifneq ($(CONFIG_TPL_ENV_SUPPORT)$(CONFIG_SPL_ENV_SUPPORT),) -obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o -obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o -obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o -obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o -obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o -obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o -obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o -endif endif -#environment -obj-y += env_common.o #others obj-$(CONFIG_DDR_SPD) += ddr_spd.o obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o @@ -173,5 +128,3 @@ obj-$(CONFIG_CMD_DFU) += dfu.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o - -CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) diff --git a/env/Kconfig b/env/Kconfig new file mode 100644 index 0000000000..b622da71d1 --- /dev/null +++ b/env/Kconfig @@ -0,0 +1,68 @@ +menu "Environment" + +if ARCH_SUNXI + +choice + prompt "Environment Device" + default ENV_IS_IN_MMC if ARCH_SUNXI + +config ENV_IS_IN_MMC + bool "Environment in an MMC device" + depends on CMD_MMC + help + Define this if you have an MMC device which you want to use for the + environment. + +config ENV_IS_IN_NAND + bool "Environment in a NAND device" + depends on CMD_NAND + help + Define this if you have a NAND device which you want to use for the + environment. + +config ENV_IS_IN_UBI + bool "Environment in a UBI volume" + depends on CMD_UBI + depends on CMD_MTDPARTS + help + Define this if you have a UBI volume which you want to use for the + environment. + +config ENV_IS_NOWHERE + bool "Environment is not stored" + help + Define this if you don't want to or can't have an environment stored + on a storage medium + +endchoice + +config ENV_OFFSET + hex "Environment Offset" + depends on !ENV_IS_IN_UBI + depends on !ENV_IS_NOWHERE + default 0x88000 if ARCH_SUNXI + help + Offset from the start of the device (or partition) + +config ENV_SIZE + hex "Environment Size" + depends on !ENV_IS_NOWHERE + default 0x20000 if ARCH_SUNXI + help + Size of the environment storage area + +config ENV_UBI_PART + string "UBI partition name" + depends on ENV_IS_IN_UBI + help + MTD partition containing the UBI device + +config ENV_UBI_VOLUME + string "UBI volume name" + depends on ENV_IS_IN_UBI + help + Name of the volume that you want to store the environment in. + +endif + +endmenu diff --git a/env/Makefile b/env/Makefile new file mode 100644 index 0000000000..4c1bdcfdf4 --- /dev/null +++ b/env/Makefile @@ -0,0 +1,57 @@ +# +# (C) Copyright 2004-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += common.o + +ifndef CONFIG_SPL_BUILD +obj-y += attr.o +obj-y += callback.o +obj-y += flags.o +obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += dataflash.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o +extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o +extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o +obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o +obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o +obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o +obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o +obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o +obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o +obj-$(CONFIG_ENV_IS_IN_NVRAM) += nvram.o +obj-$(CONFIG_ENV_IS_IN_ONENAND) += onenand.o +obj-$(CONFIG_ENV_IS_IN_SATA) += sata.o +obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o +obj-$(CONFIG_ENV_IS_IN_REMOTE) += remote.o +obj-$(CONFIG_ENV_IS_IN_UBI) += ubi.o +obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o +endif + +ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o +# environment +ifdef CONFIG_TPL_BUILD +obj-$(CONFIG_TPL_ENV_SUPPORT) += attr.o +obj-$(CONFIG_TPL_ENV_SUPPORT) += flags.o +obj-$(CONFIG_TPL_ENV_SUPPORT) += callback.o +else +obj-$(CONFIG_SPL_ENV_SUPPORT) += attr.o +obj-$(CONFIG_SPL_ENV_SUPPORT) += flags.o +obj-$(CONFIG_SPL_ENV_SUPPORT) += callback.o +endif +ifneq ($(CONFIG_TPL_ENV_SUPPORT)$(CONFIG_SPL_ENV_SUPPORT),) +obj-$(CONFIG_ENV_IS_NOWHERE) += nowhere.o +obj-$(CONFIG_ENV_IS_IN_MMC) += mmc.o +obj-$(CONFIG_ENV_IS_IN_FAT) += fat.o +obj-$(CONFIG_ENV_IS_IN_EXT4) += ext4.o +obj-$(CONFIG_ENV_IS_IN_NAND) += nand.o +obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += sf.o +obj-$(CONFIG_ENV_IS_IN_FLASH) += flash.o +endif +endif + +CFLAGS_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) diff --git a/common/env_attr.c b/env/attr.c similarity index 100% rename from common/env_attr.c rename to env/attr.c diff --git a/common/env_callback.c b/env/callback.c similarity index 100% rename from common/env_callback.c rename to env/callback.c diff --git a/common/env_common.c b/env/common.c similarity index 100% rename from common/env_common.c rename to env/common.c diff --git a/common/env_dataflash.c b/env/dataflash.c similarity index 100% rename from common/env_dataflash.c rename to env/dataflash.c diff --git a/common/env_eeprom.c b/env/eeprom.c similarity index 100% rename from common/env_eeprom.c rename to env/eeprom.c diff --git a/common/env_embedded.c b/env/embedded.c similarity index 100% rename from common/env_embedded.c rename to env/embedded.c diff --git a/common/env_ext4.c b/env/ext4.c similarity index 100% rename from common/env_ext4.c rename to env/ext4.c diff --git a/common/env_fat.c b/env/fat.c similarity index 100% rename from common/env_fat.c rename to env/fat.c diff --git a/common/env_flags.c b/env/flags.c similarity index 100% rename from common/env_flags.c rename to env/flags.c diff --git a/common/env_flash.c b/env/flash.c similarity index 100% rename from common/env_flash.c rename to env/flash.c diff --git a/common/env_mmc.c b/env/mmc.c similarity index 100% rename from common/env_mmc.c rename to env/mmc.c diff --git a/common/env_nand.c b/env/nand.c similarity index 100% rename from common/env_nand.c rename to env/nand.c diff --git a/common/env_nowhere.c b/env/nowhere.c similarity index 100% rename from common/env_nowhere.c rename to env/nowhere.c diff --git a/common/env_nvram.c b/env/nvram.c similarity index 100% rename from common/env_nvram.c rename to env/nvram.c diff --git a/common/env_onenand.c b/env/onenand.c similarity index 100% rename from common/env_onenand.c rename to env/onenand.c diff --git a/common/env_remote.c b/env/remote.c similarity index 100% rename from common/env_remote.c rename to env/remote.c diff --git a/common/env_sata.c b/env/sata.c similarity index 100% rename from common/env_sata.c rename to env/sata.c diff --git a/common/env_sf.c b/env/sf.c similarity index 100% rename from common/env_sf.c rename to env/sf.c diff --git a/common/env_ubi.c b/env/ubi.c similarity index 100% rename from common/env_ubi.c rename to env/ubi.c diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index f8b1d4af38..2cf05a0978 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -165,8 +165,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*);
/* Cache Configuration */ #define CONFIG_SYS_CACHELINE_SIZE 16 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 7247111cf5..0546afda69 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -181,7 +181,7 @@
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text); + env/embedded.o(.text);
#ifdef NORFLASH_PS32BIT # define CONFIG_ENV_OFFSET (0x8000) diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 4ef83f7862..7e70a3b045 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -87,8 +87,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text);
#define CONFIG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/ #define CONFIG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 3efd7e59cf..ef5deb869c 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -31,8 +31,8 @@ #endif
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*);
/* * Command line configuration. diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 4f7a19b5d3..433f8327cc 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -33,7 +33,7 @@
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text) + env/embedded.o(.text)
/* * BOOTP options diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 0b0e4e60c7..094973a168 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -41,8 +41,8 @@ #endif
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text);
/* * BOOTP options diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 5d324ba5bf..1a8f973e39 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -42,8 +42,8 @@ #endif
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text);
/* * BOOTP options diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 061a632c98..604daf577a 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -33,7 +33,7 @@
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + env/embedded.o(.text*);
/* * BOOTP options diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index b88c3709c6..86fb277897 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -189,7 +189,7 @@
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*) + env/embedded.o(.text*)
/*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 999bcd9495..7e7f1ee918 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -193,8 +193,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*);
/*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 3a39e5031d..ee621f03be 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -193,8 +193,8 @@ #define CONFIG_ENV_IS_IN_FLASH 1
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*);
/*----------------------------------------------------------------------- * Cache Configuration diff --git a/include/configs/amcore.h b/include/configs/amcore.h index acae6914e5..02a0ad9e7e 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -94,8 +94,8 @@ #define CONFIG_ENV_SECT_SIZE 0x1000
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*);
/* memory map space for linux boot data */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 61989d6bab..722f8c79fa 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -307,7 +307,7 @@
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*) + env/embedded.o(.text*)
#if ENABLE_JFFS /* JFFS Partition offset set */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index b078e10475..aff7af7d52 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -104,8 +104,8 @@ #endif
#define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text);
/* * BOOTP options diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ac3c2c7f13..f25a8bf725 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -69,10 +69,10 @@ libs-y += common/init/
# Special handling for a few options which support SPL/TPL ifeq ($(CONFIG_TPL_BUILD),y) -libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += common/ cmd/ +libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ libs-$(CONFIG_TPL_LIBGENERIC_SUPPORT) += lib/ else -libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ +libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ endif
diff --git a/tools/Makefile b/tools/Makefile index cb1683e153..2ce858d2b1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -37,7 +37,7 @@ hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo HOSTCFLAGS_bmp_logo.o := -pedantic
hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc -envcrc-objs := envcrc.o lib/crc32.o common/env_embedded.o lib/sha1.o +envcrc-objs := envcrc.o lib/crc32.o env/embedded.o lib/sha1.o
hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr HOSTCFLAGS_gen_eth_addr.o := -pedantic @@ -221,7 +221,7 @@ HOSTCFLAGS_sha256.o := -pedantic quiet_cmd_wrap = WRAP $@ cmd_wrap = echo "#include <../$(patsubst $(obj)/%,%,$@)>" >$@
-$(obj)/lib/%.c $(obj)/common/%.c: +$(obj)/lib/%.c $(obj)/common/%.c $(obj)/env/%.c: $(call cmd,wrap)
clean-dirs := lib common