* [U-Boot] [GIT PULL] MIPS patches
@ 2011-02-12 5:10 Shinya Kuribayashi
2011-02-12 19:38 ` Wolfgang Denk
0 siblings, 1 reply; 8+ messages in thread
From: Shinya Kuribayashi @ 2011-02-12 5:10 UTC (permalink / raw)
To: u-boot
Hi,
Please pull the following MIPS patches, thanks.
Daniel Schwierzeck (3):
MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled
MIPS: Purple: Fix multiple definition error on final linking of u-boot binary
MIPS: dbau1x00: Remove unused flash driver stub
Shinya Kuribayashi (5):
cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended
MIPS: Move Alchemy Au1x00 based boards to boards.cfg
MIPS: Move Qemu MIPS target to boards.cfg
MIPS: Move Inca-IP targets to boards.cfg
MIPS: Move VCT boards to boards.cfg
Makefile | 89 ------------------------------------------
board/dbau1x00/Makefile | 2 +-
board/dbau1x00/flash.c | 43 --------------------
board/incaip/lowlevel_init.S | 2 +-
board/purple/u-boot.lds | 5 --
boards.cfg | 24 +++++++++++
common/cmd_ide.c | 3 +-
include/configs/incaip.h | 9 +++-
include/configs/vct.h | 7 ++-
9 files changed, 39 insertions(+), 145 deletions(-)
delete mode 100644 board/dbau1x00/flash.c
diff --git a/Makefile b/Makefile
index 05b404d..6133160 100644
--- a/Makefile
+++ b/Makefile
@@ -1092,95 +1092,6 @@ smdk6400_config : unconfig
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
#========================================================================
-# MIPS
-#========================================================================
-#########################################################################
-## MIPS32 4Kc
-#########################################################################
-
-incaip_100MHz_config \
-incaip_133MHz_config \
-incaip_150MHz_config \
-incaip_config: unconfig
- @mkdir -p $(obj)include
- @[ -z "$(findstring _100MHz,$@)" ] || \
- echo "#define CPU_CLOCK_RATE 100000000" >>$(obj)include/config.h
- @[ -z "$(findstring _133MHz,$@)" ] || \
- echo "#define CPU_CLOCK_RATE 133000000" >>$(obj)include/config.h
- @[ -z "$(findstring _150MHz,$@)" ] || \
- echo "#define CPU_CLOCK_RATE 150000000" >>$(obj)include/config.h
- @$(MKCONFIG) -n $@ -a incaip mips mips incaip
-
-vct_premium_config \
-vct_premium_small_config \
-vct_premium_onenand_config \
-vct_premium_onenand_small_config \
-vct_platinum_config \
-vct_platinum_small_config \
-vct_platinum_onenand_config \
-vct_platinum_onenand_small_config \
-vct_platinumavc_config \
-vct_platinumavc_small_config \
-vct_platinumavc_onenand_config \
-vct_platinumavc_onenand_small_config: unconfig
- @mkdir -p $(obj)include
- @[ -z "$(findstring _premium,$@)" ] || \
- echo "#define CONFIG_VCT_PREMIUM" > $(obj)include/config.h
- @[ -z "$(findstring _platinum_,$@)" ] || \
- echo "#define CONFIG_VCT_PLATINUM" > $(obj)include/config.h
- @[ -z "$(findstring _platinumavc,$@)" ] || \
- echo "#define CONFIG_VCT_PLATINUMAVC" > $(obj)include/config.h
- @[ -z "$(findstring _onenand,$@)" ] || \
- echo "#define CONFIG_VCT_ONENAND" >> $(obj)include/config.h
- @[ -z "$(findstring _small,$@)" ] || \
- echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
- @$(MKCONFIG) -n $@ -a vct mips mips vct micronas
-
-#########################################################################
-## MIPS32 AU1X00
-#########################################################################
-
-dbau1000_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_DBAU1000 1" >$(obj)include/config.h
- @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1100_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_DBAU1100 1" >$(obj)include/config.h
- @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1500_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_DBAU1500 1" >$(obj)include/config.h
- @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
- @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-dbau1550_el_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_DBAU1550 1" >$(obj)include/config.h
- @$(MKCONFIG) -a dbau1x00 mips mips dbau1x00
-
-gth2_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_GTH2 1" >$(obj)include/config.h
- @$(MKCONFIG) -a $@ mips mips gth2
-
-pb1000_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_PB1000 1" >$(obj)include/config.h
- @$(MKCONFIG) -a pb1x00 mips mips pb1x00
-
-qemu_mips_config : unconfig
- @mkdir -p $(obj)include
- @echo "#define CONFIG_QEMU_MIPS 1" >$(obj)include/config.h
- @$(MKCONFIG) -a qemu-mips mips mips qemu-mips
-
-#========================================================================
# Nios
#========================================================================
diff --git a/board/dbau1x00/Makefile b/board/dbau1x00/Makefile
index f1594a2..e36a9d2 100644
--- a/board/dbau1x00/Makefile
+++ b/board/dbau1x00/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS = $(BOARD).o flash.o
+COBJS = $(BOARD).o
SOBJS = lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/dbau1x00/flash.c b/board/dbau1x00/flash.c
deleted file mode 100644
index a2fed1d..0000000
--- a/board/dbau1x00/flash.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
-
-/*-----------------------------------------------------------------------
- * flash_init()
- *
- * sets up flash_info and returns size of FLASH (bytes)
- */
-unsigned long flash_init (void)
-{
- printf ("Skipping flash_init\n");
- return (0);
-}
-
-int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
-{
- printf ("write_buff not implemented\n");
- return (-1);
-}
diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S
index fe525ec..b765795 100644
--- a/board/incaip/lowlevel_init.S
+++ b/board/incaip/lowlevel_init.S
@@ -283,7 +283,7 @@ lowlevel_init:
/* EBU, CGU and SDRAM Initialization.
*/
- li a0, CPU_CLOCK_RATE
+ li a0, CONFIG_CPU_CLOCK_RATE
move t0, ra
/* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init()
diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds
index 542601a..719f268 100644
--- a/board/purple/u-boot.lds
+++ b/board/purple/u-boot.lds
@@ -36,11 +36,6 @@ SECTIONS
{
arch/mips/cpu/start.o (.text)
board/purple/lowlevel_init.o (.text)
- arch/mips/cpu/cache.o (.text)
- common/main.o (.text)
- common/dlmalloc.o (.text)
- common/cmd_boot.o (.text)
- lib/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/boards.cfg b/boards.cfg
index c977528..b8369e1 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -213,8 +213,32 @@ M5282EVB m68k mcf52x2 m5282evb freesca
M53017EVB m68k mcf52x2 m53017evb freescale
EP2500 m68k mcf52x2 ep2500 Mercury
microblaze-generic microblaze microblaze microblaze-generic xilinx
+dbau1000 mips mips dbau1x00 - - dbau1x00:DBAU1000
+dbau1100 mips mips dbau1x00 - - dbau1x00:DBAU1100
+dbau1500 mips mips dbau1x00 - - dbau1x00:DBAU1500
+dbau1550 mips mips dbau1x00 - - dbau1x00:DBAU1550
+dbau1550_el mips mips dbau1x00 - - dbau1x00:DBAU1550
+gth2 mips mips
+incaip mips mips
+incaip_100MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=100000000
+incaip_133MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=133000000
+incaip_150MHz mips mips incaip - - incaip:CPU_CLOCK_RATE=150000000
+pb1000 mips mips pb1x00 - - pb1x00:PB1000
purple mips mips
+qemu_mips mips mips qemu-mips - - qemu-mips
tb0229 mips mips
+vct_premium mips mips vct micronas - vct:VCT_PREMIUM
+vct_premium_small mips mips vct micronas - vct:VCT_PREMIUM,VCT_SMALL_IMAGE
+vct_premium_onenand mips mips vct micronas - vct:VCT_PREMIUM,VCT_ONENAND
+vct_premium_onenand_small mips mips vct micronas - vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinum mips mips vct micronas - vct:VCT_PLATINUM
+vct_platinum_small mips mips vct micronas - vct:VCT_PLATINUM,VCT_SMALL_IMAGE
+vct_platinum_onenand mips mips vct micronas - vct:VCT_PLATINUM,VCT_ONENAND
+vct_platinum_onenand_small mips mips vct micronas - vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinumavc mips mips vct micronas - vct:VCT_PLATINUMAVC
+vct_platinumavc_small mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
+vct_platinumavc_onenand mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND
+vct_platinumavc_onenand_small mips mips vct micronas - vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
PCI5441 nios2 nios2 pci5441 psyent
PK1C20 nios2 nios2 pk1c20 psyent
EVB64260 powerpc 74xx_7xx evb64260 - - EVB64260
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index df7bdf5..a1f7e57 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -811,7 +811,8 @@ set_pcmcia_timing (int pmode)
/* We only need to swap data if we are running on a big endian cpu. */
/* But Au1x00 cpu:s already swaps data in big endian mode! */
-#if defined(__LITTLE_ENDIAN) || ( defined(CONFIG_AU1X00) && !defined(CONFIG_GTH2) )
+#if defined(__LITTLE_ENDIAN) || \
+ (defined(CONFIG_SOC_AU1X00) && !defined(CONFIG_GTH2))
#define input_swap_data(x,y,z) input_data(x,y,z)
#else
static void
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index b7ba6f4..f2950e8 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -31,9 +31,12 @@
#define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */
#define CONFIG_INCA_IP 1 /* on a INCA-IP Board */
-#ifndef CPU_CLOCK_RATE
-/* allowed values: 100000000, 133000000, and 150000000 */
-#define CPU_CLOCK_RATE 150000000 /* default: 150 MHz clock for the MIPS core */
+/*
+ * Clock for the MIPS core (MHz)
+ * allowed values: 100000000, 133000000, and 150000000 (default)
+ */
+#ifndef CONFIG_CPU_CLOCK_RATE
+#define CONFIG_CPU_CLOCK_RATE 150000000
#endif
#define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 4894969..325ac8c 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -109,17 +109,20 @@
/*
* Only Premium/Platinum have ethernet support right now
*/
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+ !defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_PING
#define CONFIG_CMD_SNTP
#else
#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
#endif
/*
* Only Premium/Platinum have USB-EHCI support right now
*/
-#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)
+#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \
+ !defined(CONFIG_VCT_SMALL_IMAGE)
#define CONFIG_CMD_USB
#define CONFIG_CMD_FAT
#endif
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
2011-02-12 5:10 Shinya Kuribayashi
@ 2011-02-12 19:38 ` Wolfgang Denk
0 siblings, 0 replies; 8+ messages in thread
From: Wolfgang Denk @ 2011-02-12 19:38 UTC (permalink / raw)
To: u-boot
Dear Shinya Kuribayashi,
In message <4D561628.6070709@pobox.com> you wrote:
> Hi,
>
> Please pull the following MIPS patches, thanks.
>
> Daniel Schwierzeck (3):
> MIPS: VCT: Fix enabling of unwanted options if networking or USB support are disabled
> MIPS: Purple: Fix multiple definition error on final linking of u-boot binary
> MIPS: dbau1x00: Remove unused flash driver stub
>
> Shinya Kuribayashi (5):
> cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended
> MIPS: Move Alchemy Au1x00 based boards to boards.cfg
> MIPS: Move Qemu MIPS target to boards.cfg
> MIPS: Move Inca-IP targets to boards.cfg
> MIPS: Move VCT boards to boards.cfg
>
> Makefile | 89 ------------------------------------------
> board/dbau1x00/Makefile | 2 +-
> board/dbau1x00/flash.c | 43 --------------------
> board/incaip/lowlevel_init.S | 2 +-
> board/purple/u-boot.lds | 5 --
> boards.cfg | 24 +++++++++++
> common/cmd_ide.c | 3 +-
> include/configs/incaip.h | 9 +++-
> include/configs/vct.h | 7 ++-
> 9 files changed, 39 insertions(+), 145 deletions(-)
> delete mode 100644 board/dbau1x00/flash.c
Can you please use "git request-pull" next time?
In any case, please make sure to mention which branch I am supposed to
pull from!
I figured you probably mean u-boot-mips.git #master - hope this was
correct?
Applied, thanks.
Best regards,
Wolfgang Denk
--
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
A fail-safe circuit will destroy others. -- Klipstein
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
@ 2011-04-02 13:20 Shinya Kuribayashi
2011-04-05 10:17 ` Wolfgang Denk
0 siblings, 1 reply; 8+ messages in thread
From: Shinya Kuribayashi @ 2011-04-02 13:20 UTC (permalink / raw)
To: u-boot
Hi,
Please pull the MIPS updates, thanks in advance.
--- 8< ---
The following changes since commit 67a490d60d70f2b01d55976440ba30154af96965:
atmel_nand: don't require CONFIG_SYS_NAND_ENABLE_PIN (2011-04-01 14:49:08 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
Daniel Schwierzeck (5):
MIPS: Purple: Remove Purple support
MIPS: Move content of arch/mips/cpu to arch/mips/cpu/mips32
MIPS: Optimize the setup of CPU optimization flags
MIPS: IncaIP: Move all IncaIP specific code to separate subdirectory
MIPS: Au1x00: Move all Au1x00 specific code to separate subdirectory
MAINTAINERS | 1 -
MAKEALL | 4 +-
arch/mips/cpu/{ => mips32}/Makefile | 5 -
.../mips/cpu/mips32/au1x00}/Makefile | 15 +-
arch/mips/cpu/{ => mips32/au1x00}/au1x00_eth.c | 0
arch/mips/cpu/{ => mips32/au1x00}/au1x00_serial.c | 0
.../mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.c | 0
.../mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.h | 0
.../mips/cpu/mips32/au1x00}/config.mk | 12 +-
arch/mips/cpu/{ => mips32}/cache.S | 4 -
arch/mips/cpu/{ => mips32}/config.mk | 15 +-
arch/mips/cpu/{ => mips32}/cpu.c | 0
.../mips/cpu/mips32/incaip}/Makefile | 16 +-
arch/mips/cpu/{ => mips32/incaip}/asc_serial.c | 83 ---
arch/mips/cpu/{ => mips32/incaip}/asc_serial.h | 0
.../mips/cpu/mips32/incaip}/config.mk | 12 +-
arch/mips/cpu/{ => mips32/incaip}/incaip_clock.c | 0
arch/mips/cpu/{ => mips32/incaip}/incaip_wdt.S | 0
arch/mips/cpu/{ => mips32}/interrupts.c | 0
arch/mips/cpu/{ => mips32}/start.S | 32 -
arch/mips/include/asm/inca-ip.h | 10 -
arch/mips/lib/board.c | 10 -
board/purple/flash.c | 595 --------------------
board/purple/lowlevel_init.S | 36 --
board/purple/purple.c | 284 ----------
board/purple/sconsole.c | 125 ----
board/purple/sconsole.h | 46 --
board/purple/u-boot.lds | 75 ---
boards.cfg | 51 +-
doc/README.Purple | 84 ---
include/configs/purple.h | 173 ------
31 files changed, 53 insertions(+), 1635 deletions(-)
rename arch/mips/cpu/{ => mips32}/Makefile (87%)
copy {board/purple => arch/mips/cpu/mips32/au1x00}/Makefile (83%)
rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_eth.c (100%)
rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_serial.c (100%)
rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.c (100%)
rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.h (100%)
copy {board/purple => arch/mips/cpu/mips32/au1x00}/config.mk (83%)
rename arch/mips/cpu/{ => mips32}/cache.S (98%)
rename arch/mips/cpu/{ => mips32}/config.mk (83%)
rename arch/mips/cpu/{ => mips32}/cpu.c (100%)
rename {board/purple => arch/mips/cpu/mips32/incaip}/Makefile (83%)
rename arch/mips/cpu/{ => mips32/incaip}/asc_serial.c (77%)
rename arch/mips/cpu/{ => mips32/incaip}/asc_serial.h (100%)
rename {board/purple => arch/mips/cpu/mips32/incaip}/config.mk (83%)
rename arch/mips/cpu/{ => mips32/incaip}/incaip_clock.c (100%)
rename arch/mips/cpu/{ => mips32/incaip}/incaip_wdt.S (100%)
rename arch/mips/cpu/{ => mips32}/interrupts.c (100%)
rename arch/mips/cpu/{ => mips32}/start.S (92%)
delete mode 100644 board/purple/flash.c
delete mode 100644 board/purple/lowlevel_init.S
delete mode 100644 board/purple/purple.c
delete mode 100644 board/purple/sconsole.c
delete mode 100644 board/purple/sconsole.h
delete mode 100644 board/purple/u-boot.lds
delete mode 100644 doc/README.Purple
delete mode 100644 include/configs/purple.h
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
2011-04-02 13:20 [U-Boot] [GIT PULL] MIPS patches Shinya Kuribayashi
@ 2011-04-05 10:17 ` Wolfgang Denk
0 siblings, 0 replies; 8+ messages in thread
From: Wolfgang Denk @ 2011-04-05 10:17 UTC (permalink / raw)
To: u-boot
Dear Shinya Kuribayashi,
In message <4D9722BB.2090704@pobox.com> you wrote:
> Hi,
>
> Please pull the MIPS updates, thanks in advance.
>
> --- 8< ---
> The following changes since commit 67a490d60d70f2b01d55976440ba30154af96965:
>
> atmel_nand: don't require CONFIG_SYS_NAND_ENABLE_PIN (2011-04-01 14:49:08 -0500)
>
> are available in the git repository at:
> git://git.denx.de/u-boot-mips.git master
>
> Daniel Schwierzeck (5):
> MIPS: Purple: Remove Purple support
> MIPS: Move content of arch/mips/cpu to arch/mips/cpu/mips32
> MIPS: Optimize the setup of CPU optimization flags
> MIPS: IncaIP: Move all IncaIP specific code to separate subdirectory
> MIPS: Au1x00: Move all Au1x00 specific code to separate subdirectory
>
> MAINTAINERS | 1 -
> MAKEALL | 4 +-
> arch/mips/cpu/{ => mips32}/Makefile | 5 -
> .../mips/cpu/mips32/au1x00}/Makefile | 15 +-
> arch/mips/cpu/{ => mips32/au1x00}/au1x00_eth.c | 0
> arch/mips/cpu/{ => mips32/au1x00}/au1x00_serial.c | 0
> .../mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.c | 0
> .../mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.h | 0
> .../mips/cpu/mips32/au1x00}/config.mk | 12 +-
> arch/mips/cpu/{ => mips32}/cache.S | 4 -
> arch/mips/cpu/{ => mips32}/config.mk | 15 +-
> arch/mips/cpu/{ => mips32}/cpu.c | 0
> .../mips/cpu/mips32/incaip}/Makefile | 16 +-
> arch/mips/cpu/{ => mips32/incaip}/asc_serial.c | 83 ---
> arch/mips/cpu/{ => mips32/incaip}/asc_serial.h | 0
> .../mips/cpu/mips32/incaip}/config.mk | 12 +-
> arch/mips/cpu/{ => mips32/incaip}/incaip_clock.c | 0
> arch/mips/cpu/{ => mips32/incaip}/incaip_wdt.S | 0
> arch/mips/cpu/{ => mips32}/interrupts.c | 0
> arch/mips/cpu/{ => mips32}/start.S | 32 -
> arch/mips/include/asm/inca-ip.h | 10 -
> arch/mips/lib/board.c | 10 -
> board/purple/flash.c | 595 --------------------
> board/purple/lowlevel_init.S | 36 --
> board/purple/purple.c | 284 ----------
> board/purple/sconsole.c | 125 ----
> board/purple/sconsole.h | 46 --
> board/purple/u-boot.lds | 75 ---
> boards.cfg | 51 +-
> doc/README.Purple | 84 ---
> include/configs/purple.h | 173 ------
> 31 files changed, 53 insertions(+), 1635 deletions(-)
> rename arch/mips/cpu/{ => mips32}/Makefile (87%)
> copy {board/purple => arch/mips/cpu/mips32/au1x00}/Makefile (83%)
> rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_eth.c (100%)
> rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_serial.c (100%)
> rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.c (100%)
> rename arch/mips/cpu/{ => mips32/au1x00}/au1x00_usb_ohci.h (100%)
> copy {board/purple => arch/mips/cpu/mips32/au1x00}/config.mk (83%)
> rename arch/mips/cpu/{ => mips32}/cache.S (98%)
> rename arch/mips/cpu/{ => mips32}/config.mk (83%)
> rename arch/mips/cpu/{ => mips32}/cpu.c (100%)
> rename {board/purple => arch/mips/cpu/mips32/incaip}/Makefile (83%)
> rename arch/mips/cpu/{ => mips32/incaip}/asc_serial.c (77%)
> rename arch/mips/cpu/{ => mips32/incaip}/asc_serial.h (100%)
> rename {board/purple => arch/mips/cpu/mips32/incaip}/config.mk (83%)
> rename arch/mips/cpu/{ => mips32/incaip}/incaip_clock.c (100%)
> rename arch/mips/cpu/{ => mips32/incaip}/incaip_wdt.S (100%)
> rename arch/mips/cpu/{ => mips32}/interrupts.c (100%)
> rename arch/mips/cpu/{ => mips32}/start.S (92%)
> delete mode 100644 board/purple/flash.c
> delete mode 100644 board/purple/lowlevel_init.S
> delete mode 100644 board/purple/purple.c
> delete mode 100644 board/purple/sconsole.c
> delete mode 100644 board/purple/sconsole.h
> delete mode 100644 board/purple/u-boot.lds
> delete mode 100644 doc/README.Purple
> delete mode 100644 include/configs/purple.h
Applied, thanks.
Best regards,
Wolfgang Denk
--
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
It may be bad manners to talk with your mouth full, but it isn't too
good either if you speak when your head is empty.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
@ 2011-05-09 15:17 Shinya Kuribayashi
2011-05-10 20:35 ` Wolfgang Denk
0 siblings, 1 reply; 8+ messages in thread
From: Shinya Kuribayashi @ 2011-05-09 15:17 UTC (permalink / raw)
To: u-boot
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@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)/
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%)
diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 318d34b..6ab8acd 100644
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -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
diff --git a/arch/mips/cpu/mips32/Makefile b/arch/mips/cpu/mips32/Makefile
index e315c1b..eb8e005 100644
--- a/arch/mips/cpu/mips32/Makefile
+++ b/arch/mips/cpu/mips32/Makefile
@@ -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))
diff --git a/arch/mips/cpu/mips32/cache.S b/arch/mips/cpu/mips32/cache.S
index 2965938..5ce0ec4 100644
--- a/arch/mips/cpu/mips32/cache.S
+++ b/arch/mips/cpu/mips32/cache.S
@@ -51,75 +51,6 @@
.set pop
.endm
-/*
- * cacheop macro to automate cache operations
- * first some helpers...
- */
-#define _mincache(size, maxsize) \
- bltu size,maxsize,9f ; \
- move size,maxsize ; \
-9:
-
-#define _align(minaddr, maxaddr, linesize) \
- .set noat ; \
- subu AT,linesize,1 ; \
- not AT ; \
- and minaddr,AT ; \
- addu maxaddr,-1 ; \
- and maxaddr,AT ; \
- .set at
-
-/* general operations */
-#define doop1(op1) \
- cache op1,0(a0)
-#define doop2(op1, op2) \
- cache op1,0(a0) ; \
- nop ; \
- cache op2,0(a0)
-
-/* specials for cache initialisation */
-#define doop1lw(op1) \
- lw zero,0(a0)
-#define doop1lw1(op1) \
- cache op1,0(a0) ; \
- lw zero,0(a0) ; \
- cache op1,0(a0)
-#define doop121(op1,op2) \
- cache op1,0(a0) ; \
- nop; \
- cache op2,0(a0) ; \
- nop; \
- cache op1,0(a0)
-
-#define _oploopn(minaddr, maxaddr, linesize, tag, ops) \
- .set noreorder ; \
-10: doop##tag##ops ; \
- bne minaddr,maxaddr,10b ; \
- add minaddr,linesize ; \
- .set reorder
-
-/* finally the cache operation macros */
-#define vcacheopn(kva, n, cacheSize, cacheLineSize, tag, ops) \
- blez n,11f ; \
- addu n,kva ; \
- _align(kva, n, cacheLineSize) ; \
- _oploopn(kva, n, cacheLineSize, tag, ops) ; \
-11:
-
-#define icacheopn(kva, n, cacheSize, cacheLineSize, tag, ops) \
- _mincache(n, cacheSize); \
- blez n,11f ; \
- addu n,kva ; \
- _align(kva, n, cacheLineSize) ; \
- _oploopn(kva, n, cacheLineSize, tag, ops) ; \
-11:
-
-#define vcacheop(kva, n, cacheSize, cacheLineSize, op) \
- vcacheopn(kva, n, cacheSize, cacheLineSize, 1, (op))
-
-#define icacheop(kva, n, cacheSize, cacheLineSize, op) \
- icacheopn(kva, n, cacheSize, cacheLineSize, 1, (op))
-
.macro f_fill64 dst, offset, val
LONG_S \val, (\offset + 0 * LONGSIZE)(\dst)
LONG_S \val, (\offset + 1 * LONGSIZE)(\dst)
@@ -145,8 +76,8 @@
* mips_init_icache(uint PRId, ulong icache_size, unchar icache_linesz)
*/
LEAF(mips_init_icache)
- blez a1, 9f
- mtc0 zero, CP0_TAGLO
+ blez a1, 9f
+ mtc0 zero, CP0_TAGLO
/* clear tag to invalidate */
PTR_LI t0, INDEX_BASE
PTR_ADDU t1, t0, a1
@@ -163,15 +94,15 @@ LEAF(mips_init_icache)
1: cache_op Index_Store_Tag_I t0
PTR_ADDU t0, a2
bne t0, t1, 1b
-9: jr ra
+9: jr ra
END(mips_init_icache)
/*
* mips_init_dcache(uint PRId, ulong dcache_size, unchar dcache_linesz)
*/
LEAF(mips_init_dcache)
- blez a1, 9f
- mtc0 zero, CP0_TAGLO
+ blez a1, 9f
+ mtc0 zero, CP0_TAGLO
/* clear all tags */
PTR_LI t0, INDEX_BASE
PTR_ADDU t1, t0, a1
@@ -188,25 +119,23 @@ LEAF(mips_init_dcache)
1: cache_op Index_Store_Tag_D t0
PTR_ADDU t0, a2
bne t0, t1, 1b
-9: jr ra
+9: jr ra
END(mips_init_dcache)
-/*******************************************************************************
-*
-* mips_cache_reset - low level initialisation of the primary caches
-*
-* This routine initialises the primary caches to ensure that they
-* have good parity. It must be called by the ROM before any cached locations
-* are used to prevent the possibility of data with bad parity being written to
-* memory.
-* To initialise the instruction cache it is essential that a source of data
-* with good parity is available. This routine
-* will initialise an area of memory starting at location zero to be used as
-* a source of parity.
-*
-* RETURNS: N/A
-*
-*/
+/*
+ * mips_cache_reset - low level initialisation of the primary caches
+ *
+ * This routine initialises the primary caches to ensure that they have good
+ * parity. It must be called by the ROM before any cached locations are used
+ * to prevent the possibility of data with bad parity being written to memory.
+ *
+ * To initialise the instruction cache it is essential that a source of data
+ * with good parity is available. This routine will initialise an area of
+ * memory starting at location zero to be used as a source of parity.
+ *
+ * RETURNS: N/A
+ *
+ */
NESTED(mips_cache_reset, 0, ra)
move RA, ra
li t2, CONFIG_SYS_ICACHE_SIZE
@@ -254,13 +183,12 @@ NESTED(mips_cache_reset, 0, ra)
jr RA
END(mips_cache_reset)
-/*******************************************************************************
-*
-* dcache_status - get cache status
-*
-* RETURNS: 0 - cache disabled; 1 - cache enabled
-*
-*/
+/*
+ * dcache_status - get cache status
+ *
+ * RETURNS: 0 - cache disabled; 1 - cache enabled
+ *
+ */
LEAF(dcache_status)
mfc0 t0, CP0_CONFIG
li t1, CONF_CM_UNCACHED
@@ -271,13 +199,12 @@ LEAF(dcache_status)
2: jr ra
END(dcache_status)
-/*******************************************************************************
-*
-* dcache_disable - disable cache
-*
-* RETURNS: N/A
-*
-*/
+/*
+ * dcache_disable - disable cache
+ *
+ * RETURNS: N/A
+ *
+ */
LEAF(dcache_disable)
mfc0 t0, CP0_CONFIG
li t1, -8
@@ -287,13 +214,12 @@ LEAF(dcache_disable)
jr ra
END(dcache_disable)
-/*******************************************************************************
-*
-* dcache_enable - enable cache
-*
-* RETURNS: N/A
-*
-*/
+/*
+ * dcache_enable - enable cache
+ *
+ * RETURNS: N/A
+ *
+ */
LEAF(dcache_enable)
mfc0 t0, CP0_CONFIG
ori t0, CONF_CM_CMASK
@@ -302,27 +228,3 @@ LEAF(dcache_enable)
mtc0 t0, CP0_CONFIG
jr ra
END(dcache_enable)
-
-#ifdef CONFIG_SYS_INIT_RAM_LOCK_MIPS
-/*******************************************************************************
-*
-* mips_cache_lock - lock RAM area pointed to by a0 in cache.
-*
-* RETURNS: N/A
-*
-*/
-# define CACHE_LOCK_SIZE (CONFIG_SYS_DCACHE_SIZE)
- .globl mips_cache_lock
- .ent mips_cache_lock
-mips_cache_lock:
- li a1, CKSEG0 - CACHE_LOCK_SIZE
- addu a0, a1
- li a2, CACHE_LOCK_SIZE
- li a3, CONFIG_SYS_CACHELINE_SIZE
- move a1, a2
- icacheop(a0,a1,a2,a3,0x1d)
-
- jr ra
-
- .end mips_cache_lock
-#endif /* CONFIG_SYS_INIT_RAM_LOCK_MIPS */
diff --git a/arch/mips/cpu/mips32/start.S b/arch/mips/cpu/mips32/start.S
index e661d46..5d7467d 100644
--- a/arch/mips/cpu/mips32/start.S
+++ b/arch/mips/cpu/mips32/start.S
@@ -62,11 +62,11 @@
.globl _start
.text
_start:
- RVECENT(reset,0) /* U-boot entry point */
- RVECENT(reset,1) /* software reboot */
-#if defined(CONFIG_INCA_IP)
- .word INFINEON_EBU_BOOTCFG /* EBU init code, fetched during booting */
- .word 0x00000000 /* phase of the flash */
+ RVECENT(reset,0) # U-boot entry point
+ RVECENT(reset,1) # software reboot
+#ifdef CONFIG_INCA_IP
+ .word INFINEON_EBU_BOOTCFG # EBU init code, fetched during
+ .word 0x00000000 # booting phase of the flash
#else
RVECENT(romReserved,2)
#endif
@@ -131,7 +131,7 @@ _start:
RVECENT(romReserved,61)
RVECENT(romReserved,62)
RVECENT(romReserved,63)
- XVECENT(romExcHandle,0x200) /* bfc00200: R4000 tlbmiss vector */
+ XVECENT(romExcHandle,0x200) # bfc00200: R4000 tlbmiss vector
RVECENT(romReserved,65)
RVECENT(romReserved,66)
RVECENT(romReserved,67)
@@ -147,7 +147,7 @@ _start:
RVECENT(romReserved,77)
RVECENT(romReserved,78)
RVECENT(romReserved,79)
- XVECENT(romExcHandle,0x280) /* bfc00280: R4000 xtlbmiss vector */
+ XVECENT(romExcHandle,0x280) # bfc00280: R4000 xtlbmiss vector
RVECENT(romReserved,81)
RVECENT(romReserved,82)
RVECENT(romReserved,83)
@@ -163,7 +163,7 @@ _start:
RVECENT(romReserved,93)
RVECENT(romReserved,94)
RVECENT(romReserved,95)
- XVECENT(romExcHandle,0x300) /* bfc00300: R4000 cache vector */
+ XVECENT(romExcHandle,0x300) # bfc00300: R4000 cache vector
RVECENT(romReserved,97)
RVECENT(romReserved,98)
RVECENT(romReserved,99)
@@ -179,7 +179,7 @@ _start:
RVECENT(romReserved,109)
RVECENT(romReserved,110)
RVECENT(romReserved,111)
- XVECENT(romExcHandle,0x380) /* bfc00380: R4000 general vector */
+ XVECENT(romExcHandle,0x380) # bfc00380: R4000 general vector
RVECENT(romReserved,113)
RVECENT(romReserved,114)
RVECENT(romReserved,115)
@@ -196,19 +196,19 @@ _start:
RVECENT(romReserved,126)
RVECENT(romReserved,127)
- /* We hope there are no more reserved vectors!
+ /*
+ * We hope there are no more reserved vectors!
* 128 * 8 == 1024 == 0x400
* so this is address R_VEC+0x400 == 0xbfc00400
*/
.align 4
reset:
- /* Clear watch registers.
- */
+ /* Clear watch registers */
mtc0 zero, CP0_WATCHLO
mtc0 zero, CP0_WATCHHI
- /* WP(Watch Pending), SW0/1 should be cleared. */
+ /* WP(Watch Pending), SW0/1 should be cleared */
mtc0 zero, CP0_CAUSE
setup_c0_status_reset
@@ -217,54 +217,42 @@ reset:
mtc0 zero, CP0_COUNT
mtc0 zero, CP0_COMPARE
-#if !defined(CONFIG_SKIP_LOWLEVEL_INIT)
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
/* CONFIG0 register */
li t0, CONF_CM_UNCACHED
mtc0 t0, CP0_CONFIG
-#endif /* !CONFIG_SKIP_LOWLEVEL_INIT */
+#endif
- /* Initialize $gp.
- */
+ /* Initialize $gp */
bal 1f
- nop
+ nop
.word _gp
1:
lw gp, 0(ra)
-#if !defined(CONFIG_SKIP_LOWLEVEL_INIT)
- /* Initialize any external memory.
- */
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
+ /* Initialize any external memory */
la t9, lowlevel_init
jalr t9
- nop
+ nop
- /* Initialize caches...
- */
+ /* Initialize caches... */
la t9, mips_cache_reset
jalr t9
- nop
+ nop
- /* ... and enable them.
- */
+ /* ... and enable them */
li t0, CONF_CM_CACHABLE_NONCOHERENT
mtc0 t0, CP0_CONFIG
-#endif /* !CONFIG_SKIP_LOWLEVEL_INIT */
-
- /* Set up temporary stack.
- */
-#ifdef CONFIG_SYS_INIT_RAM_LOCK_MIPS
- li a0, CONFIG_SYS_INIT_SP_OFFSET
- la t9, mips_cache_lock
- jalr t9
- nop
#endif
+ /* Set up temporary stack */
li t0, CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET
la sp, 0(t0)
la t9, board_init_f
jr t9
- nop
+ nop
/*
* void relocate_code (addr_sp, gd, addr_moni)
@@ -279,13 +267,13 @@ reset:
.globl relocate_code
.ent relocate_code
relocate_code:
- move sp, a0 /* Set new stack pointer */
+ move sp, a0 # set new stack pointer
li t0, CONFIG_SYS_MONITOR_BASE
la t3, in_ram
- lw t2, -12(t3) /* t2 <-- uboot_end_data */
+ lw t2, -12(t3) # t2 <-- uboot_end_data
move t1, a2
- move s2, a2 /* s2 <-- destination address */
+ move s2, a2 # s2 <-- destination address
/*
* Fix $gp:
@@ -294,8 +282,8 @@ relocate_code:
*/
move t6, gp
sub gp, CONFIG_SYS_MONITOR_BASE
- add gp, a2 /* gp now adjusted */
- sub s1, gp, t6 /* s1 <-- relocation offset */
+ add gp, a2 # gp now adjusted
+ sub s1, gp, t6 # s1 <-- relocation offset
/*
* t0 = source address
@@ -306,30 +294,28 @@ relocate_code:
/*
* Save destination address and size for later usage in flush_cache()
*/
- move s0, a1 /* save gd in s0 */
- move a0, t1 /* a0 <-- destination addr */
- sub a1, t2, t0 /* a1 <-- size */
+ move s0, a1 # save gd in s0
+ move a0, t1 # a0 <-- destination addr
+ sub a1, t2, t0 # a1 <-- size
1:
lw t3, 0(t0)
sw t3, 0(t1)
addu t0, 4
ble t0, t2, 1b
- addu t1, 4 /* delay slot */
+ addu t1, 4
- /* If caches were enabled, we would have to flush them here.
- */
+ /* If caches were enabled, we would have to flush them here. */
/* a0 & a1 are already set up for flush_cache(start, size) */
la t9, flush_cache
jalr t9
- nop
+ nop
- /* Jump to where we've relocated ourselves.
- */
+ /* Jump to where we've relocated ourselves */
addi t0, s2, in_ram - _start
jr t0
- nop
+ nop
.word _gp
.word _GLOBAL_OFFSET_TABLE_
@@ -344,45 +330,43 @@ in_ram:
* GOT[0] is reserved. GOT[1] is also reserved for the dynamic object
* generated by GNU ld. Skip these reserved entries from relocation.
*/
- lw t3, -4(t0) /* t3 <-- num_got_entries */
- lw t4, -16(t0) /* t4 <-- _GLOBAL_OFFSET_TABLE_ */
- lw t5, -20(t0) /* t5 <-- _gp */
- sub t4, t5 /* compute offset*/
- add t4, t4, gp /* t4 now holds relocated _GLOBAL_OFFSET_TABLE_ */
- addi t4, t4, 8 /* Skipping first two entries. */
+ lw t3, -4(t0) # t3 <-- num_got_entries
+ lw t4, -16(t0) # t4 <-- _GLOBAL_OFFSET_TABLE_
+ lw t5, -20(t0) # t5 <-- _gp
+ sub t4, t5 # compute offset
+ add t4, t4, gp # t4 now holds relocated _G_O_T_
+ addi t4, t4, 8 # skipping first two entries
li t2, 2
1:
lw t1, 0(t4)
beqz t1, 2f
- add t1, s1
+ add t1, s1
sw t1, 0(t4)
2:
addi t2, 1
blt t2, t3, 1b
- addi t4, 4 /* delay slot */
+ addi t4, 4
- /* Clear BSS.
- */
- lw t1, -12(t0) /* t1 <-- uboot_end_data */
- lw t2, -8(t0) /* t2 <-- uboot_end */
- add t1, s1 /* adjust pointers */
+ /* Clear BSS */
+ lw t1, -12(t0) # t1 <-- uboot_end_data
+ lw t2, -8(t0) # t2 <-- uboot_end
+ add t1, s1 # adjust pointers
add t2, s1
sub t1, 4
1:
addi t1, 4
bltl t1, t2, 1b
- sw zero, 0(t1) /* delay slot */
+ sw zero, 0(t1)
- move a0, s0 /* a0 <-- gd */
+ move a0, s0 # a0 <-- gd
la t9, board_init_r
jr t9
- move a1, s2 /* delay slot */
+ move a1, s2
.end relocate_code
- /* Exception handlers.
- */
+ /* Exception handlers */
romReserved:
b romReserved
diff --git a/arch/mips/lib/time.c b/arch/mips/cpu/mips32/time.c
similarity index 100%
rename from arch/mips/lib/time.c
rename to arch/mips/cpu/mips32/time.c
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 4e90704..9244f31 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -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))
diff --git a/board/dbau1x00/u-boot.lds b/board/dbau1x00/u-boot.lds
index 3c4fbe3..4a59cea 100644
--- a/board/dbau1x00/u-boot.lds
+++ b/board/dbau1x00/u-boot.lds
@@ -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 = .;
}
diff --git a/board/gth2/u-boot.lds b/board/gth2/u-boot.lds
index aeb0fcc..9fc417f 100644
--- a/board/gth2/u-boot.lds
+++ b/board/gth2/u-boot.lds
@@ -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 = .;
}
diff --git a/board/incaip/u-boot.lds b/board/incaip/u-boot.lds
index 3c4fbe3..4a59cea 100644
--- a/board/incaip/u-boot.lds
+++ b/board/incaip/u-boot.lds
@@ -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 = .;
}
diff --git a/board/micronas/vct/u-boot.lds b/board/micronas/vct/u-boot.lds
index b90b186..3a05ef9 100644
--- a/board/micronas/vct/u-boot.lds
+++ b/board/micronas/vct/u-boot.lds
@@ -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 = .;
}
diff --git a/board/pb1x00/u-boot.lds b/board/pb1x00/u-boot.lds
index 358cc54..bd0dee1 100644
--- a/board/pb1x00/u-boot.lds
+++ b/board/pb1x00/u-boot.lds
@@ -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 = .;
}
diff --git a/board/qemu-mips/u-boot.lds b/board/qemu-mips/u-boot.lds
index bd16786..9460b20 100644
--- a/board/qemu-mips/u-boot.lds
+++ b/board/qemu-mips/u-boot.lds
@@ -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 = .;
}
diff --git a/board/tb0229/u-boot.lds b/board/tb0229/u-boot.lds
index 56d7c25..5ea1094 100644
--- a/board/tb0229/u-boot.lds
+++ b/board/tb0229/u-boot.lds
@@ -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 = .;
}
diff --git a/examples/standalone/mips.lds b/examples/standalone/mips.lds
index 63a1c92..5f766ed 100644
--- a/examples/standalone/mips.lds
+++ b/examples/standalone/mips.lds
@@ -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 = .;
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
2011-05-09 15:17 Shinya Kuribayashi
@ 2011-05-10 20:35 ` Wolfgang Denk
0 siblings, 0 replies; 8+ messages in thread
From: Wolfgang Denk @ 2011-05-10 20:35 UTC (permalink / raw)
To: u-boot
Dear Shinya Kuribayashi,
In message <4DC80575.8020401@pobox.com> 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)/
>
> 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.
> diff --git a/arch/mips/config.mk b/arch/mips/config.mk
> index 318d34b..6ab8acd 100644
> --- a/arch/mips/config.mk
> +++ b/arch/mips/config.mk
Umm... please don't include a diff with the pull request.
Best regards,
Wolfgang Denk
--
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
@ 2011-07-31 15:05 Shinya Kuribayashi
2011-08-02 19:46 ` Wolfgang Denk
0 siblings, 1 reply; 8+ messages in thread
From: Shinya Kuribayashi @ 2011-07-31 15:05 UTC (permalink / raw)
To: u-boot
Hi,
Please pull the patches from Daniel, which tries to clean up INCA-IP
dependent code in more generic way, preparing for upcoming new Lantiq
SoC support. Also consolidate MIPS generic area (cache and README).
Patches are within less than a week, but the changes are simple, clean
and well-documented, and also reviewed by Thomas and me. No need to
hold on any longer.
Thanks in advance,
--- 8< ---
The following changes since commit dd620b26332eb1e9fc0216760909c4046ba09745:
Merge branch 'master' of /home/wd/git/u-boot/custodians (2011-07-30 01:39:14 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
Daniel Schwierzeck (4):
MIPS: INCA-IP: rename inca-swap-bytes host tool
MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFG
MIPS: make cache operation mode configurable
README: update MIPS related informations
README | 35 +++++++++++++++++++++++-
arch/mips/cpu/mips32/start.S | 19 ++++++++++---
include/configs/incaip.h | 4 ++-
tools/Makefile | 8 +++---
tools/{inca-swap-bytes.c => xway-swap-bytes.c} | 0
5 files changed, 56 insertions(+), 10 deletions(-)
rename tools/{inca-swap-bytes.c => xway-swap-bytes.c} (100%)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [GIT PULL] MIPS patches
2011-07-31 15:05 Shinya Kuribayashi
@ 2011-08-02 19:46 ` Wolfgang Denk
0 siblings, 0 replies; 8+ messages in thread
From: Wolfgang Denk @ 2011-08-02 19:46 UTC (permalink / raw)
To: u-boot
Dear Shinya Kuribayashi,
In message <4E356F2E.5030709@pobox.com> you wrote:
>
> Please pull the patches from Daniel, which tries to clean up INCA-IP
> dependent code in more generic way, preparing for upcoming new Lantiq
> SoC support. Also consolidate MIPS generic area (cache and README).
>
> Patches are within less than a week, but the changes are simple, clean
> and well-documented, and also reviewed by Thomas and me. No need to
> hold on any longer.
>
> Thanks in advance,
>
> --- 8< ---
> The following changes since commit dd620b26332eb1e9fc0216760909c4046ba09745:
>
> Merge branch 'master' of /home/wd/git/u-boot/custodians (2011-07-30 01:39:14 +0200)
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-mips.git master
>
> Daniel Schwierzeck (4):
> MIPS: INCA-IP: rename inca-swap-bytes host tool
> MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFG
> MIPS: make cache operation mode configurable
> README: update MIPS related informations
>
> README | 35 +++++++++++++++++++++++-
> arch/mips/cpu/mips32/start.S | 19 ++++++++++---
> include/configs/incaip.h | 4 ++-
> tools/Makefile | 8 +++---
> tools/{inca-swap-bytes.c => xway-swap-bytes.c} | 0
> 5 files changed, 56 insertions(+), 10 deletions(-)
> rename tools/{inca-swap-bytes.c => xway-swap-bytes.c} (100%)
Applied, thanks.
Best regards,
Wolfgang Denk
--
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
"Life, loathe it or ignore it, you can't like it."
- Marvin the paranoid android
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-08-02 19:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-02 13:20 [U-Boot] [GIT PULL] MIPS patches Shinya Kuribayashi
2011-04-05 10:17 ` Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2011-07-31 15:05 Shinya Kuribayashi
2011-08-02 19:46 ` Wolfgang Denk
2011-05-09 15:17 Shinya Kuribayashi
2011-05-10 20:35 ` Wolfgang Denk
2011-02-12 5:10 Shinya Kuribayashi
2011-02-12 19:38 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox