| Submitter | Radu Moisan |
|---|---|
| Date | Aug. 3, 2012, 12:38 p.m. |
| Message ID | <1343997523-4117-1-git-send-email-radu.moisan@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/33743/ |
| State | New |
| Headers | show |
Comments
On Fri, Aug 03, 2012 at 03:38:42PM +0300, Radu Moisan wrote: > Building u-boot requires UBOOT_MACHINE. In the u-boot README file > building u-boot is achieved with "make NAME_config" and then > "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus, > the "_config" addition in u-boot.inc > NAME is the machine name, and choices area vailable in boards.conf, > I used for testing coreboot-x86. From this description I don't see why _config is now appended when probably all BSPs had it included in UBOOT_MACHINE variable before meta-nokia/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_nokia900 = "nokia_rx51_config" meta-openmoko/conf/machine/om-gta04.conf:UBOOT_MACHINE = "omap3_gta04_config" meta-openmoko/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_om-gta04 = "omap3_gta04_config" conf/machine/am180x-evm.conf:UBOOT_MACHINE = "da850evm_config" conf/machine/am335x-evm.conf:UBOOT_MACHINE = "am335x_evm_config" conf/machine/am3517-evm.conf:UBOOT_MACHINE = "am3517_evm_config" conf/machine/am37x-evm.conf:UBOOT_MACHINE = "omap3_evm_config" conf/machine/beagleboard.conf:UBOOT_MACHINE = "omap3_beagle_config" conf/machine/beaglebone.conf:UBOOT_MACHINE = "am335x_evm_config" conf/machine/hawkboard.conf:UBOOT_MACHINE = "da850_omapl138_evm_config" conf/machine/include/davinci.inc:UBOOT_MACHINE = "davinci_dvevm_config" conf/machine/include/ti814x.inc:UBOOT_MACHINE = "ti8148_evm_config_nand" conf/machine/include/ti816x.inc:UBOOT_MACHINE = "ti8168_evm_config" conf/machine/omap3-touchbook.conf:UBOOT_MACHINE = "omap3_beagle_config" conf/machine/omap3evm.conf:UBOOT_MACHINE = "omap3_evm_config" conf/machine/pandaboard.conf:UBOOT_MACHINE = "omap4_panda_config" And any sensible is to append it to *MACHINE* variable as default: recipes-bsp/u-boot/u-boot.inc:UBOOT_MACHINE ?= "${MACHINE}_config" Cheers, > > For u-boot-fw-utils fw_enc.c was changed and it requires a header > file config.h which is autogenerated at config so it requires a > "make NAME_config". > > Signed-off-by: Radu Moisan <radu.moisan@intel.com> > --- > ...ls_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} | 7 ++++--- > ...age_2012.04.01.bb => u-boot-mkimage_2012.07.bb} | 6 +++--- > meta/recipes-bsp/u-boot/u-boot.inc | 2 +- > .../{u-boot_2012.04.01.bb => u-boot_2012.07.bb} | 8 ++++---- > 4 files changed, 12 insertions(+), 11 deletions(-) > rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} (83%) > rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2012.04.01.bb => u-boot-mkimage_2012.07.bb} (84%) > rename meta/recipes-bsp/u-boot/{u-boot_2012.04.01.bb => u-boot_2012.07.bb} (82%) > > diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb > similarity index 83% > rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb > rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb > index fe3422a..2fa3b71 100644 > --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb > +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb > @@ -9,12 +9,12 @@ DEPENDS = "mtd-utils" > # make it default > DEFAULT_PREFERENCE = "-1" > > -# This revision corresponds to the tag "v2012.04.01" > +# This revision corresponds to the tag "v2012.07" > # We use the revision in order to avoid having to fetch it from the > # repo during parse > -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" > +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" > > -PV = "v2012.04.01+git${SRCPV}" > +PV = "2012.07" > > SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" > > @@ -23,6 +23,7 @@ S = "${WORKDIR}/git" > EXTRA_OEMAKE = 'HOSTCC="${CC}"' > > do_compile () { > + oe_runmake ${UBOOT_MACHINE}_config > oe_runmake env > } > > diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb > similarity index 84% > rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb > rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb > index aa107fe..752efcb 100644 > --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb > +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb > @@ -7,12 +7,12 @@ SECTION = "bootloader" > # make it default > DEFAULT_PREFERENCE = "-1" > > -# This revision corresponds to the tag "v2012.04.01" > +# This revision corresponds to the tag "v2012.07" > # We use the revision in order to avoid having to fetch it from the > # repo during parse > -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" > +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" > > -PV = "v2012.04.01+git${SRCPV}" > +PV = "2012.07" > > SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" > > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc > index 42bdde9..58a8192 100644 > --- a/meta/recipes-bsp/u-boot/u-boot.inc > +++ b/meta/recipes-bsp/u-boot/u-boot.inc > @@ -40,7 +40,7 @@ do_compile () { > unset LDFLAGS > unset CFLAGS > unset CPPFLAGS > - oe_runmake ${UBOOT_MACHINE} > + oe_runmake ${UBOOT_MACHINE}_config > oe_runmake ${UBOOT_MAKE_TARGET} > } > > diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb > similarity index 82% > rename from meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb > rename to meta/recipes-bsp/u-boot/u-boot_2012.07.bb > index c4ec50d..7ccee30 100644 > --- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb > +++ b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb > @@ -14,13 +14,13 @@ DEFAULT_PREFERENCE = "-1" > LICENSE = "GPLv2+" > LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" > > -# This revision corresponds to the tag "v2012.04.01" > +# This revision corresponds to the tag "v2012.07" > # We use the revision in order to avoid having to fetch it from the > # repo during parse > -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" > +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" > > -PV = "v2012.04.01+git${SRCPV}" > -PR = "r1" > +PV = "2012.07" > +PR = "r0" > > SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" > > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On 08/03/2012 03:46 PM, Martin Jansa wrote: > On Fri, Aug 03, 2012 at 03:38:42PM +0300, Radu Moisan wrote: >> Building u-boot requires UBOOT_MACHINE. In the u-boot README file >> building u-boot is achieved with "make NAME_config" and then >> "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus, >> the "_config" addition in u-boot.inc >> NAME is the machine name, and choices area vailable in boards.conf, >> I used for testing coreboot-x86. > From this description I don't see why _config is now appended when > probably all BSPs had it included in UBOOT_MACHINE variable before > > meta-nokia/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_nokia900 = "nokia_rx51_config" > meta-openmoko/conf/machine/om-gta04.conf:UBOOT_MACHINE = "omap3_gta04_config" > meta-openmoko/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_om-gta04 = "omap3_gta04_config" > conf/machine/am180x-evm.conf:UBOOT_MACHINE = "da850evm_config" > conf/machine/am335x-evm.conf:UBOOT_MACHINE = "am335x_evm_config" > conf/machine/am3517-evm.conf:UBOOT_MACHINE = "am3517_evm_config" > conf/machine/am37x-evm.conf:UBOOT_MACHINE = "omap3_evm_config" > conf/machine/beagleboard.conf:UBOOT_MACHINE = "omap3_beagle_config" > conf/machine/beaglebone.conf:UBOOT_MACHINE = "am335x_evm_config" > conf/machine/hawkboard.conf:UBOOT_MACHINE = "da850_omapl138_evm_config" > conf/machine/include/davinci.inc:UBOOT_MACHINE = "davinci_dvevm_config" > conf/machine/include/ti814x.inc:UBOOT_MACHINE = "ti8148_evm_config_nand" > conf/machine/include/ti816x.inc:UBOOT_MACHINE = "ti8168_evm_config" > conf/machine/omap3-touchbook.conf:UBOOT_MACHINE = "omap3_beagle_config" > conf/machine/omap3evm.conf:UBOOT_MACHINE = "omap3_evm_config" > conf/machine/pandaboard.conf:UBOOT_MACHINE = "omap4_panda_config" > > And any sensible is to append it to *MACHINE* variable as default: > recipes-bsp/u-boot/u-boot.inc:UBOOT_MACHINE ?= "${MACHINE}_config" > > Cheers, Ok, missed that, I'll fix it. radu
Dear Radu Moisan, In message <1343997523-4117-1-git-send-email-radu.moisan@intel.com> you wrote: > Building u-boot requires UBOOT_MACHINE. In the u-boot README file > building u-boot is achieved with "make NAME_config" and then > "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus, Actually a plain make NAME does the same as "make NAME_config && make all". You might also consider running "./MAKEALL NAME" instead, which aut-adjusts to te number of available cores on the build host, so you get somewhat reduced build times. Best regards, Wolfgang Denk
On 08/03/2012 07:19 PM, Wolfgang Denk wrote: > Dear Radu Moisan, > > In message <1343997523-4117-1-git-send-email-radu.moisan@intel.com> you wrote: >> Building u-boot requires UBOOT_MACHINE. In the u-boot README file >> building u-boot is achieved with "make NAME_config" and then >> "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus, > Actually a plain > > make NAME > > does the same as "make NAME_config && make all". > > You might also consider running "./MAKEALL NAME" instead, which > aut-adjusts to te number of available cores on the build host, so you > get somewhat reduced build times. I've tried to build this way but got into some errors and did not pursued further in debugging them. However, because UBOOT_MACHINE is already used as NAME_config, would be difficult to change it to NAME and ask everyone who use it, to switch. I will go with current configuration "make NAME_config" & "make all" radu
Dear Radu, In message <501F63FF.1070401@intel.com> you wrote: > > > Actually a plain > > > > make NAME > > > > does the same as "make NAME_config && make all". > > > > You might also consider running "./MAKEALL NAME" instead, which > > aut-adjusts to te number of available cores on the build host, so you > > get somewhat reduced build times. > > I've tried to build this way but got into some errors and did not > pursued further in debugging them. However, because UBOOT_MACHINE is Could you please tell me exactly what these errors were? Log files etc. highly appreciated... Best regards, Wolfgang Denk
I may be recipe configuration, however, here are my steps: >bitbake u-boot -c cleanall >bitbake u-boot -c fetch >bitbake -c devshell u-boot in the new shell >make coreboot-x86 (without _config) The output I got is as follows: Configuring for coreboot-x86 - Board: coreboot, Options: SYS_TEXT_BASE=0xFC0000 make /bin/bash: i386-linux-gcc: command not found /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. make[1]: Entering directory `/home/radu/Documents/Development/yocto/build/tmp/work/qemux86-poky-linux/u-boot-2012.07-r0/git' /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. Generating include/autoconf.mk /bin/bash: line 3: i386-linux-gcc: command not found /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. Generating include/autoconf.mk.dep /bin/bash: line 3: i386-linux-gcc: command not found make[1]: Leaving directory `/home/radu/Documents/Development/yocto/build/tmp/work/qemux86-poky-linux/u-boot-2012.07-r0/git' /bin/bash: i386-linux-gcc: command not found /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. make[1]: Entering directory `/home/radu/Documents/Development/yocto/build/tmp/work/qemux86-poky-linux/u-boot-2012.07-r0/git' /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found /bin/bash: i386-linux-ld: command not found /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. /bin/bash: i386-linux-gcc: command not found basename: missing operand Try `basename --help' for more information. i386-linux-gcc -DDO_DEPS_ONLY \ -g -Os -ffunction-sections -fvisibility=hidden -D__KERNEL__ -I/home/radu/Documents/Development/yocto/build/tmp/work/qemux86-poky-linux/u-boot-2012.07-r0/git/include -fno-builtin -ffreestanding -nostdinc -isystem -pipe -fno-strict-aliasing -Wstrict-prototypes -mregparm=3 -fomit-frame-pointer -ffreestanding -fno-toplevel-reorder -fno-stack-protector -fno-dwarf2-cfi-asm -DREALMODE_BASE=0x7c0 -DCONFIG_X86 -D__I386__ -march=i386 -Werror -Wall -Wstrict-prototypes -fno-stack-protector \ -o lib/asm-offsets.s lib/asm-offsets.c -c -S /bin/bash: i386-linux-gcc: command not found make[1]: *** [lib/asm-offsets.s] Error 127 make[1]: Leaving directory `/home/radu/Documents/Development/yocto/build/tmp/work/qemux86-poky-linux/u-boot-2012.07-r0/git' make: *** [coreboot-x86] Error 2 However this is the same out as when I do >make coreboot-x86_config >make all This happens only when I'm trying to build inside the devshell, which lead me to believe that maybe the environment is not set completely, until at do_compile. radu On 08/06/2012 10:45 AM, Wolfgang Denk wrote: > Dear Radu, > > In message <501F63FF.1070401@intel.com> you wrote: >>> Actually a plain >>> >>> make NAME >>> >>> does the same as "make NAME_config && make all". >>> >>> You might also consider running "./MAKEALL NAME" instead, which >>> aut-adjusts to te number of available cores on the build host, so you >>> get somewhat reduced build times. >> I've tried to build this way but got into some errors and did not >> pursued further in debugging them. However, because UBOOT_MACHINE is > Could you please tell me exactly what these errors were? Log files > etc. highly appreciated... > > Best regards, > > Wolfgang Denk >
Dear Radu, In message <501FC96A.8000400@intel.com> you wrote: > > in the new shell > > >make coreboot-x86 (without _config) > > The output I got is as follows: > > Configuring for coreboot-x86 - Board: coreboot, Options: > SYS_TEXT_BASE=0xFC0000 > make > /bin/bash: i386-linux-gcc: command not found > /bin/bash: i386-linux-gcc: command not found It seems CROSS_COMPILE is set to "i386-linux-", but i386-linux-gcc is not anywhere in your PATH. Please check your PATH and fix it. Best regards, Wolfgang Denk
CROSS_COMPILE is set in EXTRA_OEMAKE which is used in oe-runmake() within do_compile() Running devshell is achieved in do_devshell() which is run after do_patch() but before do_compile(), that's why in devshell CROSS_COMPILE is not (yet) set. I think this is the intended way for things to work, devshell usage, as I see it, is mainly for pre-compile debugging purposes. radu On 08/06/2012 04:46 PM, Wolfgang Denk wrote: > Dear Radu, > > In message <501FC96A.8000400@intel.com> you wrote: >> in the new shell >> >> >make coreboot-x86 (without _config) >> >> The output I got is as follows: >> >> Configuring for coreboot-x86 - Board: coreboot, Options: >> SYS_TEXT_BASE=0xFC0000 >> make >> /bin/bash: i386-linux-gcc: command not found >> /bin/bash: i386-linux-gcc: command not found > It seems CROSS_COMPILE is set to "i386-linux-", but i386-linux-gcc is > not anywhere in your PATH. Please check your PATH and fix it. > > Best regards, > > Wolfgang Denk >
Dear Radu, In message <501FD013.5040000@intel.com> you wrote: > > CROSS_COMPILE is set in EXTRA_OEMAKE which is used in oe-runmake() > within do_compile() > Running devshell is achieved in do_devshell() which is run after > do_patch() but before do_compile(), that's why in devshell CROSS_COMPILE > is not (yet) set. But CROSS_COMPILE _is_ set (and apparently has the value "i386-linux-". The problem is that PATH is not set such that it contains any such file as i386-linux-gcc. Best regards, Wolfgang Denk
On Mon, Aug 6, 2012 at 7:13 AM, Wolfgang Denk <wd@denx.de> wrote: > Dear Radu, > > In message <501FD013.5040000@intel.com> you wrote: >> >> CROSS_COMPILE is set in EXTRA_OEMAKE which is used in oe-runmake() >> within do_compile() >> Running devshell is achieved in do_devshell() which is run after >> do_patch() but before do_compile(), that's why in devshell CROSS_COMPILE >> is not (yet) set. > But CROSS_COMPILE _is_ set (and apparently has the value > "i386-linux-". > > The problem is that PATH is not set such that it contains any such > file as i386-linux-gcc. > > > Best regards, > > Wolfgang Denk > > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de > "Beware of bugs in the above code; I have only proved it correct, not > tried it." - Donald Knuth > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Hi Wolfgang If the fix proposed here http://lists.denx.de/pipermail/u-boot/2012-August/129828.html is accepted into u-boot then we wont need these glues.
I meant, set with the correct value. "i386-linux-" is preloaded into CROSS_COMPILE and then at do_compile() "gcc" is appended to it. Is there in interest, to actually build u-boot in devshell? Radu On 08/06/2012 05:13 PM, Wolfgang Denk wrote: > Dear Radu, > > In message <501FD013.5040000@intel.com> you wrote: >> CROSS_COMPILE is set in EXTRA_OEMAKE which is used in oe-runmake() >> within do_compile() >> Running devshell is achieved in do_devshell() which is run after >> do_patch() but before do_compile(), that's why in devshell CROSS_COMPILE >> is not (yet) set. > But CROSS_COMPILE _is_ set (and apparently has the value > "i386-linux-". > > The problem is that PATH is not set such that it contains any such > file as i386-linux-gcc. > > > Best regards, > > Wolfgang Denk >
Patch
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb similarity index 83% rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb index fe3422a..2fa3b71 100644 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb @@ -9,12 +9,12 @@ DEPENDS = "mtd-utils" # make it default DEFAULT_PREFERENCE = "-1" -# This revision corresponds to the tag "v2012.04.01" +# This revision corresponds to the tag "v2012.07" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" -PV = "v2012.04.01+git${SRCPV}" +PV = "2012.07" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" @@ -23,6 +23,7 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = 'HOSTCC="${CC}"' do_compile () { + oe_runmake ${UBOOT_MACHINE}_config oe_runmake env } diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb similarity index 84% rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb index aa107fe..752efcb 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb @@ -7,12 +7,12 @@ SECTION = "bootloader" # make it default DEFAULT_PREFERENCE = "-1" -# This revision corresponds to the tag "v2012.04.01" +# This revision corresponds to the tag "v2012.07" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" -PV = "v2012.04.01+git${SRCPV}" +PV = "2012.07" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 42bdde9..58a8192 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -40,7 +40,7 @@ do_compile () { unset LDFLAGS unset CFLAGS unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} + oe_runmake ${UBOOT_MACHINE}_config oe_runmake ${UBOOT_MAKE_TARGET} } diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb similarity index 82% rename from meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb rename to meta/recipes-bsp/u-boot/u-boot_2012.07.bb index c4ec50d..7ccee30 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb @@ -14,13 +14,13 @@ DEFAULT_PREFERENCE = "-1" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -# This revision corresponds to the tag "v2012.04.01" +# This revision corresponds to the tag "v2012.07" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935" -PV = "v2012.04.01+git${SRCPV}" -PR = "r1" +PV = "2012.07" +PR = "r0" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
Building u-boot requires UBOOT_MACHINE. In the u-boot README file building u-boot is achieved with "make NAME_config" and then "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus, the "_config" addition in u-boot.inc NAME is the machine name, and choices area vailable in boards.conf, I used for testing coreboot-x86. For u-boot-fw-utils fw_enc.c was changed and it requires a header file config.h which is autogenerated at config so it requires a "make NAME_config". Signed-off-by: Radu Moisan <radu.moisan@intel.com> --- ...ls_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} | 7 ++++--- ...age_2012.04.01.bb => u-boot-mkimage_2012.07.bb} | 6 +++--- meta/recipes-bsp/u-boot/u-boot.inc | 2 +- .../{u-boot_2012.04.01.bb => u-boot_2012.07.bb} | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} (83%) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2012.04.01.bb => u-boot-mkimage_2012.07.bb} (84%) rename meta/recipes-bsp/u-boot/{u-boot_2012.04.01.bb => u-boot_2012.07.bb} (82%)