[U-Boot] [PATCH 0/2] blackfin: Do not generate unused files

newer
[U-Boot] [PATCH] tools/.gitignore:...

older
[U-Boot] [PATCH v9 0/4] mtd: nand:...

Masahiro Yamada

29 Nov 2013 29 Nov '13

7:34 a.m.

Masahiro Yamada (2): blackfin: Do not generate unused header bootrom-asm-offsets.h blackfin: Do not generate unused binary init.elf

Makefile | 2 -- arch/blackfin/cpu/.gitignore | 4 --- arch/blackfin/cpu/Makefile | 16 ------------ arch/blackfin/cpu/bootrom-asm-offsets.awk | 41 ------------------------------ arch/blackfin/cpu/bootrom-asm-offsets.c.in | 12 --------- arch/blackfin/cpu/init.lds.S | 25 ------------------ 6 files changed, 100 deletions(-) delete mode 100644 arch/blackfin/cpu/.gitignore delete mode 100644 arch/blackfin/cpu/bootrom-asm-offsets.awk delete mode 100644 arch/blackfin/cpu/bootrom-asm-offsets.c.in delete mode 100644 arch/blackfin/cpu/init.lds.S

-- 1.8.3.2

Show replies by date

Masahiro Yamada

29 Nov 29 Nov

7:34 a.m.

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

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

Sonic Zhang

2 Dec 2 Dec

6:18 a.m.

New subject: [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

Masahiro Yamada

6 Dec 6 Dec

6:48 a.m.

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

Hello Sonic.

On Mon, 2 Dec 2013 13:18:19 +0800 Sonic Zhang sonic.adi@gmail.com wrote:

...

Hi Masahiro,

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

Sonic

Thanks.

Could you send a pull request to Tom?

Best Regards Masahiro Yamada

Zhang, Sonic

7:11 a.m.

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

Hi Yamada,

The pull request will be sent after the next merge window in Jan.

Regards,

Sonic

...

-----Original Message----- From: Masahiro Yamada [mailto:yamada.m@jp.panasonic.com] Sent: Friday, December 06, 2013 1:48 PM To: Sonic Zhang Cc: U-Boot; Zhang, Sonic Subject: Re: [U-Boot] [PATCH 1/2] blackfin: Do not generate unused header bootrom- asm-offsets.h

Hello Sonic.

On Mon, 2 Dec 2013 13:18:19 +0800 Sonic Zhang sonic.adi@gmail.com wrote:

...
Hi Masahiro,

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

Sonic

Thanks.

Could you send a pull request to Tom?

Best Regards Masahiro Yamada

Masahiro Yamada

7:32 a.m.

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

Hello Sonic.

...

The pull request will be sent after the next merge window in Jan.

How come it takes so long? The 7 commits remaining in u-boot-blackfin/next look like bug fixes or trivial changes.

I want to use my patch as a prerequisite of my next series.

Best Regards Masahiro Yamada

Zhang, Sonic

7:49 a.m.

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

Hi Tom,

Are bug fixing patches fine to be merged before next merge windows? If so, I will send you a new pull request for Blackfin arch right now.

Regards,

Sonic

...

-----Original Message----- From: Masahiro Yamada [mailto:yamada.m@jp.panasonic.com] Sent: Friday, December 06, 2013 2:32 PM To: Zhang, Sonic Cc: Sonic Zhang; U-Boot Subject: Re: [U-Boot] [PATCH 1/2] blackfin: Do not generate unused header bootrom- asm-offsets.h

Hello Sonic.

...
The pull request will be sent after the next merge window in Jan.

How come it takes so long? The 7 commits remaining in u-boot-blackfin/next look like bug fixes or trivial changes.

I want to use my patch as a prerequisite of my next series.

Best Regards Masahiro Yamada

Masahiro Yamada

8:22 a.m.

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

Hello Sonic

...

Are bug fixing patches fine to be merged before next merge windows?

Of course you can send a pull request anytime if the patches are bug fixes, not new features.

You can refer to our wiki page: http://www.denx.de/wiki/U-Boot/ReleaseCycle

It says like follows: - While this merge window is open, new features can be added to the U-Boot source tree. Linus Torvalds explains here and there what the term "merge window" is supposed to mean. - After the merge window closes, no new features may be added to allow for a release candidate phase which is intended to fix bugs and regressions.

Best Regards Masahiro Yamada

Masahiro Yamada

29 Nov 29 Nov

7:34 a.m.

New subject: [U-Boot] [PATCH 2/2] blackfin: Do not generate unused binary init.elf

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

Hello Sonic

This file too. It looks like arch/blackfin/cpu/init.elf is not used.

Please let me know if this file is necessary or not.

Best Regards Masahiro Yamada

Makefile | 1 - arch/blackfin/cpu/.gitignore | 2 -- arch/blackfin/cpu/Makefile | 6 ------ arch/blackfin/cpu/init.lds.S | 25 ------------------------- 4 files changed, 34 deletions(-) delete mode 100644 arch/blackfin/cpu/.gitignore delete mode 100644 arch/blackfin/cpu/init.lds.S

diff --git a/Makefile b/Makefile index bbb053f..b7df731 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/init.{lds,elf} @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)include/bmp_logo_data.h @rm -f $(obj)lib/asm-offsets.s diff --git a/arch/blackfin/cpu/.gitignore b/arch/blackfin/cpu/.gitignore deleted file mode 100644 index 3df1fa2..0000000 --- a/arch/blackfin/cpu/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -init.lds -init.elf diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index a61594a..f574ccb 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -9,7 +9,6 @@ # Licensed under the GPL-2 or later. #

-extra-y := init.elf extra-y += initcode.o extra-y += start.o obj-y := interrupt.o cache.o @@ -34,8 +33,3 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) exit 1 ; \ fi endif - -$(obj)init.lds: init.lds.S - $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@ -$(obj)init.elf: $(obj)init.lds $(obj)init.o $(obj)initcode.o - $(LD) $(LDFLAGS) -T $^ -o $@ diff --git a/arch/blackfin/cpu/init.lds.S b/arch/blackfin/cpu/init.lds.S deleted file mode 100644 index 602e7c8..0000000 --- a/arch/blackfin/cpu/init.lds.S +++ /dev/null @@ -1,25 +0,0 @@ -/* - * linker script for simple init.elf - * - * Copyright (c) 2005-2011 Analog Device Inc. - * - * Licensed under the GPL-2 or later. - */ - -#include <config.h> -#include <asm/blackfin.h> -#undef ALIGN -#undef ENTRY - -OUTPUT_ARCH(bfin) - -MEMORY -{ - l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE -} - -ENTRY(_start) -SECTIONS -{ - .text.l1 : { *(.text .text.*) } >l1_code -}

-- 1.8.3.2

Zhang, Sonic

9:10 a.m.

New subject: [U-Boot] [PATCH 2/2] blackfin: Do not generate unused binary init.elf

Hi Yamada,

The init.elf is used to debug u-boot boot process on Blackfin via JTAG. You can't load u-boot binary to memory via JTAG without run the init.elf in Blackfin L1 SRAM first. So, this can't be removed.

Regards,

Sonic

...

-----Original Message----- From: Masahiro Yamada [mailto:yamada.m@jp.panasonic.com] Sent: Friday, November 29, 2013 2:34 PM To: u-boot@lists.denx.de Cc: Masahiro Yamada; Zhang, Sonic Subject: [PATCH 2/2] blackfin: Do not generate unused binary init.elf

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

Hello Sonic

This file too. It looks like arch/blackfin/cpu/init.elf is not used.

Please let me know if this file is necessary or not.

Best Regards Masahiro Yamada

Makefile | 1 - arch/blackfin/cpu/.gitignore | 2 -- arch/blackfin/cpu/Makefile | 6 ------ arch/blackfin/cpu/init.lds.S | 25 ------------------------- 4 files changed, 34 deletions(-) delete mode 100644 arch/blackfin/cpu/.gitignore delete mode 100644 arch/blackfin/cpu/init.lds.S

diff --git a/Makefile b/Makefile index bbb053f..b7df731 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/init.{lds,elf}
@rm -f $(obj)include/bmp_logo.h
@rm -f $(obj)include/bmp_logo_data.h
@rm -f $(obj)lib/asm-offsets.s
diff --git a/arch/blackfin/cpu/.gitignore b/arch/blackfin/cpu/.gitignore deleted file mode 100644 index 3df1fa2..0000000 --- a/arch/blackfin/cpu/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -init.lds -init.elf diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index a61594a..f574ccb 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -9,7 +9,6 @@ # Licensed under the GPL-2 or later. #

-extra-y := init.elf extra-y += initcode.o extra-y += start.o obj-y := interrupt.o cache.o @@ -34,8 +33,3 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) exit 1 ; \ fi endif

