summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Lee <timlee660101@gmail.com>2024-04-29 12:12:52 +0300
committerTim Lee <chli30@nuvoton.com>2024-05-02 09:02:25 +0300
commit3012b0e24a1ff7478fda109895515ced1472ec09 (patch)
treebb7ea91693e940ceaa32bcb30a49048717b323ee
parentba60c1d7ddcf21fa56e9bde2880ac816c1d231e0 (diff)
downloadopenbmc-3012b0e24a1ff7478fda109895515ced1472ec09.tar.xz
meta-nuvoton: u-boot-nuvoton: move to v2023.10
Signed-off-by: Tim Lee <timlee660101@gmail.com> Change-Id: I6b053fcecd1a2e7d41566fd5aef87a605dfc7ca2
-rw-r--r--meta-nuvoton/conf/machine/evb-npcm845.conf2
-rw-r--r--meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc (renamed from meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc)8
-rw-r--r--meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb (renamed from meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb)2
-rw-r--r--meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb (renamed from meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb)2
4 files changed, 7 insertions, 7 deletions
diff --git a/meta-nuvoton/conf/machine/evb-npcm845.conf b/meta-nuvoton/conf/machine/evb-npcm845.conf
index 725f2b051d..92641abb06 100644
--- a/meta-nuvoton/conf/machine/evb-npcm845.conf
+++ b/meta-nuvoton/conf/machine/evb-npcm845.conf
@@ -1,7 +1,7 @@
KMACHINE = "nuvoton"
KERNEL_DEVICETREE = "nuvoton/${KMACHINE}-npcm845-evb.dtb"
-UBOOT_MACHINE = "ArbelEVB_defconfig"
+UBOOT_MACHINE = "arbel_evb_defconfig"
UBOOT_DEVICETREE = "nuvoton-npcm845-evb"
IGPS_MACHINE = "EB"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
index a4f590cbc8..e05f15f622 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
@@ -3,12 +3,12 @@ SECTION = "bootloaders"
DEPENDS += "flex-native bison-native"
LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
-UBRANCH = "npcm-v2021.04"
+UBRANCH = "npcm-v2023.10"
SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https"
-SRCREV = "b0b0222d39fe45fd6062df5dd3cce77b1a89841d"
+SRCREV = "6cb728fcca9f9e1854e7b34c1c991a9e02eff86d"
S = "${WORKDIR}/git"
-PV .= "+${UBRANCH}+"
+PV = "v2023.10+git${SRCPV}"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb
index 029b436e9a..4f06ecf2a0 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb
@@ -1,4 +1,4 @@
-require u-boot-common-nuvoton.inc
+require u-boot-common-nuvoton_${PV}.inc
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
DEPENDS = "mtd-utils bison-native"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb
index d4c4697509..6ad140eeec 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller"
-require u-boot-common-nuvoton.inc
+require u-boot-common-nuvoton_${PV}.inc
require u-boot-nuvoton.inc
PROVIDES += "u-boot"