[meta-lsi] [PATCH 23/26] u-boot: Rename recipes to Axxia and update git link
Daniel Dragomir
daniel.dragomir at windriver.com
Fri Aug 5 08:33:46 PDT 2016
Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
recipes-bsp/u-boot/u-boot-axxia.inc | 101 ++++++++++++++++++++++++++
recipes-bsp/u-boot/u-boot-axxia_2010.03.bb | 15 ++++
recipes-bsp/u-boot/u-boot-axxia_2013.01.01.bb | 13 ++++
recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb | 4 +-
recipes-bsp/u-boot/u-boot-lsi.inc | 101 --------------------------
recipes-bsp/u-boot/u-boot-lsi_2010.03.bb | 15 ----
recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb | 13 ----
7 files changed, 131 insertions(+), 131 deletions(-)
create mode 100644 recipes-bsp/u-boot/u-boot-axxia.inc
create mode 100644 recipes-bsp/u-boot/u-boot-axxia_2010.03.bb
create mode 100644 recipes-bsp/u-boot/u-boot-axxia_2013.01.01.bb
delete mode 100644 recipes-bsp/u-boot/u-boot-lsi.inc
delete mode 100644 recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
delete mode 100644 recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-axxia.inc b/recipes-bsp/u-boot/u-boot-axxia.inc
new file mode 100644
index 0000000..44408de
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-axxia.inc
@@ -0,0 +1,101 @@
+DESCRIPTION = "U-Boot - the Universal Boot Loader"
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+
+inherit deploy
+
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
+
+python () {
+ if not d.getVar("UBOOT_MACHINE", True):
+ PN = d.getVar("PN", True)
+ FILE = os.path.basename(d.getVar("FILE", True))
+ bb.debug(1, "To build %s, see %s for instructions on \
+ setting up your machine config" % (PN, FILE))
+ raise bb.parse.SkipPackage("because UBOOT_MACHINE is not set")
+}
+
+# Some versions of u-boot use .bin and others use .img. By default use .bin
+# but enable individual recipes to change this value.
+UBOOT_SUFFIX ?= "img"
+UBOOT_IMAGE ?= "u-boot${UBOOT_EMU}-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK ?= "u-boot${UBOOT_EMU}-${MACHINE}.${UBOOT_SUFFIX}"
+UBOOT_MAKE_TARGET ?= "all"
+
+# SPL (Secondary Program Loader)
+SPL_SUFFIX = "bin"
+SPL_FILE = "u-boot-spl"
+SPL_PATH = "spl"
+SPL_BINARY = "${SPL_PATH}/${SPL_FILE}.${SPL_SUFFIX}"
+SPL_IMAGE = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}-${PV}-${PR}.${SPL_SUFFIX}"
+SPL_SYMLINK = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}.${SPL_SUFFIX}"
+
+do_compile () {
+ export SYSROOT="${STAGING_DIR_TARGET}"
+ if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
+ sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
+ fi
+
+ unset LDFLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ oe_runmake ${UBOOT_MACHINE}
+ oe_runmake ${UBOOT_MAKE_TARGET}
+}
+
+do_install () {
+ install -d ${D}/boot
+ install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+ ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+
+ if [ -e ${WORKDIR}/fw_env.config ] ; then
+ install -d ${D}${sysconfdir}
+ install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+ fi
+
+ if [ "x${SPL_BINARY}" != "x" ]
+ then
+ install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
+ ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_FILE}.${SPL_SUFFIX}
+ fi
+}
+
+FILES_${PN} = "/boot ${sysconfdir}"
+FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
+
+do_deploy () {
+ install -d ${DEPLOYDIR}
+ install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+
+ cd ${DEPLOYDIR}
+ rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
+
+ if [ "x${SPL_BINARY}" != "x" ]
+ then
+ install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
+ rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_FILE}.${SPL_SUFFIX}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
+ fi
+}
+
+addtask deploy before do_build after do_compile
+
+python do_get_tag() {
+ import subprocess
+ tag = subprocess.check_output(d.expand("cd ${S}; git describe"), shell=True)
+ bb.note("get_tag returns " + tag)
+ return tag
+}
+
+addtask get_tag after do_patch before do_build
+do_get_tag[nostamp] = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/git"
+
+PROVIDES = "virtual/bootloader"
diff --git a/recipes-bsp/u-boot/u-boot-axxia_2010.03.bb b/recipes-bsp/u-boot/u-boot-axxia_2010.03.bb
new file mode 100644
index 0000000..c65c08c
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-axxia_2010.03.bb
@@ -0,0 +1,15 @@
+require u-boot-axxia.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
+
+UBOOT_MACHINE_axxiapowerpc = "ACP344xV2_stage3_config"
+
+SPL_BINARY = ""
+
+SRCREV = "lsi_axxia_u-boot_4.8.1.103"
+
+PV = "2010.03+${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/axxia/axxia_u-boot.git"
diff --git a/recipes-bsp/u-boot/u-boot-axxia_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-axxia_2013.01.01.bb
new file mode 100644
index 0000000..a599517
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-axxia_2013.01.01.bb
@@ -0,0 +1,13 @@
+require u-boot-axxia.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+
+UBOOT_MACHINE_axxiaarm = "axxia-55xx_config"
+
+SRCREV = "lsi_axxia_u-boot_5.8.1.78"
+
+PV = "2013.01.01+${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/axxia/axxia_u-boot.git"
diff --git a/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
index dc8a947..19884b1 100644
--- a/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
@@ -1,4 +1,4 @@
-require u-boot-lsi.inc
+require u-boot-axxia.inc
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
@@ -13,4 +13,4 @@ SRCREV = "lsi_axxia_u-boot_5.8.1.78"
PV = "2013.01.01+${SRCREV}"
PR = "r1"
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
+SRC_URI = "git://github.com/axxia/axxia_u-boot.git"
diff --git a/recipes-bsp/u-boot/u-boot-lsi.inc b/recipes-bsp/u-boot/u-boot-lsi.inc
deleted file mode 100644
index 44408de..0000000
--- a/recipes-bsp/u-boot/u-boot-lsi.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-DESCRIPTION = "U-Boot - the Universal Boot Loader"
-HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
-SECTION = "bootloaders"
-
-inherit deploy
-
-EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
-
-python () {
- if not d.getVar("UBOOT_MACHINE", True):
- PN = d.getVar("PN", True)
- FILE = os.path.basename(d.getVar("FILE", True))
- bb.debug(1, "To build %s, see %s for instructions on \
- setting up your machine config" % (PN, FILE))
- raise bb.parse.SkipPackage("because UBOOT_MACHINE is not set")
-}
-
-# Some versions of u-boot use .bin and others use .img. By default use .bin
-# but enable individual recipes to change this value.
-UBOOT_SUFFIX ?= "img"
-UBOOT_IMAGE ?= "u-boot${UBOOT_EMU}-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK ?= "u-boot${UBOOT_EMU}-${MACHINE}.${UBOOT_SUFFIX}"
-UBOOT_MAKE_TARGET ?= "all"
-
-# SPL (Secondary Program Loader)
-SPL_SUFFIX = "bin"
-SPL_FILE = "u-boot-spl"
-SPL_PATH = "spl"
-SPL_BINARY = "${SPL_PATH}/${SPL_FILE}.${SPL_SUFFIX}"
-SPL_IMAGE = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}-${PV}-${PR}.${SPL_SUFFIX}"
-SPL_SYMLINK = "${SPL_FILE}${UBOOT_EMU}-${MACHINE}.${SPL_SUFFIX}"
-
-do_compile () {
- export SYSROOT="${STAGING_DIR_TARGET}"
- if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
- sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
- fi
-
- unset LDFLAGS
- unset CFLAGS
- unset CPPFLAGS
- oe_runmake ${UBOOT_MACHINE}
- oe_runmake ${UBOOT_MAKE_TARGET}
-}
-
-do_install () {
- install -d ${D}/boot
- install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
- ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
-
- if [ -e ${WORKDIR}/fw_env.config ] ; then
- install -d ${D}${sysconfdir}
- install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
- fi
-
- if [ "x${SPL_BINARY}" != "x" ]
- then
- install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
- ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_FILE}.${SPL_SUFFIX}
- fi
-}
-
-FILES_${PN} = "/boot ${sysconfdir}"
-FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
-
-do_deploy () {
- install -d ${DEPLOYDIR}
- install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-
- cd ${DEPLOYDIR}
- rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
- ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
- ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
-
- if [ "x${SPL_BINARY}" != "x" ]
- then
- install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
- rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
- ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_FILE}.${SPL_SUFFIX}
- ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
- fi
-}
-
-addtask deploy before do_build after do_compile
-
-python do_get_tag() {
- import subprocess
- tag = subprocess.check_output(d.expand("cd ${S}; git describe"), shell=True)
- bb.note("get_tag returns " + tag)
- return tag
-}
-
-addtask get_tag after do_patch before do_build
-do_get_tag[nostamp] = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/git"
-
-PROVIDES = "virtual/bootloader"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
deleted file mode 100644
index fe7a771..0000000
--- a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require u-boot-lsi.inc
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
-
-UBOOT_MACHINE_axxiapowerpc = "ACP344xV2_stage3_config"
-
-SPL_BINARY = ""
-
-SRCREV = "lsi_axxia_u-boot_4.8.1.103"
-
-PV = "2010.03+${SRCREV}"
-PR = "r1"
-
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
deleted file mode 100644
index 3bff9be..0000000
--- a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require u-boot-lsi.inc
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-UBOOT_MACHINE_axxiaarm = "axxia-55xx_config"
-
-SRCREV = "lsi_axxia_u-boot_5.8.1.78"
-
-PV = "2013.01.01+${SRCREV}"
-PR = "r1"
-
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
--
2.7.4
More information about the meta-lsi
mailing list