Skip to contentSkip to conversation

Trivial clean-up

PATCH New Masahiro Yamada 2 participants 5 messages Dec 6, 2013 – Dec 16, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

cover Trivial clean-up

Masahiro Yamada (2):
examples: x86: delete 82559_eeprom Makefile,.gitignore: Cleanup non-existing binaries

 .gitignore                         |   2 -
 Makefile                           |  10 +-
 examples/standalone/.gitignore     |   2 -
 examples/standalone/82559_eeprom.c | 356 -------------------------------------
 examples/standalone/Makefile       |   5 -
 tools/.gitignore                   |   1 -
 6 files changed, 3 insertions(+), 373 deletions(-)
 delete mode 100644 examples/standalone/82559_eeprom.c
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/2 examples: x86: delete 82559_eeprom

Commit fea25720 renamed arch/i386 to arch/x86. But it missed to modify examples/standalone/Makefile.

Since then, examples/standalone/82559_eeprom has
never compiled and nobody has noticed that.

After some discussion on ML, we agreed to delete this example.

---

To avoid a conflict, please apply the following patch first:
http://patchwork.ozlabs.org/patch/294742/

 Makefile                           |   3 +-
 examples/standalone/.gitignore     |   1 -
 examples/standalone/82559_eeprom.c | 356 -------------------------------------
 examples/standalone/Makefile       |   5 -
 4 files changed, 1 insertion(+), 364 deletions(-)
 delete mode 100644 examples/standalone/82559_eeprom.c
Makefile +1 -2
index beabd7b..458b447 100644
@@ -755,8 +755,7 @@ $(obj).boards.depend:	boards.cfg
 #########################################################################
 
 clean:
-	@rm -f $(obj)examples/standalone/82559_eeprom			  \
-	       $(obj)examples/standalone/atmel_df_pow2			  \
+	@rm -f $(obj)examples/standalone/atmel_df_pow2			  \
 	       $(obj)examples/standalone/eepro100_eeprom		  \
 	       $(obj)examples/standalone/hello_world			  \
 	       $(obj)examples/standalone/interrupt			  \
examples/standalone/.gitignore +0 -1
index 4d9ce66..1ff25b5 100644
@@ -1,4 +1,3 @@
-/82559_eeprom
 /atmel_df_pow2
 /eepro100_eeprom
 /hello_world
examples/standalone/82559_eeprom.c deleted +0 -356

356 lines not on this page · raw message

examples/standalone/Makefile +0 -5
index 6e7500d..0841c75 100644
@@ -12,11 +12,6 @@ ELF-y        := hello_world
 ELF-$(CONFIG_SMC91111)           += smc91111_eeprom
 ELF-$(CONFIG_SMC911X)            += smc911x_eeprom
 ELF-$(CONFIG_SPI_FLASH_ATMEL)    += atmel_df_pow2
-# TODO:
-#   - Fix the warning of 82559_eeprom.c and uncomment the following
-# or
-#   - Delete 82559_eeprom.c and the following line
-#ELF-$(CONFIG_X86)                += 82559_eeprom
 ELF-$(CONFIG_MPC5xxx)            += interrupt
 ELF-$(CONFIG_8xx)                += test_burst timer
 ELF-$(CONFIG_8260)               += mem_to_mem_idma2intr
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 1/2 examples: x86: delete 82559_eeprom

Quoted 9 lines · Masahiro Yamada

Commit fea25720 renamed arch/i386 to arch/x86. But it missed to modify examples/standalone/Makefile.

Since then, examples/standalone/82559_eeprom has
never compiled and nobody has noticed that.

After some discussion on ML, we agreed to delete this example.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/77d57597/attachment.pgp>
#3 lore raw

PATCH 2/2 Makefile, .gitignore: Cleanup non-existing binaries

In reply to Masahiro Yamada

---

 .gitignore                     | 2 --
 Makefile                       | 7 ++-----
 examples/standalone/.gitignore | 1 -
 tools/.gitignore               | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)
.gitignore +0 -2
index eab5c46..52cd91d 100644
@@ -57,8 +57,6 @@
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
-/u-boot.bd
-/u-boot.geany
 
 #
 # git files that we don't want to ignore even it they are dot-files
Makefile +2 -5
index 458b447..f678c4b 100644
@@ -756,7 +756,6 @@ $(obj).boards.depend:	boards.cfg
 
 clean:
 	@rm -f $(obj)examples/standalone/atmel_df_pow2			  \
-	       $(obj)examples/standalone/eepro100_eeprom		  \
 	       $(obj)examples/standalone/hello_world			  \
 	       $(obj)examples/standalone/interrupt			  \
 	       $(obj)examples/standalone/mem_to_mem_idma2intr		  \
@@ -766,9 +765,9 @@ clean:
 	       $(obj)examples/standalone/timer
 	@rm -f $(obj)examples/api/demo{,.bin}
 	@rm -f $(obj)tools/bmp_logo	   $(obj)tools/easylogo/easylogo  \
-	       $(obj)tools/env/{fw_printenv,fw_setenv}			  \
+	       $(obj)tools/env/fw_printenv				  \
 	       $(obj)tools/envcrc					  \
-	       $(obj)tools/gdb/{astest,gdbcont,gdbsend}			  \
+	       $(obj)tools/gdb/{gdbcont,gdbsend}			  \
 	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \
 	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \
 	       $(obj)tools/mk{$(BOARD),}spl				  \
@@ -778,7 +777,6 @@ clean:
 	       $(obj)tools/proftool
 	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \
 	       $(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
@@ -814,7 +812,6 @@ clobber:	tidy
 	@rm -f $(obj)u-boot.ais
 	@rm -f $(obj)u-boot.dtb
 	@rm -f $(obj)u-boot.sb
-	@rm -f $(obj)u-boot.bd
 	@rm -f $(obj)u-boot.spr
 	@rm -f $(obj)nand_spl/{u-boot.{lds,lst},System.map}
 	@rm -f $(obj)nand_spl/{u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map}
examples/standalone/.gitignore +0 -1
index 1ff25b5..6d3a616 100644
@@ -1,5 +1,4 @@
 /atmel_df_pow2
-/eepro100_eeprom
 /hello_world
 /interrupt
 /mem_to_mem_idma2intr
tools/.gitignore +0 -1
index a7fee26..6e2c4ba 100644
@@ -8,7 +8,6 @@
 /mpc86x_clk
 /mxsboot
 /ncb
-/ncp
 /proftool
 /ubsha1
 /xway-swap-bytes
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH 2/2 Makefile, .gitignore: Cleanup non-existing binaries

Quoted 1 line · Masahiro Yamada

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131216/c2f2caeb/attachment.pgp>