[U-Boot] [PATCH 3/9] Move lib_arm to lib/arm

Peter Tyser ptyser at xes-inc.com
Thu Jul 9 17:08:20 CEST 2009


Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
---
 README                             |    2 +-
 board/actux1/u-boot.lds            |    2 +-
 board/actux2/u-boot.lds            |    2 +-
 board/actux3/u-boot.lds            |    2 +-
 board/freescale/mx31ads/u-boot.lds |    2 +-
 board/trab/Makefile                |    4 ++--
 board/trab/u-boot.lds              |    2 +-
 doc/README.LED                     |    2 +-
 include/configs/B2.h               |    2 +-
 {lib_arm => lib/arm}/Makefile      |    0
 {lib_arm => lib/arm}/_ashldi3.S    |    0
 {lib_arm => lib/arm}/_ashrdi3.S    |    0
 {lib_arm => lib/arm}/_divsi3.S     |    0
 {lib_arm => lib/arm}/_modsi3.S     |    0
 {lib_arm => lib/arm}/_udivsi3.S    |    0
 {lib_arm => lib/arm}/_umodsi3.S    |    0
 {lib_arm => lib/arm}/board.c       |    0
 {lib_arm => lib/arm}/bootm.c       |    0
 {lib_arm => lib/arm}/cache-cp15.c  |    0
 {lib_arm => lib/arm}/cache.c       |    0
 {lib_arm => lib/arm}/config.mk     |    0
 {lib_arm => lib/arm}/div0.c        |    0
 {lib_arm => lib/arm}/interrupts.c  |    0
 {lib_arm => lib/arm}/reset.c       |    0
 24 files changed, 10 insertions(+), 10 deletions(-)
 rename {lib_arm => lib/arm}/Makefile (100%)
 rename {lib_arm => lib/arm}/_ashldi3.S (100%)
 rename {lib_arm => lib/arm}/_ashrdi3.S (100%)
 rename {lib_arm => lib/arm}/_divsi3.S (100%)
 rename {lib_arm => lib/arm}/_modsi3.S (100%)
 rename {lib_arm => lib/arm}/_udivsi3.S (100%)
 rename {lib_arm => lib/arm}/_umodsi3.S (100%)
 rename {lib_arm => lib/arm}/board.c (100%)
 rename {lib_arm => lib/arm}/bootm.c (100%)
 rename {lib_arm => lib/arm}/cache-cp15.c (100%)
 rename {lib_arm => lib/arm}/cache.c (100%)
 rename {lib_arm => lib/arm}/config.mk (100%)
 rename {lib_arm => lib/arm}/div0.c (100%)
 rename {lib_arm => lib/arm}/interrupts.c (100%)
 rename {lib_arm => lib/arm}/reset.c (100%)

diff --git a/README b/README
index 28991c3..e3ea156 100644
--- a/README
+++ b/README
@@ -182,5 +182,5 @@ Directory Hierarchy:
 - examples	Example code for standalone applications, etc.
 - include	Header Files
-- lib_arm	Files generic to ARM	 architecture
+- lib/arm	Files generic to ARM	 architecture
 - lib_avr32	Files generic to AVR32	 architecture
 - lib_blackfin	Files generic to Blackfin architecture
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 836775f..a695056 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -34,5 +34,5 @@ SECTIONS
 		lib_generic/string.o(.text)
 		lib_generic/vsprintf.o(.text)
-		lib_arm/board.o(.text)
+		lib/arm/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)
diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 0752656..4423000 100644
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -34,5 +34,5 @@ SECTIONS
 		lib_generic/string.o(.text)
 		lib_generic/vsprintf.o(.text)
-		lib_arm/board.o(.text)
+		lib/arm/board.o(.text)
 		common/dlmalloc.o(.text)
 		cpu/ixp/cpu.o(.text)
diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index a69e7db..985271d 100644
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -34,5 +34,5 @@ SECTIONS
 		lib_generic/string.o (.text)
 		lib_generic/vsprintf.o (.text)
-		lib_arm/board.o (.text)
+		lib/arm/board.o (.text)
 		common/dlmalloc.o (.text)
 		cpu/ixp/cpu.o (.text)
diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index 3182aa6..9482d60 100644
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -40,5 +40,5 @@ SECTIONS
 	  cpu/arm1136/start.o			(.text)
 	  board/freescale/mx31ads/libmx31ads.a	(.text)
-	  lib_arm/libarm.a			(.text)
+	  lib/arm/libarm.a			(.text)
 	  net/libnet.a				(.text)
 	  drivers/mtd/libmtd.a			(.text)
