summaryrefslogtreecommitdiff
path: root/meta-aspeed/recipes-bsp
AgeCommit message (Collapse)AuthorFilesLines
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-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-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-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-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>
2019-08-22aspeed-u-boot-sdk: Bump to latest dev commitJoel Stanley2-34/+2
This includes a fix to the bootm limit issue so the patch can be removed. It also addresses other issues, such as an updated SMP handshake and booting larger kernels. (From meta-aspeed rev: 921779183e3d57dbfddc9179f6b8fc413b453553) Change-Id: I5575ac0a7d0f72fa97b3aa6c580bdacc84ac619d Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-31u-boot-aspeed: Update to SDK v00.02.01Joel Stanley1-1/+1
(From meta-aspeed rev: fb54525540953435683dcc3bee915123e25a1a8b) Change-Id: I3dcce46f6f18ea9cf24a8b53b6f79a9899e7d6c8 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2019-07-31aspeed: u-boot: Fix SDK booting on systems with lots of RAMJoel Stanley2-0/+32
This patch is required to boot on the ast2600evb which has 2GB of RAM. It has been submitted to aspeed for inclusion in their tree. (From meta-aspeed rev: 229a6556b33641bdfc770eb9566b3db3ce01354c) Change-Id: Ic2605f6634c82bcf8c1f0d5e166fea88ff7722d4 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2019-07-27aspeed: Add Aspeed SDK recipes for U-bootBrad Bishop3-0/+62
Start by copying oe-core recipes-bsp/u-boot/ into the Aspeed BSP. The uboot recipes in oe-core master currently point to 2019.07 u-boot and the Aspeed SDK branch being pointed to by this patch is based on uboot upstream 2019.04. There weren't any changes in oe-core going from 2019.04 to 2019.07 so thats OK. After copying the oe-core recipes, fix up SRC_URI, HOMEPAGE, and a couple other variables to point at the Aspeed u-boot fork. The current aspeed-master-v2019.04 tip and evb-ast2600_defconfig will produce a uboot binary but make returns non-zero: CFGCHK u-boot.cfg Error: You must add new CONFIG options using Kconfig The following new ad-hoc CONFIG options were detected: CONFIG_RAM Please add these via Kconfig instead. Find a suitable Kconfig file and add a 'config' or 'menuconfig' option. make: *** [Makefile:1010: all] Error 1 As such the utility of this recipe is limited until the above issue is addressed. The Aspeed SDK is intended to be the basis for Aspeed G6 bringup. (From meta-aspeed rev: fe03326ee328718a79138062a0db374c0685a9c7) Change-Id: I266dc10dd8549c024ec7012da5e576a2436d195b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-14u-boot-aspeed: Add W25M512JV flash chipJoel Stanley1-1/+1
Hongwei Zhang (1): aspeed/flash: add winbond SPI support (From meta-aspeed rev: d2b5ec7b57fc02081b0912adb0a6b60a496aef8a) Change-Id: Id9db8daa9f5df2b16951bc02a4ea9d4d389b3ed7 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-04u-boot-aspeed: Add MX66L1G45G flash chipJoel Stanley1-1/+1
Adriana Kobylak (1): aspeed/flash: Add MX66L1G45G chip (From meta-aspeed rev: 32422e0ec2c05d0940448992ecbdd9d5d89c7407) Change-Id: Ie976e6210c99521423d17873237cd80b59e50f43 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-22u-boot-aspeed: Fix MT25QL01GB flash chipJoel Stanley1-1/+1
Cédric Le Goater (1): aspeed/flash: fix definition of the MT25QL01GB chip (From meta-aspeed rev: 37b73caedf44bc51e1bf798fe9d566f8646353b2) Resolves https://github.com/openbmc/u-boot/issues/18 Change-Id: If4082230d50c8da4a5a731fc14d938edd018ea10 Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-06u-boot-aspeed: MT25QL01GB NOR and G5 variant supportJoel Stanley1-1/+1
Adriana Kobylak (1): aspeed: flash: Add MT25QL01GB chip David Thompson (1): aspeed/ast-scu.c: add ast_get_m_pll_clk() for AST_SOC_G5 (From meta-aspeed rev: e16d4b9d34e083c851b31d33c549f70fc258ca11) Change-Id: Ibf2c19287048c2fa82c9c9cffdb86f524cdee16c Signed-off-by: Joel Stanley <joel@jms.id.au> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-12-17u-boot-aspeed: workaround old in-tree libfdtBrad Bishop1-0/+4
U-boot has its own FDT implementation but it isn't isolated in terms of include search paths very well in our ~2016 snapshot. Prior to now (December 2018) it wasn't noticeable but with the move to yocto 2.6 and libfdt 1.4.5 the FDT implementations are different enough that if you have libfdt headers installed on your build host (which under Yocto, is _always_) you will have host contanmination and 2016 u-boot will fail to build. Work was done in upstream u-boot during 2018 to address this, but backporting would be a not-insignificant level of effort. Instead, use the following hack until such a time that we can rebase on a more recent (circa end of 2018) u-boot tree. (From meta-aspeed rev: 7f8140089d95a529bf50c6c71112385607a64bcf) Change-Id: I7513e2c651040fab55c2e500a6e801d4f5120d9d Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-12-03aspeed: u-boot: Add dependencies on flex/bisonBrad Bishop2-1/+2
Backport oe-core 71309a5c91209d4afaee874889fa7eefb266185f to our recipes: u-boot: Add missing dependency on flex and bison native The U-Boot build, in particular the Kconfig, depends on bison and flex native. Add the missing dependencies. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (From meta-aspeed rev: ff2e4ed2f8f642fe54ac094c02c22166d8ee3131) Change-Id: Icd04ad815c63149af6033d1419a1a2e180e1b728 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-08-23[Subtree] Move board support packages to top levelDave Cobbley6-0/+155
The new subtree paradigm has moved the meta-bsp layers to the top level Change-Id: Ic4f64c39465be699bed3649e125e027d17daf938 Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>