Skip to content

GitLab

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

Fixed booting of iWave Systems G35M

parent 6f488460
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 82 deletions
Makefile
View file @ c1f1bbe7
...@@ -22,7 +22,7 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config ...@@ -22,7 +22,7 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -30,14 +30,14 @@ opiplus2e-boot-cmd: ...@@ -30,14 +30,14 @@ opiplus2e-boot-cmd:
define BOOTCMD_OPIPLUS2E define BOOTCMD_OPIPLUS2E
load mmc 0:2 $${kernel_addr_r} boot/zImage load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=tty1 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r} bootz $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_OPIPLUS2E export BOOTCMD_OPIPLUS2E
opiplus2e-fw_env.config: opiplus2e-fw_env.config:
define FW_ENV_OPIPLUS2E define FW_ENV_OPIPLUS2E
/dev/$(ROOT_DEVICE) 0x88000 0x20000 /dev/$(BOOT_DEVICE) 0x88000 0x20000
endef endef
export FW_ENV_OPIPLUS2E export FW_ENV_OPIPLUS2E
...@@ -73,7 +73,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender ...@@ -73,7 +73,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -90,8 +90,8 @@ export BOOTCMD_OPIPLUS2E_MENDER ...@@ -90,8 +90,8 @@ export BOOTCMD_OPIPLUS2E_MENDER
opiplus2e-fw_env.config-mender: opiplus2e-fw_env.config-mender:
define FW_ENV_OPIPLUS2E_MENDER define FW_ENV_OPIPLUS2E_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_OPIPLUS2E_MENDER export FW_ENV_OPIPLUS2E_MENDER
...@@ -119,7 +119,7 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config ...@@ -119,7 +119,7 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -127,14 +127,14 @@ opipcplus-boot-cmd: ...@@ -127,14 +127,14 @@ opipcplus-boot-cmd:
define BOOTCMD_OPIPCPLUS define BOOTCMD_OPIPCPLUS
load mmc 0:2 $${kernel_addr_r} boot/zImage load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=tty1 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r} bootz $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_OPIPCPLUS export BOOTCMD_OPIPCPLUS
opipcplus-fw_env.config: opipcplus-fw_env.config:
define FW_ENV_OPIPCPLUS define FW_ENV_OPIPCPLUS
/dev/$(ROOT_DEVICE) 0x88000 0x20000 /dev/$(BOOT_DEVICE) 0x88000 0x20000
endef endef
export FW_ENV_OPIPCPLUS export FW_ENV_OPIPCPLUS
...@@ -170,7 +170,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender ...@@ -170,7 +170,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -187,8 +187,8 @@ export BOOTCMD_OPIPCPLUS_MENDER ...@@ -187,8 +187,8 @@ export BOOTCMD_OPIPCPLUS_MENDER
opipcplus-fw_env.config-mender: opipcplus-fw_env.config-mender:
define FW_ENV_OPIPCPLUS_MENDER define FW_ENV_OPIPCPLUS_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_OPIPCPLUS_MENDER export FW_ENV_OPIPCPLUS_MENDER
...@@ -217,7 +217,7 @@ opi3lts: opi3lts-boot-cmd opi3lts-fw_env.config ...@@ -217,7 +217,7 @@ opi3lts: opi3lts-boot-cmd opi3lts-fw_env.config
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPI3LTS" > /etc/fw_env.config @echo "$$FW_ENV_OPI3LTS" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
rm -rf arm-trusted-firmware rm -rf arm-trusted-firmware
...@@ -226,14 +226,14 @@ opi3lts-boot-cmd: ...@@ -226,14 +226,14 @@ opi3lts-boot-cmd:
define BOOTCMD_OPI3LTS define BOOTCMD_OPI3LTS
load mmc 0:2 $${kernel_addr_r} boot/Image load mmc 0:2 $${kernel_addr_r} boot/Image
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r} booti $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_OPI3LTS export BOOTCMD_OPI3LTS
opi3lts-fw_env.config: opi3lts-fw_env.config:
define FW_ENV_OPI3LTS define FW_ENV_OPI3LTS
/dev/$(ROOT_DEVICE) 0x88000 0x20000 /dev/$(BOOT_DEVICE) 0x88000 0x20000
endef endef
export FW_ENV_OPI3LTS export FW_ENV_OPI3LTS
...@@ -270,7 +270,7 @@ opi3lts-mender: opi3lts-boot-cmd-mender opi3lts-fw_env.config-mender ...@@ -270,7 +270,7 @@ opi3lts-mender: opi3lts-boot-cmd-mender opi3lts-fw_env.config-mender
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPI3LTS_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_OPI3LTS_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
rm -rf arm-trusted-firmware rm -rf arm-trusted-firmware
...@@ -288,8 +288,8 @@ export BOOTCMD_OPI3LTS_MENDER ...@@ -288,8 +288,8 @@ export BOOTCMD_OPI3LTS_MENDER
opi3lts-fw_env.config-mender: opi3lts-fw_env.config-mender:
define FW_ENV_OPI3LTS_MENDER define FW_ENV_OPI3LTS_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_OPI3LTS_MENDER export FW_ENV_OPI3LTS_MENDER
...@@ -320,7 +320,7 @@ odroidhc2: odroidhc2-boot-cmd odroidhc2-fw_env.config ...@@ -320,7 +320,7 @@ odroidhc2: odroidhc2-boot-cmd odroidhc2-fw_env.config
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_ODROIDHC2" > /etc/fw_env.config @echo "$$FW_ENV_ODROIDHC2" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -328,14 +328,14 @@ odroidhc2-boot-cmd: ...@@ -328,14 +328,14 @@ odroidhc2-boot-cmd:
define BOOTCMD_ODROIDHC2 define BOOTCMD_ODROIDHC2
load mmc 0:2 $${kernel_addr_r} boot/zImage load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=ttySAC2,115200n8 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=ttySAC2,115200n8 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r} bootz $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_ODROIDHC2 export BOOTCMD_ODROIDHC2
odroidhc2-fw_env.config: odroidhc2-fw_env.config:
define FW_ENV_ODROIDHC2 define FW_ENV_ODROIDHC2
/dev/$(ROOT_DEVICE) 0x140000 0x20000 /dev/$(BOOT_DEVICE) 0x140000 0x20000
endef endef
export FW_ENV_ODROIDHC2 export FW_ENV_ODROIDHC2
...@@ -380,7 +380,7 @@ odroidhc2-mender: odroidhc2-boot-cmd-mender odroidhc2-fw_env.config-mender ...@@ -380,7 +380,7 @@ odroidhc2-mender: odroidhc2-boot-cmd-mender odroidhc2-fw_env.config-mender
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_ODROIDHC2_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_ODROIDHC2_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -397,8 +397,8 @@ export BOOTCMD_ODROIDHC2_MENDER ...@@ -397,8 +397,8 @@ export BOOTCMD_ODROIDHC2_MENDER
odroidhc2-fw_env.config-mender: odroidhc2-fw_env.config-mender:
define FW_ENV_ODROIDHC2_MENDER define FW_ENV_ODROIDHC2_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_ODROIDHC2_MENDER export FW_ENV_ODROIDHC2_MENDER
...@@ -416,21 +416,21 @@ terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.con ...@@ -416,21 +416,21 @@ terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.con
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
terasicde10standard-boot-cmd: terasicde10standard-boot-cmd:
define BOOTCMD_TERASICDE10STANDARD define BOOTCMD_TERASICDE10STANDARD
load mmc 0:2 $${kernel_addr_r} boot/zImage load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=ttyS0,115200 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=ttyS0,115200 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r} bootz $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_TERASICDE10STANDARD export BOOTCMD_TERASICDE10STANDARD
terasicde10standard-fw_env.config: terasicde10standard-fw_env.config:
define FW_ENV_TERASICDE10STANDARD define FW_ENV_TERASICDE10STANDARD
/dev/$(ROOT_DEVICE) 0x88000 0x20000 /dev/$(BOOT_DEVICE) 0x88000 0x20000
endef endef
export FW_ENV_TERASICDE10STANDARD export FW_ENV_TERASICDE10STANDARD
...@@ -453,7 +453,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand ...@@ -453,7 +453,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
terasicde10standard-boot-cmd-mender: terasicde10standard-boot-cmd-mender:
...@@ -469,8 +469,8 @@ export BOOTCMD_TERASICDE10STANDARD_MENDER ...@@ -469,8 +469,8 @@ export BOOTCMD_TERASICDE10STANDARD_MENDER
terasicde10standard-fw_env.config-mender: terasicde10standard-fw_env.config-mender:
define FW_ENV_TERASICDE10STANDARD_MENDER define FW_ENV_TERASICDE10STANDARD_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_TERASICDE10STANDARD_MENDER export FW_ENV_TERASICDE10STANDARD_MENDER
...@@ -487,6 +487,12 @@ iwaveg35m: iwaveg35m-boot-cmd iwaveg35m-fw_env.config iwaveg35m-boot.bif ...@@ -487,6 +487,12 @@ iwaveg35m: iwaveg35m-boot-cmd iwaveg35m-fw_env.config iwaveg35m-boot.bif
cp ../embeddedsw-xilinx/pmufw.elf u-boot-2021.04/pmufw.elf cp ../embeddedsw-xilinx/pmufw.elf u-boot-2021.04/pmufw.elf
cp arm-trusted-firmware/build/zynqmp/release/bl31/bl31.elf u-boot-2021.04 cp arm-trusted-firmware/build/zynqmp/release/bl31/bl31.elf u-boot-2021.04
$(MAKE) -C u-boot-2021.04 zynqmp_iwg35m_defconfig $(MAKE) -C u-boot-2021.04 zynqmp_iwg35m_defconfig
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config
@echo "CONFIG_SYS_MMC_ENV_DEV=1" >> u-boot-2021.04/.config
@echo "# CONFIG_SYS_REDUNDAND_ENVIRONMENT is not set" >> u-boot-2021.04/.config
@echo "CONFIG_ENV_OFFSET=0x88000" >> u-boot-2021.04/.config
$(MAKE) -C u-boot-2021.04 oldconfig
$(MAKE) -C u-boot-2021.04 $(MAKE) -C u-boot-2021.04
mkdir /uboot mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1 mkfs -t vfat -n UBOOT /dev/$(DISK)1
...@@ -501,7 +507,7 @@ iwaveg35m: iwaveg35m-boot-cmd iwaveg35m-fw_env.config iwaveg35m-boot.bif ...@@ -501,7 +507,7 @@ iwaveg35m: iwaveg35m-boot-cmd iwaveg35m-fw_env.config iwaveg35m-boot.bif
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_IWAVEG35M" > /etc/fw_env.config @echo "$$FW_ENV_IWAVEG35M" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
rm -rf arm-trusted-firmware rm -rf arm-trusted-firmware
...@@ -511,14 +517,14 @@ iwaveg35m-boot-cmd: ...@@ -511,14 +517,14 @@ iwaveg35m-boot-cmd:
define BOOTCMD_IWAVEG35M define BOOTCMD_IWAVEG35M
load mmc 1:2 $${kernel_addr_r} boot/Image load mmc 1:2 $${kernel_addr_r} boot/Image
load mmc 1:2 $${fdt_addr_r} boot/machine.dtb load mmc 1:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=ttyPS0,115200 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=ttyPS0,115200 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r} booti $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_IWAVEG35M export BOOTCMD_IWAVEG35M
iwaveg35m-fw_env.config: iwaveg35m-fw_env.config:
define FW_ENV_IWAVEG35M define FW_ENV_IWAVEG35M
/dev/$(ROOT_DEVICE) 0x88000 0x20000 /dev/$(BOOT_DEVICE) 0x88000 0x20000
endef endef
export FW_ENV_IWAVEG35M export FW_ENV_IWAVEG35M
...@@ -544,6 +550,8 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave ...@@ -544,6 +550,8 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave
tar xf u-boot-2021.04.tar.gz tar xf u-boot-2021.04.tar.gz
patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-iwaveg35m.patch patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-iwaveg35m.patch
patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-mender.patch patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-mender.patch
sed -i 's/mmcblk[0-9]/$(BOOT_DEVICE)/' u-boot-2021.04/include/config_mender_defines.h
sed -i 's/MENDER_UBOOT_STORAGE_DEVICE [0-9]/MENDER_UBOOT_STORAGE_DEVICE '"$${STORAGE_DEVICE:-1}"'/' u-boot-2021.04/include/config_mender_defines.h
cp xilinx-bootgen-2022.2/bootgen u-boot-2021.04 cp xilinx-bootgen-2022.2/bootgen u-boot-2021.04
cp ../embeddedsw-xilinx/fsbl.elf u-boot-2021.04 cp ../embeddedsw-xilinx/fsbl.elf u-boot-2021.04
cp ../embeddedsw-xilinx/pmufw.elf u-boot-2021.04/pmufw.elf cp ../embeddedsw-xilinx/pmufw.elf u-boot-2021.04/pmufw.elf
...@@ -552,6 +560,7 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave ...@@ -552,6 +560,7 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2021.04/.config @echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2021.04/.config
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config @echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config
@echo "CONFIG_SYS_MMC_ENV_DEV=$${STORAGE_DEVICE:-1}" >> u-boot-2021.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2021.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2021.04/.config
@echo "# CONFIG_ENV_OFFSET is not set" >> u-boot-2021.04/.config @echo "# CONFIG_ENV_OFFSET is not set" >> u-boot-2021.04/.config
@echo "# CONFIG_ENV_OFFSET_REDUND is not set" >> u-boot-2021.04/.config @echo "# CONFIG_ENV_OFFSET_REDUND is not set" >> u-boot-2021.04/.config
...@@ -580,7 +589,7 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave ...@@ -580,7 +589,7 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_IWAVEG35M_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_IWAVEG35M_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
rm -rf arm-trusted-firmware rm -rf arm-trusted-firmware
...@@ -599,8 +608,8 @@ export BOOTCMD_IWAVEG35M_MENDER ...@@ -599,8 +608,8 @@ export BOOTCMD_IWAVEG35M_MENDER
iwaveg35m-fw_env.config-mender: iwaveg35m-fw_env.config-mender:
define FW_ENV_IWAVEG35M_MENDER define FW_ENV_IWAVEG35M_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_IWAVEG35M_MENDER export FW_ENV_IWAVEG35M_MENDER
...@@ -624,7 +633,7 @@ rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config ...@@ -624,7 +633,7 @@ rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config
@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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -632,7 +641,7 @@ rpi3b-boot-cmd: ...@@ -632,7 +641,7 @@ rpi3b-boot-cmd:
define BOOTCMD_RPI3 define BOOTCMD_RPI3
load mmc 0:2 $${kernel_addr_r} boot/Image load mmc 0:2 $${kernel_addr_r} boot/Image
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=tty1 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r} booti $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_RPI3 export BOOTCMD_RPI3
...@@ -680,7 +689,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend ...@@ -680,7 +689,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -697,8 +706,8 @@ export BOOTCMD_RPI3_MENDER ...@@ -697,8 +706,8 @@ export BOOTCMD_RPI3_MENDER
rpi3b-fw_env.config-mender: rpi3b-fw_env.config-mender:
define FW_ENV_RPI3_MENDER define FW_ENV_RPI3_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_RPI3_MENDER export FW_ENV_RPI3_MENDER
...@@ -739,7 +748,7 @@ rpi4b: rpi4b-boot-cmd rpi4b-fw_env.config rpi4b-config ...@@ -739,7 +748,7 @@ rpi4b: rpi4b-boot-cmd rpi4b-fw_env.config rpi4b-config
@echo "$$FW_ENV_RPI4" > /etc/fw_env.config @echo "$$FW_ENV_RPI4" > /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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -747,7 +756,7 @@ rpi4b-boot-cmd: ...@@ -747,7 +756,7 @@ rpi4b-boot-cmd:
define BOOTCMD_RPI4 define BOOTCMD_RPI4
load mmc 0:2 $${kernel_addr_r} boot/Image load mmc 0:2 $${kernel_addr_r} boot/Image
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=tty1 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r} booti $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_RPI4 export BOOTCMD_RPI4
...@@ -804,7 +813,7 @@ rpi4b-mender: rpi4b-boot-cmd-mender rpi4b-fw_env.config-mender rpi4b-config-mend ...@@ -804,7 +813,7 @@ rpi4b-mender: rpi4b-boot-cmd-mender rpi4b-fw_env.config-mender rpi4b-config-mend
ln -svf /sbin/fw_printenv /sbin/fw_setenv ln -svf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_RPI4_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_RPI4_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -821,8 +830,8 @@ export BOOTCMD_RPI4_MENDER ...@@ -821,8 +830,8 @@ export BOOTCMD_RPI4_MENDER
rpi4b-fw_env.config-mender: rpi4b-fw_env.config-mender:
define FW_ENV_RPI4_MENDER define FW_ENV_RPI4_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_RPI4_MENDER export FW_ENV_RPI4_MENDER
...@@ -872,7 +881,7 @@ amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config ...@@ -872,7 +881,7 @@ amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config
@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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -880,7 +889,7 @@ amlogics905x-boot-cmd: ...@@ -880,7 +889,7 @@ amlogics905x-boot-cmd:
define BOOTCMD_AMLOGICS905X define BOOTCMD_AMLOGICS905X
load mmc 1:2 $${kernel_addr_r} boot/Image load mmc 1:2 $${kernel_addr_r} boot/Image
load mmc 1:2 $${fdt_addr_r} boot/machine.dtb load mmc 1:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1 setenv bootargs console=tty1 root=/dev/$(BOOT_DISK)2 rootfstype=ext4 rootflags=discard rw rootwait quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r} booti $${kernel_addr_r} - $${fdt_addr_r}
endef endef
export BOOTCMD_AMLOGICS905X export BOOTCMD_AMLOGICS905X
...@@ -923,7 +932,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men ...@@ -923,7 +932,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men
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
if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(BOOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2021.04 rm -rf u-boot-2021.04
...@@ -940,7 +949,7 @@ export BOOTCMD_AMLOGICS905X_MENDER ...@@ -940,7 +949,7 @@ export BOOTCMD_AMLOGICS905X_MENDER
amlogics905x-fw_env.config-mender: amlogics905x-fw_env.config-mender:
define FW_ENV_AMLOGICS905X_MENDER define FW_ENV_AMLOGICS905X_MENDER
/dev/$(ROOT_DEVICE) 0x400000 0x20000 /dev/$(BOOT_DEVICE) 0x400000 0x20000
/dev/$(ROOT_DEVICE) 0x800000 0x20000 /dev/$(BOOT_DEVICE) 0x800000 0x20000
endef endef
export FW_ENV_AMLOGICS905X_MENDER export FW_ENV_AMLOGICS905X_MENDER
u-boot-2021.04-iwaveg35m.patch
View file @ c1f1bbe7
diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile
--- u-boot-2021.04/arch/arm/dts/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile 2025-01-24 23:55:38.720330867 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile 2025-03-09 09:39:09.000000000 +0000
@@ -323,7 +323,8 @@ @@ -323,7 +323,8 @@
zynqmp-zc1751-xm016-dc2.dtb \ zynqmp-zc1751-xm016-dc2.dtb \
zynqmp-zc1751-xm017-dc3.dtb \ zynqmp-zc1751-xm017-dc3.dtb \
...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm ...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm
versal-mini-emmc0.dtb \ versal-mini-emmc0.dtb \
diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi
--- u-boot-2021.04/arch/arm/dts/pcw.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/pcw.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi 2025-01-24 23:55:38.720330867 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,205 @@ @@ -0,0 +1,205 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
...@@ -222,7 +222,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm ...@@ -222,7 +222,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi
--- u-boot-2021.04/arch/arm/dts/pl.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/pl.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi 2025-01-24 23:55:38.724330939 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,785 @@ @@ -0,0 +1,785 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
...@@ -1011,7 +1011,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/ ...@@ -1011,7 +1011,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi
--- u-boot-2021.04/arch/arm/dts/system-conf.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-conf.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi 2025-01-24 23:55:38.724330939 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* +/*
+ * CAUTION: This file is automatically generated by PetaLinux SDK. + * CAUTION: This file is automatically generated by PetaLinux SDK.
...@@ -1032,7 +1032,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/ ...@@ -1032,7 +1032,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/
+ +
diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts
--- u-boot-2021.04/arch/arm/dts/system-top.dts 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-top.dts 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts 2025-01-24 23:58:10.907097793 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
...@@ -1067,7 +1067,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar ...@@ -1067,7 +1067,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar
+#include "system-user.dtsi" +#include "system-user.dtsi"
diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi
--- u-boot-2021.04/arch/arm/dts/system-user.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-user.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi 2025-01-24 23:55:38.724330939 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,455 @@ @@ -0,0 +1,455 @@
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/gpio.h>
+/include/ "system-conf.dtsi" +/include/ "system-conf.dtsi"
...@@ -1526,7 +1526,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/ ...@@ -1526,7 +1526,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi
--- u-boot-2021.04/arch/arm/dts/zynqmp.dtsi 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/zynqmp.dtsi 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi 2025-01-24 23:55:38.728331012 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi 2025-03-09 09:39:09.000000000 +0000
@@ -667,6 +667,15 @@ @@ -667,6 +667,15 @@
power-domains = <&zynqmp_firmware PD_QSPI>; power-domains = <&zynqmp_firmware PD_QSPI>;
}; };
...@@ -1565,7 +1565,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/ ...@@ -1565,7 +1565,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/
status = "disabled"; status = "disabled";
diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c
--- u-boot-2021.04/board/xilinx/common/cpu-info.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/board/xilinx/common/cpu-info.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c 2025-01-24 23:55:38.728331012 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c 2025-03-09 09:39:09.000000000 +0000
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+
+/* +/*
...@@ -1605,7 +1605,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m ...@@ -1605,7 +1605,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m
+} +}
diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile
--- u-boot-2021.04/board/xilinx/common/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/board/xilinx/common/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile 2025-01-24 23:55:38.728331012 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile 2025-03-09 09:39:09.000000000 +0000
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
# #
...@@ -1618,7 +1618,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/b ...@@ -1618,7 +1618,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/b
endif endif
diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c
--- u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c 2025-01-24 23:55:39.012336186 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c 2025-03-09 09:39:09.000000000 +0000
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <debug_uart.h> #include <debug_uart.h>
#include <env.h> #include <env.h>
...@@ -1730,17 +1730,28 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b ...@@ -1730,17 +1730,28 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b
break; break;
case EMMC_MODE: case EMMC_MODE:
puts("EMMC_MODE\n"); puts("EMMC_MODE\n");
@@ -598,6 +652,7 @@ @@ -598,6 +652,8 @@
mode = "mmc"; mode = "mmc";
bootseq = dev_seq(dev); bootseq = dev_seq(dev);
+ env_set("modeboot", "sdboot"); + env_set("modeboot", "sdboot");
+ env_set("mmc_bootdev", "0");
break; break;
case SD_MODE: case SD_MODE:
puts("SD_MODE\n"); puts("SD_MODE\n");
@@ -632,11 +687,13 @@ @@ -613,6 +669,7 @@
mode = "mmc";
bootseq = dev_seq(dev);
env_set("modeboot", "sdboot");
+ env_set("mmc_bootdev", "0");
break;
case SD1_LSHFT_MODE:
puts("LVL_SHFT_");
@@ -631,12 +688,15 @@
mode = "mmc";
bootseq = dev_seq(dev); bootseq = dev_seq(dev);
env_set("modeboot", "sdboot"); env_set("modeboot", "sdboot");
+ env_set("mmc_bootdev", "1");
break; break;
+#ifndef CONFIG_ZYNQMP_IWG35M_H +#ifndef CONFIG_ZYNQMP_IWG35M_H
case NAND_MODE: case NAND_MODE:
...@@ -1752,7 +1763,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b ...@@ -1752,7 +1763,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b
default: default:
mode = ""; mode = "";
printf("Invalid Boot Mode:0x%x\n", bootmode); printf("Invalid Boot Mode:0x%x\n", bootmode);
@@ -677,9 +734,50 @@ @@ -677,9 +737,50 @@
} }
#endif #endif
...@@ -1803,7 +1814,16 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b ...@@ -1803,7 +1814,16 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b
return 0; return 0;
} }
@@ -716,3 +814,311 @@ @@ -699,6 +800,8 @@
return ENVL_FAT;
if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4))
return ENVL_EXT4;
+ if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC))
+ return ENVL_MMC;
return ENVL_UNKNOWN;
case NAND_MODE:
if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND))
@@ -716,3 +819,311 @@
return ENVL_NOWHERE; return ENVL_NOWHERE;
} }
} }
...@@ -2117,7 +2137,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b ...@@ -2117,7 +2137,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b
+#endif +#endif
diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c
--- u-boot-2021.04/cmd/cmd_custom_memtests.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/cmd/cmd_custom_memtests.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c 2025-01-24 23:55:39.012336186 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,537 @@ @@ -0,0 +1,537 @@
+/* This file contains the custom DDR memory tests as a part of POST +/* This file contains the custom DDR memory tests as a part of POST
+ * + *
...@@ -2658,7 +2678,7 @@ diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/ ...@@ -2658,7 +2678,7 @@ diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/
+ +
diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig
--- u-boot-2021.04/cmd/Kconfig 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/cmd/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/Kconfig 2025-01-24 23:55:39.016336259 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/Kconfig 2025-03-09 09:39:10.000000000 +0000
@@ -737,6 +737,12 @@ @@ -737,6 +737,12 @@
within the range are displayed. The minimum number of characters within the range are displayed. The minimum number of characters
for a sequence to be considered a string can be provided. for a sequence to be considered a string can be provided.
...@@ -2674,7 +2694,7 @@ diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig ...@@ -2674,7 +2694,7 @@ diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig
menu "Compression commands" menu "Compression commands"
diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile
--- u-boot-2021.04/cmd/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/cmd/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/Makefile 2025-01-24 23:55:39.016336259 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/Makefile 2025-03-09 09:39:10.000000000 +0000
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
obj-$(CONFIG_CMD_BLOCK_CACHE) += blkcache.o obj-$(CONFIG_CMD_BLOCK_CACHE) += blkcache.o
obj-$(CONFIG_CMD_BMP) += bmp.o obj-$(CONFIG_CMD_BMP) += bmp.o
...@@ -2685,7 +2705,7 @@ diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile ...@@ -2685,7 +2705,7 @@ diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile
obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o
diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig
--- u-boot-2021.04/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig 2025-01-24 23:59:28.376502679 +0000 +++ u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,329 @@ @@ -0,0 +1,329 @@
+CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_CREATE_ARCH_SYMLINK=y
+CONFIG_SYS_CACHE_SHIFT_6=y +CONFIG_SYS_CACHE_SHIFT_6=y
...@@ -3018,7 +3038,7 @@ diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35 ...@@ -3018,7 +3038,7 @@ diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35
+CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_NOWHERE=y
diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c
--- u-boot-2021.04/drivers/gpio/pca953x_gpio.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/gpio/pca953x_gpio.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c 2025-01-24 23:55:39.020336332 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c 2025-03-09 09:39:10.000000000 +0000
@@ -373,6 +373,7 @@ @@ -373,6 +373,7 @@
{ .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), }, { .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), },
{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), }, { .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
...@@ -3029,7 +3049,7 @@ diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/dr ...@@ -3029,7 +3049,7 @@ diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/dr
diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c
--- u-boot-2021.04/drivers/misc/fru_eeprom.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/drivers/misc/fru_eeprom.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c 2025-01-24 23:55:39.024336405 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,939 @@ @@ -0,0 +1,939 @@
+ +
+#include <errno.h> +#include <errno.h>
...@@ -3972,7 +3992,7 @@ diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/driv ...@@ -3972,7 +3992,7 @@ diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/driv
+U_BOOT_CMD(frudump, 3, 1, do_fru_dump, "Dump FMC Card Details", "fru-dump <i2c Bus No> <Chip Address>"); +U_BOOT_CMD(frudump, 3, 1, do_fru_dump, "Dump FMC Card Details", "fru-dump <i2c Bus No> <Chip Address>");
diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig
--- u-boot-2021.04/drivers/misc/Kconfig 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/misc/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig 2025-01-24 23:55:39.024336405 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig 2025-03-09 09:39:10.000000000 +0000
@@ -377,6 +377,12 @@ @@ -377,6 +377,12 @@
help help
Enable a generic driver for EEPROMs attached via I2C. Enable a generic driver for EEPROMs attached via I2C.
...@@ -3988,7 +4008,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/m ...@@ -3988,7 +4008,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/m
bool "Enable driver for generic I2C-attached EEPROMs for SPL" bool "Enable driver for generic I2C-attached EEPROMs for SPL"
diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/misc/Makefile diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/misc/Makefile
--- u-boot-2021.04/drivers/misc/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/misc/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/Makefile 2025-01-24 23:55:39.024336405 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/Makefile 2025-03-09 09:39:10.000000000 +0000
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o
endif endif
...@@ -3999,7 +4019,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/ ...@@ -3999,7 +4019,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/
obj-$(CONFIG_SANDBOX) += spltest_sandbox.o obj-$(CONFIG_SANDBOX) += spltest_sandbox.o
diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c
--- u-boot-2021.04/drivers/net/zynq_gem.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/net/zynq_gem.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c 2025-01-24 23:55:39.024336405 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c 2025-03-09 09:39:10.000000000 +0000
@@ -63,11 +63,7 @@ @@ -63,11 +63,7 @@
#define ZYNQ_GEM_NWCFG_FSREM 0x00020000 /* FCS removal */ #define ZYNQ_GEM_NWCFG_FSREM 0x00020000 /* FCS removal */
#define ZYNQ_GEM_NWCFG_SGMII_ENBL 0x08000000 /* SGMII Enable */ #define ZYNQ_GEM_NWCFG_SGMII_ENBL 0x08000000 /* SGMII Enable */
...@@ -4014,7 +4034,7 @@ diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers ...@@ -4014,7 +4034,7 @@ diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers
# define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */ # define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */
diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/autoconf.mk diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/autoconf.mk
--- u-boot-2021.04/include/autoconf.mk 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/autoconf.mk 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/autoconf.mk 2025-01-24 23:55:39.028336477 +0000 +++ u-boot-2021.04-iwaveg35m/include/autoconf.mk 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+CONFIG_SYS_BOOTM_LEN="(60 * 1024 * 1024)" +CONFIG_SYS_BOOTM_LEN="(60 * 1024 * 1024)"
+CONFIG_SYS_LOAD_ADDR=0x8000000 +CONFIG_SYS_LOAD_ADDR=0x8000000
...@@ -4061,7 +4081,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/au ...@@ -4061,7 +4081,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/au
+CONFIG_BOARDDIR="board/xilinx/zynqmp" +CONFIG_BOARDDIR="board/xilinx/zynqmp"
diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep
--- u-boot-2021.04/include/autoconf.mk.dep 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/autoconf.mk.dep 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep 2025-01-24 23:55:39.028336477 +0000 +++ u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+include/config/auto.conf: include/common.h include/linux/kconfig.h \ +include/config/auto.conf: include/common.h include/linux/kconfig.h \
+ include/generated/autoconf.h include/config.h include/config_uncmd_spl.h \ + include/generated/autoconf.h include/config.h include/config_uncmd_spl.h \
...@@ -4150,7 +4170,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/includ ...@@ -4150,7 +4170,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/includ
+include/linux/byteorder/generic.h: +include/linux/byteorder/generic.h:
diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h
--- u-boot-2021.04/include/config_distro_bootcmd.h 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/include/config_distro_bootcmd.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h 2025-01-24 23:55:39.028336477 +0000 +++ u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h 2025-03-09 09:39:10.000000000 +0000
@@ -489,6 +489,23 @@ @@ -489,6 +489,23 @@
\ \
BOOT_TARGET_DEVICES(BOOTENV_DEV) \ BOOT_TARGET_DEVICES(BOOTENV_DEV) \
...@@ -4177,7 +4197,7 @@ diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35 ...@@ -4177,7 +4197,7 @@ diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35
BOOTENV_SET_IDE_NEED_INIT \ BOOTENV_SET_IDE_NEED_INIT \
diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/config.h diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/config.h
--- u-boot-2021.04/include/config.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/config.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/config.h 2025-01-24 23:55:39.028336477 +0000 +++ u-boot-2021.04-iwaveg35m/include/config.h 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+/* Automatically generated - do not edit */ +/* Automatically generated - do not edit */
+#define CONFIG_BOARDDIR board/xilinx/zynqmp +#define CONFIG_BOARDDIR board/xilinx/zynqmp
...@@ -4188,7 +4208,7 @@ diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/confi ...@@ -4188,7 +4208,7 @@ diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/confi
+#include <config_fallbacks.h> +#include <config_fallbacks.h>
diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h
--- u-boot-2021.04/include/configs/xilinx_zynqmp.h 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/include/configs/xilinx_zynqmp.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h 2025-01-24 23:55:39.032336550 +0000 +++ u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h 2025-03-09 09:39:10.000000000 +0000
@@ -19,6 +19,10 @@ @@ -19,6 +19,10 @@
#define GICD_BASE 0xF9010000 #define GICD_BASE 0xF9010000
#define GICC_BASE 0xF9020000 #define GICC_BASE 0xF9020000
...@@ -4200,9 +4220,46 @@ diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35 ...@@ -4200,9 +4220,46 @@ diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE
/* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */
@@ -111,9 +115,24 @@
"script_size_f=0x80000\0" \
#if defined(CONFIG_MMC_SDHCI_ZYNQ)
-# define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
+#define BOOTENV_DEV_MMC_AUTO(devtypeu, devtypel, instance) \
+ BOOTENV_DEV_MMC(MMC, mmc, 0) \
+ BOOTENV_DEV_MMC(MMC, mmc, 1) \
+ "bootcmd_mmc_auto=" \
+ "if test ${mmc_bootdev} -eq 1; then " \
+ "run bootcmd_mmc1; " \
+ "run bootcmd_mmc0; " \
+ "elif test ${mmc_bootdev} -eq 0; then " \
+ "run bootcmd_mmc0; " \
+ "run bootcmd_mmc1; " \
+ "fi\0"
+
+#define BOOTENV_DEV_NAME_MMC_AUTO(devtypeu, devtypel, instance) \
+ "mmc_auto "
+
+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC_AUTO, mmc_auto, na)
#else
-# define BOOT_TARGET_DEVICES_MMC(func)
+#define BOOT_TARGET_DEVICES_MMC(func)
#endif
#if defined(CONFIG_SATA_CEVA)
@@ -180,8 +199,8 @@
"jtag "
#define BOOT_TARGET_DEVICES(func) \
- BOOT_TARGET_DEVICES_JTAG(func) \
BOOT_TARGET_DEVICES_MMC(func) \
+ BOOT_TARGET_DEVICES_JTAG(func) \
BOOT_TARGET_DEVICES_QSPI(func) \
BOOT_TARGET_DEVICES_NAND(func) \
BOOT_TARGET_DEVICES_USB(func) \
diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h
--- u-boot-2021.04/include/configs/zynqmp_iwg35m.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/configs/zynqmp_iwg35m.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h 2025-01-24 23:55:39.032336550 +0000 +++ u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+/* +/*
+ * (C) Copyright 2018 - 2019 iWave System Technologies Pvt Ltd. + * (C) Copyright 2018 - 2019 iWave System Technologies Pvt Ltd.
...@@ -4227,7 +4284,7 @@ diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35 ...@@ -4227,7 +4284,7 @@ diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35
+#endif /* __CONFIG_ZYNQMP_IWG35M_H */ +#endif /* __CONFIG_ZYNQMP_IWG35M_H */
diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fru.h diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fru.h
--- u-boot-2021.04/include/iw_fru.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/iw_fru.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/iw_fru.h 2025-01-24 23:55:39.032336550 +0000 +++ u-boot-2021.04-iwaveg35m/include/iw_fru.h 2025-03-09 09:39:10.000000000 +0000
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* +/*
+ * fru.h + * fru.h
...@@ -4358,7 +4415,7 @@ diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fr ...@@ -4358,7 +4415,7 @@ diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fr
+ +
diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt
--- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt 2025-01-24 23:55:39.036336623 +0000 +++ u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt 2025-03-09 09:39:10.000000000 +0000
@@ -3986,4 +3986,5 @@ @@ -3986,4 +3986,5 @@
CONFIG_YAFFS_WINCE CONFIG_YAFFS_WINCE
CONFIG_YELLOW_LED CONFIG_YELLOW_LED
......
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