summaryrefslogtreecommitdiff
path: root/meta-aspeed/recipes-bsp
AgeCommit message (Collapse)AuthorFilesLines
2022-03-30Merge tag '1-0.91' of ↵P Dheeraj Srujan Kumar4-0/+9
github.com:intel-innersource/firmware.bmc.openbmc.yocto.openbmc into update
2022-01-06Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into updateJason M. Bills3-9/+13
2021-12-30Fix the config error of u-boot-envzhanghaicheng4-0/+9
When using 64M flash, the config of u-boot CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET is wrong. The config file fw_env.config is wrong, too. Modify them according to the 64M flash dts file. Before correcting these errors, when we used setenv to set environment variables in u-boot, we could not use fw_printenv to get them. The reverse is also the same. Because they set different offset and size. Tested: 1. Use commands in u-boot: setenv test value saveenv After BMC starts, use fw_printenv can get "test=value" 2. Use the command to change the value of "test" fw_setenv test v We can get "test=v" in u-boot by printenv. Signed-off-by: zhanghaicheng <zhanghch05@inspur.com> Change-Id: I9eccf6abe743253b6f8c344a8b8648e68ab52019
2021-10-11u-boot-aspeed: use upstream u-boot.incAndrei Kartashev3-8/+12
Move u-boot-aspeed-sdk to use u-boot.inc from poki instead our own. We still need our own one for old u-boot-aspeed, so keep it as is. Tested: Build image for AST2500-based machine with u-boot-aspeed-sdk_2019.04, verified that it boots up and fw-utils installed to the image properly. Signed-off-by: Andrei Kartashev <a.kartashev@yadro.com> Change-Id: Ia5fecdedc94e9550196420884a727e7d87b313d4
2021-10-08u-boot-aspeed: Fix booting with HACEJoel Stanley1-1/+1
Joel Stanley (1): aspeed/hace: Reset when error occurs Change-Id: I10ec988f7b0b01aa76a4338ef095fbe80b4229ec Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-09-28Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills5-21/+32
into update
2021-08-30meta-aspeed: u-boot-aspeed-sdk: Ensure SOCSEC_SIGN defaults are setAndrew Jeffery1-1/+2
Include the socsec-sign class after the conditional assignments to ensure the values we might assign are considered by the functions of socsec-sign. Without this, u-boot-aspeed-sdk do_deploy logs show: ``` DEBUG: Executing python function sstate_task_prefunc DEBUG: Python function sstate_task_prefunc finished DEBUG: Executing shell function do_deploy Copying u-boot-nodtb binary... Warning: Invalid socsec signing key - SPL verified boot won't be available ``` Adjusting the location of the include gives: ``` DEBUG: Executing python function sstate_task_prefunc DEBUG: Python function sstate_task_prefunc finished DEBUG: Executing shell function do_deploy Copying u-boot-nodtb binary... check header PASS Found PEM header at position 381 check integrity PASS ``` Change-Id: I15cac4c315a6ceaeb69b0c02ba0b7d05e54f6e15 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
2021-08-23u-boot-aspeed: improve env handlingAndrei Kartashev3-1/+7
This fixes some build errors we faced due to add new ast2500-based platform. * Allow to redefine input env file. * Backport providing "u-boot-default-env" from u-boot.inc * PROVIDES += "u-boot-fw-utils" is not enough, add also RPROVIDES Last two changes allows to exclude from build modern libubootenv which somewhy doesn't work for us. Signed-off-by: Andrei Kartashev <a.kartashev@yadro.com> Change-Id: I33f152c572f6c0b4d8b608375b252290efacd1ea
2021-08-17meta-aspeed: u-boot-aspeed-sdk: Use provided signing key by defaultAndrew Jeffery1-0/+4
Allow configurations to override the SPL signing key if necessary, but provide a default in case they don't. The provided key is intended a low-security key. Change-Id: I756271970b0a55409e40dbd06f1245ada6a3cb73 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
2021-08-11meta-aspeed: prep for new override syntaxPatrick Williams5-19/+19
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I8135871ae0e3b360aff7d878f7cf04a2504f2dd0
2021-07-30Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills2-7/+9
into update
2021-06-24u-boot-aspeed: MMC env and AST2600 SPI boot fixesJoel Stanley1-1/+1
Adriana Kobylak (1): configs: aspeed-common: Add redundant env for mmc Troy Lee (2): ast2600: spl: Fixes boot from RAM device ast2600: Provide u-boot FIT image boot from RAM offset Change-Id: I9fd8c76593d83d32504288a6405c2b4c41fdb381 Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-06-24Merge tag '0.57' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills5-43/+83
into update
2021-06-22u-boot-aspeed: Add environment for booting from mmcJoel Stanley1-2/+2
This adds the u-boot environment to the u-boot binary. On the 2600 with mmc we currently rely on the default environment being populated in the image. This has the downside that if something corrupts the environment, the system won't know how to boot itself. This wasn't a problem for NOR based systems as the built in command knew how to boot the system (unless you were using a 'special' setup such as Witherspoon's UBI setup). The ast2600_openbmc_mmc.txt is copied from meta-aspeed/recipes-bsp/u-boot/files/u-boot-env-ast2600.txt. Adriana has indicated she will update openbmc to use the .txt from the u-boot tree to generate the filesystem image (or we could stop doing that, and simply use the default?). The environment processing step requires xxd on the build system. Joel Stanley (2): Makefile: Conditionally add defaultenv_h to envtools target ast2600: Add environment for booting from mmc Change-Id: I0381ac168285bade75115b7b415e18dd7fc8694e Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-06-21AST2600: Update default env for multiple FIT configEddie James1-5/+7
Add environment variables to the AST2600 to boot a certain FIT configuration of the kernel based on the "fitconfig" environment variable. The boot command will fall back to the default FIT config in case all other boot attempts fail. Also fix the kernel boot arguments in the case that boot failure occurs. The boot sequence would be: - boota with fitconfig, if it fails: - boota without fitconfig, if it fails: - bootb with fitconfig, if it fails: - bootb without fitconfig Tested: Set fitconfig to a dummy variable, and also changed the bootm command to a dummy command to force a boot failure, and verified the sequence was as expected: ast# boot boota Error loading kernel FIT image with fitconfig rainier-dummy Unknown command 'bootm-dummy' - try 'help' Error loading kernel FIT image bootb Error loading kernel FIT image with fitconfig rainier-dummy Unknown command 'bootm-dummy' - try 'help' Error loading kernel FIT image Signed-off-by: Eddie James <eajames@linux.ibm.com> Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Change-Id: I14cf935a707bdb95b0a6e4e607919ea0e027d18c
2021-05-25u-boot-aspeed: Move to SDK v00.04.00Joel Stanley1-1/+1
This rebases on the latest SDK release. Notably this release includes support for the A3 and disables debug backdoors in line with the defaults in the A3 silicon. Changes kept downstream from ASPEED's SDK in the OpenBMC branch: Eddie James (1): ARM: dts: Aspeed: Tacoma and Rainier: Add eMMC nodes and parameters Joel Stanley (15): board: ast2600: Disable eSPI early init by default dts: ast2600-evb: Enable FSI masters tools: Add script for generating recovery image configs: Add OpenBMC spl defconfig for AST2600 boards clk: ast2600: Add divisor settings for 100MHz PLL ram: ast2600: Enable device tree based DDR config ast2600: tacoma: Run DDR at 1333 ast2600: Allow selection of SPL boot devices ast2600: Modify SPL SRAM layout crypto: Add driver for Aspeed HACE ast2600: Enable HACE probing in SPL ast2600: Add HACE to device tree ast2600: spl: Add ASPEED_LOADERS option ast2600: spl: Support common boot loader features config: ast2600: Add config for SPL MMC boot with FIT signature verification Changes in the ASPEED SDK when moving from v00.03.03 include the branch of fixes that were backported for FIT support, plus the following changes from the ASPEED team: Bing-Hua Wang (3): configs: evb-ast2500-spl_defconfig: Use platform.S DDR init ast2500: spl: Skip SPI timing calibration ast2500: Fix VRAM size detection Chia-Wei Wang (2): ast2600: Disable backdoor to align A3 design ast2600: Enable UART Debug based on FWSPIMISO Chia-Wei, Wang (4): board: ast2600: Add eSPI early init sequence board: ast2600-intel: Add Intel EGS CRB support aspeed: ast2600: Fix incorrect chip revision ID board: ast2600: Enable eSPI early init by default Chin-Ting Kuo (4): sdhci: ast2600: HS200 support porting mmc: Enable SDMA feature when boot from eMMC uart: Fix UART1 route problem on A3 spi-nor: Porting MT25Q02G flash part Dylan Hung (18): cmd:aspeed: fix missing setting for the tx single packet cmd:aspeed: change broadcom id matching cmd:aspeed: add support of broadcom 54210/54213 test cmd:aspeed: refactor phy internal loopback cmd:aspeed: fix typo cmd:aspeed: remove redundant debug print cmd:aspeed: skip deselect package for I350 IOP issue cmd:aspeed: add NCSI_VERBOSE_TEST (default off) cmd:aspeed: add 100ms for phy ready cmd:aspeed: bug fixed of the length decoding of the dramtest arm:dts: revise ast2600 mac1/2 rgmii delay setting net:phy: add phy-mode support on broadcom 5461 series cmd:aspeed: add phy tx/rx delay control arguments cmd:aspeed: add bcm54615, rtl8211f and marvell88e15 delay setting cmd:aspeed: restore default page ram:aspeed: revise coding style ram:aspeed: refactor coding style arm:dts: revise rgmii tx/rx delay Fugang Duan (1): net: phy: realtek: add rx delay support for RTL8211F Jamin Lin (1): Add evb-ast2600-obmc-emmc-cot_defconfig config to support AST2600 emmc secure boot for OpenBMC Johnny Huang (6): otp: fix a1 program issue otp: fix otp cmd stuck otp: update version number to 1.0.2 otp: add AST2600A3 secure boot: fix public key exponent otp: update print otp image Ryan Chen (3): AST2600:platform.S for AST2600A3 fix for reset. it will apply for AST2600A1/A2/A3 ast2600:ddr: fix memory bandwidth issue sdram : ast2600 Troy Lee (2): config: ast2600: support OpenBMC boot from eMMC image config: ast2600-evb for openbmc boot command update chin-ting_kuo (1): Revert "mmc: Enable SDMA feature when boot from eMMC" The previous version of v2019.04-aspeed-openbmc is kept in the branch archive/v2019.04-aspeed-openbmc-3. Change-Id: Ie492bdbfaec32c3e3e0caf8d4fa1806fcd1febec Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-05-19meta-aspeed: Add development key for socsec signKlaus Heinrich Kiwi3-0/+81
Add a development (insecure, also known as 'imprint') key to u-boot-aspeed-sdk that can be used through socsec for signing the SPL on ASPEED AST2600 devices. The keypair was generated according to socsec's documentation, using: $ openssl genrsa -out rsa_oem_dss_key.pem 4096 $ openssl rsa -in rsa_oem_dss_key.pem -pubout \ -out rsa_pub_oem_dss_key.pem Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Change-Id: I9c03ed9603d7362e033862dd1e5138ba7164f13d
2021-05-19meta-aspeed: Add socsec SPL signing for AST2600Klaus Heinrich Kiwi1-0/+1
Add the necessary build infrastructure to allow ASPEED AST2600 devices to use socsec to sign the U-boot SPL, allowing Aspeed's Verified Boot to validate it. Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Change-Id: I7b38a59596819982f0a222812fcc64dfb91e104f
2021-05-19meta-aspeed: Move definitions from u-boot-aspeedKlaus Heinrich Kiwi1-42/+0
Commit '3b8a17c1d7 poky: subtree update:7d0988966c..1203d1f24d' pulls a change from openembedded-core ('cc6c3e3152 u-boot: Move definitions to common locations') that moves some definitions from u-boot.inc to other places. As u-boot-aspeed and u-boot-aspeed-sdk recipes in the meta-aspeed layer have their own version of this file (u-boot-aspeed.inc), apply the same changes that were applied to openembedded-core, which is where those recipes were based on initially, to keep them consistent and allow the use of functionality that was introduced as part of that series as well (i.e., '5af4dfe83c u-boot: Add infrastructure to SPL verified boot' on the openembedded-core tree). Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Change-Id: If9fd1eebf988d341ed1e3adc46276daa56598cba
2021-04-29u-boot-aspeed: Update to SDK v00.03.03 and HACE supportJoel Stanley1-1/+1
This updates the OpenBMC u-boot tree to use ASPEED's latest SDK, and adds support for FIT verification including use of the HACE to perform SHA calculations on the ast2600. The changes come in three categories; fixes backported and sent to ASPEED for merging in a future SDK release, patches carried that are specific to OpenBMC, and the new FIT and HACE support. Note that this does not remove the legacy image support from the SPL, so there is no dependency on the changes to load u-boot as a FIT. Fixes backported from upstream and set to ASPEED: Harald Seiler (1): common: hash: Remove a debug printf statement Heinrich Schuchardt (2): fit: check return value of fit_image_get_data_size() image-fit: fit_check_format check for valid FDT Jean-Jacques Hiblot (1): spl: fit: don't load the firmware twice Joel Stanley (4): hw_sha: Fix coding style errors hash: Allow for SHA512 hardware implementations net/ncsi: Remove debugging fit: Use hash.c to call SHA code Patrick Doyle (1): rsa: reject images with unknown padding Reuben Dowle (1): Add support for SHA384 and SHA512 Simon Glass (3): image: Be a little more verbose when checking signatures image: Return an error message from fit_config_verify_sig() image: Check hash-nodes when checking configurations Patches carried in the OpenBMC fork: Eddie James (3): ARM: dts: Aspeed: Tacoma and Rainier: Add eMMC nodes and parameters arch: ARM: Aspeed: Add SPL eMMC partition boot support configs: Add AST2600 SPL eMMC configuration Joel Stanley (11): dts: ast2600-evb: Enable FSI masters tools: Add script for generating recovery image configs: Add OpenBMC spl defconfig for AST2600 boards clk: ast2600: Add divisor settings for 100MHz PLL ram: ast2600: Enable device tree based DDR config ast2600: tacoma: Run DDR at 1333 ast2600: Allow selection of SPL boot devices config: ast2600: Reduce SPL image size ast2600: Modify SPL SRAM layout config: ast2600: Enable FIT signature verification clk: aspeed: Add HACE yclk to ast2600 Features added for FIT verification and HACE support: Joel Stanley (10): configs/ast2600: Make early malloc pool larger crypto: Add driver for Aspeed HACE ast2600: Enable HACE probing in SPL ast2600: Add HACE to device tree ast2600: spl: Add ASPEED_LOADERS option ast2600: spl: Support common boot loader features config: ast2600: Configure common MMC SPL loader configs: ast2600: Enable FIT SHA512 support ast2600: Configure u-boot load size configs: ast2600: Use non-a1 config for openbmc spl emmc Change-Id: I4e5a1adb6e2bf17823b042c31b151bfdad9d3175 Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-03-26Merge tag '0.43' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills1-1/+1
into update
2021-03-09Merge tag '0.35' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills1-1/+1
into update
2021-01-30u-boot-aspeed: SHA512 backport and FIT bugfixesJoel Stanley1-1/+1
These patches bring SHA512 support to the FIT in u-boot, SPL and mkimage. The majority of the feature comes in with "Add support for SHA384 and SHA512", while the rest are relevant bugfixes that have been made to master since v2019.04. There is not yet a change to the configuration to enable the new algorithm and therefore only a minor image size change (an increase of 247 bytes due to "image: Check hash-nodes when checking configurations"). Harald Seiler (1): common: hash: Remove a debug printf statement Heinrich Schuchardt (1): image-fit: fit_check_format check for valid FDT Joel Stanley (1): ast2600: spl: Include RAM loader in BL2 ifdef Patrick Doyle (1): rsa: reject images with unknown padding Reuben Dowle (1): Add support for SHA384 and SHA512 Simon Glass (3): image: Be a little more verbose when checking signatures image: Return an error message from fit_config_verify_sig() image: Check hash-nodes when checking configurations Change-Id: I69d7ac29d8c4d710c57fc6a45b1c48022e6808c0 Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-01-28u-boot-aspeed: Enable FIT signature verificationJoel Stanley1-1/+1
This turns on FIT signature verification ("vboot") features in the ast2600_openbmc_spl_emmc_defconfig. A signed FIT will be checked by the loader (either SPl or u-boot proper). Heinrich Schuchardt (1): fit: check return value of fit_image_get_data_size() Joel Stanley (4): ast2600: Allow selection of SPL boot devices config: ast2600: Reduce SPL image size ast2600: Modify SPL SRAM layout config: ast2600: Enable FIT signature verification Change-Id: If0974fffc63072dc922b3bc5899a791adcdb40a3 Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-12-19u-boot-aspeed: FIT and FDT fixesJoel Stanley1-1/+1
Two backports from u-boot master relating to SPL signaturues, and a patch from Hongwei that was sent to the upstream list. Heiko Stuebner (2): spl: fit: select SPL_HASH_SUPPORT for SPL_FIT_SIGNATURE spl: fit: select SPL_CRYPTO_SUPPORT for SPL_FIT_SIGNATURE Hongwei Zhang (1): Common:fdt: Check for error return value (From meta-aspeed rev: e173b53d6d29d1489853379d78649f70420ca4c7) Change-Id: I1ad719b86de2a110fef44a27c584e74faedc5748 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-12-08Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc ↵Jason M. Bills6-3/+34
into update
2020-11-09u-boot-aspeed: u-boot on eMMC supportJoel Stanley1-1/+1
This adds a new configuration ast2600_openbmc_spl_emmc_defconfig that can be used on either emmc or nor systems. Note that it will try to locate the environment on emmc, so use on nor-only systems will always use the default environment. Machines that wish to use this configuration should set UBOOT_MACHINE in their <machinename>.conf. Eddie James (3): ARM: dts: Aspeed: Tacoma and Rainier: Add eMMC nodes and parameters arch: ARM: Aspeed: Add SPL eMMC partition boot support configs: Add AST2600 SPL eMMC configuration (From meta-aspeed rev: 1a970c012150cee8e5d937716f33e4f1c2e85e02) Change-Id: I53f6b39579529f7bb6d98f4ee9a3cb067dc75cb5 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-09-26u-boot-aspeed: Disable NCSI debugJoel Stanley1-1/+1
Joel Stanley (1): net/ncsi: Disable DEBUG (From meta-aspeed rev: 59eb0deec79fa1939a450e74b416b75591b47788) Change-Id: Ib3f7695606a936b86a8ff885ab2a5c9598eae736 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-09-25u-boot-aspeed: Rebase on aspeed-master-v2019.04Joel Stanley1-1/+1
As ASPEED develop their ast2600 u-boot features, we've had a need to integrate changes from their tree into the openbmc tree. In the past we lined this up with a major version bump (as with the kernel), meaning we could create a new branch with our "out of tree" changes applied on top. However, in this case their SDK is still based on the 2019.04 release, so there's not a clear way forward. I've chosen to rebase the openbmc changes on top of their branch. The old branch is still accessible at archive/v2019.04-aspeed-openbmc-1. The bitbake recipe will continue to work as it uses the nobranch=1 flag, and specifies the version based on the SHA. The new branch contains their aspeed-master-v2019.04 tree as of today, with the OpenBMC changes applied on top. The ASPEED changes include: - support for the ast2400 - Disable of buggy AXI prefetch feature - SPL, OTP and secure boot fixes - SPI flash updates and calibration changes - eMMC, Ethernet, fixes I've boot tested it running from SPI NOR on AST2600 A1 hardware, as well as QEMU, and it reached userspace. I will bump the bitbake recipe to integrate the changes into openbmc. Andreas Dannenberg (1): spl: Make image loader infrastructure more universal Chia-Wei, Wang (18): config: ast2600: Enable board early initialization ARM: dts: ast2600: Revert dm-pre-reloc property from eMMC configs: ast2600-slt: Change DRAM speed to 1600Mbps spl: fit: Separate FIT image load and processing spl: ast2600: Fix the load buffer address Revert "spl: fit: Separate FIT image load and processing" Revert "add LPC/eSPI storngest Driving Strength" configs: ast2600-slt: Add ENV default configuration aspeed: Fix compile warning ast2600: Remove AXI-prefetch support wdt: ast2600: Fix reset mask setting spl: ast2600: Add secure boot flow support update bootflow fix boots address configs: ast2600-fpga: Fix defconfig and header ARM: spl: Add SPL relocation support spl: ast2600: Add relocation support ARM: timer: ast2600: Add dynamic frequency detection Chin-Ting Kuo (22): spi: timing: Change timing calibration method spi-flash: w25q01jv flash model support spi-flash: aspeed: Remove unused variable spi: Add w25q512jvfm flash model boot: emmc: Boot from eMMC feature early porting emmc: Move "u-boot,dm-pre-reloc" flag to evb.dts spi-nor: Add flash model w25q01jvfim and fix typo mmc: SD: Add property for timing phase and drive type mmc: slt: Add timing phase and drive type for MMC spi: cpuinfo: Add ABR, spi_aux_pin info spi: crypress: Set 4B mode to controller when address width is 4 spi: AST2500: Modify ABR boot source log spi: scu_info: Simplify scu info log related to fmc/spi spi: ast2500: Porting spi1 setting spi-flash: Set FMC04/SPIR04[6:4] when enter 4B mode spi-flash: Use user mode under specific condition spi-flash: Modify SPI/FMC CE1 default decode address fpga: fixbug: Remove CONFIG_BOARD_EARLY_INIT_F dp: Update dp base address spi: bugfix: Do not change read command until flash probe fmc: Set FMC50[1] for waiting WIP idle eMMC: Do not fill FMC50[1] when boot from eMMC Dylan Hung (18): add rmii rclk oe control add rmii rclk pin control add board_ram_info for ast2600 series move borad_add_ram_info to borad_common.c fix FPGA RGMII pin setting revise fpga mac device fix typo don't print message in sdramphy_init write scu config back if vga config is "0" refactor code: add macro for ECC setup trim tailing whitespaces don't re-init ecc if dram has been initialized fix ncsi build don't reserve VGA memory if efuse bit is set fix fpga booting add ast2650 fpga config remove dram initialization from platfrom.S remove mac init from platform.S Joel Stanley (7): dts: ast2600-evb: Enable FSI masters aspeed: Add machine names tools: Add script for generating recovery image configs: Add OpenBMC spl defconfig for AST2600 boards clk: ast2600: Add divisor settings for 100MHz PLL ram: ast2600: Enable device tree based DDR config ast2600: tacoma: Run DDR at 1333 Johnny Huang (37): otp: remove print process otp: ignore data region last 2 dw when program otp: program 2 dw then verify 2 dw when program data region otp: skip print data info when no key otp: set default value for otp strap programming rng: add aspeed rng cmd spl: fix duplicate define CONFIG_SYS_MONITOR_LEN defconfig: cot: reduce spl code size config: remove tftpput secure boot: fix hace reset and compile warning clk: rsa clock source set to hpll update otp patch code otp update otp: udpate program otp: udpate strap otp: update strap program bit otp: udpate strap read otp: reduce the code spl: ast2600: update secure boot flow defconfig: ast2600: update spl config spl: aspeed: fix ecc build secure: update bl2 verify secureboot: update bl3 verify aspeed: emmc: support emmc boot defconfig: support new boot flow defconfig: rename ast2600a1 as defaut config fix merge error defconfig: aspeed: update ecc config for new boot flow Revert "defconfig: aspeed: update ecc config for new boot flow" defconfig: aspeed: update ecc config for new boot flow otp: fix ast2600a1 info defconfig: enable position independent to support boot from uart config: enable CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK as default for ast2600 boot0: aspeed: add image size header for boot form sram cmd: otp: udpate for ast2600a2 update ast2600a2 otp register setup otp: fix compile warning and add strap info Peter Robinson (1): Remove redundant YYLOC global declaration ryan_chen (40): add link status update gpio driver fix i2c pinctrl update sd/emmc controller source update add ibm platform add kconfig for env add ast2600 openbmc defconfig fix env compile error update pcie driver mv to cmd/aspeed folder update for mv cmd/aspeed folder add pll test update full test update clk add display port driver add ast2600 defconfig update mac info update dp driver update hclk setting update axi ahb div cal update dp firmwire add more desciption about eMMC clk source update file mode update ast2400 have 32kbyte add ast2400 ompatible add ast2400 add reset for ast2400 add ast2400 include file add ast2400 board add ast2400 defconfig add ast2400 pinctrl update ast2400 reset add ast2400 clk add ast2400 defconfig update ast2500 add mac for ast2400 add for ast2400 add ast2400 clk Video format look-up table is updated for 640x480@85Hz (From meta-aspeed rev: 9d5ae052312dc45a645dc5e7ab8a9daf4ef686d6) Change-Id: I50a06ca91d86f4548d47e85e215ace4498c0c9a8 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-08-07u-boot-aspeed: Fix DTC buildJoel Stanley1-1/+1
Zane reported that gcc 10 will fail to build the branch. This is the upstream fix. Peter Robinson (1): Remove redundant YYLOC global declaration (From meta-aspeed rev: 6630a1310fd9b17abdd8fca73f5c22fc346f9c8a) Change-Id: Ie72bb58c5c7684e42951e80ce6f80e98ef4f15fe Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-07-17u-boot-aspeed: Generate default env for eMMCAdriana Kobylak2-0/+23
Generate a default environment to boot an eMMC based on a txt file. Populate the generated environment image into the eMMC. (From meta-aspeed rev: fdc603c73b2dc8851ce2d1684e9c71a5ce51a5b8) Change-Id: I93944b183b7907202b02854e931593d62603ae77 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-07-17u-boot-aspeed: Add fw_env.config for eMMCAdriana Kobylak2-1/+9
Create a fw_env.config for eMMC with a redundant environment based on the mmc distro feature. The environment is located in the first eMMC partition in the User Data area. (From meta-aspeed rev: 3aa2db46e8097aa0a9627684686ca56b5d6b9872) Change-Id: I6e768e308f03513c6cf394a0adc7110d17322d49 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-06-16u-boot-aspeed: DTC compilation hackJoel Stanley1-1/+1
Alejandro Enedino Hernandez Samaniego (1): libfdt: Make it compatible with newer dtc (From meta-aspeed rev: 724b95b0ed5b41f28b2f5926c209dace73a9b336) Change-Id: I9ca8614fe5127e6875386745780ca3c3c607d168 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-05-26Merge tag 'wht-0.56' of ↵Jason M. Bills4-3/+336
ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
2020-05-05dunfell: utilize u-boot-aspeed.inc in sdkAndrew Geissler1-1/+1
The u-boot.inc from upstream has been moved into this repository as its upstream version is no longer compatible with openbmc/u-boot. See commit 9052e5b for more details. Some notes on attempting to get upstream to work. Got to issue 3 and decided that instead of trying to cherry-pick in specific fixes from upstream, we're going to need a full rebase. Until this is possible, I think our best option is to just use the .inc from the working version of poky which is what u-boot-aspeed.inc is. 1) Build directory (B) def moved to common .inc Define BUILD directory in u-boot-common-aspeed-sdk_2019.04.inc recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +B = "${WORKDIR}/build" 2) Support in Makefile for new u-boot-initial-env file Pull in the following commit: https://github.com/u-boot/u-boot/commit/bdaa73a5b3923257add182b4ab8058dbfa33421b Available in my fork: https://github.com/geissonator/u-boot/tree/v2019.04-aspeed-openbmc-u-boot-initial-env-fix 3) CONFIG_DEFAULT_DEVICE_TREE needed | arm-openbmc-linux-gnueabi-objcopy --gap-fill=0xff -j .text -j .secure_text -j .secure_data -j .rodata -j .hash -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn -j .binman_sym_table -j .text_rest -j .dtb.init.rodata -j .efi_runtime -j .efi_runtime_rel -O binary u-boot u-boot-nodtb.bin | make -f /home/andrewg/Code/openbmc/build/tmp/work/witherspoon_tacoma-openbmc-linux-gnueabi/u-boot-aspeed-sdk/1_v2019.04+gitAUTOINC+58583dd97d-r0/git/scripts/Makefile.build obj=arch/arm/dts dtbs | test -e arch/arm/dts/unset.dtb || ( \ | echo >&2; \ | echo >&2 "Device Tree Source is not correctly specified."; \ | echo >&2 "Please define 'CONFIG_DEFAULT_DEVICE_TREE'"; \ | echo >&2 "or build with 'DEVICE_TREE=<device_tree>' argument"; \ | echo >&2; \ (From meta-aspeed rev: cd159fccefe991336e798da35ed5a2b0abf27e62) Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I1d28bd1125fe5acb1e644a751e44c65772892d0c Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-05-04Merge tag 'wht-0.53' of ↵Jason M. Bills1-1/+1
ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
2020-04-30dunfell: python3 support in u-bootAndrew Geissler1-3/+3
(From meta-aspeed rev: 31cde1a9933517f545e23e6a539349eaa92e903f) Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ic1e0aa287e911953764b4356ebfed0d400b987b9 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-30dunfell: move u-boot.inc into aspeed layerAndrew Geissler2-1/+334
The latest upstream of oe-core has diverged to the point where the meta-aspeed layer can no longer utilize the shared u-boot.inc In particular it has introduced a new, buildable config file, u-boot-initial-env, which is referenced throughout the u-boot.inc file now. The best solution is that OpenBMC upstream the changes it requires for u-boot but resource constraints have prevented that. The current hybrid approach of using a 2016 version of u-boot, pointing to source code in openbmc/u-boot but continuing to use the upstream u-boot.inc really doesn't buy much and causes maintenance issues like we're seeing here. Best to just pull the working version into meta-aspeed and just cherry pick in the one change OpenBMC needs which is the move to python3. The python3 move will be in the next commit in this series. The u-boot.inc used here was from poky with this sha: 9052e5b32a0dbc810782be4963e775609b8dcc04 Resolves openbmc/u-boot#24 (From meta-aspeed rev: 8b3d81d7cd9dd0254c3b03dddad18b9e74d2975d) Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I8af2eddfa6690b840af9fc411814fb551cc25230 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-27u-boot-aspeed: SPL defconfig, DDR device tree supportJoel Stanley1-1/+1
This works around an intermittent boot failure seen on Tacoma1z. Joel Stanley (6): aspeed: Add machine names tools: Add script for generating recovery image configs: Add OpenBMC spl defconfig for AST2600 boards clk: ast2600: Add divisor settings for 100MHz PLL ram: ast2600: Enable device tree based DDR config ast2600: tacoma: Run DDR at 1333 (From meta-aspeed rev: e63dd680abed78dc2b2126c6fcbf3497c35ae18b) Change-Id: I0a2f17d242f3312592fb975fa4231237102ea517 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-15u-boot-sdk: Remove u-boot.bin make targetAdriana Kobylak1-1/+1
The recipe was first created with the make target set to u-boot.bin because there were some compilation errors. These errors are not seeing anymore. By removing the u-boot.bin target and allowing it to be the default (all), other targets like u-boot-spl.bin can be automatically built based on the defconfig. (From meta-aspeed rev: 08e8e7430606d712d8ab3630cbdc650f71caf280) Change-Id: If643afcfe6a9cdea63dd0d8011f6f2af8e287079 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-06Merge tag 'wht-0.47' of ↵Jason M. Bills6-60/+8
ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
2020-03-22u-boot-aspeed: Fix fw_env.config for ast2600Joel Stanley2-1/+5
The configuration was not set at all, leaving us with the default configuration file from u-boot. This sets it to the u-boot environment partition, /dev/mtd2. (From meta-aspeed rev: fc48e308dd25b99535a5412cbbdf1fcd66238a9b) Change-Id: Ied346a6c15f0068b8ab54cec02bc89bf9e553127 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-22u-boot-aspeed: Fix env locationJoel Stanley1-1/+1
Joel Stanley (1): config: Update ast2600 openbmc environment location (From meta-aspeed rev: 8f741295a2a80ecd37cf865e76fa6f32a0223af8) Change-Id: I83fa7c4ab457972f2efd738eda8a2d2a10cb65e7 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-17u-boot-sdk: Use OpenBMC forkJoel Stanley4-59/+3
This is a fork that is based on ASPEED's 2019.04 SDK fork. The goal is to move to a mainline based tree, but while that work is underway, this allows ast2600 support to move forward. This gains support for NC-SI, and uses kconfig for the default boot command allowing us to drop the patch to aspeed-common.h. Machines will need to indicate which device tree to use. If possible we should look to having a few common device trees, but for now they are machine specific. The AST2600 is configured to use the ast2600a1-evb device tree, which will also work on the a0 variant. (From meta-aspeed rev: 22ccf4648a776c458300c97a6d001a843b2b5c9b) Change-Id: Ib21dc9962761aac3f3148fe4908439b975545e1e Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2019-10-22Merge branch 'master' of ↵Jason M. Bills3-3/+57
ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
2019-09-27meta-aspeed: add CONFIG_USE_BOOTCOMMAND snippetBrad Bishop3-14/+16
Add a config snippet that sets CONFIG_BOOTCOMMAND to the correct address on 128MiB flashes. This requires a refresh of the u-boot sdk patch we've been carrying such that CONFIG_BOOTCOMMAND is set conditionally if not set previously. (From meta-aspeed rev: 4c8b1d729b5b21c93685cd1b1bdde05afa81f9e8) Change-Id: I7dece4bcee6d68a0367fcf4eafb78f0db3e4e4f8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-19meta-aspeed: g6: Adjust fit addressBrad Bishop1-4/+24
5b6780e981 changed the u-boot+env size and thus the same fit image address (512KiB) can be used on g6 as on the other aspeed SoCs. Refresh the initial u-boot patch rather than a new one because the original has not yet been accepted upstream. (From meta-aspeed rev: 6aa4aaf66f96acaf84a6c434ddfb3e142c087bf4) Change-Id: I5bcd6468f1578f7f820e3eeeec23d5b3756dca60 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-16aspeed-u-boot-sdk: Update to latest dev commitJoel Stanley1-1/+1
Chia-Wei, Wang (3): ast2600: add CA7 cache and SRAM parity check ast2600: revise the boot initialization flow wdt: aspeed: fix compile warning Dylan Hung (7): [update] revise memory reservation [debug] apply DDR4 100M setting [update] add config for DDR-400 [update] slower HPLL [update] adjust cpu timer according to the HPLL [update] fine tune DDR-PHY param [fix] fix DDR-PHY training hangup ryan_chen (6): update pcie driver add pcie rc pinctrl add two pcie rc add support two add default pcie at ast2600-evb dts update ast2600 fmc interrupt #no (From meta-aspeed rev: 7daf7145abdd5499da5ebb25f4f214712b596562) Change-Id: I0cf2c21a605683472f9dcdc4516d7c4f5d7858e5 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-11meta-aspeed: Move g6 environmentBrad Bishop2-0/+33
The Aspeed u-boot tree has the g6 environment at 640KiB. Move to 512KiB for easy OpenBMC compatibility. (From meta-aspeed rev: 5b6780e9810f79b352db7ae8c6a352d978ef2cd3) Change-Id: I65a8c799eb1db8756516a4f46098c75ee18751d1 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-05aspeed-u-boot-sdk: Update to latest dev commitJoel Stanley1-1/+1
Chia-Wei, Wang (1): aspeed: ast2600: add CPU clock initialization Dylan Hung (9): [add] add ECC setting [update] correct the ecc range [fix] fix build error when ASPEED_ECC is off [update] ecc off by default [update] add ECC enable message target margin 0 is legal arg. [fix] fix incorrect DMA base calculation [update] fix 2600 fpga issue. [update] update ast2600 fpga config ryan_chen (8): add otp strap bspi size info add pcie support for evb add for spi aux information disable h2x pcie at default add for h2x add i2c pinctrl add i2c pinctrl update enable ast2600 evb i2c (From meta-aspeed rev: af1e9221445c4932ead0722287873686fe86b399) Change-Id: I1bfcad52dbd0a27f0e753c8c14d22584156f02b5 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>