diff --git a/board/trab/Makefile b/board/trab/Makefile
index 30e5fbb..9233f49 100644
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -52,6 +52,6 @@ $(obj)trab_fkt.srec:	$(OBJS_FKT) $(LIB)
 		-L$(obj)../../examples -lstubs \
 		-L$(obj)../../lib_generic -lgeneric \
-		$(obj)../../lib_arm/div0.o \
-		$(obj)../../lib_arm/_*.o
+		$(obj)../../lib/arm/div0.o \
+		$(obj)../../lib/arm/_*.o
 	$(OBJCOPY) -O srec $(<:.o=) $@
 
diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index d8bcfa4..2e0e721 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -34,5 +34,5 @@ SECTIONS
 	{
 	  cpu/arm920t/start.o	(.text)
-	  lib_arm/_umodsi3.o	(.text)
+	  lib/arm/_umodsi3.o	(.text)
 	  lib_generic/zlib.o	(.text)
 	  lib_generic/crc32.o	(.text)
diff --git a/doc/README.LED b/doc/README.LED
index 94e552a..db3e8b0 100644
--- a/doc/README.LED
+++ b/doc/README.LED
@@ -70,5 +70,5 @@ blue_LED_on
 blue_LED_off
 
-These are weakly defined in lib_arm/board.c to noops. Where applicable, define
+These are weakly defined in lib/arm/board.c to noops. Where applicable, define
 these functions in the board specific source.
 
diff --git a/include/configs/B2.h b/include/configs/B2.h
index e5439f3..5c2c8c9 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -208,5 +208,5 @@
 
 /*
-	Linux TAGs (see lib_arm/armlinux.c)
+	Linux TAGs (see lib/arm/armlinux.c)
 */
 #define CONFIG_CMDLINE_TAG
diff --git a/lib_arm/Makefile b/lib/arm/Makefile
similarity index 100%
rename from lib_arm/Makefile
rename to lib/arm/Makefile
diff --git a/lib_arm/_ashldi3.S b/lib/arm/_ashldi3.S
similarity index 100%
rename from lib_arm/_ashldi3.S
rename to lib/arm/_ashldi3.S
diff --git a/lib_arm/_ashrdi3.S b/lib/arm/_ashrdi3.S
similarity index 100%
rename from lib_arm/_ashrdi3.S
rename to lib/arm/_ashrdi3.S
diff --git a/lib_arm/_divsi3.S b/lib/arm/_divsi3.S
similarity index 100%
rename from lib_arm/_divsi3.S
rename to lib/arm/_divsi3.S
diff --git a/lib_arm/_modsi3.S b/lib/arm/_modsi3.S
similarity index 100%
rename from lib_arm/_modsi3.S
rename to lib/arm/_modsi3.S
diff --git a/lib_arm/_udivsi3.S b/lib/arm/_udivsi3.S
similarity index 100%
rename from lib_arm/_udivsi3.S
rename to lib/arm/_udivsi3.S
diff --git a/lib_arm/_umodsi3.S b/lib/arm/_umodsi3.S
similarity index 100%
rename from lib_arm/_umodsi3.S
rename to lib/arm/_umodsi3.S
diff --git a/lib_arm/board.c b/lib/arm/board.c
similarity index 100%
rename from lib_arm/board.c
rename to lib/arm/board.c
diff --git a/lib_arm/bootm.c b/lib/arm/bootm.c
similarity index 100%
rename from lib_arm/bootm.c
rename to lib/arm/bootm.c
diff --git a/lib_arm/cache-cp15.c b/lib/arm/cache-cp15.c
similarity index 100%
rename from lib_arm/cache-cp15.c
rename to lib/arm/cache-cp15.c
diff --git a/lib_arm/cache.c b/lib/arm/cache.c
similarity index 100%
rename from lib_arm/cache.c
rename to lib/arm/cache.c
diff --git a/lib_arm/config.mk b/lib/arm/config.mk
similarity index 100%
rename from lib_arm/config.mk
rename to lib/arm/config.mk
diff --git a/lib_arm/div0.c b/lib/arm/div0.c
similarity index 100%
rename from lib_arm/div0.c
rename to lib/arm/div0.c
diff --git a/lib_arm/interrupts.c b/lib/arm/interrupts.c
similarity index 100%
rename from lib_arm/interrupts.c
rename to lib/arm/interrupts.c
diff --git a/lib_arm/reset.c b/lib/arm/reset.c
similarity index 100%
rename from lib_arm/reset.c
rename to lib/arm/reset.c
-- 
1.6.2.1



More information about the U-Boot mailing list