[U-Boot] [PATCH] Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig

Alex Kiernan alex.kiernan at gmail.com
Fri Apr 26 06:19:06 UTC 2019


On Thu, Apr 25, 2019 at 8:07 PM Michal Simek <michal.simek at xilinx.com> wrote:
>
> On 19. 04. 19 6:38, Alex Kiernan wrote:
> > This converts the following to Kconfig:
> >    CONFIG_SUPPORT_EMMC_BOOT
> >
> > Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
> > ---
> > Green travis build:
> >
> > https://travis-ci.org/akiernan/u-boot/builds/521906850
> >
> > Testing affected boards for configuration changes:
> >
> >   boards.cfg is up to date. Nothing to do.
> >   Summary of 3 commits for 95 boards (4 threads, 1 job per thread)
> >   01: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx
> >      aarch64:  w+   xilinx_zynqmp_mini_emmc1 xilinx_zynqmp_mini_emmc0 xilinx_zynqmp_mini_qspi clearfog_gt_8k imx8qxp_mek xilinx_zynqmp_mini xilinx_zynqmp_mini_nand imx8mq_evk
> >          arm:  w+   cm_t54 cl-som-imx7 marsboard clearfog apalis_imx6 warp7 pico-hobbit-imx7d pico-pi-imx6ul dms-ba16 arndale riotboard pico-hobbit-imx6ul colibri_imx7 pico-imx7d xpress_spl opos6uldev warp7_bl33 imx6dl_mamoj ge_bx50v3 display5 mx7dsabresd_qspi display5_factory colibri_imx7_emmc gwventana_nand mx7dsabresd gwventana_gw5904 gwventana_emmc am57xx_hs_evm_usb omap5_uevm brppt1_spi xilinx_zynqmp_r5 vinco mx6sabresd warp riotboard_spl vining_2000 zc5601 zc5202 xpress pico-imx6ul dms-ba16-1g pico-pi-imx7d
> >   02: configs: Resync with savedefconfig
> >   03: Convert CONFIG_SUPPORT_EMMC_BOOT to Kconfig
> >
> >  README                                           | 3 ---
> >  configs/am57xx_evm_defconfig                     | 1 +
> >  configs/am57xx_hs_evm_defconfig                  | 1 +
> >  configs/am57xx_hs_evm_usb_defconfig              | 1 +
> >  configs/apalis-tk1_defconfig                     | 1 +
> >  configs/apalis_imx6_defconfig                    | 1 +
> >  configs/arndale_defconfig                        | 1 +
> >  configs/avnet_ultra96_rev1_defconfig             | 1 +
> >  configs/cl-som-imx7_defconfig                    | 1 +
> >  configs/clearfog_defconfig                       | 1 +
> >  configs/cm_t54_defconfig                         | 1 +
> >  configs/colibri_imx6_defconfig                   | 1 +
> >  configs/colibri_imx7_emmc_defconfig              | 1 +
> >  configs/display5_defconfig                       | 1 +
> >  configs/display5_factory_defconfig               | 1 +
> >  configs/dms-ba16-1g_defconfig                    | 1 +
> >  configs/dms-ba16_defconfig                       | 1 +
> >  configs/dra7xx_evm_defconfig                     | 1 +
> >  configs/dra7xx_hs_evm_defconfig                  | 1 +
> >  configs/dra7xx_hs_evm_usb_defconfig              | 1 +
> >  configs/edison_defconfig                         | 1 +
> >  configs/ge_bx50v3_defconfig                      | 1 +
> >  configs/gwventana_emmc_defconfig                 | 1 +
> >  configs/gwventana_gw5904_defconfig               | 1 +
> >  configs/gwventana_nand_defconfig                 | 1 +
> >  configs/imx6dl_mamoj_defconfig                   | 1 +
> >  configs/imx8mq_evk_defconfig                     | 1 +
> >  configs/imx8qxp_mek_defconfig                    | 1 +
> >  configs/liteboard_defconfig                      | 1 +
> >  configs/mt7623n_bpir2_defconfig                  | 1 +
> >  configs/mx6sabresd_defconfig                     | 1 +
> >  configs/mx7dsabresd_defconfig                    | 1 +
> >  configs/mx7dsabresd_qspi_defconfig               | 1 +
> >  configs/mx7ulp_evk_defconfig                     | 1 +
> >  configs/mx7ulp_evk_plugin_defconfig              | 1 +
> >  configs/odroid-xu3_defconfig                     | 1 +
> >  configs/omap5_uevm_defconfig                     | 1 +
> >  configs/opos6uldev_defconfig                     | 1 +
> >  configs/peach-pi_defconfig                       | 1 +
> >  configs/peach-pit_defconfig                      | 1 +
> >  configs/pico-hobbit-imx6ul_defconfig             | 1 +
> >  configs/pico-hobbit-imx7d_defconfig              | 1 +
> >  configs/pico-imx6ul_defconfig                    | 1 +
> >  configs/pico-imx7d_defconfig                     | 1 +
> >  configs/pico-pi-imx6ul_defconfig                 | 1 +
> >  configs/pico-pi-imx7d_defconfig                  | 1 +
> >  configs/riotboard_defconfig                      | 1 +
> >  configs/riotboard_spl_defconfig                  | 1 +
> >  configs/smdk5250_defconfig                       | 1 +
> >  configs/smdk5420_defconfig                       | 1 +
> >  configs/snow_defconfig                           | 1 +
> >  configs/spring_defconfig                         | 1 +
> >  configs/stm32mp15_basic_defconfig                | 1 +
> >  configs/stm32mp15_trusted_defconfig              | 1 +
> >  configs/uniphier_ld4_sld8_defconfig              | 1 +
> >  configs/uniphier_v7_defconfig                    | 1 +
> >  configs/uniphier_v8_defconfig                    | 1 +
> >  configs/vinco_defconfig                          | 1 +
> >  configs/vining_2000_defconfig                    | 1 +
> >  configs/warp7_bl33_defconfig                     | 1 +
> >  configs/warp7_defconfig                          | 1 +
> >  configs/warp_defconfig                           | 1 +
> >  configs/xilinx_zynqmp_mini_emmc0_defconfig       | 1 +
> >  configs/xilinx_zynqmp_mini_emmc1_defconfig       | 1 +
>
> these 2 requires this option to be enabled.
>
> >  configs/xilinx_zynqmp_zc1275_revB_defconfig      | 1 +
>
>
> >  configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> >  configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig | 1 +
>
> these two.
>
> >  configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> >  configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> >  configs/xilinx_zynqmp_zcu100_revC_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
> >  configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu104_revA_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu104_revC_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu106_revA_defconfig      | 1 +
> >  configs/xilinx_zynqmp_zcu111_revA_defconfig      | 1 +
>
> All of these boards have no EMMC that's why please don't enable this
> option for them.
>

