At present common.h has a lot of uncommon declarations in it. Many of these would be better placed elsewhere, in header files more related to their purpose. In particular the environnment functions should move to the environment headers. This should reduce the overall amount of code compiled and the length of time taken to build U-Boot.
This series splits the current environment.h file into:
env.h common definitions widely used in U-Boot; and env_internal.h features internal to the environment drivers, etc.
Most files can then include just env.h which is fairly small and does not have any CONFIG magic.
At the same time some dead code was noticed in common.h so this series removes some of this.
After this series common.h is down to about 400 lines. For reference it was about 1000 lines up until 3 years ago.
Simon Glass (39): common: Move gzip functions into a new gzip header common: Drop the dpram_... functions common: Move lcd_setmem() to lcd.h common: Remove video_setmem() env: Create a new file for environment functions env: Move get_env_id() to env.h env: Move env_get_f() to env.h env: Move env_init() to env.h env: Move env_relocate() to env.h env: Move envmatch() to env.h env: Move env_set_hex() to env.h env: Move env_set_ulong() to env.h env: Move env_get_ulong() to env.h env: Move env_get_yesno() to env.h env: Move env_get_hex() to env.h env: Move env_set() to env.h env: Move env_get() to env.h env: Move eth_env_get/set_enetaddr() to env.h env: Move uncommon functions to env.h env: Move set_default_vars to env.h env: Move env_load/save functions to env.h env: Move env import/export functions to env.h env: Drop env_crc_update() env: Move get/set_default_env() to env.h env: Move env_get_char() to env.h env: Move env_reloc() to env.h env: Rename environment to embedded_environment env: Move env_valid to env.h env: Move callback definitions to env.h env: Drop the ENTRY typdef env: Drop _ENTRY env: Rename the redundancy flags env: Drop the ACTION typedef env: Drop the double underscores in search.h env: Move TOTAL_MALLOC_LEN to environment.h env: Drop environment.h header file where not needed env: Rename environment.h to env_internal.h Drop PCMCIA common: Add a note about the effort to reduce common.h
README | 2 +- api/api.c | 7 +- arch/arm/cpu/arm926ejs/spear/spr_misc.c | 2 +- arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 3 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 3 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-imx/cmd_dek.c | 1 - arch/arm/mach-imx/mx6/opos6ul.c | 4 +- arch/arm/mach-imx/mx7/soc.c | 1 + arch/arm/mach-imx/video.c | 1 + arch/arm/mach-kirkwood/cpu.c | 1 + arch/arm/mach-meson/board-common.c | 2 +- arch/arm/mach-omap2/boot-common.c | 1 - arch/arm/mach-omap2/omap3/clock.c | 1 - arch/arm/mach-omap2/utils.c | 2 +- arch/arm/mach-rmobile/cpu_info.c | 1 + arch/arm/mach-rockchip/rk3288-board.c | 1 + arch/arm/mach-socfpga/misc_gen5.c | 1 + arch/arm/mach-socfpga/misc_s10.c | 1 + arch/arm/mach-stm32mp/cpu.c | 2 +- arch/arm/mach-tegra/board2.c | 1 + arch/arm/mach-tegra/cboot.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 1 + arch/arm/mach-uniphier/mmc-first-dev.c | 1 + arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 1 + arch/mips/lib/bootm.c | 1 + arch/nds32/include/asm/u-boot.h | 1 - arch/nds32/lib/bootm.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc85xx/mp.c | 2 + arch/powerpc/lib/bootm.c | 2 +- arch/riscv/include/asm/u-boot.h | 1 - arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/zimage.c | 1 + arch/xtensa/lib/bootm.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 2 +- board/Arcturus/ucp1020/spl.c | 3 +- board/Arcturus/ucp1020/ucp1020.c | 1 + board/BuR/brppt1/board.c | 1 + board/BuR/brxre1/board.c | 1 + board/BuR/common/br_resetc.c | 1 + board/BuR/common/common.c | 1 + board/BuS/eb_cpu5282/eb_cpu5282.c | 1 + board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/CarMediaLab/flea3/flea3.c | 1 + board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/Synology/ds414/cmd_syno.c | 1 + board/alliedtelesis/x530/x530.c | 1 + board/amazon/kc1/kc1.c | 1 + board/amlogic/p200/p200.c | 2 +- board/amlogic/p201/p201.c | 2 +- board/amlogic/p212/p212.c | 2 +- board/amlogic/q200/q200.c | 2 +- board/amlogic/s400/s400.c | 1 - board/amlogic/u200/u200.c | 1 - board/aristainetos/aristainetos-v2.c | 1 + board/armadeus/apf27/apf27.c | 1 - board/armltd/integrator/integrator.c | 1 + board/atmel/common/board.c | 1 + board/atmel/common/mac_eeprom.c | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 1 + board/bachmann/ot1200/ot1200.c | 1 + board/birdland/bav335x/board.c | 4 +- board/bluegiga/apx4devkit/apx4devkit.c | 1 + board/bluewater/gurnard/gurnard.c | 1 + board/bosch/guardian/board.c | 3 +- board/bosch/shc/board.c | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 1 + board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 1 + board/broadcom/bcm28155_ap/bcm28155_ap.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/buffalo/lsxl/lsxl.c | 3 +- board/cadence/xtfpga/xtfpga.c | 1 + board/ccv/xpress/xpress.c | 1 + board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/compulab/cm_fx6/cm_fx6.c | 2 +- board/compulab/cm_t335/cm_t335.c | 2 +- board/compulab/cm_t35/cm_t35.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/compulab/common/omap3_display.c | 1 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 + board/cssi/MCR3000/MCR3000.c | 1 + board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- board/eets/pdu001/board.c | 2 +- board/el/el6x/el6x.c | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 1 + board/engicam/common/board.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/b4860qds/spl.c | 3 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 1 + board/freescale/bsc9132qds/bsc9132qds.c | 1 + board/freescale/c29xpcie/c29xpcie.c | 1 + board/freescale/c29xpcie/spl.c | 2 +- board/freescale/common/cmd_esbc_validate.c | 1 + board/freescale/common/fsl_chain_of_trust.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/common/vid.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/imx8mq_evk/imx8mq_evk.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 2 +- board/freescale/ls1012aqds/ls1012aqds.c | 2 +- board/freescale/ls1012ardb/ls1012ardb.c | 2 +- board/freescale/ls1028a/ls1028a.c | 2 +- board/freescale/ls1088a/eth_ls1088aqds.c | 1 + board/freescale/ls1088a/ls1088a.c | 3 +- board/freescale/ls2080a/ls2080a.c | 2 +- board/freescale/ls2080aqds/eth.c | 1 + board/freescale/ls2080aqds/ls2080aqds.c | 3 +- board/freescale/ls2080ardb/ls2080ardb.c | 3 +- board/freescale/lx2160a/eth_lx2160aqds.c | 1 + board/freescale/lx2160a/lx2160a.c | 2 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc837xemds/pci.c | 1 + board/freescale/mpc837xerdb/mpc837xerdb.c | 1 + board/freescale/mpc8572ds/mpc8572ds.c | 1 + board/freescale/mx51evk/mx51evk_video.c | 1 + board/freescale/mx53loco/mx53loco.c | 1 + board/freescale/mx53loco/mx53loco_video.c | 1 + board/freescale/mx6sabreauto/mx6sabreauto.c | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 + .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 + board/freescale/mx6ullevk/mx6ullevk.c | 1 + board/freescale/p1010rdb/p1010rdb.c | 1 + board/freescale/p1010rdb/spl.c | 3 +- board/freescale/p1022ds/p1022ds.c | 1 + board/freescale/p1022ds/spl.c | 3 +- board/freescale/p1023rdb/p1023rdb.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 3 +- board/freescale/p1_twr/p1_twr.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + board/freescale/t102xqds/spl.c | 2 +- board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/spl.c | 2 +- board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/freescale/t4rdb/spl.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 1 + board/gardena/smart-gateway-at91sam/board.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 3 +- board/gateworks/gw_ventana/common.c | 1 + board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 3 +- board/gdsys/a38x/keyprogram.c | 1 + board/gdsys/mpc8308/gazerbeam.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/gdsys/p1022/controlcenterd.c | 1 + board/ge/bx50v3/bx50v3.c | 1 + board/ge/common/ge_common.c | 1 + board/ge/mx53ppd/mx53ppd.c | 2 +- board/grinn/chiliboard/board.c | 2 +- board/grinn/liteboard/board.c | 1 + board/gumstix/pepper/board.c | 2 +- board/highbank/highbank.c | 1 + board/hisilicon/poplar/poplar.c | 1 + board/imgtec/ci20/ci20.c | 2 +- board/intel/edison/edison.c | 2 +- board/isee/igep003x/board.c | 2 +- board/isee/igep00x0/igep00x0.c | 1 + board/k+p/kp_imx53/kp_id_rev.c | 2 +- board/k+p/kp_imx53/kp_imx53.c | 1 + board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 1 + board/keymile/common/common.c | 1 + board/keymile/common/ivm.c | 1 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/kosagi/novena/novena.c | 2 +- board/laird/wb50n/wb50n.c | 1 + board/lg/sniper/sniper.c | 1 + board/liebherr/display5/display5.c | 2 +- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/mccmon6.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/logicpd/zoom1/zoom1.c | 2 +- board/menlo/m53menlo/m53menlo.c | 2 + board/micronas/vct/vct.c | 1 + board/mscc/ocelot/ocelot.c | 1 - board/nokia/rx51/rx51.c | 1 + board/nvidia/p2371-2180/p2371-2180.c | 2 +- board/nvidia/p2771-0000/p2771-0000.c | 2 +- board/overo/overo.c | 1 + board/phytec/pcm051/board.c | 2 +- board/phytec/pcm052/pcm052.c | 4 +- board/phytec/pfla02/pfla02.c | 1 + board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- .../dragonboard410c/dragonboard410c.c | 2 +- .../dragonboard820c/dragonboard820c.c | 1 + board/raspberrypi/rpi/rpi.c | 2 +- board/renesas/alt/alt.c | 3 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 3 +- board/renesas/koelsch/koelsch.c | 3 +- board/renesas/lager/lager.c | 3 +- board/renesas/porter/porter.c | 3 +- board/renesas/sh7752evb/sh7752evb.c | 2 +- board/renesas/sh7753evb/sh7753evb.c | 2 +- board/renesas/sh7757lcr/sh7757lcr.c | 2 +- board/renesas/silk/silk.c | 3 +- board/renesas/stout/stout.c | 3 +- board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 +- board/samsung/common/exynos5-dt.c | 1 + board/samsung/common/misc.c | 1 + board/samsung/odroid/odroid.c | 1 + board/samsung/trats/trats.c | 1 + board/samsung/universal_c210/universal.c | 1 + board/samtec/vining_fpga/socfpga.c | 2 +- board/siemens/common/board.c | 1 + board/siemens/common/factoryset.c | 2 +- board/siemens/draco/board.c | 1 + board/siemens/pxm2/board.c | 2 +- board/siemens/rut/board.c | 1 + board/siemens/taurus/taurus.c | 2 +- board/silica/pengwyn/board.c | 2 +- board/socrates/socrates.c | 1 + board/softing/vining_2000/vining_2000.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 + board/st/stm32mp1/stm32mp1.c | 3 +- board/sunxi/board.c | 3 +- board/synopsys/hsdk/env-lib.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + board/tcl/sl50/board.c | 4 +- board/technologic/ts4800/ts4800.c | 2 +- .../puma_rk3399/puma-rk3399.c | 2 +- board/ti/am335x/board.c | 4 +- board/ti/am43xx/board.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/am65x/evm.c | 1 + board/ti/beagle/beagle.c | 1 + board/ti/common/board_detect.c | 1 + board/ti/dra7xx/evm.c | 2 +- board/ti/evm/evm.c | 1 + board/ti/ks2_evm/board.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + board/ti/panda/panda.c | 1 + board/ti/ti814x/evm.c | 2 +- board/ti/ti816x/evm.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- board/toradex/apalis-imx8/apalis-imx8.c | 2 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_vf/colibri_vf.c | 1 + board/toradex/common/tdx-cfg-block.c | 1 + board/toradex/common/tdx-common.c | 2 +- board/tqc/tqma6/tqma6.c | 1 + board/udoo/neo/neo.c | 1 + board/udoo/udoo.c | 1 + board/varisys/common/sys_eeprom.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/vscom/baltos/board.c | 2 +- board/wandboard/wandboard.c | 1 + board/warp7/warp7.c | 1 + .../work_92105/work_92105_display.c | 1 + board/xes/common/board.c | 1 + board/xilinx/zynq/board.c | 1 + board/xilinx/zynqmp/cmds.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + cmd/Kconfig | 8 - cmd/Makefile | 1 - cmd/aes.c | 1 - cmd/avb.c | 1 + cmd/bdinfo.c | 1 + cmd/binop.c | 1 + cmd/blob.c | 1 - cmd/bmp.c | 8 +- cmd/bootefi.c | 1 + cmd/bootm.c | 2 +- cmd/bootmenu.c | 1 + cmd/cbfs.c | 1 + cmd/config.c | 1 + cmd/cramfs.c | 1 + cmd/dtimg.c | 1 + cmd/efidebug.c | 1 - cmd/elf.c | 2 +- cmd/ethsw.c | 2 +- cmd/fdt.c | 1 + cmd/fpga.c | 2 + cmd/gpt.c | 1 + cmd/i2c.c | 1 - cmd/ide.c | 4 - cmd/ini.c | 2 +- cmd/itest.c | 1 + cmd/jffs2.c | 1 + cmd/license.c | 1 + cmd/load.c | 1 + cmd/lzmadec.c | 1 + cmd/md5sum.c | 1 + cmd/mtdparts.c | 1 + cmd/mvebu/bubt.c | 1 + cmd/nand.c | 1 + cmd/net.c | 1 + cmd/nvedit.c | 45 +-- cmd/nvedit_efi.c | 1 + cmd/part.c | 1 + cmd/pcmcia.c | 341 ----------------- cmd/pxe.c | 1 + cmd/qfw.c | 1 + cmd/reiser.c | 1 + cmd/setexpr.c | 1 + cmd/source.c | 1 + cmd/spl.c | 1 + cmd/tpm-common.c | 1 + cmd/tpm-v1.c | 1 + cmd/tpm_test.c | 1 - cmd/trace.c | 1 + cmd/ubi.c | 1 + cmd/unzip.c | 2 + cmd/ximg.c | 2 + cmd/zfs.c | 1 + cmd/zip.c | 1 + common/autoboot.c | 1 + common/board_f.c | 11 +- common/board_r.c | 17 +- common/bootm.c | 2 + common/bootm_os.c | 1 + common/bootretry.c | 1 + common/cli.c | 1 + common/cli_hush.c | 1 + common/cli_simple.c | 1 + common/command.c | 1 + common/console.c | 3 +- common/fdt_support.c | 1 + common/hash.c | 1 + common/hwconfig.c | 1 + common/image-android.c | 1 + common/image-fdt.c | 1 + common/image.c | 2 +- common/main.c | 1 + common/spl/spl_dfu.c | 4 +- common/spl/spl_ext.c | 1 + common/spl/spl_fat.c | 1 + common/spl/spl_fit.c | 1 + common/spl/spl_net.c | 1 + common/spl/spl_ymodem.c | 1 + common/splash.c | 1 + common/splash_source.c | 1 + common/update.c | 1 + common/usb_hub.c | 1 + common/usb_kbd.c | 1 + disk/part.c | 1 + disk/part_amiga.c | 1 + doc/README.marubun-pcmcia | 65 ---- doc/README.ne2000 | 11 - drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/bootcount/bootcount_env.c | 2 +- drivers/ddr/fsl/fsl_ddr_gen4.c | 1 + drivers/ddr/fsl/interactive.c | 1 + drivers/ddr/fsl/options.c | 1 + drivers/dfu/dfu.c | 1 + drivers/fastboot/fb_command.c | 1 + drivers/fastboot/fb_common.c | 1 + drivers/fastboot/fb_getvar.c | 1 + drivers/fastboot/fb_mmc.c | 1 + drivers/input/i8042.c | 1 + drivers/input/input.c | 1 + drivers/misc/fs_loader.c | 1 + drivers/mtd/cfi_flash.c | 3 +- drivers/mtd/jedec_flash.c | 1 - drivers/mtd/mtd_uboot.c | 1 + drivers/net/dc2114x.c | 1 + drivers/net/fec_mxc.c | 2 +- drivers/net/fm/b4860.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 2 +- drivers/net/fsl-mc/mc.c | 1 + drivers/net/fsl_mcdmafec.c | 2 +- drivers/net/ftmac100.c | 1 + drivers/net/lan91c96.c | 1 + drivers/net/mcffec.c | 2 +- drivers/net/ne2000_base.c | 12 +- drivers/net/netconsole.c | 5 +- drivers/net/phy/micrel_ksz90x1.c | 1 + drivers/net/sandbox-raw.c | 1 + drivers/net/sh_eth.c | 2 +- drivers/net/ti/cpsw-common.c | 1 - drivers/pci/fsl_pci_init.c | 1 + drivers/pci/pci.c | 1 + drivers/pci/pci_common.c | 1 + drivers/pcmcia/Kconfig | 0 drivers/pcmcia/Makefile | 6 - drivers/pcmcia/marubun_pcmcia.c | 99 ----- drivers/qe/qe.c | 1 - drivers/reset/reset-socfpga.c | 1 + drivers/rtc/m41t60.c | 1 + drivers/scsi/scsi.c | 1 + drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial.c | 2 +- drivers/serial/usbtty.c | 1 + drivers/tee/sandbox.c | 8 +- drivers/usb/gadget/designware_udc.c | 1 + drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/f_dfu.c | 1 + drivers/usb/gadget/f_fastboot.c | 1 + drivers/usb/gadget/f_rockusb.c | 1 + drivers/usb/gadget/f_sdp.c | 1 + drivers/usb/host/ehci-fsl.c | 1 + drivers/video/ati_radeon_fb.c | 1 + drivers/video/cfb_console.c | 2 + drivers/video/mb862xx.c | 1 + drivers/video/mx3fb.c | 1 + drivers/video/mxsfb.c | 1 + drivers/video/videomodes.c | 1 + env/callback.c | 11 +- env/common.c | 21 +- env/eeprom.c | 13 +- env/embedded.c | 2 +- env/env.c | 3 +- env/ext4.c | 5 +- env/fat.c | 5 +- env/flags.c | 15 +- env/flash.c | 23 +- env/mmc.c | 7 +- env/nand.c | 9 +- env/nowhere.c | 3 +- env/nvram.c | 3 +- env/onenand.c | 2 +- env/remote.c | 2 +- env/sata.c | 5 +- env/sf.c | 19 +- env/ubi.c | 9 +- examples/api/demo.c | 1 + examples/api/glue.c | 3 +- fs/fs.c | 1 + fs/ubifs/ubifs.c | 2 + include/bootcount.h | 1 + include/command.h | 1 + include/common.h | 191 +--------- include/env.h | 346 ++++++++++++++++++ include/env_callback.h | 25 +- include/env_default.h | 2 +- include/env_flags.h | 7 +- include/{environment.h => env_internal.h} | 110 ++---- include/exports.h | 1 + include/gzip.h | 103 ++++++ include/lcd.h | 1 + include/net.h | 1 + include/pcmcia.h | 137 ------- include/pcmcia/yenta.h | 156 -------- include/search.h | 77 ++-- lib/efi_loader/efi_boottime.c | 1 - lib/efi_loader/efi_console.c | 1 + lib/efi_loader/efi_variable.c | 3 +- lib/fdtdec.c | 2 + lib/gunzip.c | 5 +- lib/gzip.c | 1 + lib/hashtable.c | 66 ++-- lib/smbios.c | 1 + lib/uuid.c | 1 + net/bootp.c | 1 + net/dns.c | 1 + net/eth-uclass.c | 2 +- net/eth_common.c | 4 +- net/eth_legacy.c | 2 +- net/link_local.c | 1 + net/net.c | 3 +- net/tftp.c | 1 + net/wol.c | 2 +- post/post.c | 1 + scripts/config_whitelist.txt | 6 - test/compression.c | 1 + test/dm/eth.c | 1 + test/env/hashtable.c | 20 +- tools/env/fw_env.c | 24 +- tools/env/fw_env.h | 1 + tools/env/fw_env_main.c | 1 + tools/envcrc.c | 6 +- 495 files changed, 1183 insertions(+), 1541 deletions(-) delete mode 100644 cmd/pcmcia.c delete mode 100644 doc/README.marubun-pcmcia delete mode 100644 drivers/pcmcia/Kconfig delete mode 100644 drivers/pcmcia/Makefile delete mode 100644 drivers/pcmcia/marubun_pcmcia.c create mode 100644 include/env.h rename include/{environment.h => env_internal.h} (75%) create mode 100644 include/gzip.h delete mode 100644 include/pcmcia.h delete mode 100644 include/pcmcia/yenta.h