From f55a0a36808747142ed5d842f8ca5d98aeea55dd Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Wed, 14 Sep 2022 12:02:47 +0300 Subject: IBS: Save MAC Addresses to U-Boot Env on Update Squashed commit of the following: commit 5b59ce70011059c5b18c4e17228af622a012ce44 Author: Evgeny Alekseev (IBS Group) Date: Wed Sep 14 11:55:07 2022 +0300 Initramfs init script. Add MAC address setting. commit 075246418649d997e6900bed9e865bfbd2d74635 Author: Evgeny Alekseev (IBS Group) Date: Thu Sep 1 13:29:11 2022 +0300 IBS: initrd obmc-init.sh script ifconfig=>ip* commit 972c9e269576ac6f500f3cc0b4d25f43cc1f8806 Author: Evgeny Alekseev (IBS Group) Date: Wed Sep 14 07:30:56 2022 +0300 FIX: swap eth0 and eth1 addresses commit 6c151f6a27211717bb831576a7cc1960c9574063 Author: Evgeny Alekseev (IBS Group) Date: Tue Sep 13 19:33:46 2022 +0300 IBS: Save MAC Addresses to U-Boot Env on Update IBS: Save MAC Addresses to U-Boot Env on Update Fix MAC1 get to save in u-boot env in obmc-update commit badebb57f518de898b3f786d632515ad84a25e64 Author: Evgeny Alekseev (IBS Group) Date: Tue Sep 13 19:15:07 2022 +0300 IBS: Save MAC Addresses to U-Boot Env on Update --- .../conf/machine/include/sila-ast2500.inc | 2 +- .../recipes-kernel/linux/linux-aspeed/sila.cfg | 2 +- .../recipes-bsp/u-boot/libubootenv/fw_env.config | 1 + .../recipes-bsp/u-boot/libubootenv/u-boot-initial-env | 7 +++++++ .../recipes-bsp/u-boot/libubootenv_%.bbappend | 10 ++++++++++ .../packagegroups/packagegroup-ibs-apps.bb | 1 + .../initrdscripts/obmc-phosphor-initfs/obmc-init.sh | 19 +++++++++++++++---- .../initrdscripts/obmc-phosphor-initfs/obmc-update.sh | 15 +++++++++++++++ .../images/obmc-phosphor-initramfs.bbappend | 2 ++ 9 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/fw_env.config create mode 100644 meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/u-boot-initial-env create mode 100644 meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv_%.bbappend create mode 100644 meta-ibs/meta-cp2-5422/recipes-phosphor/images/obmc-phosphor-initramfs.bbappend diff --git a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500.inc b/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500.inc index 66d5d179f1..0b91223b9a 100644 --- a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500.inc +++ b/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500.inc @@ -4,7 +4,7 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-${FACTORY}-${MACHINE}.dtb" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed" -PREFERRED_PROVIDER_u-boot-fw-utils = "u-boot-fw-utils-aspeed" +PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/sila.cfg b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/sila.cfg index 11d949f85c..b1fde7d7a8 100644 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/sila.cfg +++ b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/sila.cfg @@ -39,7 +39,7 @@ CONFIG_I2C_SLAVE_MQUEUE=y CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 CONFIG_ASPEED_BT_IPMI_BMC=n -CONFIG_ASPEED_LPC_CTRL=n +CONFIG_ASPEED_LPC_CTRL=y CONFIG_ASPEED_LPC_MBOX=y CONFIG_ASPEED_LPC_SIO=y CONFIG_ASPEED_LPC_SNOOP=y diff --git a/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/fw_env.config b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/fw_env.config new file mode 100644 index 0000000000..61e0e1e717 --- /dev/null +++ b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/fw_env.config @@ -0,0 +1 @@ +/dev/mtd2 0x00000 0x10000 diff --git a/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/u-boot-initial-env b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/u-boot-initial-env new file mode 100644 index 0000000000..8ce22f4caf --- /dev/null +++ b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv/u-boot-initial-env @@ -0,0 +1,7 @@ +bootargs=console=ttyS4,115200n8 root=/dev/ram rw +bootcmd=bootm 20100000 +bootdelay=2 +baudrate=115200 +verify=yes +spi_dma=yes + diff --git a/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv_%.bbappend b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv_%.bbappend new file mode 100644 index 0000000000..39e097fdd1 --- /dev/null +++ b/meta-ibs/meta-common/recipes-bsp/u-boot/libubootenv_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" +SRC_URI:append = " file://fw_env.config \ + file://u-boot-initial-env \ + " + +do_install:append() { + install -d ${D}${sysconfdir} + install -m 0444 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 0444 ${WORKDIR}/u-boot-initial-env ${D}${sysconfdir}/u-boot-initial-env +} diff --git a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb index 4ef5d9f254..73a541f635 100644 --- a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb +++ b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb @@ -44,6 +44,7 @@ RDEPENDS:${PN}-flash = " \ SUMMARY:${PN}-system = "System software" RDEPENDS:${PN}-system = " \ + libubootenv-bin \ dbus-sensors \ entity-manager \ intel-ipmi-oem \ diff --git a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh index 5c894bdffa..ac685e7494 100644 --- a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh +++ b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-init.sh @@ -419,16 +419,27 @@ mkdir -p $upper $work nfs_bootargs=$(get_fw_env_var nfs_bootargs) ipaddr=$(get_fw_env_var ipaddr) netmask=$(get_fw_env_var netmask) +ethif=$(get_fw_env_var ethif) +#Specialy swap mac addresses because of u-boot swap +mac0=$(get_fw_env_var eth1addr) +mac1=$(get_fw_var eth0addr) +ip link set dev eth0 down +ip link set dev eth1 down +ip link set dev eth0 address $mac0 +ip link set dev eth1 address $mac1 +ip link set dev eth0 up +ip link set dev eth1 up if [ -n "$nfs_bootargs" ] then echo NFS bootargs: $nfs_bootargs echo IP_ADDR: $ipaddr - ifconfig eth1 $ipaddr - ifconfig eth0 $ipaddr - ifconfig eth0 netmask $(netmask) - ifconfig eth1 netmask $(netmask) + echo "ip a add $ipaddr/$netmask dev $ethif" + ip link set dev eth0 down + ip link set dev eth1 down + ip a add $ipaddr/$netmask dev $ethif + ip link set dev $ethif up echo mounting NFS rootfs mount -t nfs -v $nfs_bootargs /root -o nolock,rw else diff --git a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-update.sh b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-update.sh index bd4cfb14d4..8e2f2c4f06 100644 --- a/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-update.sh +++ b/meta-ibs/meta-common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/obmc-update.sh @@ -287,4 +287,19 @@ then rm -rf $save fi + +# +# Save current MAC Address: +# ======================== +# +mac0=`ifconfig eth0 | grep HWaddr | tr -s ' ' | cut -f5 -d' '` +mac1=`ifconfig eth1 | grep HWaddr | tr -s ' ' | cut -f5 -d' '` + +echo "Saving MAC addresses to u-boot env." +echo "eth0: ${mac0}" +echo "eth1: ${mac1}" +fw_setenv ethaddr ${mac1} 2>/dev/null +fw_setenv eth0addr ${mac1} 2>/dev/null +fw_setenv eth1addr ${mac0} 2>/dev/null + exit diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/images/obmc-phosphor-initramfs.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/images/obmc-phosphor-initramfs.bbappend new file mode 100644 index 0000000000..3fceb4f108 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/images/obmc-phosphor-initramfs.bbappend @@ -0,0 +1,2 @@ +PACKAGE_INSTALL:append = "libubootenv-bin" + -- cgit v1.2.3