Picking the first of those, with buildman run across this branch,
looking at the build for the upstream branch point 7d9940674247
("Merge tag 'pull-24apr19' of git://git.denx.de/u-boot-dm"), it's
defined there:

$ fgrep CONFIG_SUPPORT_EMMC_BOOT
01_of_03_g7d994067424776b6184872b82fcaf4c0b95528f9_Merge-tag-\'pull-24ap/xilinx_zynqmp_zc1751_xm018_dc4/u-boot.cfg
#define CONFIG_SUPPORT_EMMC_BOOT

I can drop it, but that would be a change that this changeset
introduces where it was intended to be exactly the same before and
after - right now they all seem to get it because they define
CONFIG_MMC_SDHCI_ZYNQ which triggers:

#if defined(CONFIG_MMC_SDHCI_ZYNQ)
# define CONFIG_SUPPORT_EMMC_BOOT
#endif

in include/configs/xilinx_zynqmp.h

Happy to drop it if you can let me know exactly which configs I should
change - this is the list that buildman think has it in master:

xilinx_zynqmp_mini_emmc0
xilinx_zynqmp_mini_emmc1
xilinx_zynqmp_zc1275_revB
xilinx_zynqmp_zc1751_xm015_dc1
xilinx_zynqmp_zc1751_xm017_dc3
xilinx_zynqmp_zc1751_xm018_dc4
xilinx_zynqmp_zc1751_xm019_dc5
xilinx_zynqmp_zcu100_revC
xilinx_zynqmp_zcu102_rev1_0
xilinx_zynqmp_zcu102_revA
xilinx_zynqmp_zcu102_revB
xilinx_zynqmp_zcu104_revA
xilinx_zynqmp_zcu104_revC
xilinx_zynqmp_zcu106_revA
xilinx_zynqmp_zcu111_revA

-- 
Alex Kiernan


More information about the U-Boot mailing list