The environment code is ripe for improvement in various ways. It has lots of duplication and inconsistencies between how things work with different environment locations. It does not properly use Kconfig. Error checking and handling is patchy.
This series makes a start at improving things:
- moves the rest of the CONFIG_ENV_IS_IN_... options to Kconfig - introduces the concept of a location driver for the environment - drops some of the duplicated code - improves error handling a little (more to be done here) - moves code into a new env/ directory
There is still much more to do: - complete Kconfig conversion (e.g. CONFIG_ENV_SIZE) - unify environment settings so that all locations support the same options - try to rationalise the redundancy code (can we create a common implementation used by all drivers?) - allow environment in multiple locations (e.g. as a fallback) - figure out why CONFIG_ENV_IS_IN_FLASH enables the environment in flash even in SPL, which other locations do not - move environment functions from common.h to environment.h
Changes in v5: - Rebase to master (e.g. for ENV_FAT_DEVICE_AND_PART) - Rewrite commit message to mention that it just changes tabs now - Add new patch to convert CONFIG_ENV_IS_IN... to a choice - Fix 81-column line - Rebase to master
Changes in v4: - Update the commit message to comment on special cases - Adjust implementation of env_get_char_spec() to avoid recursion - Fix incorrect setting of env_valid in env_init_new() - Add changes for edison also - Reduce patch to only change setenv(), not any related function - Split out changes to setenv_ulong(), etc. into a new patch - Add new patch to rename eth_setenv_enetaddr() - Reduce patch to only change getenv() and getenv_f() - Update comment message to mention use of getenv() in condition context - Add new patch to rename eth_getenv_enetaddr() - Add new patch to rename some other genenv()-related functions - Rebase to master, dropping patches already applied
Changes in v3: - Rebase to master
Changes in v2: - Add conditions for the am335x_hs_evm board with SPL - Add new patch to rename setenv() and friends to env_set() - Add new patch to rename setenv() and friends to env_set() - Add new patch to rename getenv() and friends to env_get() - Add new patch to rename getenv_hex(), getenv_yesno(), getenv_ulong() - Add new patch to rename getenv() and friends to env_get() - Rebase to master
Simon Glass (30): Makefile: Rename 'env' target to 'environ' Move environment files from common/ to env/ env: Use tabs in ENV_IS_IN_FAT env: common: Make env_get_addr/get_char_memory() static env: common: Drop env_get_addr() env: common: Factor out the common env_valid check env: common: Drop env_get_char_init() env: common: Drop env_get_char_memory() env: Add an enum for environment state env: Rename nand env_location to nand_env_location env: Create a location driver for each location env: Convert CONFIG_ENV_IS_IN... to a choice env: Add a new implementation of environment access env: Switch over to use environment location drivers env: Drop common init() functions env: Drop the env_name_spec global env: Drop unused env_ptr variables env: Drop env_init_new() env: Drop env_get_char_spec() env: Drop env_relocate_spec() in favour of env_load() env: Drop saveenv() in favour of env_save() env: Rename setenv() to env_set() env: Rename common functions related to setenv() env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr() env: Rename getenv/_f() to env_get() env: Rename getenv_hex(), getenv_yesno(), getenv_ulong() env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr() env: Rename some other getenv()-related functions env: Adjust the get_char() method to return an int env: Adjust the load() method to return an error
Kconfig | 2 + Makefile | 5 +- README | 2 +- api/api.c | 6 +- arch/arc/lib/bootm.c | 2 +- arch/arm/cpu/armv7/vf610/generic.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- arch/arm/lib/bootm.c | 6 +- arch/arm/lib/semihosting.c | 2 +- arch/arm/mach-davinci/misc.c | 4 +- arch/arm/mach-imx/mx6/opos6ul.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 4 +- arch/arm/mach-imx/video.c | 2 +- arch/arm/mach-keystone/ddr3.c | 2 +- arch/arm/mach-keystone/keystone.c | 2 +- arch/arm/mach-kirkwood/cpu.c | 4 +- arch/arm/mach-omap2/boot-common.c | 5 +- arch/arm/mach-omap2/utils.c | 20 +- arch/arm/mach-rockchip/rk3036-board.c | 4 +- arch/arm/mach-rockchip/rk322x-board.c | 4 +- arch/arm/mach-rockchip/rk3288-board.c | 4 +- arch/arm/mach-socfpga/misc_gen5.c | 4 +- arch/arm/mach-tegra/board2.c | 4 +- arch/arm/mach-tegra/tegra186/nvtboot_board.c | 6 +- arch/arm/mach-uniphier/board_late_init.c | 12 +- arch/arm/mach-uniphier/mmc-first-dev.c | 2 +- arch/m68k/lib/bootm.c | 3 +- arch/microblaze/lib/bootm.c | 2 +- arch/mips/lib/bootm.c | 6 +- arch/nds32/lib/bootm.c | 4 +- arch/nios2/lib/bootm.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 10 +- arch/powerpc/cpu/mpc85xx/fdt.c | 4 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mp.c | 2 +- arch/powerpc/lib/bootm.c | 11 +- arch/sh/cpu/u-boot.lds | 4 +- arch/sh/lib/bootm.c | 2 +- arch/sh/lib/zimageboot.c | 2 +- arch/x86/lib/zimage.c | 8 +- arch/xtensa/lib/bootm.c | 2 +- board/Arcturus/ucp1020/cmd_arc.c | 20 +- board/Arcturus/ucp1020/spl.c | 3 +- board/Arcturus/ucp1020/ucp1020.c | 20 +- board/Barix/ipam390/ipam390.c | 2 +- board/BuR/brppt1/board.c | 2 +- board/BuR/brxre1/board.c | 22 +- board/BuR/common/common.c | 56 +-- board/BuS/eb_cpu5282/eb_cpu5282.c | 8 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 8 +- board/CarMediaLab/flea3/flea3.c | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 4 +- board/LaCie/netspace_v2/netspace_v2.c | 4 +- board/Synology/ds414/cmd_syno.c | 6 +- board/amazon/kc1/kc1.c | 4 +- board/amlogic/odroid-c2/odroid-c2.c | 8 +- board/aries/ma5d4evk/ma5d4evk.c | 2 +- board/aristainetos/aristainetos-v2.c | 8 +- board/armltd/integrator/integrator.c | 2 +- board/atmel/sama5d2_xplained/sama5d2_xplained.c | 4 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- board/bachmann/ot1200/ot1200.c | 4 +- board/birdland/bav335x/board.c | 12 +- board/bluegiga/apx4devkit/apx4devkit.c | 4 +- board/bluewater/gurnard/gurnard.c | 6 +- board/bosch/shc/board.c | 10 +- board/boundary/nitrogen6x/nitrogen6x.c | 14 +- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 2 +- board/broadcom/bcm28155_ap/bcm28155_ap.c | 2 +- board/buffalo/lsxl/lsxl.c | 4 +- board/cadence/xtfpga/xtfpga.c | 4 +- board/ccv/xpress/xpress.c | 2 +- board/compulab/cl-som-am57x/eth.c | 6 +- board/compulab/cm_fx6/cm_fx6.c | 12 +- board/compulab/cm_t335/cm_t335.c | 4 +- board/compulab/cm_t35/cm_t35.c | 4 +- board/compulab/cm_t3517/cm_t3517.c | 4 +- board/compulab/cm_t54/cm_t54.c | 6 +- board/compulab/common/omap3_display.c | 4 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 8 +- board/cssi/MCR3000/MCR3000.c | 2 +- board/davinci/da8xxevm/da850evm.c | 6 +- board/davinci/da8xxevm/omapl138_lcdk.c | 6 +- board/el/el6x/el6x.c | 2 +- board/engicam/common/board.c | 14 +- board/engicam/geam6ul/geam6ul.c | 2 +- board/engicam/icorem6/icorem6.c | 4 +- board/engicam/icorem6_rqs/icorem6_rqs.c | 4 +- board/engicam/isiotmx6ul/isiotmx6ul.c | 4 +- board/esd/meesc/meesc.c | 7 +- board/freescale/b4860qds/b4860qds.c | 8 +- board/freescale/b4860qds/spl.c | 3 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 4 +- board/freescale/bsc9132qds/bsc9132qds.c | 4 +- board/freescale/c29xpcie/c29xpcie.c | 4 +- board/freescale/c29xpcie/spl.c | 3 +- board/freescale/common/cmd_esbc_validate.c | 2 +- board/freescale/common/fsl_chain_of_trust.c | 4 +- board/freescale/common/sys_eeprom.c | 4 +- board/freescale/common/vid.c | 4 +- board/freescale/corenet_ds/corenet_ds.c | 4 +- board/freescale/ls2080aqds/eth.c | 6 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 2 +- board/freescale/mpc837xemds/pci.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 4 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/freescale/mx51evk/mx51evk_video.c | 2 +- board/freescale/mx53loco/mx53loco.c | 4 +- board/freescale/mx53loco/mx53loco_video.c | 2 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 8 +- board/freescale/mx6sabresd/mx6sabresd.c | 8 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 6 +- board/freescale/mx6ullevk/mx6ullevk.c | 4 +- board/freescale/p1010rdb/p1010rdb.c | 4 +- board/freescale/p1010rdb/spl.c | 3 +- board/freescale/p1022ds/p1022ds.c | 4 +- board/freescale/p1022ds/spl.c | 3 +- board/freescale/p1023rdb/p1023rdb.c | 4 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 7 +- board/freescale/p1_p2_rdb_pc/spl.c | 3 +- board/freescale/p1_twr/p1_twr.c | 4 +- board/freescale/p2041rdb/p2041rdb.c | 4 +- board/freescale/qemu-ppce500/qemu-ppce500.c | 4 +- board/freescale/t102xqds/spl.c | 3 +- board/freescale/t102xqds/t102xqds.c | 4 +- board/freescale/t102xrdb/spl.c | 3 +- board/freescale/t102xrdb/t102xrdb.c | 4 +- board/freescale/t1040qds/t1040qds.c | 4 +- board/freescale/t104xrdb/spl.c | 3 +- board/freescale/t104xrdb/t104xrdb.c | 4 +- board/freescale/t208xqds/spl.c | 3 +- board/freescale/t208xqds/t208xqds.c | 4 +- board/freescale/t208xrdb/spl.c | 3 +- board/freescale/t208xrdb/t208xrdb.c | 4 +- board/freescale/t4qds/spl.c | 3 +- board/freescale/t4qds/t4240emu.c | 4 +- board/freescale/t4qds/t4240qds.c | 6 +- board/freescale/t4rdb/spl.c | 3 +- board/freescale/t4rdb/t4240rdb.c | 4 +- board/gateworks/gw_ventana/common.c | 2 +- board/gateworks/gw_ventana/gw_ventana.c | 64 +-- board/gateworks/gw_ventana/gw_ventana_spl.c | 6 +- board/gdsys/a38x/keyprogram.c | 4 +- board/gdsys/mpc8308/hrcon.c | 2 +- board/gdsys/mpc8308/strider.c | 2 +- board/gdsys/p1022/controlcenterd-id.c | 10 +- board/gdsys/p1022/controlcenterd.c | 6 +- board/grinn/chiliboard/board.c | 8 +- board/grinn/liteboard/board.c | 6 +- board/gumstix/pepper/board.c | 4 +- board/highbank/highbank.c | 6 +- board/htkw/mcx/mcx.c | 2 +- board/intel/edison/edison.c | 15 +- board/isee/igep003x/board.c | 10 +- board/isee/igep00x0/igep00x0.c | 4 +- board/keymile/common/common.c | 26 +- board/keymile/common/ivm.c | 10 +- board/keymile/km83xx/km83xx.c | 8 +- board/keymile/km_arm/km_arm.c | 6 +- board/keymile/kmp204x/kmp204x.c | 8 +- board/kosagi/novena/novena.c | 4 +- board/lg/sniper/sniper.c | 4 +- board/liebherr/mccmon6/mccmon6.c | 6 +- board/logicpd/imx6/imx6logic.c | 6 +- board/logicpd/omap3som/omap3logic.c | 4 +- board/logicpd/zoom1/zoom1.c | 4 +- board/micronas/vct/vct.c | 2 +- board/nokia/rx51/rx51.c | 10 +- board/overo/overo.c | 44 +- board/phytec/pcm051/board.c | 4 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 2 +- board/raspberrypi/rpi/rpi.c | 28 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 4 +- board/renesas/ecovec/ecovec.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/sh7752evb/sh7752evb.c | 4 +- board/renesas/sh7753evb/sh7753evb.c | 4 +- board/renesas/sh7757lcr/sh7757lcr.c | 6 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- board/rockchip/kylin_rk3036/kylin_rk3036.c | 2 +- board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 +- board/samsung/common/exynos5-dt.c | 2 +- board/samsung/common/misc.c | 14 +- board/samsung/odroid/odroid.c | 2 +- board/samsung/trats/trats.c | 2 +- board/samsung/universal_c210/universal.c | 2 +- board/samtec/vining_2000/vining_2000.c | 10 +- board/samtec/vining_fpga/socfpga.c | 18 +- board/siemens/common/board.c | 4 +- board/siemens/common/factoryset.c | 8 +- board/siemens/common/factoryset.h | 2 +- board/siemens/draco/board.c | 8 +- board/siemens/pxm2/board.c | 6 +- board/siemens/rut/board.c | 4 +- board/siemens/taurus/taurus.c | 47 +-- board/silica/pengwyn/board.c | 4 +- board/socrates/socrates.c | 4 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 8 +- board/spear/common/spr_misc.c | 12 +- board/st/stm32f429-discovery/stm32f429-discovery.c | 4 +- board/sunxi/board.c | 18 +- board/syteco/zmx25/zmx25.c | 6 +- board/tcl/sl50/board.c | 14 +- board/technexion/twister/twister.c | 2 +- board/technologic/ts4800/ts4800.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 12 +- board/ti/am335x/board.c | 16 +- board/ti/am43xx/board.c | 10 +- board/ti/am57xx/board.c | 22 +- board/ti/beagle/beagle.c | 38 +- board/ti/common/board_detect.c | 18 +- board/ti/dra7xx/evm.c | 14 +- board/ti/evm/evm.c | 4 +- board/ti/ks2_evm/board.c | 12 +- board/ti/ks2_evm/board_k2g.c | 4 +- board/ti/panda/panda.c | 4 +- board/ti/ti814x/evm.c | 4 +- board/ti/ti816x/evm.c | 4 +- board/timll/devkit8000/devkit8000.c | 4 +- board/toradex/apalis_imx6/apalis_imx6.c | 9 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_vf/colibri_vf.c | 2 +- board/toradex/common/tdx-cfg-block.c | 2 +- board/toradex/common/tdx-common.c | 10 +- board/tqc/tqma6/tqma6.c | 2 +- board/udoo/neo/neo.c | 2 +- board/udoo/udoo.c | 4 +- board/varisys/common/sys_eeprom.c | 6 +- board/varisys/cyrus/cyrus.c | 4 +- board/vscom/baltos/board.c | 8 +- board/wandboard/wandboard.c | 8 +- .../work-microwave/work_92105/work_92105_display.c | 2 +- board/xes/common/board.c | 6 +- board/xilinx/zynq/board.c | 12 +- board/xilinx/zynqmp/zynqmp.c | 6 +- cmd/bdinfo.c | 6 +- cmd/bootm.c | 4 +- cmd/bootmenu.c | 4 +- cmd/cbfs.c | 2 +- cmd/cramfs.c | 10 +- cmd/elf.c | 32 +- cmd/fdt.c | 31 +- cmd/fpga.c | 4 +- cmd/gpt.c | 6 +- cmd/ini.c | 6 +- cmd/itest.c | 2 +- cmd/jffs2.c | 6 +- cmd/load.c | 16 +- cmd/log.c | 6 +- cmd/lzmadec.c | 2 +- cmd/md5sum.c | 4 +- cmd/mtdparts.c | 44 +- cmd/mvebu/bubt.c | 2 +- cmd/nand.c | 12 +- cmd/net.c | 40 +- cmd/nvedit.c | 38 +- cmd/part.c | 8 +- cmd/pxe.c | 39 +- cmd/qfw.c | 6 +- cmd/reiser.c | 8 +- cmd/setexpr.c | 10 +- cmd/source.c | 2 +- cmd/tpm.c | 4 +- cmd/trace.c | 18 +- cmd/unzip.c | 2 +- cmd/ximg.c | 6 +- cmd/zfs.c | 6 +- cmd/zip.c | 2 +- common/Kconfig | 442 -------------------- common/Makefile | 49 +-- common/autoboot.c | 24 +- common/board_f.c | 4 +- common/board_r.c | 22 +- common/bootm.c | 18 +- common/bootm_os.c | 12 +- common/bootretry.c | 2 +- common/cli.c | 2 +- common/cli_hush.c | 16 +- common/cli_simple.c | 4 +- common/console.c | 14 +- common/fb_mmc.c | 2 +- common/fdt_support.c | 6 +- common/hash.c | 4 +- common/hwconfig.c | 6 +- common/image-android.c | 4 +- common/image-fdt.c | 6 +- common/image.c | 32 +- common/lcd.c | 2 +- common/main.c | 4 +- common/spl/Kconfig | 4 +- common/spl/spl_dfu.c | 4 +- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 4 +- common/spl/spl_net.c | 4 +- common/splash.c | 2 +- common/splash_source.c | 6 +- common/update.c | 11 +- common/usb_hub.c | 2 +- common/usb_kbd.c | 6 +- disk/part.c | 2 +- disk/part_amiga.c | 4 +- doc/README.enetaddr | 10 +- drivers/bootcount/bootcount_env.c | 11 +- drivers/ddr/fsl/fsl_ddr_gen4.c | 2 +- drivers/ddr/fsl/interactive.c | 8 +- drivers/ddr/fsl/options.c | 6 +- drivers/dfu/dfu.c | 6 +- drivers/dfu/dfu_mmc.c | 2 +- drivers/input/i8042.c | 2 +- drivers/input/input.c | 2 +- drivers/mtd/cfi_flash.c | 2 +- drivers/mtd/dataflash.c | 7 +- drivers/net/dc2114x.c | 2 +- drivers/net/fec_mxc.c | 4 +- drivers/net/fm/b4860.c | 2 +- drivers/net/fm/fdt.c | 2 +- drivers/net/fm/fm.c | 2 +- drivers/net/fsl-mc/mc.c | 10 +- drivers/net/fsl_mcdmafec.c | 4 +- drivers/net/ftgmac100.c | 2 +- drivers/net/ftmac100.c | 2 +- drivers/net/lan91c96.c | 4 +- drivers/net/mcffec.c | 8 +- drivers/net/ne2000_base.c | 6 +- drivers/net/netconsole.c | 14 +- drivers/net/phy/micrel.c | 2 +- drivers/net/sandbox-raw.c | 4 +- drivers/net/sh_eth.c | 2 +- drivers/pci/fsl_pci_init.c | 4 +- drivers/pci/pci.c | 4 +- drivers/pci/pci_common.c | 2 +- drivers/rtc/m41t60.c | 2 +- drivers/scsi/scsi.c | 2 +- drivers/serial/usbtty.c | 9 +- drivers/usb/gadget/designware_udc.c | 2 +- drivers/usb/gadget/ether.c | 14 +- drivers/usb/gadget/f_dfu.c | 2 +- drivers/usb/gadget/f_fastboot.c | 6 +- drivers/usb/host/ehci-fsl.c | 2 +- drivers/video/ati_radeon_fb.c | 3 +- drivers/video/cfb_console.c | 2 +- drivers/video/ct69000.c | 3 +- drivers/video/mb862xx.c | 3 +- drivers/video/mx3fb.c | 2 +- drivers/video/mxsfb.c | 2 +- drivers/video/videomodes.c | 5 +- env/Kconfig | 455 +++++++++++++++++++++ env/Makefile | 57 +++ common/env_attr.c => env/attr.c | 0 common/env_callback.c => env/callback.c | 2 +- common/env_common.c => env/common.c | 46 +-- common/env_dataflash.c => env/dataflash.c | 33 +- common/env_eeprom.c => env/eeprom.c | 61 ++- common/env_embedded.c => env/embedded.c | 0 env/env.c | 151 +++++++ common/env_ext4.c => env/ext4.c | 28 +- common/env_fat.c => env/fat.c | 48 ++- common/env_flags.c => env/flags.c | 6 +- common/env_flash.c => env/flash.c | 92 +++-- common/env_mmc.c => env/mmc.c | 59 ++- common/env_nand.c => env/nand.c | 71 ++-- common/env_nowhere.c => env/nowhere.c | 22 +- common/env_nvram.c => env/nvram.c | 26 +- common/env_onenand.c => env/onenand.c | 24 +- common/env_remote.c => env/remote.c | 24 +- common/env_sata.c => env/sata.c | 37 +- common/env_sf.c => env/sf.c | 76 ++-- common/env_ubi.c => env/ubi.c | 41 +- fs/fs.c | 14 +- fs/ubifs/ubifs.c | 2 +- include/_exports.h | 4 +- include/asm-generic/global_data.h | 4 +- include/common.h | 94 ++++- 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 +- include/configs/tam3517-common.h | 2 +- include/dataflash.h | 2 +- include/environment.h | 133 +++++- include/exports.h | 4 +- include/image.h | 8 +- include/net.h | 12 +- include/search.h | 2 +- lib/fdtdec.c | 2 +- lib/smbios.c | 2 +- lib/uuid.c | 2 +- net/arp.c | 2 +- net/bootp.c | 14 +- net/dns.c | 2 +- net/eth-uclass.c | 10 +- net/eth_common.c | 34 +- net/eth_internal.h | 4 +- net/eth_legacy.c | 8 +- net/link_local.c | 2 +- net/net.c | 14 +- net/net_rand.h | 2 +- net/tftp.c | 10 +- post/post.c | 2 +- scripts/Makefile.spl | 4 +- test/command_ut.c | 16 +- test/dm/eth.c | 108 ++--- tools/Makefile | 4 +- tools/env/fw_env.c | 2 +- tools/env/fw_env.h | 4 +- tools/env/fw_env_main.c | 8 +- 425 files changed, 2595 insertions(+), 2210 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 (98%) rename common/env_common.c => env/common.c (89%) rename common/env_dataflash.c => env/dataflash.c (75%) rename common/env_eeprom.c => env/eeprom.c (86%) rename common/env_embedded.c => env/embedded.c (100%) create mode 100644 env/env.c rename common/env_ext4.c => env/ext4.c (91%) rename common/env_fat.c => env/fat.c (76%) rename common/env_flags.c => env/flags.c (99%) rename common/env_flash.c => env/flash.c (80%) rename common/env_mmc.c => env/mmc.c (90%) rename common/env_nand.c => env/nand.c (87%) rename common/env_nowhere.c => env/nowhere.c (58%) rename common/env_nvram.c => env/nvram.c (86%) rename common/env_onenand.c => env/onenand.c (89%) rename common/env_remote.c => env/remote.c (73%) rename common/env_sata.c => env/sata.c (84%) rename common/env_sf.c => env/sf.c (87%) rename common/env_ubi.c => env/ubi.c (91%)