All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: openbmc@lists.ozlabs.org
Subject: [PATCH u-boot 02/12] aspeed: rework top level configuration of the Aspeed SoC
Date: Thu,  6 Oct 2016 23:26:35 +0200	[thread overview]
Message-ID: <1475789205-19618-3-git-send-email-clg@kaod.org> (raw)
In-Reply-To: <1475789205-19618-1-git-send-email-clg@kaod.org>

and also add a proper CONFIG_ARCH_ASPEED

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 arch/arm/Kconfig                               | 16 ++++---------
 {board/aspeed => arch/arm/mach-aspeed}/Kconfig | 32 ++++++++++++++++++++++++--
 board/aspeed/ast-g4/Kconfig                    |  6 -----
 board/aspeed/ast-g5/Kconfig                    |  6 -----
 configs/ast_g4_ncsi_defconfig                  |  1 +
 configs/ast_g4_phy_defconfig                   |  1 +
 configs/ast_g5_ncsi_defconfig                  |  1 +
 configs/ast_g5_phy_defconfig                   |  1 +
 include/configs/ast-common.h                   |  1 -
 9 files changed, 39 insertions(+), 26 deletions(-)
 rename {board/aspeed => arch/arm/mach-aspeed}/Kconfig (52%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f155d22b1197..b75ff1296cc2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -130,6 +130,9 @@ choice
 	prompt "Target select"
 	default TARGET_HIKEY
 
+config ARCH_ASPEED
+       bool "Support Apseed SoCs"
+
 config ARCH_AT91
 	bool "Atmel AT91"
 
@@ -899,18 +902,10 @@ config TARGET_THUNDERX_88XX
 	select OF_CONTROL
 	select SYS_CACHE_SHIFT_7
 
-config TARGET_AST_G5
-       bool "Support Apseed fifth generation SoCs"
-       select CPU_ARM1176
-       select AST_SPI_NOR
-
-config TARGET_AST_G4
-       bool "Support Aspeed fourth generation SoCs"
-       select CPU_ARM926EJS
-       select AST_SPI_NOR
-
 endchoice
 
+source "arch/arm/mach-aspeed/Kconfig"
+
 source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/mach-bcm283x/Kconfig"
@@ -1050,7 +1045,6 @@ source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/zipitz2/Kconfig"
-source "board/aspeed/Kconfig"
 
 source "arch/arm/Kconfig.debug"
 
diff --git a/board/aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig
similarity index 52%
rename from board/aspeed/Kconfig
rename to arch/arm/mach-aspeed/Kconfig
index 3dcf1a26d50e..316f4c5815e0 100644
--- a/board/aspeed/Kconfig
+++ b/arch/arm/mach-aspeed/Kconfig
@@ -1,5 +1,21 @@
-source "board/aspeed/ast-g5/Kconfig"
-source "board/aspeed/ast-g4/Kconfig"
+if ARCH_ASPEED
+
+
+choice
+	prompt "Aspeed SoC select"
+	optional
+
+config TARGET_AST_G5
+       bool "Support Apseed fifth generation SoCs"
+       select CPU_ARM1176
+       select AST_SPI_NOR
+
+config TARGET_AST_G4
+       bool "Support Aspeed fourth generation SoCs"
+       select CPU_ARM926EJS
+       select AST_SPI_NOR
+
+endchoice
 
 choice
 	prompt "Network configuration"
@@ -20,3 +36,15 @@ config AST_SPI_NOR
 	help
 	  Enable Aspeed SMC driver to access the SPI NOR flash of the
 	  BMC
+
+config SYS_VENDOR
+	default "aspeed"
+
+config SYS_SOC
+	default "aspeed"
+
+
+source "board/aspeed/ast-g5/Kconfig"
+source "board/aspeed/ast-g4/Kconfig"
+
+endif
diff --git a/board/aspeed/ast-g4/Kconfig b/board/aspeed/ast-g4/Kconfig
index 2bec9a733a92..e0892afbb3a1 100644
--- a/board/aspeed/ast-g4/Kconfig
+++ b/board/aspeed/ast-g4/Kconfig
@@ -9,12 +9,6 @@ config SYS_CPU
 config SYS_BOARD
 	default "ast-g4"
 
-config SYS_VENDOR
-	default "aspeed"
-
-config SYS_SOC
-	default "aspeed"
-
 config SYS_CONFIG_NAME
 	default "ast-g4-phy" if ASPEED_NET_PHY
 	default "ast-g4-ncsi" if ASPEED_NET_NCSI
diff --git a/board/aspeed/ast-g5/Kconfig b/board/aspeed/ast-g5/Kconfig
index 9bd3e7de49a4..b809a6b1750f 100644
--- a/board/aspeed/ast-g5/Kconfig
+++ b/board/aspeed/ast-g5/Kconfig
@@ -9,12 +9,6 @@ config SYS_CPU
 config SYS_BOARD
 	default "ast-g5"
 
-config SYS_VENDOR
-	default "aspeed"
-
-config SYS_SOC
-	default "aspeed"
-
 config SYS_CONFIG_NAME
 	default "ast-g5-phy" if ASPEED_NET_PHY
 	default "ast-g5-ncsi" if ASPEED_NET_NCSI
diff --git a/configs/ast_g4_ncsi_defconfig b/configs/ast_g4_ncsi_defconfig
index 4ee71c5d9a2e..0314af82c37e 100644
--- a/configs/ast_g4_ncsi_defconfig
+++ b/configs/ast_g4_ncsi_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
 CONFIG_TARGET_AST_G4=y
 CONFIG_SYS_PROMPT="ast# "
 CONFIG_CMD_DHCP=y
diff --git a/configs/ast_g4_phy_defconfig b/configs/ast_g4_phy_defconfig
index 61fd69b46897..7e9e5712a9ef 100644
--- a/configs/ast_g4_phy_defconfig
+++ b/configs/ast_g4_phy_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
 CONFIG_TARGET_AST_G4=y
 CONFIG_ASPEED_NET_PHY=y
 CONFIG_SYS_PROMPT="ast# "
diff --git a/configs/ast_g5_ncsi_defconfig b/configs/ast_g5_ncsi_defconfig
index 6d11afbbc6c1..b1f4f185a53f 100644
--- a/configs/ast_g5_ncsi_defconfig
+++ b/configs/ast_g5_ncsi_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
 CONFIG_TARGET_AST_G5=y
 CONFIG_SYS_PROMPT="ast# "
 CONFIG_CMD_DHCP=y
diff --git a/configs/ast_g5_phy_defconfig b/configs/ast_g5_phy_defconfig
index 20f62e08f540..63ff21f65f71 100644
--- a/configs/ast_g5_phy_defconfig
+++ b/configs/ast_g5_phy_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
 CONFIG_TARGET_AST_G5=y
 CONFIG_ASPEED_NET_PHY=y
 CONFIG_SYS_PROMPT="ast# "
diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h
index 81befc66cd62..d0638158ab25 100644
--- a/include/configs/ast-common.h
+++ b/include/configs/ast-common.h
@@ -14,7 +14,6 @@
 #ifndef __AST_COMMON_CONFIG_H
 #define __AST_COMMON_CONFIG_H
 
-#define CONFIG_ARCH_ASPEED
 #define CONFIG_EXTRA_ENV_SETTINGS ASPEED_ENV_SETTINGS
 
 #define CONFIG_ARCH_CPU_INIT
-- 
2.7.4

  parent reply	other threads:[~2016-10-06 21:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-06 21:26 [PATCH u-boot 00/12] config cleanups and small fixes Cédric Le Goater
2016-10-06 21:26 ` [PATCH u-boot 01/12] aspeed: add CONFIG_AST_SPI_NOR Cédric Le Goater
2016-10-10  6:21   ` Joel Stanley
2016-10-06 21:26 ` Cédric Le Goater [this message]
2016-10-10  6:22   ` [PATCH u-boot 02/12] aspeed: rework top level configuration of the Aspeed SoC Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 03/12] aspeed: use CONFIG_TARGET_AST_G{4,5} Cédric Le Goater
2016-10-10  6:22   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 04/12] aspeed: remove CONFIG_SYS_INIT_RAM_END Cédric Le Goater
2016-10-10  6:22   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 05/12] aspeed: replace CONFIG_ASPEED_TIMER_CLK with CONFIG_TIMER_CLK_FREQ Cédric Le Goater
2016-10-10  6:22   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 06/12] aspeed: timer cleanups Cédric Le Goater
2016-10-10  6:22   ` Joel Stanley
2016-10-17  6:52     ` Cédric Le Goater
2016-10-06 21:26 ` [PATCH u-boot 07/12] aspeed: add configuration for the network devices Cédric Le Goater
2016-10-10  6:23   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 08/12] aspeed: remove CONFIG_MAC_NUM Cédric Le Goater
2016-10-10  6:23   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 09/12] aspeed: add CONFIG_DRAM_ECC Cédric Le Goater
2016-10-10  6:23   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 10/12] aspeed: remove CONFIG_PHY_MAX_ADDR Cédric Le Goater
2016-10-10  6:23   ` Joel Stanley
2016-10-06 21:26 ` [PATCH u-boot 11/12] bootm: fix ramdisk relocation Cédric Le Goater
2016-10-10  6:23   ` Joel Stanley
2016-10-10  7:41     ` Cédric Le Goater
2016-10-06 21:26 ` [PATCH u-boot 12/12] aspeed: remove hack loading ramdisk in memory Cédric Le Goater
2016-10-10  6:24   ` Joel Stanley
2016-10-07  7:24 ` [PATCH u-boot 00/12] config cleanups and small fixes Cédric Le Goater
2016-10-10  6:24   ` Joel Stanley
2016-10-10  6:49     ` Joel Stanley
2016-10-10  7:32       ` Cédric Le Goater
2016-10-10  6:57     ` Cédric Le Goater

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=1475789205-19618-3-git-send-email-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=openbmc@lists.ozlabs.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.