September 2016 - U-Boot

[U-Boot] [PATCH v3 00/45] Kconfig: Move CONFIG_SPL_..._SUPPORT to Kconfig
by Simon Glass 19 Sep '16

19 Sep '16

This series moves all the CONFIG_SPL_..._SUPPORT options to Kconfig and fixes up existing boards to continue to build. It also adds a few small but useful features to moveconfig. There is existing work going on in this area, so some of these patches may be superseded. It has taken me a while to get this building cleanly. But I have run out of time so want to get this out. As mentioned on a recent thread [1] there is some confusion about whether an option means enabling driver support or media support. Andrew's recent series seems like a good vehicle to tidy that up. But I hope this series will make it easier. NOTE: in the v2 series I have tried to use common things in Kconfig to reduce the diffs in the defconfig files. This has helped a fair bit. But it is very error-prone and time consuming. Also I have had to add some exceptions (disabling an option in specific board configs). Overall it was not a pleasant experience :-( There are a few strange features of this conversion. The main difficulty is that some PowerPC boards do things like this in their board config file: This means that TPL reuses the SPL options. We can't support this in Kconfig so I have added a small number of CONFIG_TPL_xxx_SUPPORT options to cope with this. This made the conversion more painful than it should have been. A related issue is boards using a common header file and setting options only for SPL: This is not noticed by moveconfig so we have to clean it up manually. Also there are a few incorrect things where Kconfig options are set with #define: Finally, many defconfig files are not ordered correctly, resulting in larger patches than we might like. It would be great to have a solution for this, perhaps with buildman providing a warning. But it might slow down development. The series is fully build-tested (for bisectability) and causes no failures for the boards that already pass. The following boards fail for me at present on mainline (which I have not yet looked at): 01: buildman blackfin: + cm-bf527 bf609-ezkit bf537-stamp sparc: + grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60 nios2: + 10m50 3c120 microblaze: + microblaze-generic openrisc: + openrisc-generic [1] https://patchwork.ozlabs.org/patch/661511/ Changes in v3: - Move SPL_NET_VCI_STRING into the SPL Kconfig file also - Rebase on master Changes in v2: - Add some notes on this option to moveconfig.py - Improve the commit message and add one for resyncing with savedefconfig - Add some notes on this option to moveconfig.py - Add new patch to convert CONFIG_SPL_NET_VCI_STRING - Drop CONFIG_SPL_PINCTRL_SUPPORT - Lots of work to make use of common values across multiple boards - Added a patch to change 'spear' CONFIGs to upper case Simon Glass (45): Correct defconfigs using savedefconfig moveconfig: Add an option to skip prompts moveconfig: Add an option to commit changes Kconfig: Move SPL settings into their own file arm: fsl: Adjust ordering of #ifndef CONFIG_SPL_BUILD Drop CONFIG_SPL_RAM_SUPPORT Use separate options for TPL support Kconfig: spl: Add SPL support options to Kconfig Kconfig: tpl: Add some TPL support options to Kconfig Move existing use of CONFIG_SPL_DM to Kconfig Move existing use of CONFIG_SPL_RSA to Kconfig spear: Use upper case for CONFIG options Convert CONFIG_SPL_CRYPTO_SUPPORT to Kconfig Convert CONFIG_SPL_HASH_SUPPORT to Kconfig Convert CONFIG_SPL_DMA_SUPPORT to Kconfig Convert CONFIG_SPL_DRIVERS_MISC_SUPPORT to Kconfig Convert CONFIG_SPL_ENV_SUPPORT to Kconfig Convert CONFIG_SPL_ETH_SUPPORT to Kconfig Convert CONFIG_SPL_EXT_SUPPORT to Kconfig Convert CONFIG_SPL_FAT_SUPPORT to Kconfig Convert CONFIG_SPL_GPIO_SUPPORT to Kconfig Convert CONFIG_SPL_I2C_SUPPORT to Kconfig Convert CONFIG_SPL_LIBCOMMON_SUPPORT to Kconfig Convert CONFIG_SPL_LIBDISK_SUPPORT to Kconfig Convert CONFIG_SPL_LIBGENERIC_SUPPORT to Kconfig Convert CONFIG_SPL_MMC_SUPPORT to Kconfig Convert CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT to Kconfig Convert CONFIG_SPL_MTD_SUPPORT to Kconfig Convert CONFIG_SPL_MUSB_NEW_SUPPORT to Kconfig Convert CONFIG_SPL_NAND_SUPPORT to Kconfig Convert CONFIG_SPL_NET_VCI_STRING to Kconfig Convert CONFIG_SPL_NET_SUPPORT to Kconfig Convert CONFIG_SPL_NOR_SUPPORT to Kconfig Convert CONFIG_SPL_ONENAND_SUPPORT to Kconfig Remove CONFIG_SPL_PINCTRL_SUPPORT Convert CONFIG_SPL_POWER_SUPPORT to Kconfig Convert CONFIG_SPL_SATA_SUPPORT to Kconfig Convert CONFIG_SPL_SERIAL_SUPPORT to Kconfig Convert CONFIG_SPL_SPI_FLASH_SUPPORT to Kconfig Convert CONFIG_SPL_SPI_SUPPORT to Kconfig Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig Convert CONFIG_SPL_USB_SUPPORT to Kconfig Convert CONFIG_SPL_WATCHDOG_SUPPORT to Kconfig Convert CONFIG_SPL_YMODEM_SUPPORT to Kconfig Kconfig | 68 --- README | 49 -- arch/arm/cpu/arm926ejs/spear/timer.c | 2 +- arch/arm/cpu/armv7/am33xx/Kconfig | 10 + arch/arm/cpu/armv7/omap3/Kconfig | 33 ++ arch/arm/cpu/armv7/omap4/Kconfig | 33 ++ arch/arm/cpu/armv7/omap5/Kconfig | 33 ++ arch/arm/cpu/armv8/zynqmp/Kconfig | 24 + arch/arm/include/asm/fsl_secure_boot.h | 7 +- arch/arm/mach-exynos/Kconfig | 9 + arch/arm/mach-rockchip/rk3036/Kconfig | 3 + arch/arm/mach-rockchip/rk3288/Kconfig | 15 + arch/arm/mach-socfpga/Kconfig | 27 + arch/arm/mach-tegra/Kconfig | 12 + arch/arm/mach-uniphier/Kconfig | 15 + arch/arm/mach-zynq/Kconfig | 24 + arch/powerpc/include/asm/fsl_secure_boot.h | 6 - board/sunxi/Kconfig | 21 + board/ti/am335x/Kconfig | 9 + board/ti/common/Kconfig | 36 ++ common/Kconfig | 2 + common/Makefile | 12 +- common/spl/Kconfig | 555 +++++++++++++++++++++ configs/A10-OLinuXino-Lime_defconfig | 3 +- configs/A10s-OLinuXino-M_defconfig | 3 +- configs/A13-OLinuXinoM_defconfig | 2 +- configs/A13-OLinuXino_defconfig | 3 +- configs/A20-OLinuXino-Lime2_defconfig | 3 +- configs/A20-OLinuXino-Lime_defconfig | 3 +- configs/A20-OLinuXino_MICRO_defconfig | 3 +- configs/A20-Olimex-SOM-EVB_defconfig | 3 +- configs/Ainol_AW1_defconfig | 1 + configs/Ampe_A76_defconfig | 3 +- configs/Auxtek-T003_defconfig | 1 + configs/Auxtek-T004_defconfig | 1 + configs/B4420QDS_NAND_defconfig | 10 +- configs/B4860QDS_NAND_defconfig | 10 +- configs/B4860QDS_SECURE_BOOT_defconfig | 1 + configs/BSC9131RDB_NAND_SYSCLK100_defconfig | 4 +- configs/BSC9131RDB_NAND_defconfig | 4 +- configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK100_defconfig | 4 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 1 + configs/BSC9132QDS_NAND_DDRCLK133_defconfig | 4 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 1 + configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 1 + .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 1 + .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 1 + .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 1 + configs/Bananapi_defconfig | 3 +- configs/Bananapro_defconfig | 3 +- configs/C29XPCIE_NAND_defconfig | 13 +- configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/CHIP_defconfig | 4 +- configs/CSQ_CS908_defconfig | 2 +- configs/Chuwi_V7_CW0825_defconfig | 1 + configs/Colombus_defconfig | 2 +- configs/Cubieboard2_defconfig | 3 +- configs/Cubieboard_defconfig | 3 +- configs/Cubietruck_defconfig | 3 +- configs/Empire_electronix_d709_defconfig | 3 +- configs/Empire_electronix_m712_defconfig | 1 + configs/Hummingbird_A31_defconfig | 2 +- configs/Hyundai_A7HD_defconfig | 1 + configs/Itead_Ibox_A20_defconfig | 3 +- configs/Lamobo_R1_defconfig | 3 +- configs/Linksprite_pcDuino3_Nano_defconfig | 3 +- configs/Linksprite_pcDuino3_defconfig | 3 +- configs/Linksprite_pcDuino_defconfig | 3 +- configs/MK808C_defconfig | 1 + configs/MPC8313ERDB_NAND_33_defconfig | 4 +- configs/MPC8313ERDB_NAND_66_defconfig | 4 +- configs/MSI_Primo73_defconfig | 1 + configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000G_quad_defconfig | 2 +- configs/Mele_A1000_defconfig | 3 +- configs/Mele_I7_defconfig | 2 +- configs/Mele_M3_defconfig | 3 +- configs/Mele_M5_defconfig | 3 +- configs/Mele_M9_defconfig | 2 +- configs/Mini-X_defconfig | 1 + configs/Orangepi_defconfig | 3 +- configs/Orangepi_mini_defconfig | 3 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_NAND_defconfig | 13 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 10 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 11 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_NAND_defconfig | 13 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_SDCARD_defconfig | 10 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PA_SPIFLASH_defconfig | 11 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_NAND_defconfig | 13 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 10 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 11 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_NAND_defconfig | 14 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_SDCARD_defconfig | 10 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 1 + configs/P1010RDB-PB_SPIFLASH_defconfig | 11 +- configs/P1020MBG-PC_36BIT_SDCARD_defconfig | 9 +- configs/P1020MBG-PC_SDCARD_defconfig | 9 +- configs/P1020RDB-PC_36BIT_NAND_defconfig | 12 +- configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 9 +- configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 10 +- configs/P1020RDB-PC_NAND_defconfig | 12 +- configs/P1020RDB-PC_SDCARD_defconfig | 9 +- configs/P1020RDB-PC_SPIFLASH_defconfig | 10 +- configs/P1020RDB-PD_NAND_defconfig | 12 +- configs/P1020RDB-PD_SDCARD_defconfig | 9 +- configs/P1020RDB-PD_SPIFLASH_defconfig | 10 +- configs/P1020UTM-PC_36BIT_SDCARD_defconfig | 9 +- configs/P1020UTM-PC_SDCARD_defconfig | 9 +- configs/P1021RDB-PC_36BIT_NAND_defconfig | 12 +- configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 9 +- configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig | 10 +- configs/P1021RDB-PC_NAND_defconfig | 12 +- configs/P1021RDB-PC_SDCARD_defconfig | 9 +- configs/P1021RDB-PC_SPIFLASH_defconfig | 10 +- configs/P1022DS_36BIT_NAND_defconfig | 12 +- configs/P1022DS_36BIT_SDCARD_defconfig | 9 +- configs/P1022DS_36BIT_SPIFLASH_defconfig | 10 +- configs/P1022DS_NAND_defconfig | 13 +- configs/P1022DS_SDCARD_defconfig | 9 +- configs/P1022DS_SPIFLASH_defconfig | 10 +- configs/P1024RDB_NAND_defconfig | 12 +- configs/P1024RDB_SDCARD_defconfig | 9 +- configs/P1024RDB_SPIFLASH_defconfig | 10 +- configs/P1025RDB_NAND_defconfig | 13 +- configs/P1025RDB_SDCARD_defconfig | 9 +- configs/P1025RDB_SPIFLASH_defconfig | 10 +- configs/P2020RDB-PC_36BIT_NAND_defconfig | 13 +- configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 9 +- configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 10 +- configs/P2020RDB-PC_NAND_defconfig | 12 +- configs/P2020RDB-PC_SDCARD_defconfig | 9 +- configs/P2020RDB-PC_SPIFLASH_defconfig | 10 +- configs/P2041RDB_SECURE_BOOT_defconfig | 1 + configs/P3041DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P3041DS_SECURE_BOOT_defconfig | 1 + configs/P4080DS_SECURE_BOOT_defconfig | 1 + configs/P5020DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P5020DS_SECURE_BOOT_defconfig | 1 + configs/P5040DS_NAND_SECURE_BOOT_defconfig | 1 + configs/P5040DS_SECURE_BOOT_defconfig | 1 + configs/Sinlinx_SinA31s_defconfig | 2 +- configs/Sinovoip_BPI_M2_defconfig | 2 +- configs/Sinovoip_BPI_M3_defconfig | 2 +- configs/T1023RDB_NAND_defconfig | 10 +- configs/T1023RDB_SDCARD_defconfig | 10 +- configs/T1023RDB_SECURE_BOOT_defconfig | 1 + configs/T1023RDB_SPIFLASH_defconfig | 11 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 1 + configs/T1024QDS_NAND_defconfig | 10 +- configs/T1024QDS_SDCARD_defconfig | 10 +- configs/T1024QDS_SECURE_BOOT_defconfig | 1 + configs/T1024QDS_SPIFLASH_defconfig | 11 +- configs/T1024RDB_NAND_defconfig | 10 +- configs/T1024RDB_SDCARD_defconfig | 10 +- configs/T1024RDB_SECURE_BOOT_defconfig | 1 + configs/T1024RDB_SPIFLASH_defconfig | 11 +- configs/T1040D4RDB_NAND_defconfig | 10 +- configs/T1040D4RDB_SDCARD_defconfig | 10 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1040D4RDB_SPIFLASH_defconfig | 11 +- configs/T1040QDS_SECURE_BOOT_defconfig | 1 + configs/T1040RDB_NAND_defconfig | 10 +- configs/T1040RDB_SDCARD_defconfig | 10 +- configs/T1040RDB_SECURE_BOOT_defconfig | 1 + configs/T1040RDB_SPIFLASH_defconfig | 11 +- configs/T1042D4RDB_NAND_defconfig | 10 +- configs/T1042D4RDB_SDCARD_defconfig | 10 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1042D4RDB_SPIFLASH_defconfig | 11 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 14 +- configs/T1042RDB_PI_NAND_defconfig | 10 +- configs/T1042RDB_PI_SDCARD_defconfig | 10 +- configs/T1042RDB_PI_SPIFLASH_defconfig | 11 +- configs/T1042RDB_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_NAND_defconfig | 10 +- configs/T2080QDS_SDCARD_defconfig | 10 +- configs/T2080QDS_SECURE_BOOT_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 11 +- configs/T2080RDB_NAND_defconfig | 10 +- configs/T2080RDB_SDCARD_defconfig | 10 +- configs/T2080RDB_SECURE_BOOT_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 11 +- configs/T2081QDS_NAND_defconfig | 10 +- configs/T2081QDS_SDCARD_defconfig | 10 +- configs/T2081QDS_SPIFLASH_defconfig | 11 +- configs/T4160QDS_NAND_defconfig | 10 +- configs/T4160QDS_SDCARD_defconfig | 10 +- configs/T4160QDS_SECURE_BOOT_defconfig | 1 + configs/T4240QDS_NAND_defconfig | 10 +- configs/T4240QDS_SDCARD_defconfig | 10 +- configs/T4240QDS_SECURE_BOOT_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 10 +- configs/UTOO_P66_defconfig | 1 + configs/Wexler_TAB7200_defconfig | 1 + configs/Wits_Pro_A20_DKT_defconfig | 3 +- configs/Wobo_i5_defconfig | 1 + configs/Yones_Toptech_BD1078_defconfig | 1 + configs/a3m071_defconfig | 7 +- configs/a4m2k_defconfig | 7 +- configs/am335x_baltos_defconfig | 18 +- configs/am335x_boneblack_defconfig | 6 +- configs/am335x_boneblack_vboot_defconfig | 6 +- configs/am335x_evm_defconfig | 6 +- configs/am335x_evm_nor_defconfig | 6 +- configs/am335x_evm_spiboot_defconfig | 8 +- configs/am335x_evm_usbspl_defconfig | 10 +- configs/am335x_igep0033_defconfig | 16 +- configs/am335x_shc_defconfig | 16 +- configs/am335x_shc_ict_defconfig | 16 +- configs/am335x_shc_netboot_defconfig | 17 +- configs/am335x_shc_prompt_defconfig | 16 +- configs/am335x_shc_sdboot_defconfig | 16 +- configs/am335x_shc_sdboot_prompt_defconfig | 16 +- configs/am335x_sl50_defconfig | 17 +- configs/am3517_crane_defconfig | 4 +- configs/am3517_evm_defconfig | 5 +- configs/am43xx_evm_defconfig | 6 +- configs/am43xx_evm_ethboot_defconfig | 9 +- configs/am43xx_evm_usbhost_boot_defconfig | 10 +- configs/am43xx_hs_evm_defconfig | 8 +- configs/am57xx_evm_defconfig | 8 +- configs/am57xx_evm_nodt_defconfig | 6 +- configs/am57xx_hs_evm_defconfig | 8 +- configs/apf27_defconfig | 4 +- configs/apx4devkit_defconfig | 6 +- configs/arndale_defconfig | 2 +- configs/at91sam9m10g45ek_mmc_defconfig | 9 +- configs/at91sam9m10g45ek_nandflash_defconfig | 7 +- configs/at91sam9n12ek_nandflash_defconfig | 7 +- configs/at91sam9n12ek_spiflash_defconfig | 8 +- configs/at91sam9x5ek_nandflash_defconfig | 7 +- configs/at91sam9x5ek_spiflash_defconfig | 8 +- configs/axm_defconfig | 9 +- configs/ba10_tv_box_defconfig | 3 +- configs/bg0900_defconfig | 6 +- configs/birdland_bav335a_defconfig | 15 +- configs/birdland_bav335b_defconfig | 15 +- configs/brppt1_mmc_defconfig | 11 +- configs/brppt1_nand_defconfig | 11 +- configs/brppt1_spi_defconfig | 13 +- configs/brxre1_defconfig | 10 +- configs/cairo_defconfig | 3 +- configs/cgtqmx6eval_defconfig | 13 +- configs/chromebook_jerry_defconfig | 6 + configs/clearfog_defconfig | 8 +- configs/cm_fx6_defconfig | 11 +- configs/cm_t335_defconfig | 15 +- configs/cm_t35_defconfig | 3 +- configs/cm_t43_defconfig | 14 +- configs/cm_t54_defconfig | 5 +- configs/corvus_defconfig | 7 +- configs/da850_am18xxevm_defconfig | 7 +- configs/da850evm_defconfig | 7 +- configs/db-88f6720_defconfig | 8 +- configs/db-88f6820-gp_defconfig | 8 +- configs/db-mv784mp-gp_defconfig | 8 +- configs/devkit3250_defconfig | 8 +- configs/difrnce_dit4350_defconfig | 3 +- configs/dra7xx_evm_defconfig | 8 +- configs/dra7xx_hs_evm_defconfig | 8 +- configs/draco_defconfig | 15 +- configs/ds414_defconfig | 8 +- configs/dserve_dsrv9703c_defconfig | 1 + configs/duovero_defconfig | 4 +- configs/eco5pk_defconfig | 3 +- configs/edminiv2_defconfig | 6 +- configs/etamin_defconfig | 15 +- configs/evb-rk3288_defconfig | 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/ga10h_v1_1_defconfig | 2 +- configs/gt90h_v4_defconfig | 2 +- configs/gwventana_defconfig | 15 +- configs/i12-tvbox_defconfig | 3 +- configs/iNet_3F_defconfig | 1 + configs/iNet_3W_defconfig | 1 + configs/iNet_86VS_defconfig | 1 + configs/icnova-a20-swac_defconfig | 3 +- configs/igep0020_defconfig | 5 +- configs/igep0030_defconfig | 5 +- configs/igep0030_nand_defconfig | 5 +- configs/igep0032_defconfig | 5 +- configs/inet1_defconfig | 1 + configs/inet86dz_defconfig | 2 +- configs/inet97fv2_defconfig | 1 + configs/inet98v_rev2_defconfig | 3 +- configs/inet9f_rev03_defconfig | 1 + configs/ipam390_defconfig | 7 +- configs/jesurun_q5_defconfig | 3 +- configs/k2e_evm_defconfig | 9 +- configs/k2g_evm_defconfig | 9 +- configs/k2hk_evm_defconfig | 9 +- configs/k2l_evm_defconfig | 9 +- configs/kc1_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 11 +- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 11 +- configs/ls1021aqds_sdcard_qspi_defconfig | 11 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 + .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 15 +- configs/ls1021atwr_sdcard_ifc_defconfig | 10 +- configs/ls1021atwr_sdcard_qspi_defconfig | 10 +- configs/ls1043aqds_nand_defconfig | 11 +- configs/ls1043aqds_sdcard_ifc_defconfig | 11 +- configs/ls1043aqds_sdcard_qspi_defconfig | 11 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 11 +- configs/ls1043ardb_sdcard_defconfig | 11 +- configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 10 +- configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 10 +- configs/m28evk_defconfig | 6 +- configs/m53evk_defconfig | 7 +- configs/ma5d4evk_defconfig | 8 +- configs/maxbcm_defconfig | 8 +- configs/mcx_defconfig | 4 +- configs/microblaze-generic_defconfig | 8 +- configs/miniarm-rk3288_defconfig | 1 + configs/mixtile_loftq_defconfig | 2 +- configs/mk802_a10s_defconfig | 1 + configs/mk802_defconfig | 2 +- configs/mk802ii_defconfig | 1 + configs/mt_ventoux_defconfig | 3 +- configs/mx23_olinuxino_defconfig | 6 +- configs/mx23evk_defconfig | 6 +- configs/mx28evk_auart_console_defconfig | 6 +- configs/mx28evk_defconfig | 6 +- configs/mx28evk_nand_defconfig | 6 +- configs/mx28evk_spi_defconfig | 6 +- configs/mx31pdk_defconfig | 5 +- configs/mx6cuboxi_defconfig | 11 +- configs/mx6sabresd_spl_defconfig | 11 +- configs/mx6slevk_spl_defconfig | 11 +- configs/mx6sxsabresd_spl_defconfig | 11 +- configs/mx6ul_14x14_evk_defconfig | 11 +- configs/mx6ul_9x9_evk_defconfig | 11 +- configs/novena_defconfig | 12 +- configs/omap3_beagle_defconfig | 3 +- configs/omap3_evm_defconfig | 3 +- configs/omap3_ha_defconfig | 3 +- configs/omap3_logic_defconfig | 3 +- configs/omap3_overo_defconfig | 3 +- configs/omap4_panda_defconfig | 4 +- configs/omap4_sdp4430_defconfig | 4 +- configs/omap5_uevm_defconfig | 1 + configs/omapl138_lcdk_defconfig | 5 +- configs/orangepi_2_defconfig | 1 + configs/orangepi_pc_defconfig | 1 + configs/orangepi_pc_plus_defconfig | 1 + configs/orangepi_plus2e_defconfig | 1 + configs/orangepi_plus_defconfig | 3 +- configs/ot1200_spl_defconfig | 10 +- configs/pcm051_rev1_defconfig | 18 +- configs/pcm051_rev3_defconfig | 18 +- configs/pcm058_defconfig | 15 +- configs/peach-pi_defconfig | 2 +- configs/peach-pit_defconfig | 2 +- configs/pengwyn_defconfig | 20 +- configs/pepper_defconfig | 11 + configs/picosam9g45_defconfig | 10 +- configs/platinum_picon_defconfig | 13 +- configs/platinum_titanium_defconfig | 13 +- configs/polaroid_mid2407pxe03_defconfig | 2 +- configs/polaroid_mid2809pxe04_defconfig | 2 +- configs/popmetal-rk3288_defconfig | 1 + configs/pov_protab2_ips9_defconfig | 1 + configs/pxm2_defconfig | 15 +- configs/q8_a13_tablet_defconfig | 3 +- configs/q8_a23_tablet_800x480_defconfig | 2 +- configs/q8_a33_tablet_1024x600_defconfig | 2 +- configs/q8_a33_tablet_800x480_defconfig | 2 +- configs/r7-tv-dongle_defconfig | 1 + configs/rastaban_defconfig | 15 +- configs/rock2_defconfig | 1 + configs/rut_defconfig | 15 +- configs/sama5d2_ptc_nandflash_defconfig | 7 +- configs/sama5d2_ptc_spiflash_defconfig | 8 +- configs/sama5d2_xplained_mmc_defconfig | 9 +- configs/sama5d2_xplained_spiflash_defconfig | 8 +- configs/sama5d3_xplained_mmc_defconfig | 9 +- configs/sama5d3_xplained_nandflash_defconfig | 7 +- configs/sama5d3xek_mmc_defconfig | 9 +- configs/sama5d3xek_nandflash_defconfig | 7 +- configs/sama5d3xek_spiflash_defconfig | 8 +- configs/sama5d4_xplained_mmc_defconfig | 9 +- configs/sama5d4_xplained_nandflash_defconfig | 7 +- configs/sama5d4_xplained_spiflash_defconfig | 8 +- configs/sama5d4ek_mmc_defconfig | 9 +- configs/sama5d4ek_nandflash_defconfig | 7 +- configs/sama5d4ek_spiflash_defconfig | 8 +- configs/sandbox_spl_defconfig | 7 +- configs/sansa_fuze_plus_defconfig | 6 +- configs/sc_sps_1_defconfig | 6 +- configs/smartweb_defconfig | 6 +- configs/smdk5250_defconfig | 2 +- configs/smdk5420_defconfig | 2 +- configs/sniper_defconfig | 2 + configs/snow_defconfig | 2 +- configs/socfpga_arria5_defconfig | 4 +- configs/socfpga_cyclone5_defconfig | 4 +- configs/socfpga_de0_nano_soc_defconfig | 4 +- configs/socfpga_is1_defconfig | 4 +- configs/socfpga_mcvevk_defconfig | 4 +- configs/socfpga_sockit_defconfig | 4 +- configs/socfpga_socrates_defconfig | 4 +- configs/socfpga_sr1500_defconfig | 4 +- configs/socfpga_vining_fpga_defconfig | 6 +- configs/spear300_defconfig | 2 +- configs/spear300_nand_defconfig | 2 +- configs/spear300_usbtty_defconfig | 2 +- configs/spear300_usbtty_nand_defconfig | 2 +- configs/spear310_defconfig | 2 +- configs/spear310_nand_defconfig | 2 +- configs/spear310_pnor_defconfig | 2 +- configs/spear310_usbtty_defconfig | 2 +- configs/spear310_usbtty_nand_defconfig | 2 +- configs/spear310_usbtty_pnor_defconfig | 2 +- configs/spear320_defconfig | 2 +- configs/spear320_nand_defconfig | 2 +- configs/spear320_pnor_defconfig | 2 +- configs/spear320_usbtty_defconfig | 2 +- configs/spear320_usbtty_nand_defconfig | 2 +- configs/spear320_usbtty_pnor_defconfig | 2 +- configs/spear600_defconfig | 2 +- configs/spear600_nand_defconfig | 2 +- configs/spear600_usbtty_defconfig | 2 +- configs/spear600_usbtty_nand_defconfig | 2 +- configs/spring_defconfig | 2 +- configs/stv0991_defconfig | 2 +- configs/sunxi_Gemei_G9_defconfig | 1 + configs/tao3530_defconfig | 3 +- configs/taurus_defconfig | 9 +- configs/tb100_defconfig | 1 + configs/theadorable_debug_defconfig | 8 +- configs/theadorable_defconfig | 8 +- configs/thuban_defconfig | 15 +- configs/ti814x_evm_defconfig | 10 +- configs/ti816x_evm_defconfig | 10 +- configs/tricorder_defconfig | 2 +- configs/tricorder_flash_defconfig | 2 +- configs/twister_defconfig | 3 +- configs/udoo_defconfig | 11 +- configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + configs/uniphier_sld3_defconfig | 1 + configs/wandboard_defconfig | 11 +- configs/woodburn_sd_defconfig | 8 +- configs/work_92105_defconfig | 8 +- configs/x600_defconfig | 6 +- configs/xfi3_defconfig | 6 +- configs/xilinx_zynqmp_ep_defconfig | 4 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 4 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 8 +- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 4 +- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 4 +- configs/xilinx_zynqmp_zcu102_defconfig | 4 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 4 +- configs/xpress_spl_defconfig | 11 +- configs/zc5202_defconfig | 13 +- configs/zc5601_defconfig | 13 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- drivers/Makefile | 16 +- include/common.h | 15 +- include/configs/B4860QDS.h | 8 - include/configs/BSC9131RDB.h | 2 - include/configs/BSC9132QDS.h | 2 - include/configs/C29XPCIE.h | 11 +- include/configs/MPC8313ERDB.h | 2 - include/configs/P1010RDB.h | 29 -- include/configs/P1022DS.h | 24 - include/configs/T102xQDS.h | 11 - include/configs/T102xRDB.h | 11 - include/configs/T104xRDB.h | 11 - include/configs/T208xQDS.h | 11 - include/configs/T208xRDB.h | 11 - include/configs/T4240QDS.h | 9 - include/configs/T4240RDB.h | 8 - include/configs/a3m071.h | 5 - include/configs/am335x_evm.h | 14 - include/configs/am335x_igep0033.h | 1 - include/configs/am335x_shc.h | 7 - include/configs/am335x_sl50.h | 10 - include/configs/am3517_crane.h | 9 - include/configs/am3517_evm.h | 10 - include/configs/am43xx_evm.h | 9 - include/configs/am57xx_evm.h | 3 - include/configs/apf27.h | 2 - include/configs/at91sam9m10g45ek.h | 9 - include/configs/at91sam9n12ek.h | 11 - include/configs/at91sam9x5ek.h | 11 - include/configs/baltos.h | 7 - include/configs/bav335x.h | 11 - include/configs/brppt1.h | 6 - include/configs/brxre1.h | 2 - include/configs/bur_am335x_common.h | 6 - include/configs/cgtqmx6eval.h | 4 - include/configs/chromebook_jerry.h | 7 - include/configs/clearfog.h | 9 - include/configs/cm_fx6.h | 5 +- include/configs/cm_t35.h | 10 - include/configs/cm_t43.h | 7 - include/configs/cm_t54.h | 1 - include/configs/corvus.h | 6 - include/configs/da850evm.h | 11 - include/configs/db-88f6720.h | 7 - include/configs/db-88f6820-gp.h | 9 - include/configs/db-mv784mp-gp.h | 7 - include/configs/devkit3250.h | 4 - include/configs/devkit8000.h | 1 - include/configs/dra7xx_evm.h | 8 - include/configs/draco.h | 4 - include/configs/ds414.h | 7 - include/configs/edminiv2.h | 4 - include/configs/el6x_common.h | 4 - include/configs/etamin.h | 4 - include/configs/evb_rk3288.h | 2 - include/configs/exynos5-common.h | 4 - include/configs/fennec_rk3288.h | 2 - include/configs/firefly-rk3288.h | 2 - include/configs/gw_ventana.h | 4 - include/configs/imx6_spl.h | 10 - include/configs/ipam390.h | 5 - include/configs/kc1.h | 9 - include/configs/ls1021aqds.h | 18 - include/configs/ls1021atwr.h | 8 - include/configs/ls1043a_common.h | 18 - include/configs/ls2080a_common.h | 8 - include/configs/m53evk.h | 5 - include/configs/ma5d4evk.h | 7 - include/configs/maxbcm.h | 7 - include/configs/mcx.h | 9 - include/configs/microblaze-generic.h | 4 - include/configs/miniarm_rk3288.h | 2 - include/configs/mx31pdk.h | 3 - include/configs/mx6cuboxi.h | 2 - include/configs/mx6sabresd.h | 2 - include/configs/mx6slevk.h | 2 - include/configs/mx6sxsabresd.h | 2 - include/configs/mx6ul_14x14_evk.h | 2 - include/configs/mxs.h | 4 - include/configs/novena.h | 2 - include/configs/omap3_evm.h | 9 - include/configs/omap3_igep00x0.h | 4 - include/configs/omapl138_lcdk.h | 5 - include/configs/ot1200.h | 3 - include/configs/p1_p2_rdb_pc.h | 24 - include/configs/pcm051.h | 7 - include/configs/pcm058.h | 6 - include/configs/pengwyn.h | 9 - include/configs/picosam9g45.h | 9 - include/configs/platinum.h | 2 - include/configs/popmetal_rk3288.h | 2 - include/configs/pxm2.h | 4 - include/configs/rastaban.h | 4 - include/configs/rk3036_common.h | 2 - include/configs/rk3288_common.h | 8 - include/configs/rock2.h | 2 - include/configs/rut.h | 4 - include/configs/sama5d2_ptc.h | 8 - include/configs/sama5d2_xplained.h | 10 - include/configs/sama5d3_xplained.h | 9 - include/configs/sama5d3xek.h | 11 - include/configs/sama5d4_xplained.h | 11 - include/configs/sama5d4ek.h | 11 - include/configs/sandbox_spl.h | 5 - include/configs/siemens-am33x-common.h | 15 - include/configs/smartweb.h | 5 - include/configs/sniper.h | 10 - include/configs/socfpga_common.h | 17 - include/configs/spear3xx_evb.h | 9 +- include/configs/spear6xx_evb.h | 6 +- include/configs/sunxi-common.h | 14 - include/configs/tam3517-common.h | 10 - include/configs/tao3530.h | 10 - include/configs/taurus.h | 8 - include/configs/tegra-common.h | 5 - include/configs/theadorable.h | 7 - include/configs/thuban.h | 4 - include/configs/ti814x_evm.h | 10 +- include/configs/ti816x_evm.h | 10 +- include/configs/ti_am335x_common.h | 1 - include/configs/ti_armv7_common.h | 15 - include/configs/ti_armv7_keystone2.h | 7 - include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap4_common.h | 1 - include/configs/tqma6.h | 5 - include/configs/tricorder.h | 10 - include/configs/udoo.h | 2 - include/configs/uniphier.h | 8 - include/configs/wandboard.h | 2 - include/configs/woodburn_sd.h | 6 - include/configs/work_92105.h | 4 - include/configs/x600.h | 4 - include/configs/xilinx_zynqmp.h | 6 - include/configs/xpress.h | 2 - include/configs/zynq-common.h | 8 - lib/Makefile | 9 +- net/Kconfig | 3 - scripts/Makefile.spl | 10 +- tools/moveconfig.py | 55 +- 627 files changed, 3366 insertions(+), 1516 deletions(-) create mode 100644 common/spl/Kconfig -- 2.8.0.rc3.226.g39d4020

