Skip to contentSkip to conversation

MIPS patches

GIT PULL Applied Shinya Kuribayashi 2 participants 2 messages May 9, 2011 – May 10, 2011 MIPS

lore
Share & tools
lore

Shinya Kuribayashi

author
#0 lore raw

Hi,

Please pull the MIPS updates, thanks in advance.

--- 8< ---
The following changes since commit 96d04c3150ae9284500aef48803d7d132968f2b2:

IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

are available in the git repository at:
ssh://[email protected]/u-boot-mips.git master

Daniel Schwierzeck (1):

      MIPS: Introduce --gc-sections for MIPS

Shinya Kuribayashi (3):
MIPS: Remove mips_cache_lock() feature
MIPS: Coding style cleanups on common assembly files
MIPS: Move timer code to arch/mips/cpu/$(CPU)/

 arch/mips/config.mk                  |    2 +
 arch/mips/cpu/mips32/Makefile        |    2 +-
 arch/mips/cpu/mips32/cache.S         |  174 ++++++++--------------------------
 arch/mips/cpu/mips32/start.S         |  124 +++++++++++--------------
 arch/mips/{lib => cpu/mips32}/time.c |    0
 arch/mips/lib/Makefile               |    1 -
 board/dbau1x00/u-boot.lds            |   10 +-
 board/gth2/u-boot.lds                |   10 +-
 board/incaip/u-boot.lds              |   10 +-
 board/micronas/vct/u-boot.lds        |   10 +-
 board/pb1x00/u-boot.lds              |   10 +-
 board/qemu-mips/u-boot.lds           |   10 +-
 board/tb0229/u-boot.lds              |   10 +-
 examples/standalone/mips.lds         |   10 +-
 14 files changed, 135 insertions(+), 248 deletions(-)
 rename arch/mips/{lib => cpu/mips32}/time.c (100%)
arch/mips/config.mk +2 -0
index 318d34b..6ab8acd 100644
@@ -50,3 +50,5 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__
 PLATFORM_CPPFLAGS		+= -G 0 -mabicalls -fpic
 PLATFORM_CPPFLAGS		+= -msoft-float
 PLATFORM_LDFLAGS		+= -G 0 -static -n -nostdlib
+PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
+LDFLAGS_FINAL			+= --gc-sections
arch/mips/cpu/mips32/Makefile +1 -1
index e315c1b..eb8e005 100644
@@ -27,7 +27,7 @@ LIB	= $(obj)lib$(CPU).o
 
 START	= start.o
 SOBJS-y	= cache.o
-COBJS-y	= cpu.o interrupts.o
+COBJS-y	= cpu.o interrupts.o time.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
arch/mips/cpu/mips32/cache.S +38 -136

227 lines not on this page · raw message

arch/mips/cpu/mips32/start.S +54 -70

262 lines not on this page · raw message

arch/mips/cpu/mips32/time.c renamed from arch/mips/lib/time.c +0 -0
similarity index 100%
rename from arch/mips/lib/time.c
rename to arch/mips/cpu/mips32/time.c
arch/mips/lib/Makefile +0 -1
index 4e90704..9244f31 100644
@@ -33,7 +33,6 @@ COBJS-y	+= bootm_qemu_mips.o
 else
 COBJS-y	+= bootm.o
 endif
-COBJS-y	+= time.o
 
 SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
board/dbau1x00/u-boot.lds +5 -5
index 3c4fbe3..4a59cea 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -52,7 +52,7 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	.u_boot_cmd : {
 	  __u_boot_cmd_start = .;

@@ -64,7 +64,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD)  : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
board/gth2/u-boot.lds +5 -5
index aeb0fcc..9fc417f 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -52,7 +52,7 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	.u_boot_cmd : {
 	  __u_boot_cmd_start = .;

@@ -64,7 +64,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD)  : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
board/incaip/u-boot.lds +5 -5
index 3c4fbe3..4a59cea 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -52,7 +52,7 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	.u_boot_cmd : {
 	  __u_boot_cmd_start = .;

@@ -64,7 +64,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD)  : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
board/micronas/vct/u-boot.lds +5 -5
index b90b186..3a05ef9 100644
@@ -31,14 +31,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -50,7 +50,7 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	. = ALIGN(4);
 	.u_boot_cmd : {

@@ -64,8 +64,8 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
+	.sbss (NOLOAD)  : { *(.sbss*) }
 	. = ALIGN(4);
-	.bss (NOLOAD)  : { *(.bss) }
+	.bss (NOLOAD)  : { *(.bss*) }
 	uboot_end = .;
 }
