* [U-Boot] [PATCH v2 1/5] ARM: ARM720t: remove empty asm/arch/hardware.h
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
@ 2015-04-21 12:59 ` Masahiro Yamada
2015-04-23 13:15 ` [U-Boot] [U-Boot, v2, " Tom Rini
2015-04-21 12:59 ` [U-Boot] [PATCH v2 2/5] ARM: integrator: move board select into mach-integrator/Kconfig Masahiro Yamada
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Masahiro Yamada @ 2015-04-21 12:59 UTC (permalink / raw)
To: u-boot
arch/arm/cpu/arm720t/start.S includes <asm/arch/hardware.h>,
but the hardware.h headers of ARM720T boards are all empty.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
---
Changes in v2: None
arch/arm/cpu/arm720t/start.S | 1 -
arch/arm/include/asm/arch-arm720t/hardware.h | 17 -----------------
arch/arm/include/asm/arch-tegra114/hardware.h | 22 ----------------------
arch/arm/include/asm/arch-tegra124/hardware.h | 16 ----------------
arch/arm/include/asm/arch-tegra20/hardware.h | 13 -------------
arch/arm/include/asm/arch-tegra30/hardware.h | 22 ----------------------
6 files changed, 91 deletions(-)
delete mode 100644 arch/arm/include/asm/arch-arm720t/hardware.h
delete mode 100644 arch/arm/include/asm/arch-tegra114/hardware.h
delete mode 100644 arch/arm/include/asm/arch-tegra124/hardware.h
delete mode 100644 arch/arm/include/asm/arch-tegra20/hardware.h
delete mode 100644 arch/arm/include/asm/arch-tegra30/hardware.h
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index ec8e88d..0bb3441 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -9,7 +9,6 @@
#include <asm-offsets.h>
#include <config.h>
-#include <asm/hardware.h>
/*
*************************************************************************
diff --git a/arch/arm/include/asm/arch-arm720t/hardware.h b/arch/arm/include/asm/arch-arm720t/hardware.h
deleted file mode 100644
index 8ca42d9..0000000
--- a/arch/arm/include/asm/arch-arm720t/hardware.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ARM7_HW_H
-#define __ARM7_HW_H
-
-/*
- * Copyright (c) 2004 Cucy Systems (http://www.cucy.com)
- * Curt Brune <curt@cucy.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
-/* include IntegratorCP/CM720T specific hardware file if there was one */
-#else
-#error No hardware file defined for this configuration
-#endif
-
-#endif /* __ARM7_HW_H */
diff --git a/arch/arm/include/asm/arch-tegra114/hardware.h b/arch/arm/include/asm/arch-tegra114/hardware.h
deleted file mode 100644
index c21fbb6..0000000
--- a/arch/arm/include/asm/arch-tegra114/hardware.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TEGRA114_HARDWARE_H_
-#define _TEGRA114_HARDWARE_H_
-
-/* include tegra specific hardware definitions */
-
-#endif /* _TEGRA114_HARDWARE_H_ */
diff --git a/arch/arm/include/asm/arch-tegra124/hardware.h b/arch/arm/include/asm/arch-tegra124/hardware.h
deleted file mode 100644
index 114fce8..0000000
--- a/arch/arm/include/asm/arch-tegra124/hardware.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * (C) Copyright 2013
- * NVIDIA Corporation <www.nvidia.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef _TEGRA124_HARDWARE_H_
-#define _TEGRA124_HARDWARE_H_
-
-/*
- * Include Tegra-specific hardware definitions
- * Nothing needed currently for Tegra124
- */
-
-#endif /* _TEGRA124_HARDWARE_H_ */
diff --git a/arch/arm/include/asm/arch-tegra20/hardware.h b/arch/arm/include/asm/arch-tegra20/hardware.h
deleted file mode 100644
index a295894..0000000
--- a/arch/arm/include/asm/arch-tegra20/hardware.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* (C) Copyright 2010-2011
-* NVIDIA Corporation <www.nvidia.com>
-*
- * SPDX-License-Identifier: GPL-2.0+
-*/
-
-#ifndef __TEGRA2_HW_H
-#define __TEGRA2_HW_H
-
-/* include tegra specific hardware definitions */
-
-#endif /* __TEGRA2_HW_H */
diff --git a/arch/arm/include/asm/arch-tegra30/hardware.h b/arch/arm/include/asm/arch-tegra30/hardware.h
deleted file mode 100644
index b1a5aa9..0000000
--- a/arch/arm/include/asm/arch-tegra30/hardware.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TEGRA30_HARDWARE_H_
-#define _TEGRA30_HARDWARE_H_
-
-/* include tegra specific hardware definitions */
-
-#endif /* _TEGRA30-HARDWARE_H_ */
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 2/5] ARM: integrator: move board select into mach-integrator/Kconfig
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
2015-04-21 12:59 ` [U-Boot] [PATCH v2 1/5] ARM: ARM720t: remove empty asm/arch/hardware.h Masahiro Yamada
@ 2015-04-21 12:59 ` Masahiro Yamada
2015-04-23 13:15 ` [U-Boot] [U-Boot, v2, " Tom Rini
2015-04-21 12:59 ` [U-Boot] [PATCH v2 3/5] ARM: integrator: split board select into AP/CP select and CM select Masahiro Yamada
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Masahiro Yamada @ 2015-04-21 12:59 UTC (permalink / raw)
To: u-boot
The board/SoC select menu in arch/arm/Kconfig is still cluttered.
Add ARCH_INTEGRATOR into arch/arm/Kconfig and move the board select
under arch/arm/mach-integrator.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
Changes in v2: None
arch/arm/Kconfig | 38 ++----------
arch/arm/mach-integrator/Kconfig | 57 ++++++++++++++++++
board/armltd/integrator/Kconfig | 103 --------------------------------
configs/integratorap_cm720t_defconfig | 1 +
configs/integratorap_cm920t_defconfig | 1 +
configs/integratorap_cm926ejs_defconfig | 1 +
configs/integratorap_cm946es_defconfig | 1 +
configs/integratorcp_cm1136_defconfig | 1 +
configs/integratorcp_cm920t_defconfig | 1 +
configs/integratorcp_cm926ejs_defconfig | 1 +
configs/integratorcp_cm946es_defconfig | 1 +
include/configs/integratorap.h | 1 -
12 files changed, 70 insertions(+), 137 deletions(-)
create mode 100644 arch/arm/mach-integrator/Kconfig
delete mode 100644 board/armltd/integrator/Kconfig
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ac7a11b..8046d3e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -61,18 +61,6 @@ config SEMIHOSTING
choice
prompt "Target select"
-config TARGET_INTEGRATORAP_CM720T
- bool "Support integratorap_cm720t"
- select CPU_ARM720T
-
-config TARGET_INTEGRATORAP_CM920T
- bool "Support integratorap_cm920t"
- select CPU_ARM920T
-
-config TARGET_INTEGRATORCP_CM920T
- bool "Support integratorcp_cm920t"
- select CPU_ARM920T
-
config ARCH_AT91
bool "Atmel AT91"
@@ -92,14 +80,6 @@ config TARGET_SMDK2410
bool "Support smdk2410"
select CPU_ARM920T
-config TARGET_INTEGRATORAP_CM926EJS
- bool "Support integratorap_cm926ejs"
- select CPU_ARM926EJS
-
-config TARGET_INTEGRATORCP_CM926EJS
- bool "Support integratorcp_cm926ejs"
- select CPU_ARM926EJS
-
config TARGET_ASPENITE
bool "Support aspenite"
select CPU_ARM926EJS
@@ -247,10 +227,6 @@ config ARCH_VERSATILE
bool "ARM Ltd. Versatile family"
select CPU_ARM926EJS
-config TARGET_INTEGRATORCP_CM1136
- bool "Support integratorcp_cm1136"
- select CPU_ARM1136
-
config TARGET_IMX31_PHYCORE
bool "Support imx31_phycore"
select CPU_ARM1136
@@ -299,14 +275,6 @@ config ARCH_BCM283X
select DM_SERIAL
select DM_GPIO
-config TARGET_INTEGRATORAP_CM946ES
- bool "Support integratorap_cm946es"
- select CPU_ARM946ES
-
-config TARGET_INTEGRATORCP_CM946ES
- bool "Support integratorcp_cm946es"
- select CPU_ARM946ES
-
config TARGET_VEXPRESS_CA15_TC2
bool "Support vexpress_ca15_tc2"
select CPU_V7
@@ -461,6 +429,9 @@ config ARCH_HIGHBANK
bool "Calxeda Highbank"
select CPU_V7
+config ARCH_INTEGRATOR
+ bool "ARM Ltd. Integrator family"
+
config ARCH_KEYSTONE
bool "TI Keystone"
select CPU_V7
@@ -789,6 +760,8 @@ source "arch/arm/cpu/armv7/exynos/Kconfig"
source "arch/arm/mach-highbank/Kconfig"
+source "arch/arm/mach-integrator/Kconfig"
+
source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
@@ -835,7 +808,6 @@ source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/db-mv784mp-gp/Kconfig"
source "board/Marvell/gplugd/Kconfig"
source "board/armadeus/apf27/Kconfig"
-source "board/armltd/integrator/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/bachmann/ot1200/Kconfig"
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
new file mode 100644
index 0000000..4406399
--- /dev/null
+++ b/arch/arm/mach-integrator/Kconfig
@@ -0,0 +1,57 @@
+menu "Integrator Options"
+ depends on ARCH_INTEGRATOR
+
+choice
+ prompt "ARM Ltd. Integrator board select"
+
+config TARGET_INTEGRATORAP_CM720T
+ bool "Support integratorap_cm720t"
+ select CPU_ARM720T
+
+config TARGET_INTEGRATORAP_CM920T
+ bool "Support integratorap_cm920t"
+ select CPU_ARM920T
+
+config TARGET_INTEGRATORCP_CM920T
+ bool "Support integratorcp_cm920t"
+ select CPU_ARM920T
+
+config TARGET_INTEGRATORAP_CM926EJS
+ bool "Support integratorap_cm926ejs"
+ select CPU_ARM926EJS
+
+config TARGET_INTEGRATORCP_CM926EJS
+ bool "Support integratorcp_cm926ejs"
+ select CPU_ARM926EJS
+
+config TARGET_INTEGRATORCP_CM1136
+ bool "Support integratorcp_cm1136"
+ select CPU_ARM1136
+
+config TARGET_INTEGRATORAP_CM946ES
+ bool "Support integratorap_cm946es"
+ select CPU_ARM946ES
+
+config TARGET_INTEGRATORCP_CM946ES
+ bool "Support integratorcp_cm946es"
+ select CPU_ARM946ES
+
+endchoice
+
+config SYS_BOARD
+ default "integrator"
+
+config SYS_VENDOR
+ default "armltd"
+
+config SYS_CONFIG_NAME
+ default "integratorap" if TARGET_INTEGRATORAP_CM720T || \
+ TARGET_INTEGRATORAP_CM920T || \
+ TARGET_INTEGRATORAP_CM926EJS || \
+ TARGET_INTEGRATORAP_CM946ES
+ default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \
+ TARGET_INTEGRATORCP_CM926EJS || \
+ TARGET_INTEGRATORCP_CM946ES || \
+ TARGET_INTEGRATORCP_CM1136
+
+endmenu
diff --git a/board/armltd/integrator/Kconfig b/board/armltd/integrator/Kconfig
deleted file mode 100644
index 6153b5d..0000000
--- a/board/armltd/integrator/Kconfig
+++ /dev/null
@@ -1,103 +0,0 @@
-if TARGET_INTEGRATORAP_CM720T
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORAP_CM920T
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM920T
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORAP_CM926EJS
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM926EJS
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORCP_CM1136
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorcp"
-
-endif
-
-if TARGET_INTEGRATORAP_CM946ES
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorap"
-
-endif
-
-if TARGET_INTEGRATORCP_CM946ES
-
-config SYS_BOARD
- default "integrator"
-
-config SYS_VENDOR
- default "armltd"
-
-config SYS_CONFIG_NAME
- default "integratorcp"
-
-endif
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 0bb7b08..5c15d57 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM720T"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM720T=y
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index fb925d5..d2a9a71 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM920T=y
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index 308a1e6..af4cfa5 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM926EJS=y
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index d1b9db5..ee07206 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM946ES=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 3feb656..5deedc8 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM1136"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM1136=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index f304bbe..5ed8539 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM920T=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index a8d762b..4840ec4 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM926EJS=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index 2e67dbc..dcd034d 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y
+CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM946ES=y
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index e168c8c..8439db7 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -18,7 +18,6 @@
#include "integrator-common.h"
/* Integrator/AP-specific configuration */
-#define CONFIG_ARCH_INTEGRATOR
#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 3/5] ARM: integrator: split board select into AP/CP select and CM select
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
2015-04-21 12:59 ` [U-Boot] [PATCH v2 1/5] ARM: ARM720t: remove empty asm/arch/hardware.h Masahiro Yamada
2015-04-21 12:59 ` [U-Boot] [PATCH v2 2/5] ARM: integrator: move board select into mach-integrator/Kconfig Masahiro Yamada
@ 2015-04-21 12:59 ` Masahiro Yamada
2015-04-23 13:15 ` [U-Boot] [U-Boot, v2, " Tom Rini
2015-04-21 12:59 ` [U-Boot] [PATCH v2 4/5] ARM: integrator: abolish CONFIG_INTEGRATOR Masahiro Yamada
` (2 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Masahiro Yamada @ 2015-04-21 12:59 UTC (permalink / raw)
To: u-boot
Select integrator boards by the combination of platform select (AP/CP)
and core module select (CM720T, CM920T, ...).
This allows us to remove CONFIG_SYS_EXTRA_OPTIONS and make Kconfig
much cleaner.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
Changes in v2: None
arch/arm/mach-integrator/Kconfig | 57 +++++++++++++++------------------
configs/integratorap_cm720t_defconfig | 4 +--
configs/integratorap_cm920t_defconfig | 4 +--
configs/integratorap_cm926ejs_defconfig | 4 +--
configs/integratorap_cm946es_defconfig | 4 +--
configs/integratorcp_cm1136_defconfig | 4 +--
configs/integratorcp_cm920t_defconfig | 4 +--
configs/integratorcp_cm926ejs_defconfig | 4 +--
configs/integratorcp_cm946es_defconfig | 4 +--
9 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 4406399..6794660 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -2,40 +2,39 @@ menu "Integrator Options"
depends on ARCH_INTEGRATOR
choice
- prompt "ARM Ltd. Integrator board select"
+ prompt "Integrator platform select"
-config TARGET_INTEGRATORAP_CM720T
- bool "Support integratorap_cm720t"
- select CPU_ARM720T
+config ARCH_INTEGRATOR_AP
+ bool "Support Integrator/AP platform"
-config TARGET_INTEGRATORAP_CM920T
- bool "Support integratorap_cm920t"
- select CPU_ARM920T
+config ARCH_INTEGRATOR_CP
+ bool "Support Integrator/CP platform"
-config TARGET_INTEGRATORCP_CM920T
- bool "Support integratorcp_cm920t"
- select CPU_ARM920T
+endchoice
-config TARGET_INTEGRATORAP_CM926EJS
- bool "Support integratorap_cm926ejs"
- select CPU_ARM926EJS
+choice
+ prompt "Integrator core module select"
-config TARGET_INTEGRATORCP_CM926EJS
- bool "Support integratorcp_cm926ejs"
- select CPU_ARM926EJS
+config CM720T
+ bool "Core Module for ARM720T"
+ select CPU_ARM720T
-config TARGET_INTEGRATORCP_CM1136
- bool "Support integratorcp_cm1136"
- select CPU_ARM1136
+config CM920T
+ bool "Core Module for ARM920T"
+ select CPU_ARM920T
-config TARGET_INTEGRATORAP_CM946ES
- bool "Support integratorap_cm946es"
- select CPU_ARM946ES
+config CM926EJ_S
+ bool "Core Module for ARM926EJ-STM"
+ select CPU_ARM926EJS
-config TARGET_INTEGRATORCP_CM946ES
- bool "Support integratorcp_cm946es"
+config CM946ES
+ bool "Core Module for ARM946E-STM"
select CPU_ARM946ES
+config CM1136
+ bool "Core Module for ARM1136JF-STM"
+ select CPU_ARM1136
+
endchoice
config SYS_BOARD
@@ -45,13 +44,7 @@ config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
- default "integratorap" if TARGET_INTEGRATORAP_CM720T || \
- TARGET_INTEGRATORAP_CM920T || \
- TARGET_INTEGRATORAP_CM926EJS || \
- TARGET_INTEGRATORAP_CM946ES
- default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \
- TARGET_INTEGRATORCP_CM926EJS || \
- TARGET_INTEGRATORCP_CM946ES || \
- TARGET_INTEGRATORCP_CM1136
+ default "integratorap" if ARCH_INTEGRATOR_AP
+ default "integratorcp" if ARCH_INTEGRATOR_CP
endmenu
diff --git a/configs/integratorap_cm720t_defconfig b/configs/integratorap_cm720t_defconfig
index 5c15d57..fc0dc67 100644
--- a/configs/integratorap_cm720t_defconfig
+++ b/configs/integratorap_cm720t_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM720T"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORAP_CM720T=y
+CONFIG_ARCH_INTEGRATOR_AP=y
+CONFIG_CM720T=y
diff --git a/configs/integratorap_cm920t_defconfig b/configs/integratorap_cm920t_defconfig
index d2a9a71..eb6afb9 100644
--- a/configs/integratorap_cm920t_defconfig
+++ b/configs/integratorap_cm920t_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORAP_CM920T=y
+CONFIG_ARCH_INTEGRATOR_AP=y
+CONFIG_CM920T=y
diff --git a/configs/integratorap_cm926ejs_defconfig b/configs/integratorap_cm926ejs_defconfig
index af4cfa5..8667fcb 100644
--- a/configs/integratorap_cm926ejs_defconfig
+++ b/configs/integratorap_cm926ejs_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORAP_CM926EJS=y
+CONFIG_ARCH_INTEGRATOR_AP=y
+CONFIG_CM926EJ_S=y
diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index ee07206..1e8c157 100644
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORAP_CM946ES=y
+CONFIG_ARCH_INTEGRATOR_AP=y
+CONFIG_CM946ES=y
diff --git a/configs/integratorcp_cm1136_defconfig b/configs/integratorcp_cm1136_defconfig
index 5deedc8..f039470 100644
--- a/configs/integratorcp_cm1136_defconfig
+++ b/configs/integratorcp_cm1136_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM1136"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORCP_CM1136=y
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM1136=y
diff --git a/configs/integratorcp_cm920t_defconfig b/configs/integratorcp_cm920t_defconfig
index 5ed8539..cb364a1 100644
--- a/configs/integratorcp_cm920t_defconfig
+++ b/configs/integratorcp_cm920t_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORCP_CM920T=y
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM920T=y
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig
index 4840ec4..32ea7b9 100644
--- a/configs/integratorcp_cm926ejs_defconfig
+++ b/configs/integratorcp_cm926ejs_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORCP_CM926EJS=y
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM926EJ_S=y
diff --git a/configs/integratorcp_cm946es_defconfig b/configs/integratorcp_cm946es_defconfig
index dcd034d..e7fc706 100644
--- a/configs/integratorcp_cm946es_defconfig
+++ b/configs/integratorcp_cm946es_defconfig
@@ -1,4 +1,4 @@
-CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
-CONFIG_TARGET_INTEGRATORCP_CM946ES=y
+CONFIG_ARCH_INTEGRATOR_CP=y
+CONFIG_CM946ES=y
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 4/5] ARM: integrator: abolish CONFIG_INTEGRATOR
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
` (2 preceding siblings ...)
2015-04-21 12:59 ` [U-Boot] [PATCH v2 3/5] ARM: integrator: split board select into AP/CP select and CM select Masahiro Yamada
@ 2015-04-21 12:59 ` Masahiro Yamada
2015-04-23 13:15 ` [U-Boot] [U-Boot, v2, " Tom Rini
2015-04-21 12:59 ` [U-Boot] [PATCH v2 5/5] ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig Masahiro Yamada
2015-04-22 12:08 ` [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Linus Walleij
5 siblings, 1 reply; 12+ messages in thread
From: Masahiro Yamada @ 2015-04-21 12:59 UTC (permalink / raw)
To: u-boot
Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
Changes in v2: None
arch/arm/cpu/arm946es/cpu.c | 4 ++--
include/configs/integrator-common.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
index e20e5a8..5d864b9 100644
--- a/arch/arm/cpu/arm946es/cpu.c
+++ b/arch/arm/cpu/arm946es/cpu.c
@@ -53,7 +53,7 @@ static void cache_flush (void)
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i));
}
-#ifndef CONFIG_INTEGRATOR
+#ifndef CONFIG_ARCH_INTEGRATOR
__attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
{
@@ -63,4 +63,4 @@ __attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused)))
;
}
-#endif /* #ifdef CONFIG_INTEGRATOR */
+#endif /* #ifdef CONFIG_ARCH_INTEGRATOR */
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 4362925..12c7382 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -7,8 +7,6 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#define CONFIG_INTEGRATOR
-
#define CONFIG_SYS_TEXT_BASE 0x01000000
#define CONFIG_SYS_MEMTEST_START 0x100000
#define CONFIG_SYS_MEMTEST_END 0x10000000
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 5/5] ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
` (3 preceding siblings ...)
2015-04-21 12:59 ` [U-Boot] [PATCH v2 4/5] ARM: integrator: abolish CONFIG_INTEGRATOR Masahiro Yamada
@ 2015-04-21 12:59 ` Masahiro Yamada
2015-04-23 13:15 ` [U-Boot] [U-Boot, v2, " Tom Rini
2015-04-22 12:08 ` [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Linus Walleij
5 siblings, 1 reply; 12+ messages in thread
From: Masahiro Yamada @ 2015-04-21 12:59 UTC (permalink / raw)
To: u-boot
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
Changes in v2:
- Move this macro, not delete
arch/arm/mach-integrator/Kconfig | 4 ++++
include/configs/integratorcp.h | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 6794660..8ffc544 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -9,9 +9,13 @@ config ARCH_INTEGRATOR_AP
config ARCH_INTEGRATOR_CP
bool "Support Integrator/CP platform"
+ select ARCH_CINTEGRATOR
endchoice
+config ARCH_CINTEGRATOR
+ bool
+
choice
prompt "Integrator core module select"
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 7c1ef24..7518b60 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -18,7 +18,6 @@
#include "integrator-common.h"
/* Integrator CP-specific configuration */
-#define CONFIG_ARCH_CINTEGRATOR
#define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer 1 is clocked at 1Mhz */
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up
2015-04-21 12:59 [U-Boot] [PATCH v2 0/5] ARM: integrator: Kconfig Clean up Masahiro Yamada
` (4 preceding siblings ...)
2015-04-21 12:59 ` [U-Boot] [PATCH v2 5/5] ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig Masahiro Yamada
@ 2015-04-22 12:08 ` Linus Walleij
5 siblings, 0 replies; 12+ messages in thread
From: Linus Walleij @ 2015-04-22 12:08 UTC (permalink / raw)
To: u-boot
On Tue, Apr 21, 2015 at 2:59 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Masahiro Yamada (5):
> ARM: ARM720t: remove empty asm/arch/hardware.h
> ARM: integrator: move board select into mach-integrator/Kconfig
> ARM: integrator: split board select into AP/CP select and CM select
> ARM: integrator: abolish CONFIG_INTEGRATOR
> ARM: integrator: move CONFIG_ARCH_CINTEGRATOR to Kconfig
I tested all of these patches, they need rebasing though becasue they don't
apply cleanly on the U-Boot master, I've tested it together with my
regression fixes and CONFIG_DM conversion and it works fine so:
Tested-by: Linus Walleij <linus.walleij@linaro.org>
for all five patches. Tested on Integrator/AP, real hardware.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 12+ messages in thread