Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/aspeed-master' into aspeed-master
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamin-aspeed
jamin-aspeed committed Mar 31, 2023
2 parents 5ab28d6 + a644213 commit d9eeb0e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions meta-aspeed-sdk/conf/machine/include/aspeed-sdk.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ SERIAL_CONSOLES ?= "115200;ttyS4"
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 ?= "0x40000000"
UBOOT_ENTRYPOINT:aspeed-g5 ?= "0x80000000"
UBOOT_ENTRYPOINT:aspeed-g6 ?= "0x80000000"
UBOOT_LOADADDRESS:aspeed-g4 ?= "0x40000000"
UBOOT_LOADADDRESS:aspeed-g5 ?= "0x80000000"
UBOOT_LOADADDRESS:aspeed-g6 ?= "0x80000000"

PREFERRED_VERSION_iperf3 ?= "3.1.4"
PREFERRED_VERSION_nbd ?= "3.20"

0 comments on commit d9eeb0e

Please sign in to comment.