[U-Boot] [PATCH 1/2] ARM: sunxi: move board/sunxi/Kconfig to arch/arm/mach-sunxi/Kconfig
For the consistent location of SoC-level Kconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 3 ++- {board/sunxi => arch/arm/mach-sunxi}/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename {board/sunxi => arch/arm/mach-sunxi}/Kconfig (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ed506da..b54466a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1079,6 +1079,8 @@ source "arch/arm/mach-sti/Kconfig"
source "arch/arm/mach-stm32/Kconfig"
+source "arch/arm/mach-sunxi/Kconfig" + source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig" @@ -1157,7 +1159,6 @@ source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" -source "board/sunxi/Kconfig" source "board/syteco/zmx25/Kconfig" source "board/tcl/sl50/Kconfig" source "board/birdland/bav335x/Kconfig" diff --git a/board/sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig similarity index 100% rename from board/sunxi/Kconfig rename to arch/arm/mach-sunxi/Kconfig
Fix annoying config redefines in SoC/board level Kconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
arch/arm/Kconfig | 8 ++++++++ arch/arm/mach-sunxi/Kconfig | 26 -------------------------- 2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b54466a..cc8e0a6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -675,6 +675,14 @@ config ARCH_SUNXI select USB_STORAGE if DISTRO_DEFAULTS select USB_KEYBOARD if DISTRO_DEFAULTS select USE_TINY_PRINTF + imply PRE_CONSOLE_BUFFER + imply SPL_GPIO_SUPPORT + imply SPL_LIBCOMMON_SUPPORT + imply SPL_LIBDISK_SUPPORT + imply SPL_LIBGENERIC_SUPPORT + imply SPL_MMC_SUPPORT if GENERIC_MMC + imply SPL_POWER_SUPPORT + imply SPL_SERIAL_SUPPORT
config TARGET_TS4600 bool "Support TS4600" diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index a667c9e..97d1713 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -3,32 +3,6 @@ if ARCH_SUNXI config IDENT_STRING default " Allwinner Technology"
-# FIXME: Should not redefine these Kconfig symbols -config PRE_CONSOLE_BUFFER - default y - -config SPL_GPIO_SUPPORT - default y - -config SPL_LIBCOMMON_SUPPORT - default y - -config SPL_LIBDISK_SUPPORT - default y - -config SPL_LIBGENERIC_SUPPORT - default y - -config SPL_MMC_SUPPORT - depends on SPL && GENERIC_MMC - default y - -config SPL_POWER_SUPPORT - default y - -config SPL_SERIAL_SUPPORT - default y - config SUNXI_HIGH_SRAM bool default n
Hello Masahiro,
On Tue, Apr 25, 2017 at 01:42:06PM +0900, Masahiro Yamada wrote:
For the consistent location of SoC-level Kconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
This patch doesn't seem to apply, which tree did you base this on?
Thanks! Maxime
Hi Maxime,
2017-04-25 18:46 GMT+09:00 Maxime Ripard maxime.ripard@free-electrons.com:
Hello Masahiro,
On Tue, Apr 25, 2017 at 01:42:06PM +0900, Masahiro Yamada wrote:
For the consistent location of SoC-level Kconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
This patch doesn't seem to apply, which tree did you base this on?
Thanks! Maxime
I built up this patch on top of http://patchwork.ozlabs.org/patch/754573/
If you apply this patch onto the latest master (commit 3c476d8), please give -C2 option to "git am" in order to reduce the context.
Hi,
On Tue, Apr 25, 2017 at 06:56:52PM +0900, Masahiro Yamada wrote:
Hi Maxime,
2017-04-25 18:46 GMT+09:00 Maxime Ripard maxime.ripard@free-electrons.com:
Hello Masahiro,
On Tue, Apr 25, 2017 at 01:42:06PM +0900, Masahiro Yamada wrote:
For the consistent location of SoC-level Kconfig.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
This patch doesn't seem to apply, which tree did you base this on?
Thanks! Maxime
I built up this patch on top of http://patchwork.ozlabs.org/patch/754573/
If you apply this patch onto the latest master (commit 3c476d8), please give -C2 option to "git am" in order to reduce the context.
Could you rebase it on top of sunxi/master, or do you want to merge it through another tree?
Thanks! Maxime
participants (2)
-
Masahiro Yamada -
Maxime Ripard