Skip to content

GitLab

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

Upgraded u-boot to 2020.04 to get support of Python 3

parent d8074b6e
Show whitespace changes
Inline Side-by-side
Showing with 261 additions and 246 deletions
Makefile
View file @ a40381ae
opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.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-2019.04 < u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-sunxi_env_in_mmc0.patch $(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig
$(MAKE) -C u-boot-2019.04 orangepi_plus2e_defconfig $(MAKE) -C u-boot-2020.04
$(MAKE) -C u-boot-2019.04
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=u-boot-2019.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8 dd if=u-boot-2020.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPLUS2E" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_OPIPLUS2E" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPLUS2E" > /etc/fw_env.config @echo "$$FW_ENV_OPIPLUS2E" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
opiplus2e-boot-cmd: opiplus2e-boot-cmd:
define BOOTCMD_OPIPLUS2E define BOOTCMD_OPIPLUS2E
...@@ -36,29 +35,28 @@ endef ...@@ -36,29 +35,28 @@ endef
export FW_ENV_OPIPLUS2E export FW_ENV_OPIPLUS2E
opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.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-2019.04 < u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-sunxi_wdt.patch $(MAKE) -C u-boot-2020.04 orangepi_plus2e_defconfig
$(MAKE) -C u-boot-2019.04 orangepi_plus2e_defconfig @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2019.04/.config @echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT=y" >> u-boot-2019.04/.config @echo "CONFIG_WDT_SUNXI=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2019.04/.config $(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2019.04 oldconfig $(MAKE) -C u-boot-2020.04
$(MAKE) -C u-boot-2019.04
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151 dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
dd if=u-boot-2019.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8 dd if=u-boot-2020.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPLUS2E_MENDER" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_OPIPLUS2E_MENDER" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPLUS2E_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_OPIPLUS2E_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
opiplus2e-boot-cmd-mender: opiplus2e-boot-cmd-mender:
define BOOTCMD_OPIPLUS2E_MENDER define BOOTCMD_OPIPLUS2E_MENDER
...@@ -79,26 +77,25 @@ endef ...@@ -79,26 +77,25 @@ endef
export FW_ENV_OPIPLUS2E_MENDER export FW_ENV_OPIPLUS2E_MENDER
opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.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-2019.04 < u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_env_in_mmc0.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-sunxi_env_in_mmc0.patch $(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig
$(MAKE) -C u-boot-2019.04 orangepi_pc_plus_defconfig $(MAKE) -C u-boot-2020.04
$(MAKE) -C u-boot-2019.04
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=u-boot-2019.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8 dd if=u-boot-2020.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPCPLUS" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_OPIPCPLUS" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPCPLUS" > /etc/fw_env.config @echo "$$FW_ENV_OPIPCPLUS" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
opipcplus-boot-cmd: opipcplus-boot-cmd:
define BOOTCMD_OPIPCPLUS define BOOTCMD_OPIPCPLUS
...@@ -116,29 +113,28 @@ endef ...@@ -116,29 +113,28 @@ endef
export FW_ENV_OPIPCPLUS export FW_ENV_OPIPCPLUS
opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.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-2019.04 < u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-sunxi_wdt.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-sunxi_wdt.patch $(MAKE) -C u-boot-2020.04 orangepi_pc_plus_defconfig
$(MAKE) -C u-boot-2019.04 orangepi_pc_plus_defconfig @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2019.04/.config @echo "CONFIG_WDT=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT=y" >> u-boot-2019.04/.config @echo "CONFIG_WDT_SUNXI=y" >> u-boot-2020.04/.config
@echo "CONFIG_WDT_SUNXI=y" >> u-boot-2019.04/.config $(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2019.04 oldconfig $(MAKE) -C u-boot-2020.04
$(MAKE) -C u-boot-2019.04
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151 dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
dd if=u-boot-2019.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8 dd if=u-boot-2020.04/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPCPLUS_MENDER" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_OPIPCPLUS_MENDER" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPCPLUS_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_OPIPCPLUS_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
opipcplus-boot-cmd-mender: opipcplus-boot-cmd-mender:
define BOOTCMD_OPIPCPLUS_MENDER define BOOTCMD_OPIPCPLUS_MENDER
...@@ -159,20 +155,20 @@ endef ...@@ -159,20 +155,20 @@ endef
export FW_ENV_OPIPCPLUS_MENDER export FW_ENV_OPIPCPLUS_MENDER
terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.config terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.config
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
$(MAKE) -C u-boot-2019.04 socfpga_de10_nano_defconfig $(MAKE) -C u-boot-2020.04 socfpga_de10_nano_defconfig
$(MAKE) -C u-boot-2019.04 $(MAKE) -C u-boot-2020.04
mkdir /uboot mkdir /uboot
sfdisk --part-type /dev/$(ROOT_DEVICE) 1 a2 sfdisk --part-type /dev/$(ROOT_DEVICE) 1 a2
dd if=u-boot-2019.04/u-boot-with-spl.sfp of=/dev/$(DISK)1 dd if=u-boot-2020.04/u-boot-with-spl.sfp of=/dev/$(DISK)1
@echo "$$BOOTCMD_TERASICDE10STANDARD" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_TERASICDE10STANDARD" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_TERASICDE10STANDARD" > /etc/fw_env.config @echo "$$FW_ENV_TERASICDE10STANDARD" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
terasicde10standard-boot-cmd: terasicde10standard-boot-cmd:
define BOOTCMD_TERASICDE10STANDARD define BOOTCMD_TERASICDE10STANDARD
...@@ -190,21 +186,21 @@ endef ...@@ -190,21 +186,21 @@ endef
export FW_ENV_TERASICDE10STANDARD export FW_ENV_TERASICDE10STANDARD
terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10standard-fw_env.config-mender terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10standard-fw_env.config-mender
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
$(MAKE) -C u-boot-2019.04 socfpga_de10_nano_defconfig $(MAKE) -C u-boot-2020.04 socfpga_de10_nano_defconfig
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2019.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2019.04 oldconfig $(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2019.04 $(MAKE) -C u-boot-2020.04
dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151 dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
dd if=u-boot-2019.04/u-boot-with-spl.sfp of=/dev/$(DISK)1 dd if=u-boot-2020.04/u-boot-with-spl.sfp of=/dev/$(DISK)1
@echo "$$BOOTCMD_TERASICDE10STANDARD_MENDER" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_TERASICDE10STANDARD_MENDER" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_TERASICDE10STANDARD_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_TERASICDE10STANDARD_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
terasicde10standard-boot-cmd-mender: terasicde10standard-boot-cmd-mender:
define BOOTCMD_TERASICDE10STANDARD_MENDER define BOOTCMD_TERASICDE10STANDARD_MENDER
...@@ -225,27 +221,27 @@ endef ...@@ -225,27 +221,27 @@ endef
export FW_ENV_TERASICDE10STANDARD_MENDER export FW_ENV_TERASICDE10STANDARD_MENDER
rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-serial-number-fix.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-serial-number-fix.patch
$(MAKE) -C u-boot-2019.04 rpi_3_defconfig $(MAKE) -C u-boot-2020.04 rpi_3_defconfig
$(MAKE) -C u-boot-2019.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
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
cp u-boot-2019.04/u-boot.bin /uboot/u-boot.bin cp u-boot-2020.04/u-boot.bin /uboot/u-boot.bin
@echo "$$BOOTCMD_RPI3" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_RPI3" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
@echo "$$RPI3CONFIG" > /uboot/config.txt @echo "$$RPI3CONFIG" > /uboot/config.txt
tar xf rpi3-firmware.tar.xz -C /uboot --no-same-owner tar xf rpi3-firmware.tar.xz -C /uboot --no-same-owner
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_RPI3" > /etc/fw_env.config @echo "$$FW_ENV_RPI3" > /etc/fw_env.config
dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16 dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
rpi3b-boot-cmd: rpi3b-boot-cmd:
define BOOTCMD_RPI3 define BOOTCMD_RPI3
...@@ -276,28 +272,28 @@ endef ...@@ -276,28 +272,28 @@ endef
export RPI3CONFIG export RPI3CONFIG
rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mender rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mender
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.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-2019.04 < u-boot-2019.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
$(MAKE) -C u-boot-2019.04 rpi_3_defconfig $(MAKE) -C u-boot-2020.04 rpi_3_defconfig
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2019.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
@echo "CONFIG_BCM2835_WDT=y" >> u-boot-2019.04/.config @echo "CONFIG_BCM2835_WDT=y" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2019.04 oldconfig $(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2019.04 $(MAKE) -C u-boot-2020.04
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151 dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
cp u-boot-2019.04/u-boot.bin /uboot/u-boot.bin cp u-boot-2020.04/u-boot.bin /uboot/u-boot.bin
@echo "$$BOOTCMD_RPI3_MENDER" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_RPI3_MENDER" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
@echo "$$RPI3CONFIG_MENDER" > /uboot/config.txt @echo "$$RPI3CONFIG_MENDER" > /uboot/config.txt
tar xf rpi3-firmware.tar.xz --no-same-owner -C /uboot tar xf rpi3-firmware.tar.xz --no-same-owner -C /uboot
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -svf /sbin/fw_printenv /sbin/fw_setenv ln -svf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_RPI3_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_RPI3_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
rpi3b-boot-cmd-mender: rpi3b-boot-cmd-mender:
define BOOTCMD_RPI3_MENDER define BOOTCMD_RPI3_MENDER
...@@ -331,35 +327,35 @@ endef ...@@ -331,35 +327,35 @@ endef
export RPI3CONFIG_MENDER export RPI3CONFIG_MENDER
amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
$(MAKE) -C u-boot-2019.04 p212_defconfig $(MAKE) -C u-boot-2020.04 p212_defconfig
$(MAKE) -C u-boot-2019.04 $(MAKE) -C u-boot-2020.04
tar xf amlogics905x-firmware.tar.xz -C u-boot-2019.04 tar xf amlogics905x-firmware.tar.xz -C u-boot-2020.04
cp u-boot-2019.04/u-boot.bin u-boot-2019.04/fip/bl33.bin cp u-boot-2020.04/u-boot.bin u-boot-2020.04/fip/bl33.bin
cd u-boot-2019.04 && ./blx_fix.sh fip/bl30.bin fip/zero_tmp fip/bl30_zero.bin fip/bl301.bin fip/bl301_zero.bin fip/bl30_new.bin bl30 cd u-boot-2020.04 && ./blx_fix.sh fip/bl30.bin fip/zero_tmp fip/bl30_zero.bin fip/bl301.bin fip/bl301_zero.bin fip/bl30_new.bin bl30
cd u-boot-2019.04 && ./acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0 cd u-boot-2020.04 && ./acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0
cd u-boot-2019.04 && ./blx_fix.sh fip/bl2_acs.bin fip/zero_tmp fip/bl2_zero.bin fip/bl21.bin fip/bl21_zero.bin fip/bl2_new.bin bl2 cd u-boot-2020.04 && ./blx_fix.sh fip/bl2_acs.bin fip/zero_tmp fip/bl2_zero.bin fip/bl21.bin fip/bl21_zero.bin fip/bl2_new.bin bl2
$(MAKE) -C u-boot-2019.04/gxlimg $(MAKE) -C u-boot-2020.04/gxlimg
cd u-boot-2019.04 && gxlimg/gxlimg -t bl2 -s fip/bl2_new.bin fip/bl2.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl2 -s fip/bl2_new.bin fip/bl2.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl30_new.bin fip/bl30_new.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl30_new.bin fip/bl30_new.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl31.img fip/bl31.img.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl31.img fip/bl31.img.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl33.bin fip/bl33.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl33.bin fip/bl33.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t fip --bl2 fip/bl2.bin.enc --bl30 fip/bl30_new.bin.enc --bl31 fip/bl31.img.enc --bl33 fip/bl33.bin.enc fip/u-boot.bin cd u-boot-2020.04 && gxlimg/gxlimg -t fip --bl2 fip/bl2.bin.enc --bl30 fip/bl30_new.bin.enc --bl31 fip/bl31.img.enc --bl33 fip/bl33.bin.enc fip/u-boot.bin
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=u-boot-2019.04/fip/u-boot.bin of=/dev/$(ROOT_DEVICE) conv=fsync,notrunc bs=512 seek=1 dd if=u-boot-2020.04/fip/u-boot.bin of=/dev/$(ROOT_DEVICE) conv=fsync,notrunc bs=512 seek=1
@echo "$$BOOTCMD_AMLOGICS905X" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_AMLOGICS905X" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_AMLOGICS905X" > /etc/fw_env.config @echo "$$FW_ENV_AMLOGICS905X" > /etc/fw_env.config
dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16 dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
amlogics905x-boot-cmd: amlogics905x-boot-cmd:
define BOOTCMD_AMLOGICS905X define BOOTCMD_AMLOGICS905X
...@@ -377,36 +373,36 @@ endef ...@@ -377,36 +373,36 @@ endef
export FW_ENV_AMLOGICS905X export FW_ENV_AMLOGICS905X
amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-mender amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-mender
tar xf u-boot-2019.04.tar.bz2 tar xf u-boot-2020.04.tar.bz2
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-mender.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-mender.patch
patch -Np1 -d u-boot-2019.04 < u-boot-2019.04-boot_from_mmc1.patch patch -Np1 -d u-boot-2020.04 < u-boot-2020.04-boot_from_mmc1.patch
$(MAKE) -C u-boot-2019.04 p212_defconfig $(MAKE) -C u-boot-2020.04 p212_defconfig
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2019.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2020.04/.config
$(MAKE) -C u-boot-2019.04 oldconfig $(MAKE) -C u-boot-2020.04 oldconfig
$(MAKE) -C u-boot-2019.04 $(MAKE) -C u-boot-2020.04
tar xf amlogics905x-firmware.tar.xz -C u-boot-2019.04 tar xf amlogics905x-firmware.tar.xz -C u-boot-2020.04
cp u-boot-2019.04/u-boot.bin u-boot-2019.04/fip/bl33.bin cp u-boot-2020.04/u-boot.bin u-boot-2020.04/fip/bl33.bin
cd u-boot-2019.04 && ./blx_fix.sh fip/bl30.bin fip/zero_tmp fip/bl30_zero.bin fip/bl301.bin fip/bl301_zero.bin fip/bl30_new.bin bl30 cd u-boot-2020.04 && ./blx_fix.sh fip/bl30.bin fip/zero_tmp fip/bl30_zero.bin fip/bl301.bin fip/bl301_zero.bin fip/bl30_new.bin bl30
cd u-boot-2019.04 && ./acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0 cd u-boot-2020.04 && ./acs_tool.py fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0
cd u-boot-2019.04 && ./blx_fix.sh fip/bl2_acs.bin fip/zero_tmp fip/bl2_zero.bin fip/bl21.bin fip/bl21_zero.bin fip/bl2_new.bin bl2 cd u-boot-2020.04 && ./blx_fix.sh fip/bl2_acs.bin fip/zero_tmp fip/bl2_zero.bin fip/bl21.bin fip/bl21_zero.bin fip/bl2_new.bin bl2
$(MAKE) -C u-boot-2019.04/gxlimg $(MAKE) -C u-boot-2020.04/gxlimg
cd u-boot-2019.04 && gxlimg/gxlimg -t bl2 -s fip/bl2_new.bin fip/bl2.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl2 -s fip/bl2_new.bin fip/bl2.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl30_new.bin fip/bl30_new.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl30_new.bin fip/bl30_new.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl31.img fip/bl31.img.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl31.img fip/bl31.img.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t bl3x -c fip/bl33.bin fip/bl33.bin.enc cd u-boot-2020.04 && gxlimg/gxlimg -t bl3x -c fip/bl33.bin fip/bl33.bin.enc
cd u-boot-2019.04 && gxlimg/gxlimg -t fip --bl2 fip/bl2.bin.enc --bl30 fip/bl30_new.bin.enc --bl31 fip/bl31.img.enc --bl33 fip/bl33.bin.enc fip/u-boot.bin cd u-boot-2020.04 && gxlimg/gxlimg -t fip --bl2 fip/bl2.bin.enc --bl30 fip/bl30_new.bin.enc --bl31 fip/bl31.img.enc --bl33 fip/bl33.bin.enc fip/u-boot.bin
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151 dd if=/dev/zero of=/dev/$(ROOT_DEVICE) bs=512 seek=1 count=49151
dd if=u-boot-2019.04/fip/u-boot.bin of=/dev/$(ROOT_DEVICE) conv=fsync,notrunc bs=512 seek=1 dd if=u-boot-2020.04/fip/u-boot.bin of=/dev/$(ROOT_DEVICE) conv=fsync,notrunc bs=512 seek=1
@echo "$$BOOTCMD_AMLOGICS905X_MENDER" > u-boot-2019.04/boot.cmd @echo "$$BOOTCMD_AMLOGICS905X_MENDER" > u-boot-2020.04/boot.cmd
u-boot-2019.04/tools/mkimage -C none -A arm -T script -d u-boot-2019.04/boot.cmd /uboot/boot.scr u-boot-2020.04/tools/mkimage -C none -A arm -T script -d u-boot-2020.04/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2019.04 envtools $(MAKE) -C u-boot-2020.04 envtools
cp u-boot-2019.04/tools/env/fw_printenv /sbin/fw_printenv cp u-boot-2020.04/tools/env/fw_printenv /sbin/fw_printenv
ln -svf /sbin/fw_printenv /sbin/fw_setenv ln -svf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_AMLOGICS905X_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_AMLOGICS905X_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2019.04 rm -rf u-boot-2020.04
amlogics905x-boot-cmd-mender: amlogics905x-boot-cmd-mender:
define BOOTCMD_AMLOGICS905X_MENDER define BOOTCMD_AMLOGICS905X_MENDER
......
u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch deleted 100644 → 0
View file @ d8074b6e
diff -uNr u-boot-2019.04/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2019.04/arch/arm/mach-sunxi/clock_sun6i.c 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2019-09-01 10:49:11.867320183 +0930
@@ -115,11 +115,10 @@
int k = 1;
int m = 1;
- if (clk > 1152000000) {
- k = 2;
- } else if (clk > 768000000) {
+ if (clk >= 1368000000) {
k = 3;
- m = 2;
+ } else if (clk >= 768000000) {
+ k = 2;
}
/* Switch to 24MHz clock while changing PLL1 */
u-boot-2019.04-boot_from_mmc1.patch → u-boot-2020.04-boot_from_mmc1.patch
View file @ a40381ae
diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-boot_from_mmc1/include/config_mender_defines.h diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-boot_from_mmc1/include/config_mender_defines.h
--- u-boot-2019.04/include/config_mender_defines.h 2020-03-05 13:35:37.709211780 +1030 --- u-boot-2020.04/include/config_mender_defines.h 2020-05-30 20:14:13.527252484 +0930
+++ u-boot-2019.04-boot_from_mmc1/include/config_mender_defines.h 2020-03-05 13:39:02.755576198 +1030 +++ u-boot-2020.04-boot_from_mmc1/include/config_mender_defines.h 2020-05-30 20:40:22.384134573 +0930
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
#define MENDER_ROOTFS_PART_A_NUMBER 2 #define MENDER_ROOTFS_PART_A_NUMBER 2
#define MENDER_ROOTFS_PART_B_NUMBER 3 #define MENDER_ROOTFS_PART_B_NUMBER 3
......
u-boot-2019.04-mender.patch → u-boot-2020.04-mender.patch
View file @ a40381ae
diff -uNr u-boot-2019.04/env/Kconfig u-boot-2019.04-mender/env/Kconfig diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p212_defconfig
--- u-boot-2019.04/env/Kconfig 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/configs/p212_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/env/Kconfig 2020-04-17 11:05:40.302138528 +0930 +++ u-boot-2020.04-mender/configs/p212_defconfig 2020-05-30 20:33:19.766074670 +0930
@@ -473,14 +473,8 @@ @@ -1,7 +1,7 @@
if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC CONFIG_ARM=y
CONFIG_ARCH_MESON=y
CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_MESON_GXL=y
CONFIG_NR_DRAM_BANKS=1
diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/rpi_3_defconfig
--- u-boot-2020.04/configs/rpi_3_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/configs/rpi_3_defconfig 2020-05-30 20:35:38.147421723 +0930
@@ -4,7 +4,7 @@
CONFIG_SYS_TEXT_BASE=0x00080000
CONFIG_TARGET_RPI_3=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SIZE=0x20000
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
--- u-boot-2020.04/env/Kconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/env/Kconfig 2020-05-30 20:21:45.096362246 +0930
@@ -488,18 +488,8 @@
environment location.
config ENV_OFFSET config ENV_OFFSET
- hex "Environment Offset" - hex "Environment offset"
- depends on !ENV_IS_IN_UBI - depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \
- depends on !ENV_IS_NOWHERE - ENV_IS_IN_SPI_FLASH
- default 0x3f8000 if ARCH_ROCKCHIP - default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
- default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
- default 0x88000 if ARCH_SUNXI - default 0x88000 if ARCH_SUNXI
- default 0xE0000 if ARCH_ZYNQ - default 0xE0000 if ARCH_ZYNQ
- default 0x1E00000 if ARCH_ZYNQMP - default 0x1E00000 if ARCH_ZYNQMP
- default 0x7F40000 if ARCH_VERSAL
- default 0 if ARC - default 0 if ARC
- default 0x140000 if ARCH_AT91
- default 0x260000 if ARCH_OMAP2PLUS
+ hex "Environment Offset will be set by mender patch" + hex "Environment Offset will be set by mender patch"
+ depends on !ARCH_SUNXI + depends on !ARCH_SUNXI
help help
Offset from the start of the device (or partition) Offset from the start of the device (or partition)
diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/include/config_mender_defines.h diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-mender/include/config_mender_defines.h
--- u-boot-2019.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/config_mender_defines.h 2020-04-17 11:05:40.304138535 +0930 +++ u-boot-2020.04-mender/include/config_mender_defines.h 2020-05-30 20:14:13.527252484 +0930
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* Shell variables */ +/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1 +#define MENDER_BOOT_PART_NUMBER 1
...@@ -39,9 +67,9 @@ diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/i ...@@ -39,9 +67,9 @@ diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/i
+ +
+/* For sanity checks. */ +/* For sanity checks. */
+#define MENDER_BOOTENV_SIZE 0x20000 +#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/config_mender.h diff -uNr u-boot-2020.04/include/config_mender.h u-boot-2020.04-mender/include/config_mender.h
--- u-boot-2019.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/config_mender.h 2020-04-17 11:05:40.304138535 +0930 +++ u-boot-2020.04-mender/include/config_mender.h 2020-05-30 20:14:13.527252484 +0930
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -126,37 +154,33 @@ diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/c ...@@ -126,37 +154,33 @@ diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/c
+#endif /* !MENDER_AUTO_PROBING */ +#endif /* !MENDER_AUTO_PROBING */
+ +
+#endif /* HEADER_CONFIG_MENDER_H */ +#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-2019.04/include/configs/meson64.h u-boot-2019.04-mender/include/configs/meson64.h diff -uNr u-boot-2020.04/include/configs/meson64.h u-boot-2020.04-mender/include/configs/meson64.h
--- u-boot-2019.04/include/configs/meson64.h 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/include/configs/meson64.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/meson64.h 2020-04-17 11:04:59.329998736 +0930 +++ u-boot-2020.04-mender/include/configs/meson64.h 2020-05-30 20:31:28.306795518 +0930
@@ -38,7 +38,9 @@ @@ -37,6 +37,8 @@
#define CONFIG_CPU_ARMV8 #define CONFIG_CPU_ARMV8
#define CONFIG_REMAKE_ELF #define CONFIG_REMAKE_ELF
-#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_SIZE 0x20000
+#define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_ENV +#define CONFIG_BOOTCOUNT_ENV
#define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_MAXARGS 32
#define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
diff -uNr u-boot-2019.04/include/configs/rpi.h u-boot-2019.04-mender/include/configs/rpi.h diff -uNr u-boot-2020.04/include/configs/rpi.h u-boot-2020.04-mender/include/configs/rpi.h
--- u-boot-2019.04/include/configs/rpi.h 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/include/configs/rpi.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/rpi.h 2020-04-17 11:05:40.304138535 +0930 +++ u-boot-2020.04-mender/include/configs/rpi.h 2020-05-30 20:31:51.976854499 +0930
@@ -71,7 +71,9 @@ @@ -97,6 +97,8 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
/* Environment */ /* Environment */
-#define CONFIG_ENV_SIZE SZ_16K
+#define CONFIG_ENV_SIZE SZ_128K
+#define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_ENV +#define CONFIG_BOOTCOUNT_ENV
#define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_SYS_LOAD_ADDR 0x1000000
#define CONFIG_PREBOOT "usb start"
diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/configs/sun8i.h /* Shell */
--- u-boot-2019.04/include/configs/sun8i.h 2019-04-09 11:10:40.000000000 +0930 diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/configs/sun8i.h
+++ u-boot-2019.04-mender/include/configs/sun8i.h 2020-04-17 11:05:40.304138535 +0930 --- u-boot-2020.04/include/configs/sun8i.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/sun8i.h 2020-05-30 20:14:13.528252487 +0930
@@ -17,4 +17,7 @@ @@ -17,4 +17,7 @@
*/ */
#include <configs/sunxi-common.h> #include <configs/sunxi-common.h>
...@@ -165,10 +189,10 @@ diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/c ...@@ -165,10 +189,10 @@ diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/c
+#define CONFIG_BOOTCOUNT_ENV +#define CONFIG_BOOTCOUNT_ENV
+ +
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/include/configs/sunxi-common.h diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-mender/include/configs/sunxi-common.h
--- u-boot-2019.04/include/configs/sunxi-common.h 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/include/configs/sunxi-common.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/sunxi-common.h 2020-04-17 11:05:40.305138538 +0930 +++ u-boot-2020.04-mender/include/configs/sunxi-common.h 2020-05-30 20:14:13.528252487 +0930
@@ -144,15 +144,7 @@ @@ -134,15 +134,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 #define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif #endif
...@@ -184,9 +208,9 @@ diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/in ...@@ -184,9 +208,9 @@ diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/in
#ifndef CONFIG_MACH_SUN8I_V3S #ifndef CONFIG_MACH_SUN8I_V3S
/* 64MB of malloc() pool */ /* 64MB of malloc() pool */
diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env_default.h diff -uNr u-boot-2020.04/include/env_default.h u-boot-2020.04-mender/include/env_default.h
--- u-boot-2019.04/include/env_default.h 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/include/env_default.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/include/env_default.h 2020-04-17 11:05:40.305138538 +0930 +++ u-boot-2020.04-mender/include/env_default.h 2020-05-30 20:14:13.528252487 +0930
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
#include <env_callback.h> #include <env_callback.h>
...@@ -194,7 +218,7 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env ...@@ -194,7 +218,7 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env
+#include <env_mender.h> +#include <env_mender.h>
+ +
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t environment __UBOOT_ENV_SECTION__(environment) = { env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
ENV_CRC, /* CRC Sum */ ENV_CRC, /* CRC Sum */
@@ -21,6 +23,7 @@ @@ -21,6 +23,7 @@
#else #else
...@@ -213,9 +237,9 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env ...@@ -213,9 +237,9 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env
#endif #endif
#ifdef CONFIG_RAMBOOTCOMMAND #ifdef CONFIG_RAMBOOTCOMMAND
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0" "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_mender.h diff -uNr u-boot-2020.04/include/env_mender.h u-boot-2020.04-mender/include/env_mender.h
--- u-boot-2019.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/env_mender.h 2020-04-17 11:05:40.305138538 +0930 +++ u-boot-2020.04-mender/include/env_mender.h 2020-05-30 20:14:13.528252487 +0930
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -303,9 +327,9 @@ diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_ ...@@ -303,9 +327,9 @@ diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_
+#endif /* !MENDER_AUTO_PROBING */ +#endif /* !MENDER_AUTO_PROBING */
+ +
+#endif /* HEADER_ENV_MENDER_H */ +#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-2019.04/scripts/Makefile.autoconf u-boot-2019.04-mender/scripts/Makefile.autoconf diff -uNr u-boot-2020.04/scripts/Makefile.autoconf u-boot-2020.04-mender/scripts/Makefile.autoconf
--- u-boot-2019.04/scripts/Makefile.autoconf 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/scripts/Makefile.autoconf 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-mender/scripts/Makefile.autoconf 2020-04-17 11:05:40.305138538 +0930 +++ u-boot-2020.04-mender/scripts/Makefile.autoconf 2020-05-30 20:14:13.529252489 +0930
@@ -109,7 +109,8 @@ @@ -109,7 +109,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \ echo \#include \<asm/config.h\>; \
......
u-boot-2019.04-serial-number-fix.patch → u-boot-2020.04-serial-number-fix.patch
View file @ a40381ae
diff -uNr u-boot-2019.04/board/raspberrypi/rpi/rpi.c u-boot-2019.04-serial-number-fix/board/raspberrypi/rpi/rpi.c diff -uNr u-boot-2020.04/board/raspberrypi/rpi/rpi.c u-boot-2020.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2019.04/board/raspberrypi/rpi/rpi.c 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/board/raspberrypi/rpi/rpi.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2019-09-01 10:46:40.881020934 +0930 +++ u-boot-2020.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2020-05-30 19:51:58.277978268 +0930
@@ -373,9 +373,6 @@ @@ -371,9 +371,6 @@
int ret; int ret;
char serial_string[17] = { 0 }; char serial_string[17] = { 0 };
...@@ -11,10 +11,10 @@ diff -uNr u-boot-2019.04/board/raspberrypi/rpi/rpi.c u-boot-2019.04-serial-numbe ...@@ -11,10 +11,10 @@ diff -uNr u-boot-2019.04/board/raspberrypi/rpi/rpi.c u-boot-2019.04-serial-numbe
BCM2835_MBOX_INIT_HDR(msg); BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL); BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-serial-number-fix/board/sunxi/board.c diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-serial-number-fix/board/sunxi/board.c
--- u-boot-2019.04/board/sunxi/board.c 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/board/sunxi/board.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-serial-number-fix/board/sunxi/board.c 2019-09-01 10:46:40.882020936 +0930 +++ u-boot-2020.04-serial-number-fix/board/sunxi/board.c 2020-05-30 19:51:58.277978268 +0930
@@ -777,6 +777,7 @@ @@ -781,6 +781,7 @@
uint8_t mac_addr[6]; uint8_t mac_addr[6];
char ethaddr[16]; char ethaddr[16];
int i, ret; int i, ret;
...@@ -22,7 +22,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-serial-number-fix/bo ...@@ -22,7 +22,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-serial-number-fix/bo
ret = sunxi_get_sid(sid); ret = sunxi_get_sid(sid);
if (ret == 0 && sid[0] != 0) { if (ret == 0 && sid[0] != 0) {
@@ -825,10 +826,10 @@ @@ -829,10 +830,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr); eth_env_set_enetaddr(ethaddr, mac_addr);
} }
......
u-boot-2019.04-sunxi_env_in_mmc0.patch → u-boot-2020.04-sunxi_env_in_mmc0.patch
View file @ a40381ae
diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2019.04/include/configs/sunxi-common.h 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/include/configs/sunxi-common.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2019-09-01 10:50:52.325519293 +0930 +++ u-boot-2020.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2020-05-30 20:01:25.717364330 +0930
@@ -144,13 +144,7 @@ @@ -134,13 +134,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 #define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif #endif
......
u-boot-2019.04-sunxi_wdt.patch → u-boot-2020.04-sunxi_wdt.patch
View file @ a40381ae
diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunxi/board.c diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-2019.04/board/sunxi/board.c 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/board/sunxi/board.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/board/sunxi/board.c 2019-09-01 10:53:00.394773118 +0930 +++ u-boot-2020.04-sunxi_wdt/board/sunxi/board.c 2020-05-30 20:04:51.966871529 +0930
@@ -36,6 +36,7 @@ @@ -40,6 +40,7 @@
#include <spl.h> #include <spl.h>
#include <sy8106a.h> #include <sy8106a.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -9,7 +9,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx ...@@ -9,7 +9,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx
#if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD) #if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
/* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */ /* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */
@@ -312,6 +313,20 @@ @@ -316,6 +317,20 @@
return spl; return spl;
} }
...@@ -30,10 +30,10 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx ...@@ -30,10 +30,10 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx
int dram_init(void) int dram_init(void)
{ {
struct boot_file_head *spl = get_spl_header(SPL_DRAM_HEADER_VERSION); struct boot_file_head *spl = get_spl_header(SPL_DRAM_HEADER_VERSION);
diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drivers/watchdog/Kconfig diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-2019.04/drivers/watchdog/Kconfig 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/drivers/watchdog/Kconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/Kconfig 2019-09-01 10:53:00.394773118 +0930 +++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/Kconfig 2020-05-30 20:11:06.916793584 +0930
@@ -77,7 +77,7 @@ @@ -75,7 +75,7 @@
config WDT_ASPEED config WDT_ASPEED
bool "Aspeed ast2400/ast2500 watchdog timer support" bool "Aspeed ast2400/ast2500 watchdog timer support"
...@@ -42,12 +42,13 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive ...@@ -42,12 +42,13 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive
default y if ARCH_ASPEED default y if ARCH_ASPEED
help help
Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices. Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices.
@@ -96,11 +96,21 @@ @@ -148,12 +148,22 @@
config WDT_ORION config WDT_ORION
bool "Orion watchdog timer support" bool "Orion watchdog timer support"
- depends on WDT - depends on WDT
+ depends on WDT && ARCH_MVEBU + depends on WDT && ARCH_MVEBU
select CLK
help help
Select this to enable Orion watchdog timer, which can be found on some Select this to enable Orion watchdog timer, which can be found on some
Marvell Armada chips. Marvell Armada chips.
...@@ -62,23 +63,23 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive ...@@ -62,23 +63,23 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive
+ This provides basic infrastructure to support Sunxi watchdog + This provides basic infrastructure to support Sunxi watchdog
+ hardware, with a max timeout of ~16secs. + hardware, with a max timeout of ~16secs.
+ +
config WDT_CDNS config WDT_SANDBOX
bool "Cadence watchdog timer support" bool "Enable Watchdog Timer support for Sandbox"
depends on WDT depends on SANDBOX && WDT
diff -uNr u-boot-2019.04/drivers/watchdog/Makefile u-boot-2019.04-sunxi_wdt/drivers/watchdog/Makefile diff -uNr u-boot-2020.04/drivers/watchdog/Makefile u-boot-2020.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-2019.04/drivers/watchdog/Makefile 2019-04-09 11:10:40.000000000 +0930 --- u-boot-2020.04/drivers/watchdog/Makefile 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/Makefile 2019-09-01 10:53:00.395773120 +0930 +++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/Makefile 2020-05-30 20:04:51.967871531 +0930
@@ -23,6 +23,7 @@ @@ -22,6 +22,7 @@
obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o
obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o
+obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o +obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
obj-$(CONFIG_MPC8xx_WATCHDOG) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
diff -uNr u-boot-2019.04/drivers/watchdog/sunxi_wdt.c u-boot-2019.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c diff -uNr u-boot-2020.04/drivers/watchdog/sunxi_wdt.c u-boot-2020.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-2019.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2020.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2019-09-01 10:53:00.395773120 +0930 +++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2020-05-30 20:04:51.967871531 +0930
@@ -0,0 +1,274 @@ @@ -0,0 +1,274 @@
+/* +/*
+ * sunxi Watchdog Driver + * sunxi Watchdog Driver
......
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