Patchwork u-boot: package up u-boot.bin for field upgrades

login
register
mail settings
Submitter Koen Kooi
Date May 30, 2011, 12:01 p.m.
Message ID <1306756909-18466-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/5039/
State New, archived
Headers show

Comments

Koen Kooi - May 30, 2011, 12:01 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-bsp/uboot/u-boot.inc        |   11 +++++++++++
 meta/recipes-bsp/uboot/u-boot_2011.03.bb |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)
Koen Kooi - June 1, 2011, 9:22 a.m.
ping

Op 30 mei 2011, om 14:01 heeft Koen Kooi het volgende geschreven:

> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-bsp/uboot/u-boot.inc        |   11 +++++++++++
> meta/recipes-bsp/uboot/u-boot_2011.03.bb |    2 +-
> 2 files changed, 12 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
> index 83dfb6f..2be9fc9 100644
> --- a/meta/recipes-bsp/uboot/u-boot.inc
> +++ b/meta/recipes-bsp/uboot/u-boot.inc
> @@ -21,6 +21,7 @@ python () {
> }
> 
> UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
> +UBOOT_BINARY ?= "u-boot.bin"
> UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
> UBOOT_MAKE_TARGET ?= "all"
> 
> @@ -32,6 +33,16 @@ do_compile () {
> 	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}
> +}
> +
> +FILES_${PN} = "/boot"
> +# no gnu_hash in uboot.bin, by design, so skip QA
> +INSANE_SKIP_${PN} = True
> +
> do_deploy () {
> 	install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
> 
> diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> index 0fbb9ba..07f0609 100644
> --- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> +++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> @@ -14,7 +14,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE
> 
> SRCREV = "v2011.03"
> PV = "v2011.03+git${SRCPV}"
> -PR="r3"
> +PR="r4"
> 
> SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
> 
> -- 
> 1.6.6.1
>
Saul Wold - June 3, 2011, 12:07 a.m.
On 05/30/2011 05:01 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/recipes-bsp/uboot/u-boot.inc        |   11 +++++++++++
>   meta/recipes-bsp/uboot/u-boot_2011.03.bb |    2 +-
>   2 files changed, 12 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
> index 83dfb6f..2be9fc9 100644
> --- a/meta/recipes-bsp/uboot/u-boot.inc
> +++ b/meta/recipes-bsp/uboot/u-boot.inc
> @@ -21,6 +21,7 @@ python () {
>   }
>
>   UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
> +UBOOT_BINARY ?= "u-boot.bin"
>   UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
>   UBOOT_MAKE_TARGET ?= "all"
>
> @@ -32,6 +33,16 @@ do_compile () {
>   	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}
> +}
> +
> +FILES_${PN} = "/boot"
> +# no gnu_hash in uboot.bin, by design, so skip QA
> +INSANE_SKIP_${PN} = True
> +
>   do_deploy () {
>   	install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
>
> diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> index 0fbb9ba..07f0609 100644
> --- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> +++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
> @@ -14,7 +14,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE
>
>   SRCREV = "v2011.03"
>   PV = "v2011.03+git${SRCPV}"
> -PR="r3"
> +PR="r4"
>
>   SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>

Merged into oe-core, thanks for your patience US was on holiday on Monday

Thanks
	Sau!

Patch

diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 83dfb6f..2be9fc9 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -21,6 +21,7 @@  python () {
 }
 
 UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
+UBOOT_BINARY ?= "u-boot.bin"
 UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
 UBOOT_MAKE_TARGET ?= "all"
 
@@ -32,6 +33,16 @@  do_compile () {
 	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}
+}
+
+FILES_${PN} = "/boot"
+# no gnu_hash in uboot.bin, by design, so skip QA
+INSANE_SKIP_${PN} = True
+
 do_deploy () {
 	install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
 
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
index 0fbb9ba..07f0609 100644
--- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
@@ -14,7 +14,7 @@  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE
 
 SRCREV = "v2011.03"
 PV = "v2011.03+git${SRCPV}"
-PR="r3"
+PR="r4"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"