Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0298f4c0032e2ba7e417aacc66da98887a2e0a5b

Authored by Masahiro Yamada
1 parent bbdae1651e
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: uniphier: move CONFIG_SPL_* to defconfig or select 

As I repeated in the ML, I am unhappy with config entries with bare
defaults.  Kick them out of arch/arm/mach-uniphier/Kconfig.

Currently, CONFIG_SPL_SERIAL_SUPPORT is not user-configurable
(build fails without it), but it should be fixed later anyway,
so I am moving CONFIG_SPL_SERIAL_SUPPORT to defconfigs.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 8 changed files with 16 additions and 15 deletions Side-by-side Diff

... ... @@ -868,6 +868,8 @@
868 868 select PINCTRL
869 869 select SPL
870 870 select SPL_DM
  871 + select SPL_LIBCOMMON_SUPPORT
  872 + select SPL_LIBGENERIC_SUPPORT
871 873 select SPL_OF_CONTROL
872 874 select SPL_PINCTRL
873 875 select SUPPORT_SPL
arch/arm/mach-uniphier/Kconfig
Diff comments   View file @ 0298f4c
1 1 if ARCH_UNIPHIER
2 2  
3   -config SPL_LIBCOMMON_SUPPORT
4   - default y
5   -
6   -config SPL_LIBGENERIC_SUPPORT
7   - default y
8   -
9   -config SPL_MMC_SUPPORT
10   - default y if !ARCH_UNIPHIER_64BIT
11   -
12   -config SPL_NAND_SUPPORT
13   - default y if !ARM64
14   -
15   -config SPL_SERIAL_SUPPORT
16   - default y
17   -
18 3 config SYS_CONFIG_NAME
19 4 default "uniphier"
20 5  
configs/uniphier_ld11_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_SERIAL_SUPPORT=y
4 5 CONFIG_ARCH_UNIPHIER_LD11=y
5 6 CONFIG_MICRO_SUPPORT_CARD=y
6 7 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_ld20_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_SERIAL_SUPPORT=y
4 5 CONFIG_ARCH_UNIPHIER_LD20=y
5 6 CONFIG_MICRO_SUPPORT_CARD=y
6 7 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_ld4_sld8_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_MMC_SUPPORT=y
  5 +CONFIG_SPL_NAND_SUPPORT=y
  6 +CONFIG_SPL_SERIAL_SUPPORT=y
4 7 CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
5 8 CONFIG_MICRO_SUPPORT_CARD=y
6 9 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_pro4_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_MMC_SUPPORT=y
  5 +CONFIG_SPL_NAND_SUPPORT=y
  6 +CONFIG_SPL_SERIAL_SUPPORT=y
4 7 CONFIG_MICRO_SUPPORT_CARD=y
5 8 CONFIG_SYS_TEXT_BASE=0x84000000
6 9 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
configs/uniphier_pxs2_ld6b_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_MMC_SUPPORT=y
  5 +CONFIG_SPL_NAND_SUPPORT=y
  6 +CONFIG_SPL_SERIAL_SUPPORT=y
4 7 CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
5 8 CONFIG_MICRO_SUPPORT_CARD=y
6 9 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_sld3_defconfig
Diff comments   View file @ 0298f4c
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
3 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_SPL_MMC_SUPPORT=y
  5 +CONFIG_SPL_NAND_SUPPORT=y
  6 +CONFIG_SPL_SERIAL_SUPPORT=y
4 7 CONFIG_ARCH_UNIPHIER_SLD3=y
5 8 CONFIG_MICRO_SUPPORT_CARD=y
6 9 CONFIG_SYS_TEXT_BASE=0x84000000