Skip to content

GitLab

U
u-boot
Commit b03eb82e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Mender uses environment in MMC only, we should disable environment in FAT completely

parent e969cd3b
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
Makefile
View file @ b03eb82e
...@@ -3,6 +3,10 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config ...@@ -3,6 +3,10 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch
$(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig $(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2020.04 $(MAKE) -C u-boot-2020.04
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
...@@ -41,6 +45,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender ...@@ -41,6 +45,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
$(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig $(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT=y" >> u-boot-2020.04/.config @echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
...@@ -90,6 +95,10 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config ...@@ -90,6 +95,10 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch
$(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig $(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2020.04 $(MAKE) -C u-boot-2020.04
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
...@@ -128,6 +137,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender ...@@ -128,6 +137,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
$(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig $(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT=y" >> u-boot-2020.04/.config @echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
...@@ -208,6 +218,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand ...@@ -208,6 +218,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
$(MAKE) -C u-boot-2020.04 socfpga_de10_nano_defconfig $(MAKE) -C u-boot-2020.04 socfpga_de10_nano_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2020.04 oldconfig $(MAKE) -C u-boot-2020.04 oldconfig
...@@ -298,6 +309,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend ...@@ -298,6 +309,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
$(MAKE) -C u-boot-2020.04 rpi_3_defconfig $(MAKE) -C u-boot-2020.04 rpi_3_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
@echo "CONFIG_BCM2835_WDT=y" >> u-boot-2020.04/.config @echo "CONFIG_BCM2835_WDT=y" >> u-boot-2020.04/.config
...@@ -401,6 +413,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men ...@@ -401,6 +413,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men
patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-boot_from_mmc1.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-boot_from_mmc1.patch
$(MAKE) -C u-boot-2020.04 p212_defconfig $(MAKE) -C u-boot-2020.04 p212_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2020.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2020.04 oldconfig $(MAKE) -C u-boot-2020.04 oldconfig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment