From 9c8c98545becdb348a6d72f68071d15d1cacff8e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 23 Mar 2018 17:24:31 -0400 Subject: aspeed: cleanup u-boot-fw-utils config Move files with identical content to the base aspeed layer. Remove unnecessary u-boot bbappends as the u-boot binary does not depend on fw_env.config content. Tested: Built u-boot and fw-utils recipes, validated packages Change-Id: Iee3d3f76b93ff5f6d59ebeb18f08ad42cb6d187b Signed-off-by: Brad Bishop --- .../recipes-bsp/u-boot/files/alt_fw_env.config | 25 ++++++++++++++++++++++ .../common/recipes-bsp/u-boot/files/fw_env.config | 25 ++++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb | 8 +++++-- .../recipes-bsp/u-boot/files/alt_fw_env.config | 25 ---------------------- .../recipes-bsp/u-boot/files/fw_env.config | 25 ---------------------- .../recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend | 14 ------------ .../recipes-bsp/u-boot/u-boot_%.bbappend | 4 ---- .../recipes-bsp/u-boot/files/alt_fw_env.config | 25 ---------------------- .../recipes-bsp/u-boot/files/fw_env.config | 25 ---------------------- .../recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend | 14 ------------ .../recipes-bsp/u-boot/u-boot_%.bbappend | 4 ---- 11 files changed, 56 insertions(+), 138 deletions(-) create mode 100644 meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config create mode 100644 meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/alt_fw_env.config delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/alt_fw_env.config delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/fw_env.config delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend delete mode 100644 meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config new file mode 100644 index 000000000..3d85f9974 --- /dev/null +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config @@ -0,0 +1,25 @@ +# Configuration file for fw_(printenv/setenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. +# Furthermore, if the Flash sector size is omitted, this value is assumed to +# be the same as the Environment size, which is valid for NOR and SPI-dataflash + +# NOR example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd1 0x0000 0x20000 0x20000 +#/dev/mtd2 0x0000 0x4000 0x4000 + +# MTD SPI-dataflash example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd2 0x00000 0x20000 +/dev/mtd/alt-u-boot-env 0x00000 0x10000 +/dev/mtd/alt-u-boot-env 0x10000 0x10000 +#/dev/mtd5 0x4200 0x4200 +#/dev/mtd6 0x4200 0x4200 + +# NAND example +#/dev/mtd0 0x4000 0x4000 0x20000 2 + +# Block device example +#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config new file mode 100644 index 000000000..19ace4b88 --- /dev/null +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config @@ -0,0 +1,25 @@ +# Configuration file for fw_(printenv/setenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. +# Furthermore, if the Flash sector size is omitted, this value is assumed to +# be the same as the Environment size, which is valid for NOR and SPI-dataflash + +# NOR example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd1 0x0000 0x20000 0x20000 +#/dev/mtd2 0x0000 0x4000 0x4000 + +# MTD SPI-dataflash example +# MTD device name Device offset Env. size Flash sector size Number of sectors +#/dev/mtd2 0x00000 0x20000 +/dev/mtd/u-boot-env 0x00000 0x10000 +/dev/mtd/u-boot-env 0x10000 0x10000 +#/dev/mtd5 0x4200 0x4200 +#/dev/mtd6 0x4200 0x4200 + +# NAND example +#/dev/mtd0 0x4000 0x4000 0x20000 2 + +# Block device example +#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb index 9bba67e3e..2b2b62c9e 100644 --- a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb +++ b/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb @@ -1,6 +1,8 @@ require u-boot-common_${PV}.inc SRC_URI += "file://default-gcc.patch" +SRC_URI += "file://fw_env.config" +SRC_URI += "file://alt_fw_env.config" SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS = "mtd-utils" @@ -18,10 +20,12 @@ do_compile () { do_install () { install -d ${D}${base_sbindir} - install -d ${D}${sysconfdir} install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config } do_install_class-cross () { diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/alt_fw_env.config deleted file mode 100644 index 3d85f9974..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/alt_fw_env.config +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. -# Furthermore, if the Flash sector size is omitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# NOR example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd1 0x0000 0x20000 0x20000 -#/dev/mtd2 0x0000 0x4000 0x4000 - -# MTD SPI-dataflash example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd2 0x00000 0x20000 -/dev/mtd/alt-u-boot-env 0x00000 0x10000 -/dev/mtd/alt-u-boot-env 0x10000 0x10000 -#/dev/mtd5 0x4200 0x4200 -#/dev/mtd6 0x4200 0x4200 - -# NAND example -#/dev/mtd0 0x4000 0x4000 0x20000 2 - -# Block device example -#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config deleted file mode 100644 index 19ace4b88..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. -# Furthermore, if the Flash sector size is omitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# NOR example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd1 0x0000 0x20000 0x20000 -#/dev/mtd2 0x0000 0x4000 0x4000 - -# MTD SPI-dataflash example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd2 0x00000 0x20000 -/dev/mtd/u-boot-env 0x00000 0x10000 -/dev/mtd/u-boot-env 0x10000 0x10000 -#/dev/mtd5 0x4200 0x4200 -#/dev/mtd6 0x4200 0x4200 - -# NAND example -#/dev/mtd0 0x4000 0x4000 0x20000 2 - -# Block device example -#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend deleted file mode 100644 index 9f501ba30..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/files:" - -SRC_URI_append_ast2400 = " file://fw_env.config" -SRC_URI_append_ast2400 += "file://alt_fw_env.config" - -do_install_append_ast2400() { - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config - fi -} - -BBCLASSEXTEND += "native" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend deleted file mode 100644 index c2805ea2a..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2400 := "${THISDIR}/files:" - -SRC_URI_append_ast2400 = " file://fw_env.config" -SRC_URI_append_ast2400 += "file://alt_fw_env.config" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/alt_fw_env.config deleted file mode 100644 index 3d85f9974..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/alt_fw_env.config +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. -# Furthermore, if the Flash sector size is omitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# NOR example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd1 0x0000 0x20000 0x20000 -#/dev/mtd2 0x0000 0x4000 0x4000 - -# MTD SPI-dataflash example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd2 0x00000 0x20000 -/dev/mtd/alt-u-boot-env 0x00000 0x10000 -/dev/mtd/alt-u-boot-env 0x10000 0x10000 -#/dev/mtd5 0x4200 0x4200 -#/dev/mtd6 0x4200 0x4200 - -# NAND example -#/dev/mtd0 0x4000 0x4000 0x20000 2 - -# Block device example -#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/fw_env.config deleted file mode 100644 index 19ace4b88..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/files/fw_env.config +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash. -# Furthermore, if the Flash sector size is omitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# NOR example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd1 0x0000 0x20000 0x20000 -#/dev/mtd2 0x0000 0x4000 0x4000 - -# MTD SPI-dataflash example -# MTD device name Device offset Env. size Flash sector size Number of sectors -#/dev/mtd2 0x00000 0x20000 -/dev/mtd/u-boot-env 0x00000 0x10000 -/dev/mtd/u-boot-env 0x10000 0x10000 -#/dev/mtd5 0x4200 0x4200 -#/dev/mtd6 0x4200 0x4200 - -# NAND example -#/dev/mtd0 0x4000 0x4000 0x20000 2 - -# Block device example -#/dev/mmcblk0 0xc0000 0x20000 diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend deleted file mode 100644 index 0f46f1520..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:" - -SRC_URI_append_ast2500 = " file://fw_env.config" -SRC_URI_append_ast2500 += "file://alt_fw_env.config" - -do_install_append_ast2500() { - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config - fi -} - -BBCLASSEXTEND += "native" diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend deleted file mode 100644 index ae77edd6f..000000000 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:" - -SRC_URI_append_ast2500 = " file://fw_env.config" -SRC_URI_append_ast2500 += "file://alt_fw_env.config" -- cgit v1.2.3