4 96

[U-Boot] pull request: u-boot-uniphier/master (2nd round)
by Masahiro Yamada 19 Sep '16

19 Sep '16

Hi Tom, Here is the revised version of my pull request for the v2016.11 development cycle. The following UniPhier updates are included: - DM migration * remove legacy xHCI driver * convert MMC driver to CONFIG_BLOCK - Pinctrl driver improvements * New pin-group * Macro cleanup * Remove ad-hoc pin-mux code - Misc fixes, cleanups * Fix DRAM size of LD21 SoC * Consolidate board init functions - PLL init code cleanups and new SoC support - Update DRAM init code for LD20 SoC Please pull! The following changes since commit 8cbb389bb3da80cbf8911f8386cbff92c6a78afe: Prepare v2016.09 (2016-09-12 10:05:51 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to f9d7e17e844f9e94c39a8c95f73a4454097a6948: ARM: uniphier: update DRAM init code for LD20 SoC (2016-09-19 00:12:26 +0900) ---------------------------------------------------------------- Masahiro Yamada (27): ARM: uniphier: sort select:s alphabetically usb: uniphier: remove UniPhier xHCI driver and select DM_USB ARM: uniphier: delete unnecessary xHCI pin-mux settings ARM: uniphier: enable Generic EHCI driver for Pro4 SoC mmc: uniphier-sd: migrate to CONFIG_BLK pinctrl: uniphier: add System Bus pin-mux settings pinctrl: uniphier: move register base macros from header to .c file ARM: uniphier: remove IECTRL setup code of LD4 SoC ARM: uniphier: use checkboard() instead of misc_init_f() ARM: uniphier: merge board init functions into board_init() ARM: uniphier: fix DRAM size of LD21 SoC package ARM: uniphier: introduce flags to adjust DRAM timing for LD20/LD21 pinctrl: uniphier: support 4bit-width pin-mux register capability pinctrl: uniphier: add UniPhier sLD3 pinctrl driver ARM: dts: uniphier: add pinctrl device node and pinctrl properties ARM: uniphier: select PINCTRL and SPL_PINCTRL ARM: uniphier: remove redundant pin-muxing for EA24 pin of sLD3 SoC ARM: uniphier: remove ad-hoc pin-mux code for sLD3 ARM: uniphier: consolidate NAND pin-mux settings ARM: dts: uniphier: include System Bus pin group node in SPL DT ARM: uniphier: consolidate System Bus pin-mux settings for LD11/LD20 ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20 ARM: uniphier: rename CONFIG_DPLL_SSC_RATE_1PER ARM: uniphier: move PLL init code to U-Boot proper where possible ARM: uniphier: collect clock/PLL init code into a single directory ARM: uniphier: add PLL init code for LD20 SoC ARM: uniphier: update DRAM init code for LD20 SoC arch/arm/Kconfig | 18 +- arch/arm/dts/uniphier-ph1-ld11-ref.dts | 4 + arch/arm/dts/uniphier-ph1-ld20-ref.dts | 4 + arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 + arch/arm/dts/uniphier-ph1-sld3.dtsi | 35 ++ arch/arm/mach-uniphier/Makefile | 11 +- arch/arm/mach-uniphier/board_common.c | 20 -- arch/arm/mach-uniphier/board_early_init_r.c | 15 - .../mach-uniphier/{board_early_init_f.c => board_init.c} | 62 +++- arch/arm/mach-uniphier/boards.c | 27 +- arch/arm/mach-uniphier/clk/Makefile | 28 +- arch/arm/mach-uniphier/clk/dpll-ld20.c | 22 ++ arch/arm/mach-uniphier/clk/dpll-ld4.c | 56 ++++ arch/arm/mach-uniphier/clk/dpll-pro4.c | 60 ++++ .../{pll/pll-init-sld3.c => clk/dpll-sld3.c} | 2 +- arch/arm/mach-uniphier/clk/dpll-sld8.c | 62 ++++ arch/arm/mach-uniphier/clk/dpll-tail.c | 21 ++ .../arm/mach-uniphier/{early-clk => clk}/early-clk-ld11.c | 0 .../arm/mach-uniphier/{early-clk => clk}/early-clk-ld20.c | 0 arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld4.c | 0 .../arm/mach-uniphier/{early-clk => clk}/early-clk-pro5.c | 0 .../arm/mach-uniphier/{early-clk => clk}/early-clk-pxs2.c | 0 arch/arm/mach-uniphier/clk/pll-base-ld20.c | 123 +++++++ arch/arm/mach-uniphier/clk/pll-ld20.c | 40 +++ .../mach-uniphier/{pll/pll-init-ld4.c => clk/pll-ld4.c} | 61 +--- .../mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} | 64 +--- arch/arm/mach-uniphier/clk/pll-sld3.c | 14 + arch/arm/mach-uniphier/clk/pll.h | 21 ++ arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h | 78 +++-- arch/arm/mach-uniphier/dram/umc-ld20.c | 431 +++++++++++++++++++++++-- arch/arm/mach-uniphier/early-clk/Makefile | 13 - arch/arm/mach-uniphier/early-pinctrl/Makefile | 7 - arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c | 32 -- arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c | 28 -- arch/arm/mach-uniphier/init.h | 43 +-- arch/arm/mach-uniphier/init/init-ld11.c | 2 +- arch/arm/mach-uniphier/init/init-ld20.c | 11 +- arch/arm/mach-uniphier/init/init-ld4.c | 10 +- arch/arm/mach-uniphier/init/init-pro4.c | 10 +- arch/arm/mach-uniphier/init/init-sld3.c | 12 +- arch/arm/mach-uniphier/init/init-sld8.c | 10 +- arch/arm/mach-uniphier/micro-support-card.c | 2 +- arch/arm/mach-uniphier/micro-support-card.h | 16 +- arch/arm/mach-uniphier/pinctrl-glue.c | 32 ++ arch/arm/mach-uniphier/pinctrl/Makefile | 13 - arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 51 --- arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 41 --- arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 46 --- arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 44 --- arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 44 --- arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 46 --- arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 48 --- arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c | 35 -- arch/arm/mach-uniphier/pll/Makefile | 8 - arch/arm/mach-uniphier/pll/pll-init-sld8.c | 205 ------------ arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c | 21 -- arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c | 22 -- arch/arm/mach-uniphier/print_misc_info.c | 12 - arch/arm/mach-uniphier/sc64-regs.h | 22 +- configs/uniphier_ld11_defconfig | 2 - configs/uniphier_ld20_defconfig | 2 - configs/uniphier_ld4_sld8_defconfig | 3 - configs/uniphier_pro4_defconfig | 4 +- configs/uniphier_pxs2_ld6b_defconfig | 2 - configs/uniphier_sld3_defconfig | 1 - drivers/mmc/Kconfig | 1 + drivers/mmc/uniphier-sd.c | 50 ++- drivers/pinctrl/uniphier/Kconfig | 6 + drivers/pinctrl/uniphier/Makefile | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 24 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 9 + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 9 + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 18 ++ drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 21 ++ drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 30 ++ drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 30 ++ drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 9 + drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c | 128 ++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 21 ++ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 9 +- drivers/usb/host/Kconfig | 7 - drivers/usb/host/Makefile | 1 - drivers/usb/host/xhci-uniphier.c | 85 ----- include/configs/uniphier.h | 3 - include/fdtdec.h | 1 - lib/fdtdec.c | 1 - 86 files changed, 1472 insertions(+), 1179 deletions(-) delete mode 100644 arch/arm/mach-uniphier/board_common.c delete mode 100644 arch/arm/mach-uniphier/board_early_init_r.c rename arch/arm/mach-uniphier/{board_early_init_f.c => board_init.c} (61%) create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld20.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld4.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-pro4.c rename arch/arm/mach-uniphier/{pll/pll-init-sld3.c => clk/dpll-sld3.c} (74%) create mode 100644 arch/arm/mach-uniphier/clk/dpll-sld8.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-tail.c rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld11.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld20.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld4.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pro5.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pxs2.c (100%) create mode 100644 arch/arm/mach-uniphier/clk/pll-base-ld20.c create mode 100644 arch/arm/mach-uniphier/clk/pll-ld20.c rename arch/arm/mach-uniphier/{pll/pll-init-ld4.c => clk/pll-ld4.c} (76%) rename arch/arm/mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} (70%) create mode 100644 arch/arm/mach-uniphier/clk/pll-sld3.c create mode 100644 arch/arm/mach-uniphier/clk/pll.h delete mode 100644 arch/arm/mach-uniphier/early-clk/Makefile delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c create mode 100644 arch/arm/mach-uniphier/pinctrl-glue.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c delete mode 100644 arch/arm/mach-uniphier/pll/Makefile delete mode 100644 arch/arm/mach-uniphier/pll/pll-init-sld8.c delete mode 100644 arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c delete mode 100644 arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c delete mode 100644 arch/arm/mach-uniphier/print_misc_info.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c delete mode 100644 drivers/usb/host/xhci-uniphier.c -- Best Regards Masahiro Yamada

2 1

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 19 Sep '16

19 Sep '16

Hi Tom, Here is the first sunxi pull-req for v2016.11. This consists of a couple of small bug-fixes / defconfig improvements + 1 new board. The following changes since commit 8cbb389bb3da80cbf8911f8386cbff92c6a78afe: Prepare v2016.09 (2016-09-12 10:05:51 -0400) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to ca7628a91136364235de8fb4bd699944b981c504: sunxi: Enable USB gadget support for Sinlinx SinA33 (2016-09-18 14:39:16 +0200) ---------------------------------------------------------------- Chen-Yu Tsai (4): sunxi: musb: Power off OTG port VBUS when disabled sunxi: Add mmc0 card detect pin for Sinlinx SinA33 sunxi: Enable USB host support for Sinlinx SinA33 sunxi: Enable USB gadget support for Sinlinx SinA33 Hans de Goede (2): sunxi: axp2xx: disable ldoio0/1 at boot sunxi: musb: Re-init musb controller on repeated probe calls Jelle van der Waa (1): sunxi: Add defconfig and dts for the NanoPi NEO arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun8i-h3-nanopi-neo.dts | 125 ++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-sunxi/usb_phy.h | 1 - arch/arm/mach-sunxi/usb_phy.c | 7 -- board/sunxi/MAINTAINERS | 5 ++ configs/Sinlinx_SinA33_defconfig | 10 +++ configs/nanopi_neo_defconfig | 16 ++++ drivers/power/axp209.c | 16 ++++ drivers/power/axp221.c | 12 +++ drivers/usb/musb-new/sunxi.c | 48 ++++++------ 10 files changed, 209 insertions(+), 34 deletions(-) create mode 100644 arch/arm/dts/sun8i-h3-nanopi-neo.dts create mode 100644 configs/nanopi_neo_defconfig Regards, Hans

