* [U-Boot] [PATCH v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk
@ 2014-03-05 8:25 Masahiro Yamada
2014-03-05 14:07 ` Daniel Schwierzeck
2014-03-07 22:29 ` [U-Boot] [U-Boot, " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2014-03-05 8:25 UTC (permalink / raw)
To: u-boot
All mips32 boards define CONFIG_MIPS32 in config headers
except malta boards which define it in boards.cfg.
We can consolidate them by defining it in
arch/mips/cpu/mips32/config.mk.
CONFIG_MIPS64 definition can be moved to
arch/mips/cpu/mips64/config.mk as well.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
Changes in v2:
- Fix typo
s/mip32/mips32/ in commit log.
s/CONFIG_MIP32/CONFIG_MIPS32/
Anyway, CONFIG_MIPS32 is not used anywhere...
arch/mips/cpu/mips32/config.mk | 4 +---
arch/mips/cpu/mips64/config.mk | 4 +---
boards.cfg | 4 ++--
include/configs/dbau1x00.h | 1 -
include/configs/incaip.h | 1 -
include/configs/pb1x00.h | 1 -
include/configs/qemu-mips.h | 1 -
include/configs/qemu-mips64.h | 1 -
include/configs/vct.h | 1 -
9 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/arch/mips/cpu/mips32/config.mk b/arch/mips/cpu/mips32/config.mk
index cd4ce7a..332cd62 100644
--- a/arch/mips/cpu/mips32/config.mk
+++ b/arch/mips/cpu/mips32/config.mk
@@ -11,9 +11,7 @@
# Note: Toolchains with binutils prior to v2.16
# are no longer supported by U-Boot MIPS tree!
#
-MIPSFLAGS := -march=mips32r2
-
-PLATFORM_CPPFLAGS += $(MIPSFLAGS)
+PLATFORM_CPPFLAGS += -DCONFIG_MIPS32 -march=mips32r2
PLATFORM_CPPFLAGS += -mabi=32 -DCONFIG_32BIT
ifdef CONFIG_SYS_BIG_ENDIAN
PLATFORM_LDFLAGS += -m elf32btsmip
diff --git a/arch/mips/cpu/mips64/config.mk b/arch/mips/cpu/mips64/config.mk
index 3c01136..c55eb7f 100644
--- a/arch/mips/cpu/mips64/config.mk
+++ b/arch/mips/cpu/mips64/config.mk
@@ -11,9 +11,7 @@
# Note: Toolchains with binutils prior to v2.16
# are no longer supported by U-Boot MIPS tree!
#
-MIPSFLAGS = -march=mips64
-
-PLATFORM_CPPFLAGS += $(MIPSFLAGS)
+PLATFORM_CPPFLAGS += -DCONFIG_MIPS64 -march=mips64
PLATFORM_CPPFLAGS += -mabi=64 -DCONFIG_64BIT
ifdef CONFIG_SYS_BIG_ENDIAN
PLATFORM_LDFLAGS += -m elf64btsmip
diff --git a/boards.cfg b/boards.cfg
index 9bad27f..e26ef32 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -500,8 +500,8 @@ Active m68k mcf547x_8x - freescale m548xevb
Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek <monstr@monstr.eu>
Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu <vlad.lungu@windriver.com>
Active mips mips32 - - qemu-mips qemu_mipsel qemu-mips:SYS_LITTLE_ENDIAN -
-Active mips mips32 - imgtec malta malta malta:MIPS32,SYS_BIG_ENDIAN Paul Burton <paul.burton@imgtec.com>
-Active mips mips32 - imgtec malta maltael malta:MIPS32,SYS_LITTLE_ENDIAN Paul Burton <paul.burton@imgtec.com>
+Active mips mips32 - imgtec malta malta malta:SYS_BIG_ENDIAN Paul Burton <paul.burton@imgtec.com>
+Active mips mips32 - imgtec malta maltael malta:SYS_LITTLE_ENDIAN Paul Burton <paul.burton@imgtec.com>
Active mips mips32 - micronas vct vct_platinum vct:VCT_PLATINUM -
Active mips mips32 - micronas vct vct_platinum_onenand vct:VCT_PLATINUM,VCT_ONENAND -
Active mips mips32 - micronas vct vct_platinum_onenand_small vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE -
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index da4ff8e..e0bf3dc 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS32 1 /* MIPS32 CPU core */
#define CONFIG_DBAU1X00 1
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 7d2715d..e11d184 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */
#define CONFIG_INCA_IP 1 /* on a INCA-IP Board */
#define CONFIG_XWAY_SWAP_BYTES
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index e929b23..f924965 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS32 1 /* MIPS32 CPU core */
#define CONFIG_PB1X00 1
#define CONFIG_SOC_AU1X00 1 /* alchemy series cpu */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index dd3babb..98ed8bc 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS32 /* MIPS32 CPU core */
#define CONFIG_QEMU_MIPS
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index a1422fc..e8f5a4c 100644
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -12,7 +12,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS64 /* MIPS64 CPU core */
#define CONFIG_QEMU_MIPS
#define CONFIG_MISC_INIT_R
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 9983116..5ab4de3 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -25,7 +25,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_MIPS32 /* MIPS 4Kc CPU core */
#define CPU_CLOCK_RATE 324000000 /* Clock for the MIPS core */
#define CONFIG_SYS_MIPS_TIMER_FREQ (CPU_CLOCK_RATE / 2)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk
2014-03-05 8:25 [U-Boot] [PATCH v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk Masahiro Yamada
@ 2014-03-05 14:07 ` Daniel Schwierzeck
2014-03-07 22:29 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Schwierzeck @ 2014-03-05 14:07 UTC (permalink / raw)
To: u-boot
2014-03-05 9:25 GMT+01:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
> All mips32 boards define CONFIG_MIPS32 in config headers
> except malta boards which define it in boards.cfg.
> We can consolidate them by defining it in
> arch/mips/cpu/mips32/config.mk.
>
> CONFIG_MIPS64 definition can be moved to
> arch/mips/cpu/mips64/config.mk as well.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
>
> Changes in v2:
> - Fix typo
> s/mip32/mips32/ in commit log.
> s/CONFIG_MIP32/CONFIG_MIPS32/
> Anyway, CONFIG_MIPS32 is not used anywhere...
Indeed those defines are unused but it's a nice cleanup. Maybe I'll
drop those defines in the future.
>
> arch/mips/cpu/mips32/config.mk | 4 +---
> arch/mips/cpu/mips64/config.mk | 4 +---
> boards.cfg | 4 ++--
> include/configs/dbau1x00.h | 1 -
> include/configs/incaip.h | 1 -
> include/configs/pb1x00.h | 1 -
> include/configs/qemu-mips.h | 1 -
> include/configs/qemu-mips64.h | 1 -
> include/configs/vct.h | 1 -
> 9 files changed, 4 insertions(+), 14 deletions(-)
>
Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
--
- Daniel
^ permalink raw reply [flat|nested] 3+ messages in thread* [U-Boot] [U-Boot, v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk
2014-03-05 8:25 [U-Boot] [PATCH v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk Masahiro Yamada
2014-03-05 14:07 ` Daniel Schwierzeck
@ 2014-03-07 22:29 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-03-07 22:29 UTC (permalink / raw)
To: u-boot
On Wed, Mar 05, 2014 at 05:25:37PM +0900, Masahiro Yamada wrote:
> All mips32 boards define CONFIG_MIPS32 in config headers
> except malta boards which define it in boards.cfg.
> We can consolidate them by defining it in
> arch/mips/cpu/mips32/config.mk.
>
> CONFIG_MIPS64 definition can be moved to
> arch/mips/cpu/mips64/config.mk as well.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140307/601da5dd/attachment.pgp>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-07 22:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-05 8:25 [U-Boot] [PATCH v2] mips: move CONFIG_MIPS{32, 64} definition to config.mk Masahiro Yamada
2014-03-05 14:07 ` Daniel Schwierzeck
2014-03-07 22:29 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox