From: Shinya Kuribayashi <skuribay@pobox.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/5] MIPS: Move Inca-IP targets to boards.cfg
Date: Sat, 05 Feb 2011 23:13:12 +0900 [thread overview]
Message-ID: <4D4D5AF8.6030506@pobox.com> (raw)
In-Reply-To: <4D4D5A22.8090103@pobox.com>
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
next prev parent reply other threads:[~2011-02-05 14:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Shinya Kuribayashi [this message]
2011-02-05 14:14 ` [U-Boot] [PATCH 5/5] MIPS: Move VCT boards " Shinya Kuribayashi
2011-02-07 10:00 ` Stefan Roese
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D4D5AF8.6030506@pobox.com \
--to=skuribay@pobox.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox