diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/meta-hpe/meta-dl360poc/conf/machine/dl360poc.conf b/meta-hpe/meta-dl360poc/conf/machine/dl360poc.conf index 1f27f8cbe5..0fe0a4c21c 100644 --- a/meta-hpe/meta-dl360poc/conf/machine/dl360poc.conf +++ b/meta-hpe/meta-dl360poc/conf/machine/dl360poc.conf @@ -1,9 +1,9 @@ KERNEL_DEVICETREE = "gxp.dtb" +UBOOT_MACHINE = "gxp_defconfig" + require conf/machine/include/gxp.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/hpe.inc -#PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "dl360poc-led-manager-config-native" - VIRTUAL-RUNTIME_obmc-fan-control ?= "phosphor-pid-control" diff --git a/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-fw-utils-gxp_2020.10.bb b/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-fw-utils-gxp_2020.10.bb index daf5a2cde1..8f37dc3ec5 100644 --- a/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-fw-utils-gxp_2020.10.bb +++ b/meta-hpe/meta-gxp/recipes-bsp/u-boot/u-boot-fw-utils-gxp_2020.10.bb @@ -3,9 +3,6 @@ require u-boot-common-gxp_2020.10.inc SRC_URI += "file://fw_env.config" SRC_URI += "file://alt_fw_env.config" -# FIXME - Get fw_printenv/fw_setenv tool -UBOOT_MACHINE ?= "gxp_defconfig" - SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" DEPENDS += "mtd-utils" diff --git a/meta-hpe/meta-rl300-g11/conf/machine/rl300-g11.conf b/meta-hpe/meta-rl300-g11/conf/machine/rl300-g11.conf index ad6922ac85..91752b8206 100644 --- a/meta-hpe/meta-rl300-g11/conf/machine/rl300-g11.conf +++ b/meta-hpe/meta-rl300-g11/conf/machine/rl300-g11.conf @@ -1,5 +1,7 @@ KERNEL_DEVICETREE = "gxp.dtb" +UBOOT_MACHINE = "gxp2_defconfig" + require conf/machine/include/gxp.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/hpe.inc |