2 1

[U-Boot] Please pull ARC changes
by Alexey Brodkin 19 Sep '16

19 Sep '16

Hi Tom, That's a minor change that accommodates changes in upcoming ARC GNU tools. The following changes since commit 8cbb389bb3da80cbf8911f8386cbff92c6a78afe: Prepare v2016.09 (2016-09-12 10:05:51 -0400) are available in the git repository at: git://git.denx.de/u-boot-arc.git for you to fetch changes up to 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c: arc: Use -mcpu=XXX instead of obsolete -marcXXX (2016-09-16 12:12:26 +0300) ---------------------------------------------------------------- Alexey Brodkin (1): arc: Use -mcpu=XXX instead of obsolete -marcXXX arch/arc/config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Regards, Alexey

2 1

[U-Boot] [PATCH] Revert "image-fit: switch ENOLINK to ENOENT"
by Paul Burton 19 Sep '16

19 Sep '16

Commit bac17b78dace ("image-fit: switch ENOLINK to ENOENT") changed fit_get_node_from_config to return -ENOENT when a property doesn't exist, but didn't change any of its callers which check return values. Notably it didn't change boot_get_ramdisk, which leads to U-Boot failing to boot FIT images which don't include ramdisks with the following message: Ramdisk image is corrupt or invalid The offending commit seems to dislike ENOLINK due to it not existing on OpenBSD, but I'm not sure why that matters as we define it in include/asm-generic/errno.h anyway so simply revert the commit to fix FIT image handling. This reverts commit bac17b78dace ("image-fit: switch ENOLINK to ENOENT"). Signed-off-by: Paul Burton <paul.burton(a)imgtec.com> Cc: Jonathan Gray <jsg(a)jsg.id.au> --- common/image-fit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image-fit.c b/common/image-fit.c index 9ce68f1..f833fe3 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1566,7 +1566,7 @@ int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name, noffset = fit_conf_get_prop_node(fit_hdr, cfg_noffset, prop_name); if (noffset < 0) { debug("* %s: no '%s' in config\n", prop_name, prop_name); - return -ENOENT; + return -ENOLINK; } return noffset; -- 2.9.3

4 4

[U-Boot] [PATCH v3 0/2] Detect and reject new ad-hoc CONFIG options
by Simon Glass 18 Sep '16

18 Sep '16

Despite the availability of Kconfig, the number of ad-hoc CONFIG options in U-Boot is still at over 8000. In February 2015 (commit 741e58e0) there were around 8387 ad-hoc CONFIGs. As of this patch there are about 8336, only a little fewer. One problem is that new ones are still being added, admittedly at a slower rate. This series adds a Makefile check to detect that and produce a build error. This provides immediate feedback that new CONFIG options should go in Kconfig. Changes in v3: - Update the whitelist with mainline - Fix the match partern to exclude .py files, not anything containing "py" - Handle Kconfig files with extensions (e.g. Kconfig.64) - Handle CONFIG_SYS_EXTRA_OPTIONS containing lower case - Include lower-case letters in the CONFIG match string - Write error output to stderr so that buildman shows it - Handle Kconfig files with extensions (e.g. Kconfig.64) - Handle extra whitespace after 'config' / 'menuconfig' Changes in v2: - Rebase to mainline - Fix scripts so that there are no errors - Add the 'build-whitelist.sh' script to the tree Simon Glass (2): Kconfig: Add a whitelist of ad-hoc CONFIG options Makefile: Give a build error if ad-hoc CONFIG options are added Makefile | 10 +- scripts/build-whitelist.sh | 51 + scripts/check-config.sh | 55 + scripts/config_whitelist.txt | 8420 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 8535 insertions(+), 1 deletion(-) create mode 100755 scripts/build-whitelist.sh create mode 100755 scripts/check-config.sh create mode 100644 scripts/config_whitelist.txt -- 2.8.0.rc3.226.g39d4020

2 6

[U-Boot] [PATCH v4 08/45] Kconfig: spl: Add SPL support options to Kconfig
by Simon Glass 18 Sep '16

18 Sep '16

There are a lot of SPL options in U-Boot to enable various features and drivers. Currently these do not use Kconfig. Add them to Kconfig along with suitable help, and drop them from the README. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - Drop SPL_PINCTRL_SUPPORT Changes in v3: - Move SPL_NET_VCI_STRING into the SPL Kconfig file also Changes in v2: None README | 49 ------- common/spl/Kconfig | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++ net/Kconfig | 3 - 3 files changed, 411 insertions(+), 52 deletions(-) diff --git a/README b/README index f41a6af..d916ee7 100644 --- a/README +++ b/README @@ -3509,21 +3509,6 @@ FIT uImage format: CONFIG_SPL_INIT_MINIMAL Arch init code should be built for a very small image - CONFIG_SPL_LIBCOMMON_SUPPORT - Support for common/libcommon.o in SPL binary - - CONFIG_SPL_LIBDISK_SUPPORT - Support for disk/libdisk.o in SPL binary - - CONFIG_SPL_I2C_SUPPORT - Support for drivers/i2c/libi2c.o in SPL binary - - CONFIG_SPL_GPIO_SUPPORT - Support for drivers/gpio/libgpio.o in SPL binary - - CONFIG_SPL_MMC_SUPPORT - Support for drivers/mmc/libmmc.o in SPL binary - CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS, Address and partition on the MMC to load U-Boot from @@ -3547,12 +3532,6 @@ FIT uImage format: Partition on the MMC to load U-Boot from when the MMC is being used in fs mode - CONFIG_SPL_FAT_SUPPORT - Support for fs/fat/libfat.o in SPL binary - - CONFIG_SPL_EXT_SUPPORT - Support for EXT filesystem in SPL binary - CONFIG_SPL_FS_LOAD_PAYLOAD_NAME Filename to read to load U-Boot when reading from filesystem @@ -3591,18 +3570,10 @@ FIT uImage format: Support for a lightweight UBI (fastmap) scanner and loader - CONFIG_SPL_MTD_SUPPORT - Support for the MTD subsystem within SPL. Useful for - environment on NAND support within SPL. - CONFIG_SPL_NAND_RAW_ONLY Support to boot only raw u-boot.bin images. Use this only if you need to save space. - CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT - Set for the SPL on PPC mpc8xxx targets, support for - drivers/ddr/fsl/libddr.o in SPL binary. - CONFIG_SPL_COMMON_INIT_DDR Set for common ddr init with serial presence detect in SPL binary. @@ -3638,29 +3609,9 @@ FIT uImage format: Support for an OMAP3-specific set of functions to return the ID and MFR of the first attached NAND chip, if present. - CONFIG_SPL_SERIAL_SUPPORT - Support for drivers/serial/libserial.o in SPL binary - - CONFIG_SPL_SPI_FLASH_SUPPORT - Support for drivers/mtd/spi/libspi_flash.o in SPL binary - - CONFIG_SPL_SPI_SUPPORT - Support for drivers/spi/libspi.o in SPL binary - CONFIG_SPL_RAM_DEVICE Support for running image already present in ram, in SPL binary - CONFIG_SPL_LIBGENERIC_SUPPORT - Support for lib/libgeneric.o in SPL binary - - CONFIG_SPL_ENV_SUPPORT - Support for the environment operating in SPL binary - - CONFIG_SPL_NET_SUPPORT - Support for the net/libnet.o in SPL binary. - It conflicts with SPL env from storage medium specified by - CONFIG_ENV_IS_xxx but CONFIG_ENV_IS_NOWHERE - CONFIG_SPL_PAD_TO Image offset to which the SPL should be padded before appending the SPL payload. By default, this is defined as diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 2d2256a..b56f99b 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1,3 +1,5 @@ +menu "SPL / TPL" + config SUPPORT_SPL bool @@ -65,3 +67,412 @@ config TPL prompt "Enable TPL" help If you want to build TPL as well as the normal image and SPL, say Y. + +config SPL_CRC32_SUPPORT + bool "Support CRC32" + depends on SPL_FIT + help + Enable this to support CRC32 in FIT images within SPL. This is a + 32-bit checksum value that can be used to verify images. This is + the least secure type of checksum, suitable for detected + accidental image corruption. For secure applications you should + consider SHA1 or SHA256. + +config SPL_MD5_SUPPORT + bool "Support MD5" + depends on SPL_FIT + help + Enable this to support MD5 in FIT images within SPL. An MD5 + checksum is a 128-bit hash value used to check that the image + contents have not been corrupted. Note that MD5 is not considered + secure as it is possible (with a brute-force attack) to adjust the + image while still retaining the same MD5 hash value. For secure + applications where images may be changed maliciously, you should + consider SHA1 or SHA256. + +config SPL_SHA1_SUPPORT + bool "Support SHA1" + depends on SPL_FIT + help + Enable this to support SHA1 in FIT images within SPL. A SHA1 + checksum is a 160-bit (20-byte) hash value used to check that the + image contents have not been corrupted or maliciously altered. + While SHA1 is fairly secure it is coming to the end of its life + due to the expanding computing power avaiable to brute-force + attacks. For more security, consider SHA256. + +config SPL_SHA256_SUPPORT + bool "Support SHA256" + depends on SPL_FIT + help + Enable this to support SHA256 in FIT images within SPL. A SHA256 + checksum is a 256-bit (32-byte) hash value used to check that the + image contents have not been corrupted. SHA256 is recommended for + use in secure applications since (as at 2016) there is no known + feasible attack that could produce a 'collision' with differing + input data. Use this for the highest security. Note that only the + SHA256 variant is supported: SHA512 and others are not currently + supported in U-Boot. + +config SPL_CRYPTO_SUPPORT + bool "Support crypto drivers" + depends on SPL + help + Enable crypto drivers in SPL. These drivers can be used to + accelerate secure boot processing in secure applications. Enable + this option to build the drivers in drivers/crypto as part of an + SPL build. + +config SPL_HASH_SUPPORT + bool "Support hashing drivers" + depends on SPL + help + Enable hashing drivers in SPL. These drivers can be used to + accelerate secure boot processing in secure applications. Enable + this option to build system-specific drivers for hash acceleration + as part of an SPL build. + +config SPL_DMA_SUPPORT + bool "Support DMA drivers" + depends on SPL + help + Enable DMA (direct-memory-access) drivers in SPL. These drivers + can be used to handle memory-to-peripheral data transfer without + the CPU moving the data. Enable this option to build the drivers + in drivers/dma as part of an SPL build. + +config SPL_DRIVERS_MISC_SUPPORT + bool "Support misc drivers" + depends on SPL + help + Enable miscellaneous drivers in SPL. These drivers perform various + tasks that don't fall nicely into other categories, Enable this + option to build the drivers in drivers/misc as part of an SPL + build, for those that support building in SPL (not all drivers do). + +config SPL_ENV_SUPPORT + bool "Support an environment" + depends on SPL + help + Enable environment support in SPL. The U-Boot environment provides + a number of settings (essentially name/value pairs) which can + control many aspects of U-Boot's operation. Normally this is not + needed in SPL as it has a much simpler task with less + configuration. But some boards use this to support 'Falcon' boot + on EXT2 and FAT, where SPL boots directly into Linux without + starting U-Boot first. Enabling this option will make getenv() + and setenv() available in SPL. + +config SPL_ETH_SUPPORT + bool "Support Ethernet" + depends on SPL_ENV_SUPPORT + help + Enable access to the network subsystem and associated Ethernet + drivers in SPL. This permits SPL to load U-Boot over an Ethernet + link rather than from an on-board peripheral. Environment support + is required since the network stack uses a number of environment + variables. See also SPL_NET_SUPPORT. + +config SPL_EXT_SUPPORT + bool "Support EXT filesystems" + depends on SPL + help + Enable support for EXT2/3/4 filesystems with SPL. This permits + U-Boot (or Linux in Falcon mode) to be loaded from an EXT + filesystem from within SPL. Support for the underlying block + device (e.g. MMC or USB) must be enabled separately. + +config SPL_FAT_SUPPORT + bool "Support FAT filesystems" + depends on SPL + help + Enable support for FAT and VFAT filesystems with SPL. This + permits U-Boot (or Linux in Falcon mode) to be loaded from a FAT + filesystem from within SPL. Support for the underlying block + device (e.g. MMC or USB) must be enabled separately. + +config SPL_FPGA_SUPPORT + bool "Support FPGAs" + depends on SPL + help + Enable support for FPGAs in SPL. Field-programmable Gate Arrays + provide software-configurable hardware which is typically used to + implement peripherals (such as UARTs, LCD displays, MMC) or + accelerate custom processing functions, such as image processing + or machine learning. Sometimes it is useful to program the FPGA + as early as possible during boot, and this option can enable that + within SPL. + +config SPL_GPIO_SUPPORT + bool "Support GPIO" + depends on SPL + help + Enable support for GPIOs (General-purpose Input/Output) in SPL. + GPIOs allow U-Boot to read the state of an input line (high or + low) and set the state of an output line. This can be used to + drive LEDs, control power to various system parts and read user + input. GPIOs can be useful in SPL to enable a 'sign-of-life' LED, + for example. Enable this option to build the drivers in + drivers/gpio as part of an SPL build. + +config SPL_I2C_SUPPORT + bool "Support I2C" + depends on SPL + help + Enable support for the I2C (Inter-Integrated Circuit) bus in SPL. + I2C works with a clock and data line which can be driven by a + one or more masters or slaves. It is a fairly complex bus but is + widely used as it only needs two lines for communication. Speeds of + 400kbps are typical but up to 3.4Mbps is supported by some + hardware. I2C can be useful in SPL to configure power management + ICs (PMICs) before raising the CPU clock speed, for example. + Enable this option to build the drivers in drivers/i2c as part of + an SPL build. + +config SPL_LIBCOMMON_SUPPORT + bool "Support common libraries" + depends on SPL + help + Enable support for common U-Boot libraries within SPL. These + libraries include common code to deal with U-Boot images, + environment and USB, for example. This option is enabled on many + boards. Enable this option to build the code in common/ as part of + an SPL build. + +config SPL_LIBDISK_SUPPORT + bool "Support disk paritions" + depends on SPL + help + Enable support for disk partitions within SPL. 'Disk' is something + of a misnomer as it includes non-spinning media such as flash (as + used in MMC and USB sticks). Partitions provide a way for a disk + to be split up into separate regions, with a partition table placed + at the start or end which describes the location and size of each + 'partition'. These partitions are typically uses as individual block + devices, typically with an EXT2 or FAT filesystem in each. This + option enables whatever partition support has been enabled in + U-Boot to also be used in SPL. It brings in the code in disk/. + +config SPL_LIBGENERIC_SUPPORT + bool "Support generic libraries" + depends on SPL + help + Enable support for generic U-Boot libraries within SPL. These + libraries include generic code to deal with device tree, hashing, + printf(), compression and the like. This option is enabled on many + boards. Enable this option to build the code in lib/ as part of an + SPL build. + +config SPL_MMC_SUPPORT + bool "Support MMC" + depends on SPL + help + Enable support for MMC (Multimedia Card) within SPL. This enables + the MMC protocol implementation and allows any enabled drivers to + be used within SPL. MMC can be used with or without disk partition + support depending on the application (SPL_LIBDISK_SUPPORT). Enable + this option to build the drivers in drivers/mmc as part of an SPL + build. + +config SPL_MPC8XXX_INIT_DDR_SUPPORT + bool "Support MPC8XXX DDR init" + depends on SPL + help + Enable support for DDR-SDRAM (double-data-rate synchronous dynamic + random-access memory) on the MPC8XXX family within SPL. This + allows DRAM to be set up before loading U-Boot into that DRAM, + where it can run. + +config SPL_MTD_SUPPORT + bool "Support MTD drivers" + depends on SPL + help + Enable support for MTD (Memory Technology Device) within SPL. MTD + provides a block interface over raw NAND and can also be used with + SPI flash. This allows SPL to load U-Boot from supported MTD + devices. See SPL_NAND_SUPPORT and SPL_ONENAND_SUPPORT for how + to enable specific MTD drivers. + +config SPL_MUSB_NEW_SUPPORT + bool "Support new Mentor Graphics USB" + depends on SPL + help + Enable support for Mentor Graphics USB in SPL. This is a new + driver used by some boards. Enable this option to build + the drivers in drivers/usb/musb-new as part of an SPL build. The + old drivers are in drivers/usb/musb. + +config SPL_NAND_SUPPORT + bool "Support NAND flash" + depends on SPL + help + Enable support for NAND (Negative AND) flash in SPL. NAND flash + can be used to allow SPL to load U-Boot from supported devices. + This enables the drivers in drivers/mtd/nand as part of an SPL + build. + +config SPL_NET_SUPPORT + bool "Support networking" + depends on SPL + help + Enable support for network devices (such as Ethernet) in SPL. + This permits SPL to load U-Boot over a network link rather than + from an on-board peripheral. Environment support is required since + the network stack uses a number of environment variables. See also + SPL_ETH_SUPPORT. + +if SPL_NET_SUPPORT +config SPL_NET_VCI_STRING + string "BOOTP Vendor Class Identifier string sent by SPL" + help + As defined by RFC 2132 the vendor class identifier field can be + sent by the client to identify the vendor type and configuration + of a client. This is often used in practice to allow for the DHCP + server to specify different files to load depending on if the ROM, + SPL or U-Boot itself makes the request +endif # if SPL_NET_SUPPORT + +config SPL_NO_CPU_SUPPORT + bool "Drop CPU code in SPL" + depends on SPL + help + This is specific to the ARM926EJ-S CPU. It disables the standard + start.S start-up code, presumably so that a replacement can be + used on that CPU. You should not enable it unless you know what + you are doing. + +config SPL_NOR_SUPPORT + bool "Support NOR flash" + depends on SPL + help + Enable support for loading U-Boot from memory-mapped NOR (Negative + OR) flash in SPL. NOR flash is slow to write but fast to read, and + a memory-mapped device makes it very easy to access. Loading from + NOR is typically achieved with just a memcpy(). + +config SPL_ONENAND_SUPPORT + bool "Support OneNAND flash" + depends on SPL + help + Enable support for OneNAND (Negative AND) flash in SPL. OneNAND is + a type of NAND flash and therefore can be used to allow SPL to + load U-Boot from supported devices. This enables the drivers in + drivers/mtd/onenand as part of an SPL build. + +config SPL_POST_MEM_SUPPORT + bool "Support POST drivers" + depends on SPL + help + Enable support for POST (Power-on Self Test) in SPL. POST is a + procedure that checks that the hardware (CPU or board) appears to + be functionally correctly. It is a sanity check that can be + performed before booting. This enables the drivers in post/drivers + as part of an SPL build. + +config SPL_POWER_SUPPORT + bool "Support power drivers" + depends on SPL + help + Enable support for power control in SPL. This includes support + for PMICs (Power-management Integrated Circuits) and some of the + features provided by PMICs. In particular, voltage regulators can + be used to enable/disable power and vary its voltage. That can be + useful in SPL to turn on boot peripherals and adjust CPU voltage + so that the clock speed can be increased. This enables the drivers + in drivers/power, drivers/power/pmic and drivers/power/regulator + as part of an SPL build. + +config SPL_SATA_SUPPORT + bool "Support loading from SATA" + depends on SPL + help + Enable support for SATA (Serial AT attachment) in SPL. This allows + use of SATA devices such as hard drives and flash drivers for + loading U-Boot. SATA is used in higher-end embedded systems and + can provide higher performance than MMC , at somewhat higher + expense and power consumption. This enables loading from SATA + using a configured device. + +config SPL_SERIAL_SUPPORT + bool "Support serial" + depends on SPL + help + Enable support for serial in SPL. This allows use of a serial UART + for displaying messages while SPL is running. It also brings in + printf() and panic() functions. This should normally be enabled + unless there are space reasons not to. Even then, consider + enabling USE_TINY_PRINTF which is a small printf() version. + +config SPL_SPI_FLASH_SUPPORT + bool "Support SPI flash drivers" + depends on SPL + help + Enable support for using SPI flash in SPL, and loading U-Boot from + SPI flash. SPI flash (Serial Peripheral Bus flash) is named after + the SPI bus that is used to connect it to a system. It is a simple + but fast bidirectional 4-wire bus (clock, chip select and two data + lines). This enables the drivers in drivers/mtd/spi as part of an + SPL build. This normally requires SPL_SPI_SUPPORT. + +config SPL_SPI_SUPPORT + bool "Support SPI drivers" + depends on SPL + help + Enable support for using SPI in SPL. This is used for connecting + to SPI flash for loading U-Boot. See SPL_SPI_FLASH_SUPPORT for + more details on that. The SPI driver provides the transport for + data between the SPI flash and the CPU. This option can be used to + enable SPI drivers that are needed for other purposes also, such + as a SPI PMIC. + +config SPL_USBETH_SUPPORT + bool "Support USB Ethernet drivers" + depends on SPL + help + Enable access to the USB network subsystem and associated + drivers in SPL. This permits SPL to load U-Boot over a + USB-connected Ethernet link (such as a USB Ethernet dongle) rather + than from an onboard peripheral. Environment support is required + since the network stack uses a number of environment variables. + See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT. + +config SPL_USB_HOST_SUPPORT + bool "Support USB host drivers" + depends on SPL + help + Enable access to USB (Universal Serial Bus) host devices so that + SPL can load U-Boot from a connected USB peripheral, such as a USB + flash stick. While USB takes a little longer to start up than most + buses, it is very flexible since many different types of storage + device can be attached. This option enables the drivers in + drivers/usb/host as part of an SPL build. + +config SPL_USB_SUPPORT + bool "Support loading from USB" + depends on SPL_USB_HOST_SUPPORT + help + Enable support for USB devices in SPL. This allows use of USB + devices such as hard drives and flash drivers for loading U-Boot. + The actual drivers are enabled separately using the normal U-Boot + config options. This enables loading from USB using a configured + device. + +config SPL_WATCHDOG_SUPPORT + bool "Support watchdog drivers" + depends on SPL + help + Enable support for watchdog drivers in SPL. A watchdog is + typically a hardware peripheral which can reset the system when it + detects no activity for a while (such as a software crash). This + enables the drivers in drivers/watchdog as part of an SPL build. + +config SPL_YMODEM_SUPPORT + bool "Support loading using Ymodem" + depends on SPL + help + While loading from serial is slow it can be a useful backup when + there is no other option. The Ymodem protocol provides a reliable + means of transmitting U-Boot over a serial line for using in SPL, + with a checksum to ensure correctness. + +endmenu diff --git a/net/Kconfig b/net/Kconfig index c393269..414c549 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -45,7 +45,4 @@ config BOOTP_VCI_STRING default "U-Boot.arm" if ARM default "U-Boot" -config SPL_NET_VCI_STRING - string - endif # if NET -- 2.8.0.rc3.226.g39d4020

