meta-ampere: mtjade: switch to use u-boot 2019.04
u-boot 2016.07 does not work well with 64MB SPI-NOR layout, which has
the following issues:
- Incorrect environment variable configuration which makes fail to boot
to kernel and has fw_setenv/fw_getenv commands not work.
- Even update the patch in meta-phosphor to fix above issue, still has
issue with setting environment variable in Linux which makes factory
reset failure each 2 times.
This commit changes to use u-boot 2019.04 to fix above issue.
Tested:
1. Do factory reset and check if the BMC can boot to kernel.
2. Trigger factory reset via Redfish multiple times (6 times) and verify
if the factory reset action can be executed at all times.
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Ibb269d96a2e2b509aeccbeeaa130aad57093d139
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 5854dff..0266fee 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -1,10 +1,8 @@
KMACHINE = "aspeed"
KERNEL_DEVICETREE = "${KMACHINE}-bmc-ampere-${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"
-UBOOT_MACHINE = "ast_g5_phy_config"
+UBOOT_MACHINE = "evb-ast2500_defconfig"
+UBOOT_DEVICETREE = "ast2500-evb"
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
@@ -13,10 +11,6 @@
# Reformat SPI flash layout to 64MB
FLASH_SIZE = "65536"
-FLASH_UBOOT_OFFSET = "0"
-FLASH_KERNEL_OFFSET = "1024"
-FLASH_ROFS_OFFSET = "10240"
-FLASH_RWFS_OFFSET = "43008"
MACHINE_FEATURES += "\
obmc-phosphor-chassis-mgmt \
diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk/ampere.cfg b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk/ampere.cfg
new file mode 100644
index 0000000..1fa5d6b
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk/ampere.cfg
@@ -0,0 +1,3 @@
+CONFIG_PHY_NCSI=n
+CONFIG_CMD_MMC=n
+CONFIG_MMC_SDHCI_ASPEED=n
diff --git a/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
new file mode 100644
index 0000000..4cac8de
--- /dev/null
+++ b/meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+ file://ampere.cfg \
+ "