-$(obj)init.lds: init.lds.S
 $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
-$(obj)init.elf: $(obj)init.lds $(obj)init.o $(obj)initcode.o
 $(LD) $(LDFLAGS) -T $^ -o $@
diff --git a/arch/blackfin/cpu/init.lds.S b/arch/blackfin/cpu/init.lds.S deleted file mode 100644 index 602e7c8..0000000 --- a/arch/blackfin/cpu/init.lds.S +++ /dev/null @@ -1,25 +0,0 @@ -/*

linker script for simple init.elf

Copyright (c) 2005-2011 Analog Device Inc.

Licensed under the GPL-2 or later.

*/

-#include <config.h> -#include <asm/blackfin.h> -#undef ALIGN -#undef ENTRY

-OUTPUT_ARCH(bfin)

-MEMORY -{
 l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE
-}

-ENTRY(_start) -SECTIONS -{
 .text.l1 : { *(.text .text.*) } >l1_code
-}

1.8.3.2

Masahiro Yamada

9:20 a.m.

New subject: [U-Boot] [PATCH 2/2] blackfin: Do not generate unused binary init.elf

Hello Sonic

...

The init.elf is used to debug u-boot boot process on Blackfin via JTAG. You can't load u-boot binary to memory via JTAG without run the init.elf in Blackfin L1 SRAM first. So, this can't be removed.

I understand. Thanks! Please reject this patch.

How about the other one? arch/blackfin/cpu/bootrom-asm-offsets.h

Best Regards Masahiro Yamada

Sonic Zhang

9:24 a.m.

New subject: [U-Boot] [PATCH 2/2] blackfin: Do not generate unused binary init.elf

NAK

Sonic Zhang

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

This file too. It looks like arch/blackfin/cpu/init.elf is not used.

Please let me know if this file is necessary or not.

Best Regards Masahiro Yamada

Makefile | 1 - arch/blackfin/cpu/.gitignore | 2 -- arch/blackfin/cpu/Makefile | 6 ------ arch/blackfin/cpu/init.lds.S | 25 ------------------------- 4 files changed, 34 deletions(-) delete mode 100644 arch/blackfin/cpu/.gitignore delete mode 100644 arch/blackfin/cpu/init.lds.S

diff --git a/Makefile b/Makefile index bbb053f..b7df731 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/init.{lds,elf}
  @rm -f $(obj)include/bmp_logo.h
  @rm -f $(obj)include/bmp_logo_data.h
  @rm -f $(obj)lib/asm-offsets.s
diff --git a/arch/blackfin/cpu/.gitignore b/arch/blackfin/cpu/.gitignore deleted file mode 100644 index 3df1fa2..0000000 --- a/arch/blackfin/cpu/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -init.lds -init.elf diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index a61594a..f574ccb 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -9,7 +9,6 @@ # Licensed under the GPL-2 or later. #

-extra-y := init.elf extra-y += initcode.o extra-y += start.o obj-y := interrupt.o cache.o @@ -34,8 +33,3 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) exit 1 ; \ fi endif

-$(obj)init.lds: init.lds.S
  $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
-$(obj)init.elf: $(obj)init.lds $(obj)init.o $(obj)initcode.o
  $(LD) $(LDFLAGS) -T $^ -o $@
diff --git a/arch/blackfin/cpu/init.lds.S b/arch/blackfin/cpu/init.lds.S deleted file mode 100644 index 602e7c8..0000000 --- a/arch/blackfin/cpu/init.lds.S +++ /dev/null @@ -1,25 +0,0 @@ -/*

linker script for simple init.elf

Copyright (c) 2005-2011 Analog Device Inc.

Licensed under the GPL-2 or later.

*/

-#include <config.h> -#include <asm/blackfin.h> -#undef ALIGN -#undef ENTRY

-OUTPUT_ARCH(bfin)

-MEMORY -{
  l1_code : ORIGIN = L1_INST_SRAM, LENGTH = L1_INST_SRAM_SIZE
-}

-ENTRY(_start) -SECTIONS -{
  .text.l1 : { *(.text .text.*) } >l1_code
-}

1.8.3.2

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

4171

Age (days ago)

4178

Last active (days ago)

List overview

Download

11 comments

3 participants

tags (0)

participants (3)

Masahiro Yamada
Sonic Zhang
Zhang, Sonic