* [U-Boot] Move MIPS boards to boards.cfg
@ 2011-02-05 14:09 Shinya Kuribayashi
2011-02-05 14:10 ` [U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended Shinya Kuribayashi
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:09 UTC (permalink / raw)
To: u-boot
Along with applying Daniel's patches, I prepared these misc patches,
trying to move all MIPS boards left in the top Makefile to boards.cfg.
Compile tested using GCC4.4-based toolchain.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
@ 2011-02-05 14:10 ` Shinya Kuribayashi
2011-02-05 14:11 ` [U-Boot] [PATCH 2/5] MIPS: Move Alchemy Au1x00 based boards to boards.cfg Shinya Kuribayashi
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:10 UTC (permalink / raw)
To: u-boot
commit 8bde63eb3f79d68f693201528dafc8ae7aa087de ([MIPS] Rename Alchemy
processor configs into CONFIG_SOC_*) forgot to pick up this one.
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
---
common/cmd_ide.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/5] MIPS: Move Alchemy Au1x00 based boards to boards.cfg
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
2011-02-05 14:10 ` [U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended Shinya Kuribayashi
@ 2011-02-05 14:11 ` Shinya Kuribayashi
2011-02-05 14:12 ` [U-Boot] [PATCH 3/5] MIPS: Move Qemu MIPS target " Shinya Kuribayashi
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:11 UTC (permalink / raw)
To: u-boot
CONFIG_GTH2 is already provided by <configs/gth2.h>, so we don't
generate it using the options fields in boards.cfg.
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
---
Makefile | 39 ---------------------------------------
boards.cfg | 7 +++++++
2 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
index 05b404d..e1f3b7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,45 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig
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
diff --git a/boards.cfg b/boards.cfg
index c977528..f1f2506 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -213,6 +213,13 @@ 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
+pb1000 mips mips pb1x00 - - pb1x00:PB1000
purple mips mips
tb0229 mips mips
PCI5441 nios2 nios2 pci5441 psyent
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 3/5] MIPS: Move Qemu MIPS target to boards.cfg
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
2011-02-05 14:10 ` [U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended Shinya Kuribayashi
2011-02-05 14:11 ` [U-Boot] [PATCH 2/5] MIPS: Move Alchemy Au1x00 based boards to boards.cfg Shinya Kuribayashi
@ 2011-02-05 14:12 ` Shinya Kuribayashi
2011-02-05 14:13 ` [U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets " Shinya Kuribayashi
2011-02-05 14:14 ` [U-Boot] [PATCH 5/5] MIPS: Move VCT boards " Shinya Kuribayashi
4 siblings, 0 replies; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:12 UTC (permalink / raw)
To: u-boot
CONFIG_QEMU_MIPS is already provided by <configs/qemu-mips.h>, so we
don't generate it using the options fields in boards.cfg.
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
---
Makefile | 5 -----
boards.cfg | 1 +
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index e1f3b7f..9e6cf25 100644
--- a/Makefile
+++ b/Makefile
@@ -1136,11 +1136,6 @@ vct_platinumavc_onenand_small_config: unconfig
echo "#define CONFIG_VCT_SMALL_IMAGE" >> $(obj)include/config.h
@$(MKCONFIG) -n $@ -a vct mips mips vct micronas
-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/boards.cfg b/boards.cfg
index f1f2506..cb67d2a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -221,6 +221,7 @@ dbau1550_el mips mips dbau1x00 -
gth2 mips mips
pb1000 mips mips pb1x00 - - pb1x00:PB1000
purple mips mips
+qemu_mips mips mips qemu-mips - - qemu-mips
tb0229 mips mips
PCI5441 nios2 nios2 pci5441 psyent
PK1C20 nios2 nios2 pk1c20 psyent
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets to boards.cfg
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
` (2 preceding siblings ...)
2011-02-05 14:12 ` [U-Boot] [PATCH 3/5] MIPS: Move Qemu MIPS target " Shinya Kuribayashi
@ 2011-02-05 14:13 ` Shinya Kuribayashi
2011-02-05 14:14 ` [U-Boot] [PATCH 5/5] MIPS: Move VCT boards " Shinya Kuribayashi
4 siblings, 0 replies; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:13 UTC (permalink / raw)
To: u-boot
At the same time, fix up CPU_CLOCK_RATE to have the CONFIG_ prefix to
work with boards.cfg.
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
---
Makefile | 13 -------------
board/incaip/lowlevel_init.S | 2 +-
boards.cfg | 4 ++++
include/configs/incaip.h | 9 ++++++---
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
index 9e6cf25..3fe0596 100644
--- a/Makefile
+++ b/Makefile
@@ -1098,19 +1098,6 @@ smdk6400_config : unconfig
## 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 \
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/boards.cfg b/boards.cfg
index cb67d2a..d3edc9f 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -219,6 +219,10 @@ dbau1500 mips mips dbau1x00 -
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
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 */
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 5/5] MIPS: Move VCT boards to boards.cfg
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
` (3 preceding siblings ...)
2011-02-05 14:13 ` [U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets " Shinya Kuribayashi
@ 2011-02-05 14:14 ` Shinya Kuribayashi
2011-02-07 10:00 ` Stefan Roese
4 siblings, 1 reply; 7+ messages in thread
From: Shinya Kuribayashi @ 2011-02-05 14:14 UTC (permalink / raw)
To: u-boot
Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
---
Makefile | 32 --------------------------------
boards.cfg | 12 ++++++++++++
2 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
index 3fe0596..6133160 100644
--- a/Makefile
+++ b/Makefile
@@ -1092,38 +1092,6 @@ smdk6400_config : unconfig
@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
#========================================================================
-# MIPS
-#========================================================================
-#########################################################################
-## MIPS32 4Kc
-#########################################################################
-
-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
-
-#========================================================================
# Nios
#========================================================================
diff --git a/boards.cfg b/boards.cfg
index d3edc9f..b8369e1 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -227,6 +227,18 @@ pb1000 mips mips pb1x00 -
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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 5/5] MIPS: Move VCT boards to boards.cfg
2011-02-05 14:14 ` [U-Boot] [PATCH 5/5] MIPS: Move VCT boards " Shinya Kuribayashi
@ 2011-02-07 10:00 ` Stefan Roese
0 siblings, 0 replies; 7+ messages in thread
From: Stefan Roese @ 2011-02-07 10:00 UTC (permalink / raw)
To: u-boot
On Saturday 05 February 2011 15:14:06 Shinya Kuribayashi wrote:
> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
Acked-by: Stefan Roese <sr@denx.de>
Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-02-07 10:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-05 14:09 [U-Boot] Move MIPS boards to boards.cfg Shinya Kuribayashi
2011-02-05 14:10 ` [U-Boot] [PATCH 1/5] cmd_ide: Fix an unused CONFIG_AU1X00 symbol to work as intended Shinya Kuribayashi
2011-02-05 14:11 ` [U-Boot] [PATCH 2/5] MIPS: Move Alchemy Au1x00 based boards to boards.cfg Shinya Kuribayashi
2011-02-05 14:12 ` [U-Boot] [PATCH 3/5] MIPS: Move Qemu MIPS target " Shinya Kuribayashi
2011-02-05 14:13 ` [U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets " Shinya Kuribayashi
2011-02-05 14:14 ` [U-Boot] [PATCH 5/5] MIPS: Move VCT boards " Shinya Kuribayashi
2011-02-07 10:00 ` Stefan Roese
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox