meta-nuvoton: u-boot-nuvoton: move to v2023.10
Signed-off-by: Tim Lee <timlee660101@gmail.com>
Change-Id: I6b053fcecd1a2e7d41566fd5aef87a605dfc7ca2
diff --git a/meta-nuvoton/conf/machine/evb-npcm845.conf b/meta-nuvoton/conf/machine/evb-npcm845.conf
index 725f2b0..92641ab 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.inc
deleted file mode 100644
index a4f590c..0000000
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-HOMEPAGE = "https://github.com/Nuvoton-Israel/u-boot"
-SECTION = "bootloaders"
-DEPENDS += "flex-native bison-native"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
-
-UBRANCH = "npcm-v2021.04"
-SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https"
-SRCREV = "b0b0222d39fe45fd6062df5dd3cce77b1a89841d"
-
-S = "${WORKDIR}/git"
-
-PV .= "+${UBRANCH}+"
diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
new file mode 100644
index 0000000..e05f15f
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc
@@ -0,0 +1,14 @@
+HOMEPAGE = "https://github.com/Nuvoton-Israel/u-boot"
+SECTION = "bootloaders"
+DEPENDS += "flex-native bison-native"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
+
+UBRANCH = "npcm-v2023.10"
+SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https"
+SRCREV = "6cb728fcca9f9e1854e7b34c1c991a9e02eff86d"
+
+S = "${WORKDIR}/git"
+
+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
similarity index 96%
rename from meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb
rename to meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb
index 029b436..4f06ecf 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
similarity index 84%
rename from meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
rename to meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb
index d4c4697..6ad140e 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"