diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-hpe/meta-gxp/conf/machine/include/gxp.inc | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-hpe/meta-gxp/conf/machine/include/gxp.inc')
-rw-r--r-- | meta-hpe/meta-gxp/conf/machine/include/gxp.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-hpe/meta-gxp/conf/machine/include/gxp.inc b/meta-hpe/meta-gxp/conf/machine/include/gxp.inc index 8f515d99a..e31814556 100644 --- a/meta-hpe/meta-gxp/conf/machine/include/gxp.inc +++ b/meta-hpe/meta-gxp/conf/machine/include/gxp.inc @@ -15,8 +15,8 @@ MACHINEOVERRIDES .= ":gxp" DEFAULTTUNE ?= "armv6-novfp" require conf/machine/include/arm/arch-armv6.inc -UBOOT_MACHINE = "gxp_defconfig" -UBOOT_ENTRYPOINT = "0x40100000" -UBOOT_LOADADDRESS = "0x40100000" +UBOOT_MACHINE ?= "gxp_defconfig" +UBOOT_ENTRYPOINT ?= "0x40100000" +UBOOT_LOADADDRESS ?= "0x40100000" |