u-boot-aspeed: Rebase on aspeed-master-v2019.04

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>

1 files changed, 1 insertions, 1 deletions

diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
index 8df836c05..5808dea2b 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
@@ -8,7 +8,7 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "541ca84e50a51e7cfbd83c96cbf659a85b3ee0df"
+SRCREV = "92c484fa9701cb9e675f54d10908d21b27f6e2fe"
 
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https"