diff options
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common.inc | 5 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils_2020.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.10.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot-tools_2019.10.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 6 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2020.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2019.10.bb) | 0 |
5 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index c3e458e925..a0f9c41469 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc | |||
@@ -10,9 +10,12 @@ LICENSE = "GPLv2+" | |||
10 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" | 10 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" |
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | # Drop this line when updating to 2020.01 final | ||
14 | PV = "2020.01~rc3" | ||
15 | |||
13 | # We use the revision in order to avoid having to fetch it from the | 16 | # We use the revision in order to avoid having to fetch it from the |
14 | # repo during parse | 17 | # repo during parse |
15 | SRCREV = "61ba1244b548463dbfb3c5285b6b22e7c772c5bd" | 18 | SRCREV = "d4a31e8ee5592072d8d5208b3e950cba2d89b6bd" |
16 | 19 | ||
17 | SRC_URI = "git://git.denx.de/u-boot.git \ | 20 | SRC_URI = "git://git.denx.de/u-boot.git \ |
18 | " | 21 | " |
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2020.01.bb index 04321b7b66..04321b7b66 100644 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.10.bb +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2020.01.bb | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb index bede984ef7..bede984ef7 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2019.10.bb +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 9a754fd09b..55d8b47870 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -7,13 +7,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
7 | 7 | ||
8 | DEPENDS += "kern-tools-native" | 8 | DEPENDS += "kern-tools-native" |
9 | 9 | ||
10 | inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 | 10 | inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native |
11 | 11 | ||
12 | DEPENDS += "swig-native python-native" | 12 | DEPENDS += "swig-native" |
13 | 13 | ||
14 | EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' | 14 | EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' |
15 | EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' | 15 | EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' |
16 | EXTRA_OEMAKE += 'PYTHON2=nativepython STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' | 16 | EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' |
17 | 17 | ||
18 | PACKAGECONFIG ??= "openssl" | 18 | PACKAGECONFIG ??= "openssl" |
19 | # u-boot will compile its own tools during the build, with specific | 19 | # u-boot will compile its own tools during the build, with specific |
diff --git a/meta/recipes-bsp/u-boot/u-boot_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot_2020.01.bb index 02d67c0db2..02d67c0db2 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2019.10.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2020.01.bb | |||