2 3

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 18 Sep '16

18 Sep '16

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit 8cbb389bb3da80cbf8911f8386cbff92c6a78afe: Prepare v2016.09 (2016-09-12 10:05:51 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 76062b9cdbe756eff75b99beaf6e94e8bb059431: i2c: at91_i2c: Fix the wrong include file (2016-09-13 06:58:54 +0200) ---------------------------------------------------------------- John Keeping (3): rockchip: i2c: use named constant when appropriate rockchip: i2c: move register write out of inner loop rockchip: i2c: fix >32 byte writes Wenyou Yang (1): i2c: at91_i2c: Fix the wrong include file drivers/i2c/at91_i2c.c | 2 +- drivers/i2c/rk_i2c.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH] sunxi: musb: Re-init musb controller on repeated probe calls
by Hans de Goede 18 Sep '16

18 Sep '16

With sunxi-musb musb_lowlevel_init() can fail when a charger; or no cable is plugged into the otg port. To avoid leaking the struct musb allocated by musb_init_controller() on repeated musb_usb_probe() calls, we were caching its result. But musb_init_controller() does more, such as calling sunxi_musb_init() which enables the clocks. Not calling sunxi_musb_init() causes the musb controller to stop working after a "usb reset" since that calls musb_usb_remove() which disables the clocks. This commit fixes this by removing the caching of the struct returned from musb_init_controller(), it replaces this by free-ing the allocated memory in musb_usb_remove() and calling musb_usb_remove() on musb_usb_probe() errors to ensure proper cleanup. While at it also make musb_usb_probe() and musb_usb_remove() static. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/usb/musb-new/sunxi.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index dece781..469377f 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -201,7 +201,6 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci) /* musb_core does not call enable / disable in a balanced manner <sigh> */ static bool enabled = false; -static struct musb *sunxi_musb; static int sunxi_musb_enable(struct musb *musb) { @@ -309,7 +308,9 @@ static struct musb_hdrc_platform_data musb_plat = { }; #ifdef CONFIG_USB_MUSB_HOST -int musb_usb_probe(struct udevice *dev) +static int musb_usb_remove(struct udevice *dev); + +static int musb_usb_probe(struct udevice *dev) { struct musb_host_data *host = dev_get_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); @@ -317,23 +318,21 @@ int musb_usb_probe(struct udevice *dev) priv->desc_before_addr = true; - if (!sunxi_musb) { - sunxi_musb = musb_init_controller(&musb_plat, NULL, - (void *)SUNXI_USB0_BASE); - } - - host->host = sunxi_musb; + host->host = musb_init_controller(&musb_plat, NULL, + (void *)SUNXI_USB0_BASE); if (!host->host) return -EIO; ret = musb_lowlevel_init(host); if (ret == 0) printf("MUSB OTG\n"); + else + musb_usb_remove(dev); return ret; } -int musb_usb_remove(struct udevice *dev) +static int musb_usb_remove(struct udevice *dev) { struct musb_host_data *host = dev_get_priv(dev); struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; @@ -346,6 +345,9 @@ int musb_usb_remove(struct udevice *dev) #endif clrbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0); + free(host->host); + host->host = NULL; + return 0; } -- 2.9.3

2 2

[U-Boot] [PATCH 00/15] ARM: uniphier: more updates for UniPhier SoC family for v2016.11-rc1
by Masahiro Yamada 18 Sep '16

18 Sep '16

- Add pinctrl driver for sLD3 SoC - Do away with legacy pin-mux code - refactoring of clock/PLL init code - Add PLL init code for LD20 SoC - Improvement of DRAM init code for LD20 SoC - Misc cleanups Masahiro Yamada (15): pinctrl: uniphier: support 4bit-width pin-mux register capability pinctrl: uniphier: add UniPhier sLD3 pinctrl driver ARM: dts: uniphier: add pinctrl device node and pinctrl properties ARM: uniphier: select PINCTRL and SPL_PINCTRL ARM: uniphier: remove redundant pin-muxing for EA24 pin of sLD3 SoC ARM: uniphier: remove ad-hoc pin-mux code for sLD3 ARM: uniphier: consolidate NAND pin-mux settings ARM: dts: uniphier: include System Bus pin group node in SPL DT ARM: uniphier: consolidate System Bus pin-mux settings for LD11/LD20 ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20 ARM: uniphier: rename CONFIG_DPLL_SSC_RATE_1PER ARM: uniphier: move PLL init code to U-Boot proper where possible ARM: uniphier: collect clock/PLL init code into a single directory ARM: uniphier: add PLL init code for LD20 SoC ARM: uniphier: update DRAM init code for LD20 SoC arch/arm/Kconfig | 2 + arch/arm/dts/uniphier-ph1-ld11-ref.dts | 4 + arch/arm/dts/uniphier-ph1-ld20-ref.dts | 4 + arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 + arch/arm/dts/uniphier-ph1-sld3.dtsi | 35 ++ arch/arm/mach-uniphier/Makefile | 6 +- arch/arm/mach-uniphier/board_init.c | 46 ++- arch/arm/mach-uniphier/clk/Makefile | 28 +- arch/arm/mach-uniphier/clk/dpll-ld20.c | 22 ++ arch/arm/mach-uniphier/clk/dpll-ld4.c | 55 +++ arch/arm/mach-uniphier/clk/dpll-pro4.c | 59 +++ .../{pll/pll-init-sld3.c => clk/dpll-sld3.c} | 2 +- arch/arm/mach-uniphier/clk/dpll-sld8.c | 61 +++ .../{pll/pll-spectrum-ld4.c => clk/dpll-tail.c} | 6 +- .../{early-clk => clk}/early-clk-ld11.c | 0 .../{early-clk => clk}/early-clk-ld20.c | 0 .../{early-clk => clk}/early-clk-ld4.c | 0 .../{early-clk => clk}/early-clk-pro5.c | 0 .../{early-clk => clk}/early-clk-pxs2.c | 0 arch/arm/mach-uniphier/clk/pll-base-ld20.c | 123 ++++++ arch/arm/mach-uniphier/clk/pll-ld20.c | 40 ++ .../{pll/pll-init-ld4.c => clk/pll-ld4.c} | 58 +-- .../{pll/pll-init-pro4.c => clk/pll-pro4.c} | 61 +-- arch/arm/mach-uniphier/clk/pll-sld3.c | 14 + arch/arm/mach-uniphier/clk/pll.h | 21 + arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h | 76 ++-- arch/arm/mach-uniphier/dram/umc-ld20.c | 431 +++++++++++++++++++-- arch/arm/mach-uniphier/early-clk/Makefile | 13 - arch/arm/mach-uniphier/early-pinctrl/Makefile | 7 - .../early-pinctrl/early-pinctrl-ld20.c | 32 -- .../early-pinctrl/early-pinctrl-sld3.c | 28 -- arch/arm/mach-uniphier/init.h | 31 +- arch/arm/mach-uniphier/init/init-ld11.c | 2 +- arch/arm/mach-uniphier/init/init-ld20.c | 8 +- arch/arm/mach-uniphier/init/init-ld4.c | 6 +- arch/arm/mach-uniphier/init/init-pro4.c | 6 +- arch/arm/mach-uniphier/init/init-sld3.c | 8 +- arch/arm/mach-uniphier/init/init-sld8.c | 6 +- arch/arm/mach-uniphier/pinctrl-glue.c | 32 ++ arch/arm/mach-uniphier/pinctrl/Makefile | 13 - arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 39 -- arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 35 -- arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 35 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 37 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 37 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 35 -- arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 48 --- arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c | 35 -- arch/arm/mach-uniphier/pll/Makefile | 8 - arch/arm/mach-uniphier/pll/pll-init-sld8.c | 205 ---------- arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c | 22 -- arch/arm/mach-uniphier/sc64-regs.h | 19 + configs/uniphier_ld11_defconfig | 2 - configs/uniphier_ld20_defconfig | 2 - configs/uniphier_ld4_sld8_defconfig | 2 - configs/uniphier_pro4_defconfig | 2 - configs/uniphier_pxs2_ld6b_defconfig | 2 - drivers/pinctrl/uniphier/Kconfig | 6 + drivers/pinctrl/uniphier/Makefile | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 20 +- drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c | 128 ++++++ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 5 +- 62 files changed, 1185 insertions(+), 894 deletions(-) create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld20.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld4.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-pro4.c rename arch/arm/mach-uniphier/{pll/pll-init-sld3.c => clk/dpll-sld3.c} (74%) create mode 100644 arch/arm/mach-uniphier/clk/dpll-sld8.c rename arch/arm/mach-uniphier/{pll/pll-spectrum-ld4.c => clk/dpll-tail.c} (72%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld11.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld20.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld4.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pro5.c (100%) rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pxs2.c (100%) create mode 100644 arch/arm/mach-uniphier/clk/pll-base-ld20.c create mode 100644 arch/arm/mach-uniphier/clk/pll-ld20.c rename arch/arm/mach-uniphier/{pll/pll-init-ld4.c => clk/pll-ld4.c} (78%) rename arch/arm/mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} (72%) create mode 100644 arch/arm/mach-uniphier/clk/pll-sld3.c create mode 100644 arch/arm/mach-uniphier/clk/pll.h delete mode 100644 arch/arm/mach-uniphier/early-clk/Makefile delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c create mode 100644 arch/arm/mach-uniphier/pinctrl-glue.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c delete mode 100644 arch/arm/mach-uniphier/pll/Makefile delete mode 100644 arch/arm/mach-uniphier/pll/pll-init-sld8.c delete mode 100644 arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c -- 1.9.1

1 16