mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Alexander Shiyan" <shc_work@mail.ru>
To: "Sascha Hauer" <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re[2]: [PATCH 1/2] Makefile: Create empty <config.h> if this header file is not needed by board
Date: Fri, 05 Apr 2013 14:07:23 +0400	[thread overview]
Message-ID: <1365156443.913580448@f163.mail.ru> (raw)
In-Reply-To: <20130405093655.GM1906@pengutronix.de>

> > > On Mon, Mar 11, 2013 at 08:10:49PM +0400, Alexander Shiyan wrote:
> > > > Patch creates empty <config.h> if this header is not needed by board.
> > > > This will allow to remove many empty config.h files from boards.
> > > > 
> > > > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > > > ---
> > > >  Makefile | 17 +++++++++++------
> > > >  1 file changed, 11 insertions(+), 6 deletions(-)
> > > > 
> > > > diff --git a/Makefile b/Makefile
> > > > index b5819fc..e8d9984 100644
> > > > --- a/Makefile
> > > > +++ b/Makefile
> > > > @@ -898,13 +898,18 @@ include/asm:
> > > >  	$(Q)$(check-symlink)
> > > >  	$(Q)$(create-symlink)
> > > >  
> > > > +define symlink-config-h
> > > > +	if [ -f $(srctree)/$(BOARD)/config.h ]; then		\
> > > > +		$(kecho) '  SYMLINK $@ -> $(BOARD)/config.h';	\
> > > > +		ln -fsn $(srctree)/$(BOARD)/config.h $@;	\
> > > > +	else							\
> > > > +		$(kecho) '  CREATE  $@';			\
> > > > +		echo -n > $@;					\
> > > > +	fi
> > > > +endef
> > > 
> > > I dropped this patch because it autogenerates files which were
> > > previously part of the repository. This causes git checkout to
> > > complain about overwriting existing files when we want to checkout
> > > earlier versions.
> > 
> > Patch creates include/config.h (which is in .gitignore) only
> > or makes symlink to board/config.h. So all already as you say below.
> 
> It creates a arch/$arch/$board/config.h, so we get the following:
Can you point it in the code?

> 
> # git checkout for-next/remove-config-h
> ...
> # make pcm038_defconfig && make
> ...
> # git checkout master
> error: The following untracked working tree files would be overwritten by checkout:
>         arch/arm/boards/pcm038/config.h
> Please move or remove them before you can switch branches.
> Aborting
> 
> So this patch forces us to manually remove arch/$arch/$board/config.h
> or to use git checkout -f

I am do not understand a problem. For me it works OK.

shc@shc /home/git/bb-test-cfg $ ls arch/arm/boards/pcm038/
env  lowlevel.c  Makefile  pcm038.c  pcm038.dox  pcm970.c  pll.h

shc@shc /home/git/bb-test-cfg $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- pcm038_defconfig
  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/basic/docproc
  HOSTCC  scripts/kconfig/conf.o
  SHIPPED scripts/kconfig/zconf.tab.c
  SHIPPED scripts/kconfig/zconf.lex.c
  SHIPPED scripts/kconfig/zconf.hash.c
  HOSTCC  scripts/kconfig/zconf.tab.o
scripts/kconfig/zconf.tab.c: В функции «header_print_comment»:
scripts/kconfig/confdata.c:540:10: предупреждение: ignoring return value of «fwrite», declared with attribute warn_unused_result [-Wunused-result]
scripts/kconfig/zconf.tab.c: В функции «kconfig_print_comment»:
scripts/kconfig/confdata.c:467:10: предупреждение: ignoring return value of «fwrite», declared with attribute warn_unused_result [-Wunused-result]
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#

shc@shc /home/git/bb-test-cfg $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-
scripts/kconfig/conf --silentoldconfig Kconfig
  Generating include/generated/mach-types.h
  CHK     include/generated/version.h
  UPD     include/generated/version.h
  CHK     include/generated/utsrelease.h
  UPD     include/generated/utsrelease.h
  SYMLINK include/asm -> include/asm-arm
  CREATE  include/config.h
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  LD      scripts/built-in.o
  CC      scripts/mod/empty.o
  HOSTCC  scripts/mod/mk_elfconfig
  MKELF   scripts/mod/elfconfig.h
  HOSTCC  scripts/mod/modpost.o
^Cmake[2]: *** [scripts/mod/modpost.o] Прерывание
make[1]: *** [scripts/mod] Прерывание
make: *** [scripts] Прерывание

shc@shc /home/git/bb-test-cfg $ ls arch/arm/boards/pcm038/
env  lowlevel.c  Makefile  pcm038.c  pcm038.dox  pcm970.c  pll.h

shc@shc /home/git/bb-test-cfg $ git commit -a
# On branch cfg
nothing to commit, working directory clean

...
So, no board/config.h. Just a empty include/config.h.

... Not understand a problem.

---
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2013-04-05 10:07 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-11 16:10 Alexander Shiyan
2013-03-11 16:10 ` [PATCH 2/2] Remove unused config.h Alexander Shiyan
2013-04-05  9:12 ` [PATCH 1/2] Makefile: Create empty <config.h> if this header file is not needed by board Sascha Hauer
2013-04-05  9:20   ` Re[2]: " Alexander Shiyan
2013-04-05  9:36     ` Sascha Hauer
2013-04-05 10:07       ` Alexander Shiyan [this message]
2013-04-05 10:18         ` Sascha Hauer
2013-04-05 10:37           ` Re[2]: " Alexander Shiyan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365156443.913580448@f163.mail.ru \
    --to=shc_work@mail.ru \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox