Re: [U-Boot] [PATCH 1/2] blackfin: Do not generate unused header bootrom-asm-offsets.h

Hi Masahiro,

It seems this header is never used any more. Applied, thanks.

Sonic

On Fri, Nov 29, 2013 at 2:34 PM, Masahiro Yamada yamada.m@jp.panasonic.com wrote:

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com

Hello, Sonic

Could you check this patch?

It looks like arch/blckfin/cpu/bootrom-asm-offsets.h is always generated, but it is not included from anywhere. So, I am posting this patch.

If it is necessary, please stop me. (And please tell me how to use it.)

Best Regards Masahiro Yamada

Makefile | 1 - arch/blackfin/cpu/.gitignore | 2 -- arch/blackfin/cpu/Makefile | 10 -------- arch/blackfin/cpu/bootrom-asm-offsets.awk | 41 ------------------------------ arch/blackfin/cpu/bootrom-asm-offsets.c.in | 12 --------- 5 files changed, 66 deletions(-) delete mode 100644 arch/blackfin/cpu/bootrom-asm-offsets.awk delete mode 100644 arch/blackfin/cpu/bootrom-asm-offsets.c.in

diff --git a/Makefile b/Makefile index f41497c..bbb053f 100644 --- a/Makefile +++ b/Makefile @@ -794,7 +794,6 @@ clean: $(obj)board/matrix_vision/*/bootscript.img \ $(obj)board/voiceblue/eeprom \ $(obj)u-boot.lds \

•          $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
           $(obj)arch/blackfin/cpu/init.{lds,elf}
    @rm -f $(obj)include/bmp_logo.h
    @rm -f $(obj)include/bmp_logo_data.h
  

diff --git a/arch/blackfin/cpu/.gitignore b/arch/blackfin/cpu/.gitignore index ba986d8..3df1fa2 100644 --- a/arch/blackfin/cpu/.gitignore +++ b/arch/blackfin/cpu/.gitignore @@ -1,4 +1,2 @@ -bootrom-asm-offsets.[chs]

init.lds init.elf diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 243dc22..a61594a 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -23,16 +23,6 @@ obj-y += traps.o

extra-y += check_initcode

-extra-y += bootrom-asm-offsets.h -$(obj)bootrom-asm-offsets.c: bootrom-asm-offsets.c.in bootrom-asm-offsets.awk

•   echo '#include <asm/mach-common/bits/bootrom.h>' | $(CPP) $(CPPFLAGS) - | gawk -f ./bootrom-asm-offsets.awk > $@.tmp
  

•   mv $@.tmp $@
  

-$(obj)bootrom-asm-offsets.s: $(obj)bootrom-asm-offsets.c

•   $(CC) $(CFLAGS) -S $^ -o $@.tmp
  

•   mv $@.tmp $@
  

-$(obj)bootrom-asm-offsets.h: $(obj)bootrom-asm-offsets.s

•   sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" $^ > $@
  

# make sure our initcode (which goes into LDR) does not # have relocs or external references $(obj)initcode.o: CFLAGS += -fno-function-sections -fno-data-sections diff --git a/arch/blackfin/cpu/bootrom-asm-offsets.awk b/arch/blackfin/cpu/bootrom-asm-offsets.awk deleted file mode 100644 index 1d61824..0000000 --- a/arch/blackfin/cpu/bootrom-asm-offsets.awk +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/gawk -f -BEGIN {

•   print "/* DO NOT EDIT: AUTOMATICALLY GENERATED"
  

•   print " * Input files: bootrom-asm-offsets.awk bootrom-asm-offsets.c.in"
  

•   print " * DO NOT EDIT: AUTOMATICALLY GENERATED"
  

•   print " */"
  

•   print ""
  

•   system("cat bootrom-asm-offsets.c.in")
  

•   print "{"
  

-}

-{

•   /* find a structure definition */
  

•   if ($0 ~ /typedef struct .* {/) {
  

•           delete members;
  

•           i = 0;
  

•           /* extract each member of the structure */
  

•           while (1) {
  

•                   getline
  

•                   if ($1 == "}")
  

•                           break;
  

•                   gsub(/[*;]/, "");
  

•                   members[i++] = $NF;
  

•           }
  

•           /* grab the structure's name */
  

•           struct = $NF;
  

•           sub(/;$/, "", struct);
  

•           /* output the DEFINE() macros */
  

•           while (i-- > 0)
  

•                   print "\tDEFINE(" struct ", " members[i] ");"
  

•           print ""
  

•   }
  

-}

-END {

•   print "\treturn 0;"
  

•   print "}"
  

-} diff --git a/arch/blackfin/cpu/bootrom-asm-offsets.c.in b/arch/blackfin/cpu/bootrom-asm-offsets.c.in deleted file mode 100644 index 64c2f24..0000000 --- a/arch/blackfin/cpu/bootrom-asm-offsets.c.in +++ /dev/null @@ -1,12 +0,0 @@ -/* A little trick taken from the kernel asm-offsets.h where we convert

• • the C structures automatically into a bunch of defines for use in
• • the assembly files.
• */

-#include <linux/stddef.h> -#include <asm/mach-common/bits/bootrom.h>

-#define _DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val)) -#define DEFINE(s, m) _DEFINE(offset_##s##_##m, offsetof(s, m))

-int main(int argc, char * const argv[])

1.8.3.2

---

U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot