From b9799be79de3f0a15a14be392ee90574433435ad Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 6 Aug 2021 09:13:33 -0500 Subject: meta-aspeed: prep for new override syntax Signed-off-by: Patrick Williams Change-Id: I8135871ae0e3b360aff7d878f7cf04a2504f2dd0 --- meta-aspeed/conf/machine/include/aspeed.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'meta-aspeed/conf/machine/include') diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index fdc411981..628a73b1d 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -3,9 +3,9 @@ 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" -PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk" -PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk" -PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk" +PREFERRED_PROVIDER_virtual/bootloader:aspeed-g6 ?= "u-boot-aspeed-sdk" +PREFERRED_PROVIDER_u-boot:aspeed-g6 ?= "u-boot-aspeed-sdk" +PREFERRED_PROVIDER_u-boot-fw-utils:aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk" # Build a FIT image and stuff core-image-minimal in it by default. KERNEL_IMAGETYPE ?= "fitImage" @@ -29,12 +29,12 @@ MACHINEOVERRIDES =. "aspeed:" SERIAL_CONSOLES ?= "115200;ttyS4" -DEFAULTTUNE_aspeed-g5 ?= "arm1176jzs" -DEFAULTTUNE_aspeed-g6 ?= "armv7ahf-vfpv4d16" +DEFAULTTUNE:aspeed-g5 ?= "arm1176jzs" +DEFAULTTUNE:aspeed-g6 ?= "armv7ahf-vfpv4d16" -UBOOT_ENTRYPOINT_aspeed-g4 ?= "0x40001000" -UBOOT_ENTRYPOINT_aspeed-g5 ?= "0x80001000" -UBOOT_ENTRYPOINT_aspeed-g6 ?= "0x80001000" -UBOOT_LOADADDRESS_aspeed-g4 ?= "0x40001000" -UBOOT_LOADADDRESS_aspeed-g5 ?= "0x80001000" -UBOOT_LOADADDRESS_aspeed-g6 ?= "0x80001000" +UBOOT_ENTRYPOINT:aspeed-g4 ?= "0x40001000" +UBOOT_ENTRYPOINT:aspeed-g5 ?= "0x80001000" +UBOOT_ENTRYPOINT:aspeed-g6 ?= "0x80001000" +UBOOT_LOADADDRESS:aspeed-g4 ?= "0x40001000" +UBOOT_LOADADDRESS:aspeed-g5 ?= "0x80001000" +UBOOT_LOADADDRESS:aspeed-g6 ?= "0x80001000" -- cgit v1.2.3