summaryrefslogtreecommitdiff
path: root/meta-aspeed/conf/machine
AgeCommit message (Collapse)AuthorFilesLines
2026-03-20aspeed: ufs supportVince Chang1-0/+7
1. Add ufs.inc It adds the mf-ufs MACHINE_FEATURES and defines WIC_SECTOR_SIZE=4096 and WIC_BLOCK_SIZE=4096 for UFS storage. 2. Add WIC file for UFS. 3. Update mmc-init script for UFS. Device mappings for UFS storage: /dev/mmcblkX => /dev/sdX Tested on AST2700EVB: ``` => tftp 403000000 obmc-phosphor-image-evb-ast2700-ufs.wic.gz => scsi scan => scsi dev 0; gzwrite scsi 0 403000000 ${filesize} : => ext4ls scsi 0:2 <DIR> 4096 . <DIR> 4096 .. <DIR> 16384 lost+found 11383904 fitImage => ext4load scsi 0:2 403000000 fitImage 11383904 bytes read in 250 ms (43.4 MiB/s) => dcache on => bootm 403000000 Using 'conf-ast2700-evb.dtb' configuration Verifying Hash Integrity ... OK Trying 'kernel-1' kernel subimage : ``` Change-Id: Iac6051f8cf67b3431808f5608792297d6f8e1476 Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
2026-03-10meta-aspeed: Default KERNEL_IMAGETYPE to Image for AST2700Vince Chang1-1/+3
Commit a5dd01c ("meta-aspeed: switch to linux-yocto-fitimage recipe") defaults KERNEL_IMAGETYPE to "zImage". Commit 65d7d51 ("meta-phosphor: obmc-bsp-common: Default KERNEL_IMAGETYPES? to zImage") defaults KERNEL_IMAGETYPES to "zImage". For arm64 builds, the zImage target is not spported, which results in a build error. Set KERNEL_IMAGETYPES and KERNEL_IMAGETYPES to "Image" to match the arm64 kernel build output. Change-Id: I71a839cf1f3d8c4c9d817ae6899f3998846be7ea Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
2026-02-26meta-aspeed: switch to linux-yocto-fitimage recipeAndrew Geissler1-2/+5
Change-Id: I0cad1c1b72db4e9f3e6fee3c1155da20f5a75d76 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2025-09-05meta-aspeed: Add ast2700 A1 supportVinceChang66376-3/+75
1. Add AST2700 support. 2. Using multiconfig for bootmcu RISCV. Tested: . setup evb-ast2700 bitbake obmc-phosphor-image QEMU: You can `runqemu` when QEMU support vbootrom. ``` build/evb-ast2700$ runqemu slirp serialstdio ``` If your QEMU doesn't support vbootrom, please run the following steps: Copy u-boot-nodtb.bin and u-boot.dtb from U-Boot build folder into the tmp/deploy/images/evb-ast2700 folder. ``` ./qemu-system-aarch64 -M ast2700a1-evb -nographic\ -device loader,addr=0x400000000,file=${IMGDIR}/u-boot-nodtb.bin,force-raw=on \ -device loader,addr=$((0x400000000 + ${UBOOT_SIZE})),file=${IMGDIR}/u-boot.dtb,force-raw=on \ -device loader,addr=0x430000000,file=${IMGDIR}/bl31.bin,force-raw=on \ -device loader,addr=0x430080000,file=${IMGDIR}/optee/tee-raw.bin,force-raw=on \ -device loader,addr=0x430000000,cpu-num=0 \ -device loader,addr=0x430000000,cpu-num=1 \ -device loader,addr=0x430000000,cpu-num=2 \ -device loader,addr=0x430000000,cpu-num=3 \ -smp 4 \ -drive file=${IMGDIR}/image-bmc,format=raw,if=mtd \ -net nic,macaddr="32:27:a0:12:00:01" \ -net user,hostfwd=:127.0.0.1:2222-:22,hostfwd=:127.0.0.1:2443-:443,hostfwd=udp:127.0.0.1:2623-:623,hostname=qemu \ -serial mon:stdio \ -snapshot \ ``` Change-Id: Id2d7cd2f49a66c292424b17e1805f4a35558746c Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
2025-07-02meta-evb: move meta-aspeed EVB machine into meta-evbVince Chang2-37/+0
Move evb-ast2500.conf and evb-ast2600.conf into meta-evb. Change-Id: I64bd938eb63dfe77ffe74e1de25f177291fe65c2 Signed-off-by: Vince Chang <vince_chang@aspeedtech.com>
2025-06-11meta-aspeed: Move QB_SYSTEM_NAME to machine-specific configs for AST2700 supportJamin Lin4-1/+3
Currently, AST2400, AST2500, and AST2600 use "qemu-system-arm" as their QEMU system binary. However, AST2700 will require "qemu-system-aarch64" due to its AArch64 architecture. To accommodate this architectural difference and prepare for future AST2700 support, move the "QB_SYSTEM_NAME" setting out of the common "aspeed.inc" and into each SoC-specific configuration file. Change-Id: I2e7dda1613ff27879676c12cf0b2900b201e47cd Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
2025-06-11meta-aspeed: Enable MCTP on supported EVBsAndrew Jeffery2-0/+4
Enables exercising parts of the MCTP stack. Change-Id: Ib8e768daa29cd20858a88554a6bb5f80c24d5be6 Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
2024-11-26meta-aspeed: Move machine specific settings to its machine configJamin Lin4-20/+25
Currently, it placed machine specific settings for AST2400, AST2500 and AST2600 in common config, aspeed.conf, with MACHINEOVERRIDE for different machine settings. However, ASPEED will upstream to support AST2700 and it should add "aspeed-g7" for AST2700 support. To make aspeed.inc more readable and simple, move all specific machine settings to individual machine config. Change-Id: I3cc1a5b57df3f24e75accdf689e8d1dbb0351238 Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
2024-02-27meta-aspeed: Specify netdev=net0 in QB_NETWORK_DEVICEAndrew Jeffery1-1/+2
Align with the default inclusion of `-netdev id=net0` in QB_SLIRP_OPT. Change-Id: I1afe24c7424cf43faa6e7f8b00d191d00b32b16a Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
2024-02-15meta-aspeed: remove meta-phosphor dependencyBrad Bishop1-1/+1
meta-aspeed does not have a hard dependency on meta-phosphor, so global configuration from meta-phosphor should be "include" and not "require". Change-Id: I6bc9e579a89665924713bc3094119a2b8cc5b925 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2024-02-08meta-aspeed: ast2600: require rather than include the archPatrick Williams1-1/+1
We should `require` the include file for the architecture settings rather than `include` them so that bitbake errors out if they are not found. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I3c74909251846afce240dfe88dc777493b596c30
2023-09-26linux-aspeed: Move to Linux v6.5Joel Stanley2-2/+2
This moves the OpenBMC kernel to a v6.5 base for ASPEED. The 6.5 kernel moved all 32-bit ARM device trees, so our BMC device tress are now under an 'aspeed' subdirectory. This change means systems must describe the KERNEL_DEVICETREE with the aspeed directory prefix. There are 78 patches in the tree, with 40 of those patches not yet queued for merging in v6.6. The remaining out of tree patches include: Andrew Jeffery (6): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): One-shot retries for failure to set page pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers ARM: dts: aspeed: witherspoon: Update max31785 node ipmi: kcs_bmc: Add a "raw" character device interface Cédric Le Goater (1): /dev/mem: add a devmem kernel parameter to activate the device Eddie James (16): ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log dt-bindings: soc: Add Aspeed XDMA Engine soc: aspeed: Add XDMA Engine Driver soc: aspeed: xdma: Add user interface soc: aspeed: xdma: Add reset ioctl soc: aspeed: xdma: Add trace events i2c: core: Add mux root adapter operations iio: si7020: Lock root adapter to wait for reset eeprom: ee1004: Enable devices on multiple busses dt-bindings: trivial-devices: Add Atmel AT30TSE004A serial eeprom eeprom: ee1004: Add OF matching support leds: pca955x: Refactor with helper functions and renaming leds: pca955x: Use pointers to driver data rather than I2C client leds: pca955x: Optimize probe led selection leds: pca955x: Add HW blink support leds: Ensure hardware blinking turns off when requested Jae Hyun Yoo (1): clk: ast2600: enable BCLK for PCI/PCIe bus always Joel Stanley (14): net: ftgmac100: Ensure tx descriptor updates are visible ARM: aspeed: Add debugfs directory ARM: soc: aspeed: Add secure boot controller support dt-bindings: trivial-devices: Remove Infineon SLB9673 TPM ARM: dts: nuvoton: npmc750-evb: Add default console tpm: tis-i2c: Add more compatible strings leds: pca955x: Revert "Remove the unused function pca95xx_num_led_regs()" arm64: configs: Add Nuvoton NPCM defconfig ARM: configs: aspeed: Add new FSI drivers ARM: config: aspeed_g5: Enable SSIF BMC driver ARM: config: aspeed: Remove FIRMWARE_MEMMAP ARM: config: aspeed: Add Ampere SMPro drivers ARM: config: Add openbmc defconfig ARM: config: openbmc: Add HPE GPX and Nuvoton 7xx Johannes Holland (1): dt-bindings: tpm: Add schema for TIS I2C devices Potin Lai (1): mtd: spi-nor: winbond: Add support for w25q01jvq Change-Id: Ib97af192391af6e71c96fe14e12cfc88c23d7a7d Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-10-18aspeed: Support runqemuJoel Stanley1-0/+20
$ runqemu nographic slirp We require nographic instead of setting -nographic through QB_OPT_APPEND in order to avoid the serial port being sent to a character device: self.qemu_opt += " -serial mon:vc" We require slirp instead of setting QB_SLIRP_OPT as we are happy with the default spirp options, we just want to enable slirp instead of the other networking options that require root access. Change-Id: I2ad8a8237ad1a0f5fa888991f7f58a6266a58caf Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-05-02meta-aspeed: Correct the offset to load kernelHoward Chiu1-0/+2
OpenBMC places kernel at offset 512 if the flash size is 32MB, but it was defined as 1024 in the present defconfig. This patch corrects the offset if the flash size is set to 32MB. Signed-off-by: Howard Chiu <howard_chiu@aspeedtech.com> Change-Id: I05749eda519cc1660921e111a36be74cb121fa68
2022-02-24meta-aspeed: evb-ast2600 Disable socsec signingJamin Lin1-0/+9
Disable the hardware root-of-trust on AST2600 EVB. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Change-Id: Iabf3bafb5db633de34731e041064318f8f56da5a
2022-02-17aspeed: evb-ast2600: Use unversioned device treeJoel Stanley1-1/+2
The EVB build is currently using the A1 device tree. Use the plain ast2600-evb.dts, as this represents the production silicon. Signed-off-by: Joel Stanley <joel@jms.id.au> Change-Id: Icef427718958bf19ee75fec906cf0476f5d37138
2022-02-17aspeed: evb-ast2500: Use 2019.04-openbmc-aspeed u-boot branchJoel Stanley1-5/+2
The old 2016.09 branch is unmaintained. ASPEED have support for the 2500 in the SDK, so use that instead. Change-Id: Iece96616d24ac21028e91695e0c8ab86d9ade1a9 Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-01-20u-boot: Make u-boot-aspeed-sdk the defaultJoel Stanley1-6/+3
This makes the v2019.04-aspeed-openbmc branch the default for all aspeed machines. Existing machines have all modified their u-boot package to use the older branch, so this patch should result in no change. Change-Id: Ic4dd0bb973a16d3d658c340e7caf6a05128327bc Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-01-18u-boot: Specify u-boot package for AST2500 machinesJoel Stanley1-0/+5
This sets u-boot to the package containing the v2016.07-aspeed-openbmc branch. This ensures there will be no change if the default changes in the future. Change-Id: Iea12e1691dbdda34a3f95d6d0862add0b15bcf37 Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-12-30Fix the config error of u-boot-envzhanghaicheng1-0/+1
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-11-04Partially revert "treewide: remove obmc-system-mgmt feature"Patrick Williams2-0/+2
The obmc-system-mgmt feature is currently used in the image to trigger inclusion of a virtual-provider which provides a number of packages many systems need. Partially revert the removal of this feature so that the outcome is: 1. The empty obmc-phosphor-sysd package is still removed. 2. By default the 'obmc-system-mgmt' feature is included, unless specifically exempted. 3. All EVB platforms remove the 'obmc-system-mgmt' feature since they have no system they are managing. This partially reverts commit 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526. Tested: * Built `bletchley` and confirmed `packagegroup-fb-apps-system` and `entity-manager` are present. ``` entity-manager armv7ahf-vfpv4d16 0.1+git0+6bf41588ab-r0 packagegroup-fb-apps-system all 1.0-r1 ``` * Built `witherspoon` and confirmed `packagegroup-op-apps-system` and `pdbg` are present. ``` packagegroup-op-apps-system noarch 1.0 pdbg arm1176jzs 3.3 ``` * Ran `bitbake -p` on `evb-ast2600` to confirm the undefined `virtual-obmc-system-mgmt` is not being included in the image. Change-Id: I8b7804d5101cc84a2c57473b3f85672bf7767c67 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
2021-09-04meta-aspeed:conf/machine: tunes files moved to arch dirsAndrew Geissler2-2/+2
Upstream yocto moved the tune files under architecture subdirectories so need to adjust our includes of them. Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I442f1403a869a117244461c8f94f940cfe7c08cd
2021-08-17meta-aspeed: ast2600: Sign the SPL with socsec by defaultAndrew Jeffery1-0/+5
Signing the SPL when secure-boot is disabled has no impact, the SoC will continue to bootstrap as normal. Change-Id: I05c1db80cb4bec44ca315190f5b3c1d97168d1d5 Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
2021-08-11meta-aspeed: prep for new override syntaxPatrick Williams1-11/+11
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I8135871ae0e3b360aff7d878f7cf04a2504f2dd0
2021-06-17evb-ast2600: enabling u-boot-spl featureTroy Lee1-1/+2
Currently, machine evb-ast2600 frozed during u-boot booting. This patchset has been tested with AST2600-A1 and AST2600-A3 EVB: AST2600-A1: ``` U-Boot SPL 2019.04 (Jun 16 2021 - 05:59:38 +0000) already initialized, Trying to boot from RAM U-Boot 2019.04 (Jun 16 2021 - 05:59:38 +0000) SOC: AST2600-A1 RST: WDT1 SOC PCI RST: #2 LPC Mode: SIO:Enable : SuperIO-2e Eth: MAC0: RGMII, MAC1: RGMII, MAC2: RGMII, MAC3: RGMII Model: AST2600 EVB DRAM: already initialized, 1008 MiB (capacity:1024 MiB, VGA:16 MiB), ECC off MMC: sdhci_slot0@100: 1, sdhci_slot1@200: 2, emmc_slot0@100: 0 Loading Environment from SPI Flash... SF: Detected w25q512jv with page size 256 Bytes, erase size 4 KiB, total 64 MiB OK In: serial@1e784000 ``` AST2600-A3: ``` BP0c00 U-Boot SPL 2019.04 (Jun 16 2021 - 05:59:38 +0000) already initialized, Trying to boot from RAM U-Boot 2019.04 (Jun 16 2021 - 05:59:38 +0000) SOC: AST2600-A3 RST: WDT1 SOC PCI RST: #2 eSPI Mode: SIO:Enable : SuperIO-2e Eth: MAC0: RGMII, MAC1: RGMII, MAC2: RGMII, MAC3: RGMII Model: AST2600 EVB DRAM: already initialized, 960 MiB (capacity:1024 MiB, VGA:64 MiB), ECC off MMC: sdhci_slot0@100: 1, sdhci_slot1@200: 2, emmc_slot0@100: 0 Loading Environment from SPI Flash... SF: Detected w25q512jv with page size 256 Bytes, erase size 4 KiB, total 64 MiB OK In: serial@1e784000 ``` Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> Change-Id: I77ec3c2928ca96ee3f51290fd3435fca08bb058a
2021-03-02aspeed: Set ast2600 evb spi flash size to 64 MiBTroy Lee1-0/+3
AST2600 evb has 64 MiB flash by default, so machine config could provide a default value for FLASH_SIZE. Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> Change-Id: Idca8734f950a16966a5a7322c0c50d6e63d9106e
2020-09-13aspeed: enable 'hw-rng' MACHINE_FEATUREPatrick Williams1-0/+1
Change Iee340ffd294c4f40ba3360acd3f750d886865608 introduced a machine feature which communicates to recipes if a hw random number generator is present. Since the Aspeed chips have a supported RNG, enable this MACHINE_FEATURE. (From meta-aspeed rev: 57caacd62ae6037119be32c608be6ae4e548e639) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I275ca0fc1445c782ea6b10e3807e3b339fead53b Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-08-04wic: Populate hostfw partitionAdriana Kobylak1-0/+1
Populate the hostfw partition by specifying the directory to be used as source for the filesystem. This directory is populated by a bbappend to the hostfw recipe. (From meta-aspeed rev: 37f30af4e377a6bc2d3c47ca435798969321f566) Change-Id: Id64e0ac6a5082be2b3ad689a6b323da8eb094e69 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-07-17u-boot-aspeed: Generate default env for eMMCAdriana Kobylak1-1/+4
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-15aspeed: Build a wic image for the eMMC User Data AreaAdriana Kobylak1-0/+5
The U-Boot SPL and U-Boot proper would be programmed to the Boot Area Hardware Partitions of the eMMC. The kernel and user space would go into the User Data Area. This commit creates an image that can be programmed into that User Data Area. Layout: --- - ----- -------- -------- ----- ------- ------ -------- ------- |GPT| | env | boot-a | boot-b | fs-a | fs-b | rwfs | hostfw |GPT-sec| --- - ----- -------- -------- ------ ------ ------ -------- ------- ^ 1MB 64MB 64MB 1GB 1GB 7GB 5GB | 0x5000 Primary GPT size (Beginning of image): 512B (Protective MBR) + 512B (Primary Header) + 16KB (Primary Table) First partition (u-boot-env) is 4K-aligned, which puts it at offset 0x5000 Secondary GPT size (End of image): 16KB (Secondary Table) + 512B (Secondary Header) Since the secondary GPT is expected to be at the end of the device, the initramfs can issue a "sgdisk -e /dev/mmcblk0" on first boot to move it to the end. The first partition holds the U-Boot environment. The following two partitions hold a filesystem with the fitImage file. Code update would reflash the full filesystem with the fitImage during an update. U-Boot can then be programmed to look for the kernel in partitions boot-a or boot-b. The remaining is a set of ext4 filesystems for user space, read-write, and host firmware. The size for the host firmware partition is configurable to be able to build an image of different size. The reason is that the tacoma system is has a User Data area just 1GB smaller than rainier. Design doc: https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/28443 Tested: Adding "WKS_HOSTFW_SIZE = "4G"" to the tacoma.conf file created a 14GB wic file: $ ls -lh *wic -rw-r--r-- 1 anoo 532919 15G Jul 14 08:18 obmc-phosphor-image-rainier.wic -rw-r--r-- 1 anoo 532919 14G Jul 14 08:36 obmc-phosphor-image-witherspoon-tacoma.wi $ wic ls obmc-phosphor-image-rainier.wic Num Start End Size Fstype ... 7 9798963200 15167672319 5368709120 ext4 $ wic ls obmc-phosphor-image-witherspoon-tacoma.wic Num Start End Size Fstype ... 7 9798963200 14093930495 4294967296 ext4 (From meta-aspeed rev: b8a647297e3f9fe724f8ee1736bb9da3806d788e) Change-Id: I18b8a15ac8eddb6abfbc7b70429ef45ffc170d9a Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-17u-boot-sdk: Use OpenBMC forkJoel Stanley1-1/+2
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-12-16Move ast2600 to use hard float call conventionVernon Mauery1-1/+1
Before this change, the ast2600 binaries were built with the soft float call convention, which allows them to run on systems that don't have hard float FPUs. Internally, this changes yocto to build like this: CXX="arm-openbmc-linux-gnueabi-g++ \ -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard ... CPP="arm-openbmc-linux-gnueabi-gcc \ -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard ... Tested: Builds and boots on ast2600-EVB (From meta-aspeed rev: 53e322518fe6f471663746934e38bf5d8143a501) Change-Id: If8037c66301ca4a3588d10270fe8d2fc610bb195 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-10-15aspeed: Add udev mtd rules to machine recommendsJoel Stanley1-1/+1
These udev rules are useful outside of fw_printenv, which is how we currently include them, so bring them in with the common machine type. (From meta-aspeed rev: 1a7cc4767eb0393bb615ae67e4b388163aa5dc48) Signed-off-by: Joel Stanley <joel@jms.id.au> Change-Id: I0779fc4c2efd0e18d7729cef4548238e56c39a47 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-26meta-aspeed: g5: drop redundant tune includeBrad Bishop1-11/+0
Anyone using OE-core after 95823b7eab is using the OE-core provided tune and not ours. Drop our redundant tune file. (From meta-aspeed rev: 5894fc514daad03f70ada285a6b37947e1fb116e) Change-Id: Ice99855d7655f926832943f6944279a0d21de5a7 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-11aspeed: g6: Fix typo in UBOOT_LOADADDRESS lineVernon Mauery1-1/+1
A typo in the UBOOT_LOADADDRESS line for g6 prevented the FIT image from properly be loaded by U-Boot. This change makes sure that the FIT image is properly generated so U-Boot can load it to the right address. Tested: Build, inspected, and booted the FIT image. (From meta-aspeed rev: 12cd1d2b96db78ca4a34751c92d63cb6212228be) Change-Id: Idad7ff047c29699a7cfb80c186e418183ca126f3 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-04aspeed: g6: Use the usual kernelBrad Bishop1-1/+0
Switch g6 to the same kernel as the other supported chips (g4 and g5). (From meta-aspeed rev: f28c73a9f2e0296c1730b88afdc6cf0c836d08fa) Change-Id: I659e535ccb4642438b9c10c48a4850d67b28982b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: drop g4/g5 UBOOT_MACHINE defaultsBrad Bishop2-4/+0
The u-boot config is a property of the board and not the SOC. Don't set a default in the g4 and g5 include files. This ensures that BSP users explicitly select a uboot config capable of booting the board. (From meta-aspeed rev: 6203fbdba652e2f7943b55b067b2e91247c795e1) Change-Id: I7b07019eb7428d8c38268e8dbed0ff5d05f3a7a2 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: conf: machine: move vuart udev ruleBrad Bishop3-4/+2
Instead of setting MACHINE_EXTRA_RDEPENDS in each SOC specific include file, just set it once in aspeed.inc. Use MACHINE_EXTRA_RRECOMMENDS as the udev rule is definitely not required and should be removable via BAD_RECOMMENDATIONS. (From meta-aspeed rev: 672366760cccfe5bf2e734939ec21c90482e298f) Change-Id: I42091a522b346fe07511e16439438a73d0c9be6c Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: machine include cleanupsBrad Bishop4-17/+8
Move most settings from the ast2xxx.inc files to aspeed.inc. This seems to be how other BSPs do it (e.g. meta-freescale) and it keeps everying in one consolidated location for easy perusal, comparison, etc. bitbake will take a different path through it's code while parsing but we wind up with the exact same variable settings in the end. Remove worthless comments from ast2xxx.inc file headers. (From meta-aspeed rev: 456a28202671507ca91b35103a13d3a1dac695db) Change-Id: Id8ed034350761770f5dae4d1a0adecc9bcfea3b5 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: g6: use the correct arm core tuneBrad Bishop2-1/+3
Use the correct tune for the g6 arm core: vfpv4d16 (From meta-aspeed rev: 8f80491f1d58fbe94ef1d32aba45789aee549cec) Change-Id: I06b7b982c9064edd7369e947cc9e41e2e39a50ed Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: set SERIAL_CONSOLES correctlyBrad Bishop5-4/+6
Provide a default setting for SERIAL_CONSOLES for all Aspeed SOCs. Set the SERIAL_CONSOLE for the g5 and g6 evb explicitly, in case the default changes. (From meta-aspeed rev: b539e873a7731bad9eee83e17838a78f281d7b4b) Change-Id: I1ee9f44535cd009de25baccacada36cd58ad4f10 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-16aspeed: provide suitable kernel build defaultsBrad Bishop1-0/+6
oe-core has these defaults: KERNEL_IMAGETYPE: "zimage" KERNEL_CLASSES: "kernel-uimage" INITRAMFS_IMAGE: "" INITRAMFS_FSTYPES: "cpio.gz" Override those defaults with Aspeed specific defaults that are more appropriate to the current state of typical usage (FIT) of Aspeed chips: KERNEL_IMAGETYPE: "fitImage" KERNEL_CLASSES: "kernel-fitimage" INITRAMFS_IMAGE: "aspeed-image-initramfs" INITRAMFS_FSTYPES: "cpio.xz" By default use aspeed-image-initramfs in the FIT image. aspeed-image-initramfs is just an alias to core-image-minimal. The alias is required because vanilla core-image-minimal is not an initramfs image recipe...in oe, in general, the usage of the image recipe (initramfs or not) is baked into the recipe itself with a line like: IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" The same behavior *could* be obtained with a bbappend but that then prevents users from using the original image recipe as a real root filesystem image in their setups. Perhaps at a later time a replacement image with an Aspeed hardware evaluation kit theme would be a more suitable default. (From meta-aspeed rev: 7639df3650f6d91c9b533e0287142fdcfbc0b2ea) Change-Id: I51def69bcfd786f4c8aad2ae68376da335aad039 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-29aspeed: Add Aspeed G6/eval configurationBrad Bishop3-0/+16
Add base configuration metadata for the Aspeed AST2600 and its evaluation board. Initially point at the Aspeed SDK until kernel and u-boot support is added upstream. (From meta-aspeed rev: 2f128068bc3b7705071868176624ef19a9000750) Change-Id: Id8636520815a2cf98f8a801f6a2241387e4a8231 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-27aspeed: g5: eval: drop unused variablesBrad Bishop1-5/+1
Leave KMACHINE at the OE-core default. It is only used by the kernel-yocto bitbake class when dealing with kernel source trees like the Yocto kernel fork that include KERNEL_FEATURES metadata right in the source tree. None of the Aspeed trees do that. Don't set FLASH_SIZE. It isn't an OE-core variable and it isn't used anywhere. (From meta-aspeed rev: 798e4360c387b12e6bd190c5e526edc1cd75521d) Change-Id: I4a68fa98108014b8517d0417357060a8fc4e7aae Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-23aspeed: add AST2500 evaluation board targetBrad Bishop1-0/+8
There currently aren't any usable targets provided with meta-aspeed. Typical OE BSP layers provide reference metadata for evaluation boards. Provide one for the AST2500 evaluation board. Typical BSPs also provide an image class that produces images usable on the target hardware. meta-aspeed doesn't have one (yet), so although baking an image (e.g. core-image-minimal) will now work, it will not produce images usable with actual Aspeed hardware. (From meta-aspeed rev: 720fcee6f9dc78ed46b4641de6f2fb0054a6da44) Change-Id: I3419d448b05aa7c72b77224e44050ca63ec20f12 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-29meta-aspeed: MACHINEOVERRIDES fixupsBrad Bishop3-15/+9
OE-Core adds the value of SOC_FAMILY to MACHINEOVERRIDES, so explicitly setting a MACHINEOVERRIDES is redundant. Drop the explicit ast2400/ast2500 MACHINEOVERRIDES and use the OE-Core provided aspeed-g4 and aspeed-g5 instead. After the redundant ast2400/ast2500 overrides are dropped, the ordering of the values in MACHINEOVERRIDES is wrong: MACHINEOVERRIDES="aspeed-g5:aspeed" This means that: FOO_aspeed = "bar" will override: FOO_aspeed-g5 = "baz" which is the opposite of expectation. The ordering is a function of config file include order and choice of the predot vs postdot operator. Use the same include ordering and dot operators as meta-fsl-arm to get the overrides to appear in MACHINEOVERRIDES in the correct order such that the expected semantics are provided and: FOO_aspeed-g5 = "bar" will override: FOO_aspeed = "baz" Drop explicit setting for FILESPATH as OE-Core adds OVERRIDES to FILESPATH and bitbake will find the appropriate defconfig without them. Move defconfigs to aspeed-g4 and aspeed-g5 since the ast2400 and ast2500 are being removed. (From meta-aspeed rev: 85d614a69c1e752fb4d5917499500c37c4f745ac) Change-Id: I63c0f71f14bf9145e7e769902be87bb267a78a30 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2018-08-23[Subtree] Move board support packages to top levelDave Cobbley4-0/+57
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>