From 44f6b4d1411c5c132dfa15847a53f7537f9d5abe Mon Sep 17 00:00:00 2001
From: Benjamin Fair <benjaminfair@google.com>
Date: Tue, 22 Jan 2019 14:34:28 -0800
Subject: u-boot-nuvoton: split common vars into an include file

Move the common variables from u-boot-nuvoton and
u-boot-fw-utils-nuvoton into a shared include file. This matches
Aspeed's U-Boot and makes it easier to update the SRCREV.

(From meta-nuvoton rev: f2ffed2c9345f79f11aab0b78f03f8350bce0476)

Change-Id: I44407ff06d25f6ad6ae00f97b53c7db4fd60064c
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc  | 14 ++++++++++++++
 .../recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb      | 13 ++-----------
 meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb      | 13 +------------
 3 files changed, 17 insertions(+), 23 deletions(-)
 create mode 100644 meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc

(limited to 'meta-nuvoton')

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
new file mode 100644
index 000000000..301dd7352
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc
@@ -0,0 +1,14 @@
+HOMEPAGE = "https://github.com/Nuvoton-Israel/u-boot"
+SECTION = "bootloaders"
+DEPENDS += "flex-native bison-native"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+UBRANCH = "npcm7xx"
+SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}"
+SRCREV = "196461383f7d043f18cab3bb34dded89fba4712a"
+
+S = "${WORKDIR}/git"
+
+PV .= "+${UBRANCH}+"
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
index cefdea803..42bc7a306 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_git.bb
@@ -1,19 +1,10 @@
+require u-boot-common-nuvoton.inc
+
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-SECTION = "bootloader"
 DEPENDS = "mtd-utils"
 
 PROVIDES += "u-boot-fw-utils"
 
-UBRANCH = "npcm7xx"
-SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}"
-SRCREV = "196461383f7d043f18cab3bb34dded89fba4712a"
-
-PV .= "+${UBRANCH}+"
-
-S = "${WORKDIR}/git"
-
 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'
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
index ea1fdbebe..0bd23d04d 100644
--- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
+++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb
@@ -1,19 +1,8 @@
 DESCRIPTION = "U-boot for Nuvoton NPCM7xx Baseboard Management Controller"
 
+require u-boot-common-nuvoton.inc
 require recipes-bsp/u-boot/u-boot.inc
 
 PROVIDES += "u-boot"
 
 DEPENDS += "dtc-native"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
-
-S = "${WORKDIR}/git"
-
-UBRANCH = "npcm7xx"
-SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}"
-SRCREV = "196461383f7d043f18cab3bb34dded89fba4712a"
-
-PV .= "+${UBRANCH}+"
-
-- 
cgit v1.2.1