mips: move CONFIG_MIPS{32, 64} definition to config.mk
PATCH v2 1/1 mips: move CONFIG_MIPS{32, 64} definition to config.mk
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 toarch/mips/cpu/mips64/config.mk as well.
---
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(-)
arch/mips/cpu/mips32/config.mk +1 -3
@@ -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
arch/mips/cpu/mips64/config.mk +1 -3
@@ -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
boards.cfg +2 -2
@@ -500,8 +500,8 @@ Active m68k mcf547x_8x - freescale m548xevb Active microblaze microblaze - xilinx microblaze-generic microblaze-generic - Michal Simek <[email protected]> Active mips mips32 - - qemu-mips qemu_mips qemu-mips:SYS_BIG_ENDIAN Vlad Lungu <[email protected]> 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 <[email protected]> -Active mips mips32 - imgtec malta maltael malta:MIPS32,SYS_LITTLE_ENDIAN Paul Burton <[email protected]> +Active mips mips32 - imgtec malta malta malta:SYS_BIG_ENDIAN Paul Burton <[email protected]> +Active mips mips32 - imgtec malta maltael malta:SYS_LITTLE_ENDIAN Paul Burton <[email protected]> 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 -
include/configs/dbau1x00.h +0 -1
@@ -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 */
include/configs/incaip.h +0 -1
@@ -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
include/configs/pb1x00.h +0 -1
@@ -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 */
include/configs/qemu-mips.h +0 -1
@@ -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
include/configs/qemu-mips64.h +0 -1
@@ -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
include/configs/vct.h +0 -1
@@ -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)
Signature · 1 line
1.8.3.2
PATCH v2 1/1 mips: move CONFIG_MIPS{32, 64} definition to config.mk
2014-03-05 9:25 GMT+01:00 Masahiro Yamada <[email protected]>:
Quoted 10 lines
All mips32 boards define
CONFIG_MIPS32in config headers except malta boards which define it in boards.cfg. We can consolidate them by defining it inarch/mips/cpu/mips32/config.mk.
CONFIG_MIPS64definition can be moved toarch/mips/cpu/mips64/config.mkas well.Signed-off-by Masahiro Yamada <[email protected]>Cc Daniel Schwierzeck <[email protected]>
Quoted 7 lines
---
Changes in v2:
- Fix typos/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.
Quoted 12 lines
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(-)
Signature · 1 line
- Daniel
PATCH v2 1/1 mips: move CONFIG_MIPS{32, 64} definition to config.mk
In reply to Masahiro YamadaQuoted 11 lines · Masahiro Yamada
All mips32 boards define
CONFIG_MIPS32in config headers except malta boards which define it in boards.cfg. We can consolidate them by defining it inarch/mips/cpu/mips32/config.mk.
CONFIG_MIPS64definition can be moved toarch/mips/cpu/mips64/config.mkas well.Signed-off-by Masahiro Yamada <[email protected]>Cc Daniel Schwierzeck <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
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>