diff options
author | Tom Rini <trini@konsulko.com> | 2019-08-13 01:46:07 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-08-13 01:46:07 +0300 |
commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /board | |
parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
download | u-boot-5939afc9611e8ba4a86b96e67670b765ee27668e.tar.xz |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'board')
251 files changed, 726 insertions, 116 deletions
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c index 7a510c61fb..2e8477ed3b 100644 --- a/board/Arcturus/ucp1020/cmd_arc.c +++ b/board/Arcturus/ucp1020/cmd_arc.c @@ -10,11 +10,11 @@ #include <common.h> #include <div64.h> +#include <env.h> #include <malloc.h> #include <spi_flash.h> #include <mmc.h> #include <version.h> -#include <environment.h> #include <asm/io.h> static ulong fwenv_addr[MAX_FWENV_ADDR]; diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c index 451a9d78bb..9314fabdf2 100644 --- a/board/Arcturus/ucp1020/spl.c +++ b/board/Arcturus/ucp1020/spl.c @@ -9,7 +9,8 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h> diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c index 54fd1782cb..6a880c97bc 100644 --- a/board/Arcturus/ucp1020/ucp1020.c +++ b/board/Arcturus/ucp1020/ucp1020.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <hwconfig.h> #include <pci.h> #include <i2c.h> diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c index b8ab19c0e7..ef4f5c9501 100644 --- a/board/BuR/brppt1/board.c +++ b/board/BuR/brppt1/board.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c index 0d1c6c4720..873208c668 100644 --- a/board/BuR/brxre1/board.c +++ b/board/BuR/brxre1/board.c @@ -9,6 +9,7 @@ * */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c index c8cc73ab14..c0e7fb65b2 100644 --- a/board/BuR/common/br_resetc.c +++ b/board/BuR/common/br_resetc.c @@ -6,6 +6,7 @@ * B&R Industrial Automation GmbH - http://www.br-automation.com/ * */ #include <common.h> +#include <env.h> #include <errno.h> #include <i2c.h> #include <dm/uclass.h> diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 89087d7dba..148fc9075e 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -10,6 +10,7 @@ */ #include <version.h> #include <common.h> +#include <env.h> #include <fdtdec.h> #include <i2c.h> #include <lcd.h> diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index 379194803a..0b916d2482 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -11,6 +11,7 @@ #include <command.h> #include "asm/m5282.h" #include <bmp_layout.h> +#include <env.h> #include <status_led.h> #include <bus_vcxk.h> diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 3818e3752a..946e20ab49 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -8,13 +8,13 @@ #include <asm/io.h> #include <dm.h> #include <clk.h> +#include <env.h> #include <spi.h> #include <mvebu/comphy.h> #include <miiphy.h> #include <linux/string.h> #include <linux/libfdt.h> #include <fdt_support.h> -#include <environment.h> #include "mox_sp.h" diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 5f6ea35e5f..1d8d08a847 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <miiphy.h> #include <netdev.h> diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c index 9eec1b7838..be0bc228ec 100644 --- a/board/CarMediaLab/flea3/flea3.c +++ b/board/CarMediaLab/flea3/flea3.c @@ -9,6 +9,7 @@ #include <common.h> #include <asm/io.h> +#include <env.h> #include <linux/errno.h> #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h> diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c index fb08e50415..686608d25a 100644 --- a/board/LaCie/net2big_v2/net2big_v2.c +++ b/board/LaCie/net2big_v2/net2big_v2.c @@ -10,7 +10,7 @@ #include <common.h> #include <command.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 453c0dd467..bd7ab22948 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -10,7 +10,7 @@ #include <common.h> #include <command.h> -#include <environment.h> +#include <env.h> #include <asm/mach-types.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c index 59e6fe0310..777948f90f 100644 --- a/board/Synology/ds414/cmd_syno.c +++ b/board/Synology/ds414/cmd_syno.c @@ -7,6 +7,7 @@ #include <common.h> #include <div64.h> +#include <env.h> #include <spi.h> #include <spi_flash.h> #include <linux/mtd/mtd.h> diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index 97dbed79dd..e0fa8067c1 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> #include <dm.h> +#include <env.h> #include <i2c.h> #include <wdt.h> #include <asm/gpio.h> diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c index 031fd11092..9034c4fbff 100644 --- a/board/amazon/kc1/kc1.c +++ b/board/amazon/kc1/kc1.c @@ -7,6 +7,7 @@ #include <config.h> #include <common.h> +#include <env.h> #include <linux/ctype.h> #include <linux/usb/musb.h> #include <asm/omap_musb.h> diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c index 62f0f4c871..41d331dda2 100644 --- a/board/amlogic/p200/p200.c +++ b/board/amlogic/p200/p200.c @@ -5,7 +5,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/gx.h> #include <asm/arch/sm.h> diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c index ef0c65cd9f..e46fcaea6d 100644 --- a/board/amlogic/p201/p201.c +++ b/board/amlogic/p201/p201.c @@ -5,7 +5,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/gx.h> #include <asm/arch/sm.h> diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 1159cee4ce..094ab5478d 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/gx.h> #include <asm/arch/sm.h> diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index 2ea97c362e..f1faa7418e 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/gx.h> #include <asm/arch/mem.h> diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c index 02a0e9286c..bdb4eca883 100644 --- a/board/amlogic/s400/s400.c +++ b/board/amlogic/s400/s400.c @@ -6,7 +6,6 @@ #include <common.h> #include <dm.h> -#include <environment.h> #include <asm/io.h> #include <asm/arch/axg.h> #include <asm/arch/sm.h> diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c index 94ee3ce6e4..69fd29d4fe 100644 --- a/board/amlogic/u200/u200.c +++ b/board/amlogic/u200/u200.c @@ -6,7 +6,6 @@ #include <common.h> #include <dm.h> -#include <environment.h> #include <asm/io.h> #include <asm/arch/axg.h> #include <asm/arch/sm.h> diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c index 4737865367..e60dc3a622 100644 --- a/board/amlogic/w400/w400.c +++ b/board/amlogic/w400/w400.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env_internal.h> #include <asm/io.h> #include <asm/arch/eth.h> diff --git a/board/aristainetos/aristainetos-v2.c b/board/aristainetos/aristainetos-v2.c index c81c441172..c0a2e41f02 100644 --- a/board/aristainetos/aristainetos-v2.c +++ b/board/aristainetos/aristainetos-v2.c @@ -13,6 +13,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c index bf2586d326..20be0c3bd4 100644 --- a/board/armadeus/apf27/apf27.c +++ b/board/armadeus/apf27/apf27.c @@ -7,7 +7,6 @@ */ #include <common.h> -#include <environment.h> #include <jffs2/jffs2.h> #include <nand.h> #include <netdev.h> diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 69d92a32a5..0a2baa7297 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -18,6 +18,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <netdev.h> #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h> diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c index 20c3b8c086..c41706c400 100644 --- a/board/atmel/common/board.c +++ b/board/atmel/common/board.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <w1.h> #include <w1-eeprom.h> #include <dm/device-internal.h> diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index 7ff1ec7462..83a7778e99 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <i2c_eeprom.h> #include <netdev.h> diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index e373f45800..acf61486d2 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -12,6 +12,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/clk.h> #include <debug_uart.h> +#include <env.h> #include <linux/ctype.h> #include <phy.h> #include <micrel.h> diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 067a970830..36f37084b3 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -9,6 +9,7 @@ #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> +#include <env.h> #include <malloc.h> #include <asm/arch/mx6-pins.h> #include <asm/mach-imx/iomux-v3.h> diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index b95186026f..8811583ac6 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> @@ -27,9 +28,8 @@ #include <cpsw.h> #include <power/tps65217.h> #include <power/tps65910.h> -#include <environment.h> +#include <env_internal.h> #include <watchdog.h> -#include <environment.h> #include "board.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c index 9aa87f5ccf..9268aa0daa 100644 --- a/board/bluegiga/apx4devkit/apx4devkit.c +++ b/board/bluegiga/apx4devkit/apx4devkit.c @@ -21,6 +21,7 @@ #include <asm/arch/iomux-mx28.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> +#include <env.h> #include <linux/mii.h> #include <miiphy.h> #include <netdev.h> diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 3cda2fafab..48e31d9065 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -12,6 +12,7 @@ #include <atmel_lcdc.h> #include <atmel_mci.h> #include <dm.h> +#include <env.h> #include <lcd.h> #include <net.h> #ifndef CONFIG_DM_ETH diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c index 86ab180f5c..ec0c4a17f6 100644 --- a/board/bosch/guardian/board.c +++ b/board/bosch/guardian/board.c @@ -11,8 +11,7 @@ #include <common.h> #include <cpsw.h> #include <dm.h> -#include <environment.h> -#include <environment.h> +#include <env_internal.h> #include <errno.h> #include <i2c.h> #include <miiphy.h> diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index feed63bdf2..a96fdef992 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> @@ -30,9 +31,8 @@ #include <miiphy.h> #include <cpsw.h> #include <power/tps65217.h> -#include <environment.h> +#include <env_internal.h> #include <watchdog.h> -#include <environment.h> #include "mmc.h" #include "board.h" diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 867eade4bd..26af3f7102 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c index 72a32a2765..ce9f0494ee 100644 --- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c +++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c @@ -6,6 +6,7 @@ #include <common.h> #include <asm/io.h> #include <asm/mach-types.h> +#include <env.h> #include <mmc.h> #include <asm/kona-common/kona_sdhci.h> #include <asm/kona-common/clk.h> diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index 6faeb6a515..87616386cb 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -6,6 +6,7 @@ #include <common.h> #include <asm/io.h> #include <asm/mach-types.h> +#include <env.h> #include <mmc.h> #include <asm/kona-common/kona_sdhci.h> #include <asm/kona-common/clk.h> diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 7f8e0f951d..5fc2c0591b 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -8,6 +8,7 @@ #include <linux/types.h> #include <common.h> +#include <env.h> #include <asm/io.h> #include <asm/bootm.h> #include <mach/timer.h> diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index bf69a746e4..95d3a5e1f5 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -8,7 +8,8 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <net.h> #include <malloc.h> #include <netdev.h> diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index bdda9314a5..256611638a 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -8,6 +8,7 @@ #include <command.h> #include <dm.h> #include <dm/platform_data/net_ethoc.h> +#include <env.h> #include <linux/ctype.h> #include <linux/string.h> #include <linux/stringify.h> diff --git a/board/ccv/xpress/xpress.c b/board/ccv/xpress/xpress.c index 35e1c557b5..05286e643c 100644 --- a/board/ccv/xpress/xpress.c +++ b/board/ccv/xpress/xpress.c @@ -16,6 +16,7 @@ #include <asm/mach-imx/mxc_i2c.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <i2c.h> #include <miiphy.h> diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index 94e7bf194b..395d5dce17 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <mmc.h> #include <phy.h> #include <netdev.h> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index e9262c64a5..feb7a71f00 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -11,7 +11,7 @@ #include <ahci.h> #include <dm.h> #include <dwc_ahsata.h> -#include <environment.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <miiphy.h> #include <mtd_node.h> diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c index 95cbb77753..6e38745191 100644 --- a/board/compulab/cm_t335/cm_t335.c +++ b/board/compulab/cm_t335/cm_t335.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <miiphy.h> #include <cpsw.h> diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index 4d171f4900..b52358baac 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -12,7 +12,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <status_led.h> #include <netdev.h> #include <net.h> diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index 504a537f45..811bbb528a 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <fdt_support.h> #include <usb.h> #include <mmc.h> diff --git a/board/compulab/common/omap3_display.c b/board/compulab/common/omap3_display.c index bc9f31ab87..cb9ebae7f9 100644 --- a/board/compulab/common/omap3_display.c +++ b/board/compulab/common/omap3_display.c @@ -10,6 +10,7 @@ #include <common.h> #include <asm/gpio.h> #include <asm/io.h> +#include <env.h> #include <stdio_dev.h> #include <asm/arch/dss.h> #include <lcd.h> diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 7c767fb8b4..6b3d5b833f 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -20,6 +20,7 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> +#include <env.h> #include <mmc.h> #include <fsl_esdhc_imx.h> #include <i2c.h> diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c index d26ac35b44..445b84c180 100644 --- a/board/cssi/MCR3000/MCR3000.c +++ b/board/cssi/MCR3000/MCR3000.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <hwconfig.h> #include <mpc8xx.h> #include <fdt_support.h> diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 2d5710076d..d9019de6e0 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -10,7 +10,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <net.h> #include <spi.h> diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 578d928443..08881f039d 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <env.h> #include <i2c.h> #include <net.h> #include <asm/arch/hardware.h> diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 40cc2a854e..2d0f78da11 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -21,7 +21,7 @@ #include <asm/mach-imx/sata.h> #include <ahci.h> #include <dwc_ahsata.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <fsl_esdhc_imx.h> #include <fuse.h> diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c index b857a5a935..8a3d0ada27 100644 --- a/board/eets/pdu001/board.c +++ b/board/eets/pdu001/board.c @@ -10,10 +10,10 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <i2c.h> -#include <environment.h> #include <watchdog.h> #include <debug_uart.h> #include <dm/ofnode.h> diff --git a/board/el/el6x/el6x.c b/board/el/el6x/el6x.c index 55db26a819..18d69a7da3 100644 --- a/board/el/el6x/el6x.c +++ b/board/el/el6x/el6x.c @@ -9,6 +9,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/mach-imx/mxc_i2c.h> diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index d6167aaef1..49e304f7eb 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <fdtdec.h> #include <virtio_types.h> #include <virtio.h> diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index 567b9f63e5..0c47afe5b5 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <env.h> #include <mmc.h> #include <asm/arch/sys_proto.h> #include <watchdog.h> diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 29b6341132..b0d2f7b6f8 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <env.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/mach-types.h> diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 9eed95b656..33cd4b4964 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c index 887fa04627..6dfc0c73ec 100644 --- a/board/freescale/b4860qds/spl.c +++ b/board/freescale/b4860qds/spl.c @@ -4,7 +4,8 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h> diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c index 9d9c83f716..30e7a1f7ed 100644 --- a/board/freescale/bsc9131rdb/bsc9131rdb.c +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c @@ -9,6 +9,7 @@ #include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/io.h> +#include <env.h> #include <miiphy.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c index 36a55285e8..dd9ad90508 100644 --- a/board/freescale/bsc9132qds/bsc9132qds.c +++ b/board/freescale/bsc9132qds/bsc9132qds.c @@ -9,6 +9,7 @@ #include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/io.h> +#include <env.h> #include <miiphy.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index 8ee3e140bb..6d103be7ff 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -9,6 +9,7 @@ #include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/io.h> +#include <env.h> #include <miiphy.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/c29xpcie/spl.c b/board/freescale/c29xpcie/spl.c index 5db60d8ed9..29040962cf 100644 --- a/board/freescale/c29xpcie/spl.c +++ b/board/freescale/c29xpcie/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h> diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index b06235f291..36b620ca23 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <fsl_validate.h> int do_esbc_halt(cmd_tbl_t *cmdtp, int flag, int argc, diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index dddfd26a13..a024e7239e 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <fsl_validate.h> #include <fsl_secboot_err.h> #include <fsl_sfp.h> diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index ab0fe0baf1..510d7c266b 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <linux/ctype.h> diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index 0ca389c9ae..b804971981 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <asm/io.h> #ifdef CONFIG_FSL_LSCH2 diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index b166faf326..3ce9a76aae 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c index 322713cced..1463e6e696 100644 --- a/board/freescale/imx8mq_evk/imx8mq_evk.c +++ b/board/freescale/imx8mq_evk/imx8mq_evk.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <errno.h> #include <asm/io.h> diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index b7a609b097..76634a3a28 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -4,9 +4,9 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <linux/libfdt.h> -#include <environment.h> #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h> diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 3cf73e1ab6..4ba8314284 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -4,9 +4,9 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <linux/libfdt.h> -#include <environment.h> #include <fsl_esdhc_imx.h> #include <asm/io.h> #include <asm/gpio.h> diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index b4c611e19f..31e41ce169 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -15,7 +15,7 @@ #include <asm/arch/soc.h> #include <fsl_esdhc.h> #include <hwconfig.h> -#include <environment.h> +#include <env_internal.h> #include <fsl_mmdc.h> #include <netdev.h> #include <fsl_sec.h> diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index a862fe6a93..86c72ee357 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -18,7 +18,7 @@ #include <ahci.h> #include <hwconfig.h> #include <mmc.h> -#include <environment.h> +#include <env_internal.h> #include <scsi.h> #include <fm_eth.h> #include <fsl_esdhc.h> diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index f648a9040b..e4527c19b8 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -18,7 +18,7 @@ #include <mmc.h> #include <scsi.h> #include <fsl_esdhc.h> -#include <environment.h> +#include <env_internal.h> #include <fsl_mmdc.h> #include <netdev.h> #include <fsl_sec.h> diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index e5de4eb70c..4aa7cec9ce 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -11,7 +11,7 @@ #include <hwconfig.h> #include <fdt_support.h> #include <linux/libfdt.h> -#include <environment.h> +#include <env_internal.h> #include <asm/arch-fsl-layerscape/soc.h> #include <i2c.h> #include <asm/arch/soc.h> diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index f16b78cf03..d4ab9791e9 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h> diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 6d11a134dc..f0bea7327d 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -3,6 +3,7 @@ * Copyright 2017-2018 NXP */ #include <common.h> +#include <env.h> #include <i2c.h> #include <malloc.h> #include <errno.h> @@ -14,7 +15,7 @@ #include <fdt_support.h> #include <linux/libfdt.h> #include <fsl-mc/fsl_mc.h> -#include <environment.h> +#include <env_internal.h> #include <asm/arch-fsl-layerscape/soc.h> #include <asm/arch/ppa.h> #include <hwconfig.h> diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c index cc1822d0f5..413a698511 100644 --- a/board/freescale/ls2080a/ls2080a.c +++ b/board/freescale/ls2080a/ls2080a.c @@ -12,7 +12,7 @@ #include <fdt_support.h> #include <linux/libfdt.h> #include <fsl-mc/fsl_mc.h> -#include <environment.h> +#include <env_internal.h> #include <asm/arch/soc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c index f706fd4cb6..1b4e6c65fb 100644 --- a/board/freescale/ls2080aqds/eth.c +++ b/board/freescale/ls2080aqds/eth.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <env.h> #include <netdev.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h> diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index a0a3301691..e9c055745f 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -3,6 +3,7 @@ * Copyright 2015 Freescale Semiconductor */ #include <common.h> +#include <env.h> #include <malloc.h> #include <errno.h> #include <netdev.h> @@ -12,7 +13,7 @@ #include <fdt_support.h> #include <linux/libfdt.h> #include <fsl-mc/fsl_mc.h> -#include <environment.h> +#include <env_internal.h> #include <i2c.h> #include <rtc.h> #include <asm/arch/soc.h> diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index ce419dfcae..2b2dbbb0ce 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -4,6 +4,7 @@ * Copyright 2017 NXP */ #include <common.h> +#include <env.h> #include <malloc.h> #include <errno.h> #include <netdev.h> @@ -14,7 +15,7 @@ #include <fdt_support.h> #include <linux/libfdt.h> #include <fsl-mc/fsl_mc.h> -#include <environment.h> +#include <env_internal.h> #include <efi_loader.h> #include <i2c.h> #include <asm/arch/mmu.h> diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c index f6e22d7337..92c06e5060 100644 --- a/board/freescale/lx2160a/eth_lx2160aqds.c +++ b/board/freescale/lx2160a/eth_lx2160aqds.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <hwconfig.h> #include <command.h> #include <netdev.h> diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 3b4cb86692..f3885fa8b7 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -16,7 +16,7 @@ #include <fdt_support.h> #include <linux/libfdt.h> #include <fsl-mc/fsl_mc.h> -#include <environment.h> +#include <env_internal.h> #include <efi_loader.h> #include <asm/arch/mmu.h> #include <hwconfig.h> diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 2dc6d7f5f5..e5aecc4e1f 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <env.h> #include <ioports.h> #include <mpc83xx.h> #include <i2c.h> diff --git a/board/freescale/mpc837xemds/pci.c b/board/freescale/mpc837xemds/pci.c index 4217638952..41b78cf5e4 100644 --- a/board/freescale/mpc837xemds/pci.c +++ b/board/freescale/mpc837xemds/pci.c @@ -6,6 +6,7 @@ #include <asm/mmu.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <mpc83xx.h> #include <pci.h> #include <i2c.h> diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 18f396aac8..4ad62bcf1d 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <env.h> #include <hwconfig.h> #include <i2c.h> #include <asm/io.h> diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 6abeeba43b..89f4d6c05f 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/mx51evk/mx51evk_video.c b/board/freescale/mx51evk/mx51evk_video.c index 995fb9a9ab..3715c5d738 100644 --- a/board/freescale/mx51evk/mx51evk_video.c +++ b/board/freescale/mx51evk/mx51evk_video.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <linux/list.h> #include <asm/gpio.h> #include <asm/arch/iomux-mx51.h> diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index d023ce667d..a177815bb8 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -12,6 +12,7 @@ #include <asm/arch/clock.h> #include <asm/arch/iomux-mx53.h> #include <asm/arch/clock.h> +#include <env.h> #include <linux/errno.h> #include <asm/mach-imx/mx5_video.h> #include <netdev.h> diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c index 160af1ef0d..ff3fc8ce3e 100644 --- a/board/freescale/mx53loco/mx53loco_video.c +++ b/board/freescale/mx53loco/mx53loco_video.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <linux/list.h> #include <asm/gpio.h> #include <asm/arch/iomux-mx53.h> diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index e1a3b47425..dc156efbbc 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -11,6 +11,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 63e1dd0a83..b0c0117968 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -10,6 +10,7 @@ #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> #include <asm/mach-imx/spi.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/mach-imx/mxc_i2c.h> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 8ee85cc384..1c10958879 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -15,6 +15,7 @@ #include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <asm/mach-imx/mxc_i2c.h> +#include <env.h> #include <linux/sizes.h> #include <common.h> #include <fsl_esdhc_imx.h> diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 785247f7e2..ccbe404478 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -16,6 +16,7 @@ #include <asm/mach-imx/mxc_i2c.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <i2c.h> #include <miiphy.h> diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 1f0f70efbd..e119347802 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -14,6 +14,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <linux/sizes.h> #include <mmc.h> diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index b0db353167..449df937e6 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -9,6 +9,7 @@ #include <asm/cache.h> #include <asm/immap_85xx.h> #include <asm/io.h> +#include <env.h> #include <miiphy.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c index e07640a0ed..8f050b3947 100644 --- a/board/freescale/p1010rdb/spl.c +++ b/board/freescale/p1010rdb/spl.c @@ -4,7 +4,8 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h> diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index 835ede562e..9406e75517 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c index cfdd9fc9c9..06273f1d20 100644 --- a/board/freescale/p1022ds/spl.c +++ b/board/freescale/p1022ds/spl.c @@ -5,7 +5,8 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h> diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c index d0012ea38b..7db04043ca 100644 --- a/board/freescale/p1023rdb/p1023rdb.c +++ b/board/freescale/p1023rdb/p1023rdb.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <pci.h> #include <asm/io.h> #include <asm/cache.h> diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 4b151e8ef3..a04a73528f 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <hwconfig.h> #include <pci.h> #include <i2c.h> diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c index 48ab271fb2..dbf9f739b2 100644 --- a/board/freescale/p1_p2_rdb_pc/spl.c +++ b/board/freescale/p1_p2_rdb_pc/spl.c @@ -5,7 +5,8 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <ns16550.h> #include <malloc.h> #include <mmc.h> diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c index fe99ebf4b2..01cac181b3 100644 --- a/board/freescale/p1_twr/p1_twr.c +++ b/board/freescale/p1_twr/p1_twr.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <hwconfig.h> #include <pci.h> #include <i2c.h> diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index 6324027c8a..baf1506908 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 42a6b5427a..fb36d8366c 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c index 1b58174ed1..3008f0919f 100644 --- a/board/freescale/t102xqds/spl.c +++ b/board/freescale/t102xqds/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index d770aebebb..6c754503d1 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c index a226d4b5b5..029e3d212c 100644 --- a/board/freescale/t102xrdb/spl.c +++ b/board/freescale/t102xrdb/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index acc0be07c5..793f54d69e 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c index 911190b1fe..55516b9f06 100644 --- a/board/freescale/t1040qds/t1040qds.c +++ b/board/freescale/t1040qds/t1040qds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c index 58a7376e7f..7b0eb8edf5 100644 --- a/board/freescale/t104xrdb/spl.c +++ b/board/freescale/t104xrdb/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index c9557b465f..c7a645108f 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <hwconfig.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c index 27f3c4c84f..9695dfc2e2 100644 --- a/board/freescale/t208xqds/spl.c +++ b/board/freescale/t208xqds/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index abd069fdfe..86d6b1defe 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c index ecb1e0d73c..ca7d6a28e0 100644 --- a/board/freescale/t208xrdb/spl.c +++ b/board/freescale/t208xrdb/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <malloc.h> #include <ns16550.h> #include <nand.h> diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index adae3f96ca..d03d48bcfa 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c index 16cc29eaa6..7666fe7556 100644 --- a/board/freescale/t4qds/spl.c +++ b/board/freescale/t4qds/spl.c @@ -4,7 +4,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h> diff --git a/board/freescale/t4qds/t4240emu.c b/board/freescale/t4qds/t4240emu.c index 512229a380..d9cb967c22 100644 --- a/board/freescale/t4qds/t4240emu.c +++ b/board/freescale/t4qds/t4240emu.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index 125bfa31bf..bb18b97e6a 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c index cc2b2f9ffb..a19558bd6b 100644 --- a/board/freescale/t4rdb/spl.c +++ b/board/freescale/t4rdb/spl.c @@ -7,7 +7,7 @@ #include <common.h> #include <console.h> -#include <environment.h> +#include <env_internal.h> #include <asm/spl.h> #include <malloc.h> #include <ns16550.h> diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index 3bfebb6214..0c95607762 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <netdev.h> #include <linux/compiler.h> diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c index 6a1389eb05..3e2da0d6f8 100644 --- a/board/gardena/smart-gateway-at91sam/board.c +++ b/board/gardena/smart-gateway-at91sam/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <debug_uart.h> +#include <env.h> #include <led.h> #include <asm/arch/at91_common.h> #include <asm/arch/clk.h> diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 6e11077977..bd494c84fc 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -4,7 +4,8 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <led.h> #include <net.h> #include <spi.h> diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index a543916615..1240a9da17 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -10,6 +10,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/mach-imx/mxc_i2c.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <hwconfig.h> #include <power/pmic.h> diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 92edc10381..8a694a71c9 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -21,7 +21,7 @@ #include <asm/setup.h> #include <dm.h> #include <dm/platform_data/serial_mxc.h> -#include <environment.h> +#include <env.h> #include <hwconfig.h> #include <i2c.h> #include <fdt_support.h> diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index eaf7aa9eca..b0891379a1 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/crm_regs.h> #include <asm/arch/mx6-ddr.h> @@ -13,7 +14,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <spl.h> diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c index 291edc340d..000897984a 100644 --- a/board/gdsys/a38x/keyprogram.c +++ b/board/gdsys/a38x/keyprogram.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <tpm-v1.h> #include <malloc.h> #include <linux/ctype.h> diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c index cd621744d2..ddd6ee8953 100644 --- a/board/gdsys/mpc8308/gazerbeam.c +++ b/board/gdsys/mpc8308/gazerbeam.c @@ -8,6 +8,7 @@ #include <common.h> #include <board.h> #include <dm.h> +#include <env.h> #include <fdt_support.h> #include <fsl_esdhc.h> #include <miiphy.h> diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index d14a28ec94..60faa4688c 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <hwconfig.h> #include <i2c.h> #include <spi.h> diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 1fdea675bd..886bc2b035 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <hwconfig.h> #include <i2c.h> #include <spi.h> diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index 6ac956caca..43f5404231 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -12,6 +12,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <malloc.h> #include <fs.h> #include <i2c.h> diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c index 7bdc924a89..6eb3d6c5d0 100644 --- a/board/gdsys/p1022/controlcenterd.c +++ b/board/gdsys/p1022/controlcenterd.c @@ -23,6 +23,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <pci.h> #include <asm/processor.h> #include <asm/mmu.h> diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 806525204f..917ecc4c18 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -9,6 +9,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> +#include <env.h> #include <linux/errno.h> #include <linux/libfdt.h> #include <asm/gpio.h> diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c index 4e6ef9c480..501c8b2daf 100644 --- a/board/ge/common/ge_common.c +++ b/board/ge/common/ge_common.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <env.h> #include <i2c.h> #include <rtc.h> diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index bf75bd2d46..5448567298 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -16,11 +16,11 @@ #include <asm/arch/clock.h> #include <asm/arch/iomux-mx53.h> #include <asm/arch/clock.h> +#include <env.h> #include <linux/errno.h> #include <linux/libfdt.h> #include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/mx5_video.h> -#include <environment.h> #include <netdev.h> #include <i2c.h> #include <mmc.h> diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c index dc0de620fc..c6d53600fa 100644 --- a/board/grinn/chiliboard/board.c +++ b/board/grinn/chiliboard/board.c @@ -16,7 +16,7 @@ #include <asm/emif.h> #include <asm/io.h> #include <cpsw.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <miiphy.h> #include <spl.h> diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 1491b8c3d4..1558ea4b84 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -17,6 +17,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <linux/sizes.h> #include <linux/fb.h> diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c index ea29dcd75e..f5beb8c940 100644 --- a/board/gumstix/pepper/board.c +++ b/board/gumstix/pepper/board.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> @@ -25,7 +26,6 @@ #include <miiphy.h> #include <cpsw.h> #include <power/tps65217.h> -#include <environment.h> #include <watchdog.h> #include "board.h" diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index 996daffa1b..9563763dfa 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -5,6 +5,7 @@ #include <common.h> #include <ahci.h> +#include <env.h> #include <netdev.h> #include <scsi.h> diff --git a/board/hisilicon/hikey960/Kconfig b/board/hisilicon/hikey960/Kconfig new file mode 100644 index 0000000000..89f096d649 --- /dev/null +++ b/board/hisilicon/hikey960/Kconfig @@ -0,0 +1,15 @@ +if TARGET_HIKEY960 + +config SYS_BOARD + default "hikey960" + +config SYS_VENDOR + default "hisilicon" + +config SYS_SOC + default "hi3660" + +config SYS_CONFIG_NAME + default "hikey960" + +endif diff --git a/board/hisilicon/hikey960/MAINTAINERS b/board/hisilicon/hikey960/MAINTAINERS new file mode 100644 index 0000000000..2c98932163 --- /dev/null +++ b/board/hisilicon/hikey960/MAINTAINERS @@ -0,0 +1,6 @@ +HIKEY960 BOARD +M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +S: Maintained +F: board/hisilicon/hikey960 +F: include/configs/hikey960.h +F: configs/hikey960_defconfig diff --git a/board/hisilicon/hikey960/Makefile b/board/hisilicon/hikey960/Makefile new file mode 100644 index 0000000000..ea5a70921f --- /dev/null +++ b/board/hisilicon/hikey960/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-y := hikey960.o diff --git a/board/hisilicon/hikey960/README b/board/hisilicon/hikey960/README new file mode 100644 index 0000000000..e1e330d535 --- /dev/null +++ b/board/hisilicon/hikey960/README @@ -0,0 +1,247 @@ +Introduction +============ + +HiKey960 is one of the 96Boards Consumer Edition board from HiSilicon. +The board/SoC has: - +* HiSilicon Kirin960 (HI3660) SoC with 4xCortex-A73 and 4xCortex-A53 +* ARM Mali G71 MP8 GPU +* 3GB LPDDR4 SDRAM +* 32GB UFS Flash Storage +* microSD +* 802.11a/b/g/n WiFi, Bluetooth + +More information about this board can be found in 96Boards website: +https://www.96boards.org/product/hikey960/ + +Currently the u-boot port supports: - +* SD card + +Compile from source +=================== + +First get all the sources + + > mkdir -p ~/hikey960/src ~/hikey960/bin + > cd ~/hikey960/src + > git clone https://github.com/ARM-software/arm-trusted-firmware + > git clone https://github.com/96boards-hikey/OpenPlatformPkg -b testing/hikey960_v1.3.4 + > git clone https://github.com/96boards-hikey/l-loader -b testing/hikey960_v1.2 + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/config + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/hisi-sec_usb_xloader.img + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/hisi-sec_uce_boot.img + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/sec_xloader.img + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/recovery.bin + > wget http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey960/release/hikey_idt + +Get the SCP_BL2 lpm3.img binary. It is shipped as part of the UEFI source. +The latest version can be obtained from the OpenPlatformPkg repo. + + > cp OpenPlatformPkg/Platforms/Hisilicon/HiKey960/Binary/lpm3.img ~/hikey960/bin/ + +Compile U-Boot +============== + + > cd ~/hikey960/src/u-boot + > make CROSS_COMPILE=aarch64-linux-gnu- hikey960_defconfig + > make CROSS_COMPILE=aarch64-linux-gnu- + > cp u-boot.bin ~/hikey960/bin/ + +Compile ARM Trusted Firmware (ATF) +================================== + + > cd ~/hikey960/src/arm-trusted-firmware + > make CROSS_COMPILE=aarch64-linux-gnu- all fip \ + SCP_BL2=~/hikey960/bin/lpm3.img \ + BL33=~/hikey960/bin/u-boot.bin DEBUG=1 PLAT=hikey960 + +Copy the resulting FIP binary + > cp build/hikey960/debug/fip.bin ~/hikey960/bin + +Compile l-loader +================ + > cd ~/hikey960/src/l-loader + > ln -sf ~/hikey960/src/arm-trusted-firmware/build/hikey960/debug/bl1.bin + > ln -sf ~/hikey960/src/arm-trusted-firmware/build/hikey960/debug/bl2.bin + > ln -sf ~/hikey960/src/arm-trusted-firmware/build/hikey960/debug/fip.bin + > ln -sf ~/hikey960/bin/u-boot.bin + > make hikey960 PTABLE_LST=linux-32g NS_BL1U=u-boot.bin + +Copy the resulting binaries + > cp *.img ~/hikey960/bin + > cp l-loader.bin ~/hikey960/bin + +These instructions are adapted from +https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/plat/hikey960.rst + +Setup Console +============= + +Install ser2net. Use telnet as the console since UEFI in recovery mode +output window fails to display in minicom. + + > sudo apt-get install ser2net + +Configure ser2net + + > sudo vi /etc/ser2net.conf + +Append one line for serial-over-USB in #ser2net.conf + + > 2004:telnet:0:/dev/ttyUSB0:115200 8DATABITS NONE 1STOPBIT banner + +Start ser2net + + > sudo killall ser2net + > sudo ser2net -u + +Open the console. + + > telnet localhost 2004 + +And you could open the console remotely, too. + +Flashing +======== + +1. Boot Hikey960 into recovery mode as per the below document: +https://github.com/96boards/documentation/blob/master/consumer/hikey/hikey960/installation/board-recovery.md + +Once Hikey960 is in recovery mode, flash the recovery binary: + + > cd ~/hikey960/src + > chmod +x ./hikey_idt + > sudo ./hikey_idt -c config -p /dev/ttyUSB1 + +Now move to the Hikey960 console and press `f` during UEFI boot. This +will allow the board to boot into fastboot mode. Once the board is in +fastboot mode, you should see the ID of the HiKey960 board using the +following command + + > sudo fastboot devices + +1ED3822A018E3372 fastboot + +3. Flash the images + +Now, the images can be flashed using fastboot: + + > sudo fastboot flash ptable ~/hikey960/bin/prm_ptable.img + > sudo fastboot flash xloader ~/hikey960/bin/sec_xloader.img + > sudo fastboot flash fastboot ~/hikey960/bin/l-loader.bin + > sudo fastboot flash fip ~/hikey960/bin/fip.bin + +4. Set the "Boot Mode" switch to OFF position for normal boot mode. +Then power on HiKey960 + +Observe the console traces using UART6 on the Low Speed Expansion header: + +NOTICE: BL2: v2.1(debug):v2.1-531-g3ee48f40 +NOTICE: BL2: Built : 18:15:58, Aug 2 2019 +INFO: BL2: Doing platform setup +INFO: UFS LUN0 contains 1024 blocks with 4096-byte size +INFO: UFS LUN1 contains 1024 blocks with 4096-byte size +INFO: UFS LUN2 contains 2048 blocks with 4096-byte size +INFO: UFS LUN3 contains 7805952 blocks with 4096-byte size +INFO: ufs: change power mode success +INFO: BL2: Loading image id 2 +INFO: Loading image id=2 at address 0x89c80000 +INFO: Image id=2 loaded: 0x89c80000 - 0x89cb5088 +INFO: BL2: Initiating SCP_BL2 transfer to SCP +INFO: BL2: SCP_BL2: 0x89c80000@0x35088 +INFO: BL2: SCP_BL2 HEAD: +INFO: BL2: SCP_BL2 0x7000 0x179 0x159 0x149 +INFO: BL2: SCP_BL2 0x189 0x18b 0x18d 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x18f +INFO: BL2: SCP_BL2 0x191 0x0 0x193 0x195 +INFO: BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd +INFO: BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd +INFO: BL2: SCP_BL2 0x18fd 0x18fd 0x18fd 0x18fd +INFO: BL2: SCP_BL2 0x4d454355 0x43494741 0x424d554e 0x21215245 +INFO: BL2: SCP_BL2 0x4a054904 0x42912000 0xf841bfbc 0xe7fa0b04 +INFO: BL2: SCP_BL2 0xb88cf000 0x3b18 0x3d1c 0x6809493e +INFO: BL2: SCP_BL2 0x4613680a 0x201f102 0xf0002a04 0x600a804c +INFO: BL2: SCP_BL2 0x204f04f 0xf203fb02 0xf102440a 0x60100204 +INFO: BL2: SCP_BL2 0x160f04f 0xf103fb01 0x68004834 0x61044408 +INFO: BL2: SCP_BL2 0x61866145 0xf8c061c7 0xf8c08020 0xf8c09024 +INFO: BL2: SCP_BL2 0xf8c0a028 0xf3efb02c 0xf3ef8208 0x68118309 +INFO: BL2: SCP_BL2 0xf1026401 0xf0110204 0xbf070f04 0x46113220 +INFO: BL2: SCP_BL2 TAIL: +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x19cad151 0x19b80040 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 0x0 0x0 0x0 0x0 +INFO: BL2: SCP_BL2 transferred to SCP +INFO: start fw loading +INFO: fw load success +WARNING: BL2: Platform setup already done!! +INFO: BL2: Loading image id 3 +INFO: Loading image id=3 at address 0x1ac58000 +INFO: Image id=3 loaded: 0x1ac58000 - 0x1ac63024 +INFO: BL2: Loading image id 5 +INFO: Loading image id=5 at address 0x1ac98000 +INFO: Image id=5 loaded: 0x1ac98000 - 0x1ad0819c +NOTICE: BL2: Booting BL31 +INFO: Entry point address = 0x1ac58000 +INFO: SPSR = 0x3cd +NOTICE: BL31: v2.1(debug):v2.1-531-g3ee48f40 +NOTICE: BL31: Built : 18:16:01, Aug 2 2019 +INFO: ARM GICv2 driver initialized +INFO: BL31: Initializing runtime services +INFO: BL31: cortex_a53: CPU workaround for 855873 was applied +INFO: plat_setup_psci_ops: sec_entrypoint=0x1ac580fc +INFO: BL31: Preparing for EL3 exit to normal world +INFO: Entry point address = 0x1ac98000 +INFO: SPSR = 0x3c9 + + +U-Boot 2019.07-00628-g286f05a6fc-dirty (Aug 02 2019 - 17:14:05 +0530) +Hikey960 + +DRAM: 3 GiB +PSCI: v1.1 +MMC: dwmmc1@ff37f000: 0 +Loading Environment from EXT4... ** File not found /uboot.env ** + +** Unable to read "/uboot.env" from mmc0:2 ** +In: serial@fff32000 +Out: serial@fff32000 +Err: serial@fff32000 +Net: Net Initialization Skipped +No ethernet found. +Hit any key to stop autoboot: 0 +switch to partitions #0, OK +mmc0 is current device +Scanning mmc 0:1... +Found /extlinux/extlinux.conf +Retrieving file: /extlinux/extlinux.conf +201 bytes read in 12 ms (15.6 KiB/s) +1: hikey960-kernel +Retrieving file: /Image +24689152 bytes read in 4377 ms (5.4 MiB/s) +append: earlycon=pl011,mmio32,0xfff32000 console=ttyAMA6,115200 rw root=/dev/mmcblk0p2 rot +Retrieving file: /hi3660-hikey960.dtb +35047 bytes read in 14 ms (2.4 MiB/s) +## Flattened Device Tree blob at 10000000 + Booting using the fdt blob at 0x10000000 + Using Device Tree in place at 0000000010000000, end 000000001000b8e6 + +Starting kernel ... + +[ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] +[ 0.000000] Linux version 5.2.0-03138-gd75da80dce39 (mani@Mani-XPS-13-9360) (gcc versi9 +[ 0.000000] Machine model: HiKey960 +[ 0.000000] earlycon: pl11 at MMIO32 0x00000000fff32000 (options '') +[ 0.000000] printk: bootconsole [pl11] enabled +[ 0.000000] efi: Getting EFI parameters from FDT: diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c new file mode 100644 index 0000000000..eb9b99eaa9 --- /dev/null +++ b/board/hisilicon/hikey960/hikey960.c @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2019 Linaro + * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <asm/io.h> +#include <asm/arch/hi3660.h> +#include <asm/armv8/mmu.h> +#include <asm/psci.h> +#include <linux/arm-smccc.h> +#include <linux/psci.h> + +#define PMIC_REG_TO_BUS_ADDR(x) (x << 2) +#define PMIC_VSEL_MASK 0x7 + +DECLARE_GLOBAL_DATA_PTR; + +#if !CONFIG_IS_ENABLED(OF_CONTROL) +#include <dm/platform_data/serial_pl01x.h> + +static const struct pl01x_serial_platdata serial_platdata = { + .base = HI3660_UART6_BASE, + .type = TYPE_PL011, + .clock = 19200000 +}; + +U_BOOT_DEVICE(hikey960_serial0) = { + .name = "serial_pl01x", + .platdata = &serial_platdata, +}; +#endif + +static struct mm_region hikey_mem_map[] = { + { + .virt = 0x0UL, /* DDR */ + .phys = 0x0UL, + .size = 0xC0000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xE0000000UL, /* Peripheral block */ + .phys = 0xE0000000UL, + .size = 0x20000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + +struct mm_region *mem_map = hikey_mem_map; + +int board_early_init_f(void) +{ + return 0; +} + +int misc_init_r(void) +{ + return 0; +} + +int dram_init(void) +{ + gd->ram_size = PHYS_SDRAM_1_SIZE; + + return 0; +} + +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; +} + +void hikey960_sd_init(void) +{ + u32 data; + + /* Enable FPLL0 */ + data = readl(SCTRL_SCFPLLCTRL0); + data |= SCTRL_SCFPLLCTRL0_FPLL0_EN; + writel(data, SCTRL_SCFPLLCTRL0); + + /* Configure LDO16 */ + data = readl(PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x79)) & + PMIC_VSEL_MASK; + data |= 6; + writel(data, PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x79)); + + data = readl(PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x78)); + data |= 2; + writel(data, PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x78)); + + udelay(100); + + /* Configure LDO9 */ + data = readl(PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x6b)) & + PMIC_VSEL_MASK; + data |= 5; + writel(data, PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x6b)); + + data = readl(PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x6a)); + data |= 2; + writel(data, PMU_REG_BASE + PMIC_REG_TO_BUS_ADDR(0x6a)); + + udelay(100); + + /* GPIO CD */ + writel(0, PINMUX4_SDDET); + + /* SD Pinconf */ + writel(15 << 4, PINCONF3_SDCLK); + writel((1 << 0) | (8 << 4), PINCONF3_SDCMD); + writel((1 << 0) | (8 << 4), PINCONF3_SDDATA0); + writel((1 << 0) | (8 << 4), PINCONF3_SDDATA1); + writel((1 << 0) | (8 << 4), PINCONF3_SDDATA2); + writel((1 << 0) | (8 << 4), PINCONF3_SDDATA3); + + /* Set SD clock mux */ + do { + data = readl(CRG_REG_BASE + 0xb8); + data |= ((1 << 6) | (1 << 6 << 16) | (0 << 4) | (3 << 4 << 16)); + writel(data, CRG_REG_BASE + 0xb8); + + data = readl(CRG_REG_BASE + 0xb8); + } while ((data & ((1 << 6) | (3 << 4))) != ((1 << 6) | (0 << 4))); + + /* Take SD out of reset */ + writel(1 << 18, CRG_PERRSTDIS4); + do { + data = readl(CRG_PERRSTSTAT4); + } while ((data & (1 << 18)) == (1 << 18)); + + /* Enable hclk_gate_sd */ + data = readl(CRG_REG_BASE + 0); + data |= (1 << 30); + writel(data, CRG_REG_BASE + 0); + + /* Enable clk_andgt_mmc */ + data = readl(CRG_REG_BASE + 0xf4); + data |= ((1 << 3) | (1 << 3 << 16)); + writel(data, CRG_REG_BASE + 0xf4); + + /* Enable clk_gate_sd */ + data = readl(CRG_PEREN4); + data |= (1 << 17); + writel(data, CRG_PEREN4); + do { + data = readl(CRG_PERCLKEN4); + } while ((data & (1 << 17)) != (1 << 17)); +} + +static void show_psci_version(void) +{ + struct arm_smccc_res res; + + arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); + + printf("PSCI: v%ld.%ld\n", + PSCI_VERSION_MAJOR(res.a0), + PSCI_VERSION_MINOR(res.a0)); +} + +int board_init(void) +{ + /* Init SD */ + hikey960_sd_init(); + + show_psci_version(); + + return 0; +} + +void reset_cpu(ulong addr) +{ + psci_system_reset(); +} diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 77948445e2..4926419a90 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -155,6 +155,7 @@ static void usb2_phy_init(void) } #if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) +#include <env.h> #include <usb.h> #include <usb/dwc2_udc.h> #include <g_dnl.h> diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c index 9811ef559f..5368b67b38 100644 --- a/board/imgtec/ci20/ci20.c +++ b/board/imgtec/ci20/ci20.c @@ -7,7 +7,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <net.h> #include <netdev.h> #include <asm/io.h> diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index d80ee3aa8a..f56b5b1aff 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -4,7 +4,7 @@ */ #include <common.h> #include <dwc3-uboot.h> -#include <environment.h> +#include <env.h> #include <mmc.h> #include <u-boot/md5.h> #include <usb.h> diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c index 965a009a9f..a8c2b121a4 100644 --- a/board/isee/igep003x/board.c +++ b/board/isee/igep003x/board.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> @@ -25,7 +26,6 @@ #include <fdt_support.h> #include <mtd_node.h> #include <jffs2/load_kernel.h> -#include <environment.h> #include "board.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index 367af82d4a..74fc5f0890 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -4,6 +4,7 @@ * ISEE 2007 SL, <www.iseebcn.com> */ #include <common.h> +#include <env.h> #include <status_led.h> #include <dm.h> #include <ns16550.h> diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c index e8f51769f6..9dae54dda5 100644 --- a/board/k+p/kp_imx53/kp_id_rev.c +++ b/board/k+p/kp_imx53/kp_id_rev.c @@ -10,7 +10,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include "kp_id_rev.h" diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c index b447e13461..84cddd4894 100644 --- a/board/k+p/kp_imx53/kp_imx53.c +++ b/board/k+p/kp_imx53/kp_imx53.c @@ -13,6 +13,7 @@ #include <asm/arch/iomux-mx53.h> #include <asm/arch/clock.h> #include <asm/gpio.h> +#include <env.h> #include <power/pmic.h> #include <fsl_pmic.h> #include "kp_id_rev.h" diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c index 7bdc64b1be..2c541ace02 100644 --- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c @@ -17,6 +17,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/iomux-v3.h> #include <asm/mach-imx/mxc_i2c.h> +#include <env.h> #include <errno.h> #include <fsl_esdhc_imx.h> #include <fuse.h> diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 92d4a6ff61..08f7f8d884 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <ioports.h> #include <command.h> #include <malloc.h> diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 23bd21c4bc..da0634f01b 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -6,6 +6,7 @@ #include <common.h> #include <cli_hush.h> +#include <env.h> #include <i2c.h> #include "common.h" diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index 880ce67fa6..51778368d9 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <env.h> #include <ioports.h> #include <mpc83xx.h> #include <i2c.h> diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 3db80615ef..922cc621f7 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <env.h> #include <i2c.h> #include <nand.h> #include <netdev.h> diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c index e7dcefacdd..4d1e38aa3a 100644 --- a/board/keymile/kmp204x/kmp204x.c +++ b/board/keymile/kmp204x/kmp204x.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index dcf3d7ff89..b7b747d196 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -9,6 +9,7 @@ #include <dm.h> #include <dm/device-internal.h> #include <ahci.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/io.h> @@ -24,7 +25,6 @@ #include <asm/mach-imx/sata.h> #include <asm/mach-imx/video.h> #include <dwc_ahsata.h> -#include <environment.h> #include <fsl_esdhc_imx.h> #include <i2c.h> #include <input.h> diff --git a/board/laird/wb50n/wb50n.c b/board/laird/wb50n/wb50n.c index 89d3795857..a2f8eaf0ba 100644 --- a/board/laird/wb50n/wb50n.c +++ b/board/laird/wb50n/wb50n.c @@ -11,6 +11,7 @@ #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h> +#include <env.h> #include <micrel.h> #include <net.h> #include <netdev.h> diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index a7de4c2167..b4205d6ed4 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -8,6 +8,7 @@ #include <config.h> #include <common.h> #include <dm.h> +#include <env.h> #include <linux/ctype.h> #include <linux/usb/musb.h> #include <asm/omap_musb.h> diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c index ea49b7197f..037c4e69e5 100644 --- a/board/liebherr/display5/display5.c +++ b/board/liebherr/display5/display5.c @@ -13,6 +13,7 @@ #include <asm/arch/mx6-pins.h> #include <asm/arch/mx6-ddr.h> #include <asm/arch/sys_proto.h> +#include <env.h> #include <errno.h> #include <asm/gpio.h> #include <malloc.h> @@ -25,7 +26,6 @@ #include <miiphy.h> #include <netdev.h> #include <i2c.h> -#include <environment.h> #include <dm.h> #include <dm/platform_data/serial_mxc.h> diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c index 27f843ec45..354b63e431 100644 --- a/board/liebherr/display5/spl.c +++ b/board/liebherr/display5/spl.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <spl.h> #include <linux/libfdt.h> #include <asm/io.h> @@ -17,7 +18,6 @@ #include "asm/arch/iomux.h" #include <asm/mach-imx/iomux-v3.h> #include <asm/gpio.h> -#include <environment.h> #include <fsl_esdhc_imx.h> #include <netdev.h> #include <bootcount.h> diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c index 0e069a7755..7d2751ab03 100644 --- a/board/liebherr/mccmon6/mccmon6.c +++ b/board/liebherr/mccmon6/mccmon6.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/arch/imx-regs.h> diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 6e3ffa72d7..7a59b89d94 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <env.h> #include <miiphy.h> #include <input.h> #include <mmc.h> diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index 5e32077d64..6bfa41737f 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -15,7 +15,7 @@ */ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <ns16550.h> #include <netdev.h> #include <twl4030.h> diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index f2227f6992..bda5f0df5b 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -18,8 +18,10 @@ #include <asm/mach-imx/video.h> #include <asm/gpio.h> #include <asm/spl.h> +#include <env.h> #include <fdt_support.h> #include <fsl_esdhc_imx.h> +#include <gzip.h> #include <i2c.h> #include <ipu_pixfmt.h> #include <linux/errno.h> diff --git a/board/micronas/vct/vct.c b/board/micronas/vct/vct.c index af3f11e8ac..e73d16db3e 100644 --- a/board/micronas/vct/vct.c +++ b/board/micronas/vct/vct.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <asm/mipsregs.h> #include "vct.h" diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c index bcae8fa50c..91d03951db 100644 --- a/board/mscc/ocelot/ocelot.c +++ b/board/mscc/ocelot/ocelot.c @@ -7,7 +7,6 @@ #include <asm/io.h> #include <asm/addrspace.h> #include <asm/types.h> -#include <environment.h> #include <spi.h> #include <led.h> #include <wait_bit.h> diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 76f6ede38c..71ca79deab 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -22,6 +22,7 @@ */ #include <common.h> +#include <env.h> #include <watchdog.h> #include <malloc.h> #include <twl4030.h> diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c index 4985302d6b..fa5288bf18 100644 --- a/board/nvidia/p2371-2180/p2371-2180.c +++ b/board/nvidia/p2371-2180/p2371-2180.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <fdtdec.h> #include <i2c.h> #include <linux/libfdt.h> diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c index d294c7ae01..63cdb3a604 100644 --- a/board/nvidia/p2771-0000/p2771-0000.c +++ b/board/nvidia/p2771-0000/p2771-0000.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <fdtdec.h> #include <i2c.h> #include <linux/libfdt.h> diff --git a/board/overo/overo.c b/board/overo/overo.c index 8fa41f8155..f13bff1871 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -13,6 +13,7 @@ */ #include <common.h> #include <dm.h> +#include <env.h> #include <ns16550.h> #include <netdev.h> #include <twl4030.h> diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c index e720fdc0d9..43f6c5afcb 100644 --- a/board/phytec/pcm051/board.c +++ b/board/phytec/pcm051/board.c @@ -9,7 +9,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c index c30df5df9d..e1ebe8e75d 100644 --- a/board/phytec/pcm052/pcm052.c +++ b/board/phytec/pcm052/pcm052.c @@ -13,8 +13,8 @@ #include <asm/arch/ddrmc-vf610.h> #include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> +#include <env.h> #include <led.h> -#include <environment.h> #include <miiphy.h> DECLARE_GLOBAL_DATA_PTR; @@ -376,7 +376,7 @@ int board_late_init(void) if ((reg & SRC_SBMR1_BOOTCFG1_SDMMC) && !(reg & SRC_SBMR1_BOOTCFG1_MMC)) { printf("------ SD card boot -------\n"); - set_default_env("!LVFBootloader", 0); + env_set_default("!LVFBootloader", 0); env_set("bootcmd", "run prepare_install_bk4r1_envs; run install_bk4r1rs"); } diff --git a/board/phytec/pfla02/pfla02.c b/board/phytec/pfla02/pfla02.c index 753cf2b87d..ae9ffe0390 100644 --- a/board/phytec/pfla02/pfla02.c +++ b/board/phytec/pfla02/pfla02.c @@ -15,6 +15,7 @@ #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/mxc_i2c.h> #include <asm/mach-imx/spi.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <mmc.h> diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 92f3bd25f4..5fcbf65b7c 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -7,8 +7,8 @@ #include <asm/io.h> #include <common.h> #include <dm.h> -#include <environment.h> -#include <fdtdec.h> +#include <env.h> +#include <env_internal.h> #include <i2c.h> #include <i2c_eeprom.h> #include <netdev.h> diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 9ceed3ad9b..d7f0f93fb1 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -7,10 +7,10 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <usb.h> #include <asm/gpio.h> #include <fdt_support.h> -#include <environment.h> #include <asm/arch/dram.h> #include <asm/arch/misc.h> diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c index ff6903523d..7a889646df 100644 --- a/board/qualcomm/dragonboard820c/dragonboard820c.c +++ b/board/qualcomm/dragonboard820c/dragonboard820c.c @@ -6,6 +6,7 @@ */ #include <asm/arch/sysmap-apq8096.h> +#include <env.h> #include <linux/arm-smccc.h> #include <linux/psci.h> #include <common.h> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 617c892dde..7a6ca8f759 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -6,7 +6,7 @@ #include <common.h> #include <config.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <efi_loader.h> #include <fdt_support.h> #include <fdt_simplefb.h> diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 0726776a57..10ef7f931b 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -6,10 +6,11 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index f5ada6e288..08c5448609 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -18,7 +18,7 @@ #include <asm/processor.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <linux/errno.h> #include <malloc.h> diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 7c61008739..f86c9f1a63 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -6,10 +6,11 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index d07a7ca2ab..841d337f4d 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -7,10 +7,11 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index f062bb0172..3cb1a56142 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -8,7 +8,8 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <malloc.h> #include <netdev.h> #include <dm.h> diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 2e15a4cbbd..86f79da7fd 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -7,10 +7,11 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c index da33a0bd8a..d0b850f35d 100644 --- a/board/renesas/sh7752evb/sh7752evb.c +++ b/board/renesas/sh7752evb/sh7752evb.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c index 5ddddb6571..e1bed7dcc3 100644 --- a/board/renesas/sh7753evb/sh7753evb.c +++ b/board/renesas/sh7753evb/sh7753evb.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c index 3222701ad2..d2671202e9 100644 --- a/board/renesas/sh7757lcr/sh7757lcr.c +++ b/board/renesas/sh7757lcr/sh7757lcr.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <malloc.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index 59ba262ad7..25221e3c55 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -7,10 +7,11 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index 7c515950d6..0a0ff5ff76 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -9,11 +9,12 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <netdev.h> #include <dm.h> #include <dm/platform_data/serial_sh.h> -#include <environment.h> +#include <env_internal.h> #include <asm/processor.h> #include <asm/mach-types.h> #include <asm/io.h> diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index e6b018d89c..6c76c3c25c 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -5,7 +5,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <i2c_eeprom.h> #include <netdev.h> diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 87eb381345..387d1b9180 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <dwc3-uboot.h> +#include <env.h> #include <fdtdec.h> #include <asm/io.h> #include <errno.h> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 53cd1b2907..3ef1e79980 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <lcd.h> #include <libtizen.h> #include <samsung/misc.h> diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index 3e594fd850..9aa97f0f2c 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -12,6 +12,7 @@ #include <asm/gpio.h> #include <asm/arch/cpu.h> #include <dm.h> +#include <env.h> #include <power/pmic.h> #include <power/regulator.h> #include <power/max77686_pmic.h> diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index e0846bcb5b..ec85f707c1 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <env.h> #include <lcd.h> #include <asm/io.h> #include <asm/gpio.h> diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index f8281f209a..ed9c5b50d9 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <env.h> #include <spi.h> #include <lcd.h> #include <asm/io.h> diff --git a/board/samtec/vining_fpga/socfpga.c b/board/samtec/vining_fpga/socfpga.c index efc8ddf162..1e095a4e7d 100644 --- a/board/samtec/vining_fpga/socfpga.c +++ b/board/samtec/vining_fpga/socfpga.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <asm/arch/reset_manager.h> #include <asm/io.h> #include <asm/gpio.h> diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 622bde5f9f..676935a843 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index 96615424f6..049a65ff77 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -8,7 +8,7 @@ #if !defined(CONFIG_SPL_BUILD) #include <common.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <asm/io.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index 95b89dac0e..a6840b895b 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -13,6 +13,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 1b9e83e248..30f0902701 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -13,7 +13,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index 25e2ed22a6..539ecef22c 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spi.h> #include <spl.h> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 6ea97eb4e8..1cf1f9e1f7 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -14,7 +14,7 @@ #include <command.h> #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> #include <asm/arch/at91sam9_smc.h> diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c index 90ea8c601c..345701fd52 100644 --- a/board/silica/pengwyn/board.c +++ b/board/silica/pengwyn/board.c @@ -6,7 +6,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <asm/arch/cpu.h> #include <asm/arch/hardware.h> #include <asm/arch/ddr_defs.h> diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index ff465a8ef2..da9ae5bebb 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <env.h> #include <pci.h> #include <asm/processor.h> #include <asm/immap_85xx.h> diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c index 533280130e..51985b91c2 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -16,9 +16,9 @@ #include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <asm/mach-imx/mxc_i2c.h> +#include <env.h> #include <linux/sizes.h> #include <common.h> -#include <environment.h> #include <fsl_esdhc_imx.h> #include <mmc.h> #include <i2c.h> diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index d333ccc446..f82fb0786a 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -18,6 +18,7 @@ #include <asm/arch/iomux.h> #include <asm/arch/mx6-pins.h> #include <asm/arch/mxc_hdmi.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index b99c6c08a3..279c7b7797 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -8,7 +8,8 @@ #include <config.h> #include <clk.h> #include <dm.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <g_dnl.h> #include <generic-phy.h> #include <i2c.h> diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 98bc3cd0c1..e3b2d13892 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -12,6 +12,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <mmc.h> #include <axp_pmic.h> #include <generic-phy.h> @@ -29,7 +30,7 @@ #include <asm/gpio.h> #include <asm/io.h> #include <u-boot/crc.h> -#include <environment.h> +#include <env_internal.h> #include <linux/libfdt.h> #include <nand.h> #include <net.h> diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c index 66e4581fae..f443c21e6d 100644 --- a/board/synopsys/hsdk/env-lib.c +++ b/board/synopsys/hsdk/env-lib.c @@ -5,6 +5,7 @@ */ #include "env-lib.h" +#include <env.h> #define MAX_CMD_LEN 25 diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index ac4d980c49..8a7642a0aa 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -6,6 +6,7 @@ #include <common.h> #include <config.h> +#include <env.h> #include <linux/printk.h> #include <linux/kernel.h> #include <linux/io.h> diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index 6bb6482dd0..c7eed31946 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> @@ -27,9 +28,8 @@ #include <cpsw.h> #include <power/tps65217.h> #include <power/tps65910.h> -#include <environment.h> +#include <env_internal.h> #include <watchdog.h> -#include <environment.h> #include "board.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c index 927a19d05a..82eb0c285c 100644 --- a/board/technologic/ts4800/ts4800.c +++ b/board/technologic/ts4800/ts4800.c @@ -11,12 +11,12 @@ #include <asm/gpio.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux-mx51.h> +#include <env.h> #include <linux/errno.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> #include <asm/mach-imx/mx5_video.h> -#include <environment.h> #include <mmc.h> #include <input.h> #include <fsl_esdhc_imx.h> diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index a7e7f022ba..4113a1c6ee 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -5,7 +5,7 @@ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <misc.h> #include <spl.h> #include <syscon.h> diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 2c32b92d94..7eaa6cd96d 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -9,6 +9,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <serial.h> @@ -33,9 +34,8 @@ #include <cpsw.h> #include <power/tps65217.h> #include <power/tps65910.h> -#include <environment.h> +#include <env_internal.h> #include <watchdog.h> -#include <environment.h> #include "../common/board_detect.h" #include "board.h" diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index d29a22cf05..2e09cc20e8 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <i2c.h> #include <linux/errno.h> #include <spl.h> diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 1a903f13a6..f78e6c2e1f 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <palmas.h> #include <sata.h> #include <usb.h> @@ -23,7 +24,6 @@ #include <asm/arch/sata.h> #include <asm/arch/gpio.h> #include <asm/arch/omap.h> -#include <environment.h> #include <usb.h> #include <linux/usb/gadget.h> #include <dwc3-uboot.h> diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 7bd8c4fa66..e01adcd642 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -14,6 +14,7 @@ #include <asm/gpio.h> #include <asm/io.h> #include <asm/omap_common.h> +#include <env.h> #include <spl.h> #include <asm/arch/sys_proto.h> diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 91e0a4c026..0138fc91fc 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -14,6 +14,7 @@ */ #include <common.h> #include <dm.h> +#include <env.h> #include <ns16550.h> #ifdef CONFIG_LED_STATUS #include <status_led.h> diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index 32fa10599e..bc89cc57bd 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> #include <asm/omap_common.h> #include <dm/uclass.h> +#include <env.h> #include <i2c.h> #include "board_detect.h" diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 179adc2fff..74d04bb1e3 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -10,6 +10,7 @@ * Steve Sakoman <steve@sakoman.com> */ #include <common.h> +#include <env.h> #include <palmas.h> #include <sata.h> #include <linux/string.h> @@ -24,7 +25,6 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/sata.h> -#include <environment.h> #include <dwc3-uboot.h> #include <dwc3-omap-uboot.h> #include <i2c.h> diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index 93408047b2..d0b9bafbd1 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -12,6 +12,7 @@ */ #include <common.h> #include <dm.h> +#include <env.h> #include <ns16550.h> #include <netdev.h> #include <asm/io.h> diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index eed62e9cac..e9bc68049b 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -8,6 +8,7 @@ #include <common.h> #include "board.h" +#include <env.h> #include <spl.h> #include <exports.h> #include <fdt_support.h> diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 6d0fc21c67..4ff9a44b37 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -6,6 +6,7 @@ * Texas Instruments Incorporated, <www.ti.com> */ #include <common.h> +#include <env.h> #include <asm/arch/clock.h> #include <asm/ti-common/keystone_net.h> #include <asm/arch/psc_defs.h> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index f88aa4dfc6..20199da390 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -11,6 +11,7 @@ #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/gpio.h> +#include <env.h> #include <twl6030.h> #include "panda_mux_data.h" diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c index d8ee51b366..2b9385d14b 100644 --- a/board/ti/ti814x/evm.c +++ b/board/ti/ti814x/evm.c @@ -9,7 +9,7 @@ #include <common.h> #include <cpsw.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <spl.h> #include <asm/arch/cpu.h> diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c index 240df8cbe1..8f7b591b5c 100644 --- a/board/ti/ti816x/evm.c +++ b/board/ti/ti816x/evm.c @@ -7,7 +7,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <spl.h> #include <asm/cache.h> #include <asm/io.h> diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 50b70a501c..490d8cbcd0 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -17,7 +17,7 @@ */ #include <common.h> #include <dm.h> -#include <environment.h> +#include <env.h> #include <ns16550.h> #include <twl4030.h> #include <asm/io.h> diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index 5433c7581b..af48b56095 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -12,7 +12,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/io.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <linux/libfdt.h> diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index beb7e10dfe..bc98858ae0 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -10,7 +10,7 @@ #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <environment.h> +#include <env_internal.h> #include <pci_tegra.h> #include <power/as3722.h> #include <power/pmic.h> diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 341735153b..6421a22c25 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -26,7 +26,7 @@ #include <dm/device-internal.h> #include <dm/platform_data/serial_mxc.h> #include <dwc_ahsata.h> -#include <environment.h> +#include <env.h> #include <fsl_esdhc_imx.h> #include <imx_thermal.h> #include <micrel.h> diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 21addaf6ed..d1ae463941 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <dm.h> #include <dm/platform_data/serial_mxc.h> +#include <env.h> #include <fdt_support.h> #include <imx_thermal.h> #include <jffs2/load_kernel.h> diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 8c725b7593..eae3c591a1 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -12,7 +12,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/io.h> -#include <environment.h> +#include <env.h> #include <errno.h> #include <linux/libfdt.h> diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 6417ba4980..ad40b589c1 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -8,6 +8,7 @@ #include <common.h> #include <dm.h> +#include <env.h> #include <asm/arch/clock.h> #include <asm/arch/crm_regs.h> @@ -24,7 +25,6 @@ #include <asm/mach-imx/video.h> #include <cpu.h> #include <dm/platform_data/serial_mxc.h> -#include <environment.h> #include <fsl_esdhc_imx.h> #include <imx_thermal.h> #include <micrel.h> diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index dad754b31f..04d8ffd1e6 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -15,6 +15,7 @@ #include <asm/arch/iomux-vf610.h> #include <asm/gpio.h> #include <asm/io.h> +#include <env.h> #include <fdt_support.h> #include <fsl_dcu_fb.h> #include <g_dnl.h> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index c19d7611c2..9c86230595 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -21,6 +21,7 @@ #endif #include <cli.h> #include <console.h> +#include <env.h> #include <flash.h> #include <malloc.h> #include <mmc.h> diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 2d560cceaf..e9441a7979 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -4,7 +4,7 @@ */ #include <common.h> -#include <environment.h> +#include <env.h> #include <g_dnl.h> #include <linux/libfdt.h> diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index 5f0c7aace3..5b20afd488 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -12,6 +12,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> #include <asm/arch/sys_proto.h> +#include <env.h> #include <linux/errno.h> #include <asm/gpio.h> #include <asm/io.h> diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index d51f648178..5c468a6a97 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -15,6 +15,7 @@ #include <asm/arch/mx6-pins.h> #include <asm/gpio.h> #include <asm/mach-imx/iomux-v3.h> +#include <env.h> #include <mmc.h> #include <fsl_esdhc_imx.h> #include <asm/arch/crm_regs.h> diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c index c34a5a636b..f2c2bf47b0 100644 --- a/board/udoo/udoo.c +++ b/board/udoo/udoo.c @@ -8,6 +8,7 @@ #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> #include <asm/arch/iomux.h> +#include <env.h> #include <malloc.h> #include <asm/arch/mx6-pins.h> #include <linux/errno.h> diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c index dea9af9b5d..77772a6923 100644 --- a/board/varisys/common/sys_eeprom.c +++ b/board/varisys/common/sys_eeprom.c @@ -12,6 +12,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <i2c.h> #include <linux/ctype.h> diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c index 4ccce8a736..fa02fefefa 100644 --- a/board/varisys/cyrus/cyrus.c +++ b/board/varisys/cyrus/cyrus.c @@ -5,6 +5,7 @@ #include <common.h> #include <command.h> +#include <env.h> #include <netdev.h> #include <linux/compiler.h> #include <asm/mmu.h> diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index c5949ad267..f5540841c9 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <env.h> #include <errno.h> #include <linux/libfdt.h> #include <spl.h> @@ -28,7 +29,6 @@ #include <miiphy.h> #include <cpsw.h> #include <power/tps65910.h> -#include <environment.h> #include <watchdog.h> #include "board.h" diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 74d7a17028..69cdf3e9c9 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -20,6 +20,7 @@ #include <asm/mach-imx/video.h> #include <asm/mach-imx/sata.h> #include <asm/io.h> +#include <env.h> #include <linux/sizes.h> #include <common.h> #include <miiphy.h> diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 134a6c99d7..39ae982257 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -13,6 +13,7 @@ #include <asm/mach-imx/iomux-v3.h> #include <asm/io.h> #include <common.h> +#include <env.h> #include <asm/arch/crm_regs.h> #include <netdev.h> #include <power/pmic.h> diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c index ffa0fcfa87..db04dcabc7 100644 --- a/board/work-microwave/work_92105/work_92105_display.c +++ b/board/work-microwave/work_92105/work_92105_display.c @@ -15,6 +15,7 @@ #include <asm/arch/cpu.h> #include <asm/arch/emc.h> #include <asm/gpio.h> +#include <env.h> #include <spi.h> #include <i2c.h> #include <version.h> diff --git a/board/xes/common/board.c b/board/xes/common/board.c index 66467c6485..43575bc302 100644 --- a/board/xes/common/board.c +++ b/board/xes/common/board.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <env.h> #include "fsl_8xxx_misc.h" int checkboard(void) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 6857f2c0b8..35191b2f81 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm/uclass.h> +#include <env.h> #include <fdtdec.h> #include <fpga.h> #include <malloc.h> diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c index 321670d4e3..ed7ba58c64 100644 --- a/board/xilinx/zynqmp/cmds.c +++ b/board/xilinx/zynqmp/cmds.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <malloc.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 057ca1fbf7..d649daba96 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <env.h> #include <sata.h> #include <ahci.h> #include <scsi.h> |