From 3012b0e24a1ff7478fda109895515ced1472ec09 Mon Sep 17 00:00:00 2001 From: Tim Lee Date: Mon, 29 Apr 2024 17:12:52 +0800 Subject: meta-nuvoton: u-boot-nuvoton: move to v2023.10 Signed-off-by: Tim Lee Change-Id: I6b053fcecd1a2e7d41566fd5aef87a605dfc7ca2 --- meta-nuvoton/conf/machine/evb-npcm845.conf | 2 +- .../recipes-bsp/u-boot/u-boot-common-nuvoton.inc | 14 -------- .../u-boot/u-boot-common-nuvoton_2023.10.inc | 14 ++++++++ .../u-boot/u-boot-fw-utils-nuvoton_2023.10.bb | 42 ++++++++++++++++++++++ .../u-boot/u-boot-fw-utils-nuvoton_git.bb | 42 ---------------------- .../recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb | 10 ++++++ .../recipes-bsp/u-boot/u-boot-nuvoton_git.bb | 10 ------ 7 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc create mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc create mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb delete mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb create mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb delete mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb 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.inc deleted file mode 100644 index a4f590cbc8..0000000000 --- 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 0000000000..e05f15f622 --- /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_2023.10.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb new file mode 100644 index 0000000000..4f06ecf2a0 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2023.10.bb @@ -0,0 +1,42 @@ +require u-boot-common-nuvoton_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +DEPENDS = "mtd-utils bison-native" +RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" + +PROVIDES += "u-boot-fw-utils" +SRC_URI += "file://fw_env.config" + +INSANE_SKIP:${PN} = "already-stripped" + +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake envtools +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install:class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_PREPROCESS_FUNCS:class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" 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_git.bb deleted file mode 100644 index 029b436e9a..0000000000 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -require u-boot-common-nuvoton.inc - -SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" -DEPENDS = "mtd-utils bison-native" -RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" - -PROVIDES += "u-boot-fw-utils" -SRC_URI += "file://fw_env.config" - -INSANE_SKIP:${PN} = "already-stripped" - -EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' -EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' - -inherit uboot-config - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake envtools -} - -do_install () { - install -d ${D}${base_sbindir} - install -d ${D}${sysconfdir} - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config -} - -do_install:class-cross () { - install -d ${D}${bindir_cross} - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv -} - -SYSROOT_PREPROCESS_FUNCS:class-cross = "uboot_fw_utils_cross" -uboot_fw_utils_cross() { - sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -BBCLASSEXTEND = "cross" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb new file mode 100644 index 0000000000..6ad140eeec --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2023.10.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller" + +require u-boot-common-nuvoton_${PV}.inc +require u-boot-nuvoton.inc + +PROVIDES += "u-boot" + +DEPENDS += "dtc-native" + +SRC_URI:append:df-phosphor-mmc = " file://u-boot-emmc.cfg" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb deleted file mode 100644 index d4c4697509..0000000000 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller" - -require u-boot-common-nuvoton.inc -require u-boot-nuvoton.inc - -PROVIDES += "u-boot" - -DEPENDS += "dtc-native" - -SRC_URI:append:df-phosphor-mmc = " file://u-boot-emmc.cfg" -- cgit v1.2.3