[U-Boot] [PATCH 0/15] Follow-up for Kbuild series: more misc targets and short logs

Simon Glass sjg at chromium.org
Sun Feb 16 05:35:47 CET 2014


Hi Masahiro,

On 7 February 2014 06:29, Masahiro Yamada <yamada.m at jp.panasonic.com> wrote:
> Kbuild series must be applied before this series.
>
> This series refactors a little, imports more Kbuild features
> and convert many rules to Kbuild style.
>
> I think most of rules will be displayed in short log formats
> by applying this series.
> (But I know there are still some old style rules.
> I need more efforts...)

You are doing amazing efforts!

I don't seem to be able to apply this series on top of the kbuild one:

git am ~/Downloads/bundle-5618-masap.mbox
Applying: kbuild: consolidate version and timestamp headers generation
error: patch failed: Makefile:1128
error: Makefile: patch does not apply
error: patch failed: doc/DocBook/Makefile:131
error: doc/DocBook/Makefile: patch does not apply
error: scripts/kernel-doc: does not exist in index
Patch failed at 0001 kbuild: consolidate version and timestamp headers
generation
The copy of the patch that failed is found in:
   /home/sjg/u/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Could you please push it somewhere?

Regards,
Simon


>
>
>
> Masahiro Yamada (15):
>   kbuild: consolidate version and timestamp headers generation
>   kbuild: abolish "depend" target
>   kbuild: move asm-offsets.h rules to ./Kbuild
>   kbuild: rename OBJCFLAGS to OBJCOPYFLAGS
>   kbuild: Add $(Q) when descending into subdirectories
>   kbuild: use shorten logs objcopy rules
>   kbuild: use shorten logs for mkimage rules
>   kbuild: use shorten logs for cat rules
>   kbuild: use shorten logs for combined rules of mkimage, padding and
>     cat
>   kbuild: use shorten log for linking u-boot
>   kbuild: use shorten logs for misc targets
>   kbuild: use shorten logs for IMX images
>   kbuild: refactor more IMX image rules
>   kbuild: support building signle targets
>   kbuild: add misc targets, help, ubootrelease, ubootversion
>
>  Kbuild                                        |  87 +++++
>  Makefile                                      | 482 ++++++++++++++++----------
>  arch/arm/config.mk                            |  14 +-
>  arch/arm/cpu/arm1136/config.mk                |  10 -
>  arch/arm/cpu/arm926ejs/config.mk              |  10 -
>  arch/arm/cpu/armv7/am33xx/config.mk           |   4 +-
>  arch/arm/cpu/armv7/config.mk                  |  10 -
>  arch/arm/cpu/armv7/omap3/config.mk            |   2 +-
>  arch/arm/cpu/armv7/omap4/config.mk            |   2 +-
>  arch/arm/cpu/armv7/omap5/config.mk            |   2 +-
>  arch/arm/cpu/pxa/config.mk                    |   2 +-
>  arch/arm/imx-common/Makefile                  |  85 +++--
>  arch/blackfin/cpu/Makefile                    |   6 +-
>  arch/mips/config.mk                           |   2 +-
>  arch/sandbox/config.mk                        |   4 +
>  board/hymod/config.mk                         |   2 +-
>  config.mk                                     |   2 +-
>  doc/DocBook/Makefile                          |   2 +-
>  examples/api/Makefile                         |  46 +--
>  examples/standalone/Makefile                  |  35 +-
>  nand_spl/board/amcc/acadia/Makefile           |   4 +-
>  nand_spl/board/amcc/bamboo/Makefile           |   4 +-
>  nand_spl/board/amcc/canyonlands/Makefile      |   4 +-
>  nand_spl/board/amcc/kilauea/Makefile          |   4 +-
>  nand_spl/board/amcc/sequoia/Makefile          |   4 +-
>  nand_spl/board/freescale/mpc8315erdb/Makefile |   4 +-
>  nand_spl/board/freescale/mpc8536ds/Makefile   |   4 +-
>  nand_spl/board/freescale/mpc8569mds/Makefile  |   4 +-
>  nand_spl/board/freescale/mpc8572ds/Makefile   |   4 +-
>  nand_spl/board/freescale/p1023rds/Makefile    |   4 +-
>  nand_spl/board/freescale/p1_p2_rdb/Makefile   |   4 +-
>  nand_spl/board/sheldon/simpc8313/Makefile     |   4 +-
>  scripts/kernel-doc                            |   4 +-
>  spl/Makefile                                  |  41 ++-
>  tools/scripts/make-asm-offsets                |  27 --
>  35 files changed, 562 insertions(+), 367 deletions(-)
>  create mode 100644 Kbuild
>  delete mode 100755 tools/scripts/make-asm-offsets
>
> --
> 1.8.3.2
>


More information about the U-Boot mailing list