board/pb1x00/u-boot.lds +5 -5
index 358cc54..bd0dee1 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -52,7 +52,7 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	.u_boot_cmd : {
 	  __u_boot_cmd_start = .;

@@ -64,7 +64,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD)  : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
board/qemu-mips/u-boot.lds +5 -5
index bd16786..9460b20 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) +0x7ff0;

@@ -53,7 +53,7 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	. = .;
 	.u_boot_cmd : {

@@ -66,7 +66,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss  : { *(.sbss) }
-	.bss  : { *(.bss) . = ALIGN(4); }
+	.sbss  : { *(.sbss*) }
+	.bss  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
board/tb0229/u-boot.lds +5 -5
index 56d7c25..5ea1094 100644
@@ -34,14 +34,14 @@ SECTIONS
 	. = ALIGN(4);
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -52,7 +52,7 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	.u_boot_cmd : {
 	  __u_boot_cmd_start = .;

@@ -64,7 +64,7 @@ SECTIONS
 	num_got_entries = (__got_end - __got_start) >> 2;
 
 	. = ALIGN(4);
-	.sbss (NOLOAD)  : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD)  : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 	uboot_end = .;
 }
examples/standalone/mips.lds +5 -5
index 63a1c92..5f766ed 100644
@@ -30,14 +30,14 @@ SECTIONS
 {
 	.text       :
 	{
-	  *(.text)
+	  *(.text*)
 	}
 
 	. = ALIGN(4);
 	.rodata  : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
 
 	. = ALIGN(4);
-	.data  : { *(.data) }
+	.data  : { *(.data*) }
 
 	. = .;
 	_gp = ALIGN(16) + 0x7ff0;

@@ -48,12 +48,12 @@ SECTIONS
 	  __got_end = .;
 	}
 
-	.sdata  : { *(.sdata) }
+	.sdata  : { *(.sdata*) }
 
 	. = ALIGN(4);
 	__bss_start = .;
-	.sbss (NOLOAD) : { *(.sbss) }
-	.bss (NOLOAD)  : { *(.bss) . = ALIGN(4); }
+	.sbss (NOLOAD) : { *(.sbss*) }
+	.bss (NOLOAD)  : { *(.bss*) . = ALIGN(4); }
 
 	_end = .;
 }
Applied
#1 lore raw

Dear Shinya Kuribayashi,

Quoted 20 lines · In message <[email protected]> you wrote:

Hi,

Please pull the MIPS updates, thanks in advance.

--- 8< ---
The following changes since commit 96d04c3150ae9284500aef48803d7d132968f2b2:

IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

are available in the git repository at:
ssh://gu-mips at git.denx.de/u-boot-mips.git master

Daniel Schwierzeck (1):

      MIPS: Introduce --gc-sections for MIPS

Shinya Kuribayashi (3):
MIPS: Remove mips_cache_lock() feature
MIPS: Coding style cleanups on common assembly files
MIPS: Move timer code to arch/mips/cpu/$(CPU)/

Quoted 16 lines
 arch/mips/config.mk                  |    2 +
 arch/mips/cpu/mips32/Makefile        |    2 +-
 arch/mips/cpu/mips32/cache.S         |  174 ++++++++--------------------------
 arch/mips/cpu/mips32/start.S         |  124 +++++++++++--------------
 arch/mips/{lib => cpu/mips32}/time.c |    0
 arch/mips/lib/Makefile               |    1 -
 board/dbau1x00/u-boot.lds            |   10 +-
 board/gth2/u-boot.lds                |   10 +-
 board/incaip/u-boot.lds              |   10 +-
 board/micronas/vct/u-boot.lds        |   10 +-
 board/pb1x00/u-boot.lds              |   10 +-
 board/qemu-mips/u-boot.lds           |   10 +-
 board/tb0229/u-boot.lds              |   10 +-
 examples/standalone/mips.lds         |   10 +-
 14 files changed, 135 insertions(+), 248 deletions(-)
 rename arch/mips/{lib => cpu/mips32}/time.c (100%)

Applied, thanks.

arch/mips/config.mk

Quoted 4 lines
arch/mips/config.mk +0 -0
index 318d34b..6ab8acd 100644

Umm... please don't include a diff with the pull request.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If in any problem you find yourself doing an immense amount of  work,
the answer can be obtained by simple inspection.