[U-Boot] [PATCH v3 00/48] Kconfig: Convert commands (D to L) to Kconfig
This series moves more commands to Kconfig.
There are two points of note:
- A patch is included to drop the whole digital thermometer and thermostat (DTT) subsystem. It has been replaced with UCLASS_THERMAL and boards should be using that instead.
- Also included is a patch to drop three-wire serial (TWS) support. This is only used by one board and does not support driver model.
These two patches can be applied now, or delayed until a better time.
Changes in v3: - Drop CMD_HASH for boards which don't define CHAIN_OF_TRUST - Add 'imply CMD_HASH' for CHAIN_OF_TRUST
Changes in v2: - Reword to indicate this option is being dropped - Change 'default y if MPC85xx' to 'default y' - Fix defconfig ordering in controlcenterd_TRAILBLAZER boards - Add 'default y if CHAIN_OF_TRUST' to drop defconfig options - Imply CMD_TIME on x86 to remove defconfig changes - Update commit message to explain why we can't 'default y if VIDEO' - Add depends on !ARM && !MIPS && !SH - Enable for all PPC boards, and explicitly disable those that don't want it - Enable for microblaze - Add new patch to enable CMD_GETTIME on sandbox
Simon Glass (48): configs: Re-sync Kconfig: Drop CONFIG_CMD_DS4510_INFO Kconfig: Drop CONFIG_CMD_DS4510_MEM Kconfig: Drop CONFIG_CMD_DS4510_RST Kconfig: Drop CONFIG_CMD_DS4510 Convert CONFIG_DS4510 to Kconfig Kconfig: Drop CONFIG_SYS_I2C_DTT_ADDR Drop three-wire serial (TWS) support Drop digital thermometer and thermostat (DTT) drivers Kconfig: Drop CONFIG_SYS_I2C_DS1621_ADDR Kconfig: Drop CONFIG_SYS_I2C_DS4510_ADDR Convert CONFIG_CMD_ECCTEST to Kconfig Convert CONFIG_CMD_EECONFIG to Kconfig Convert CONFIG_CMD_EEPROM et al to Kconfig Convert CONFIG_CMD_ENTERRCM to Kconfig Kconfig: Drop CONFIG_CMD_ENV Convert CONFIG_CMD_ENV_CALLBACK to Kconfig Convert CONFIG_CMD_ENV_FLAGS to Kconfig Convert CONFIG_CMD_ERRATA to Kconfig Convert CONFIG_CMD_ESBC_VALIDATE to Kconfig Convert CONFIG_CMD_ETHSW to Kconfig Convert CONFIG_CMD_FDC to Kconfig Kconfig: Drop CONFIG_CMD_FDT_MAX_DUMP Convert CONFIG_CMD_FPGAD to Kconfig Convert CONFIG_CMD_FPGA_LOADBP et al to Kconfig Convert CONFIG_CMD_FUSE to Kconfig Convert CONFIG_CMD_GETTIME to Kconfig Convert CONFIG_CMD_GSC to Kconfig Convert CONFIG_CMD_HASH to Kconfig Kconfig: Add CONFIG_HASH to enable hashing API Convert CONFIG_CMD_HD44760 to Kconfig Convert CONFIG_CMD_HDMIDETECT to Kconfig Convert CONFIG_CMD_IDE to Kconfig Kconfig: Add a CONFIG_IDE option Convert CONFIG_CMD_IMMAP to Kconfig Kconfig: Drop CONFIG_CMD_IMXOTP Kconfig: Drop CONFIG_CMD_IMX_FUSE Convert CONFIG_CMD_IO to Kconfig Convert CONFIG_CMD_IOLOOP to Kconfig Convert CONFIG_CMD_IOTRACE to Kconfig Convert CONFIG_CMD_JFFS2 to Kconfig fs: Kconfig: Add a separate option for FS_JFFS2 Convert CONFIG_CMD_IRQ to Kconfig Convert CONFIG_CMD_KGDB to Kconfig Kconfig: Drop CONFIG_CMD_LOADY Convert CONFIG_LZMA to Kconfig Convert CONFIG_CMD_LZMADEC to Kconfig sandbox: Enable CMD_GETTIME
README | 78 +------ api/api_storage.c | 2 +- arch/Kconfig | 12 ++ arch/arm/Kconfig | 2 + arch/arm/cpu/armv7/mx6/Kconfig | 1 + arch/arm/cpu/armv7/mx7/Kconfig | 2 + arch/arm/imx-common/Kconfig | 6 + arch/arm/include/asm/fsl_secure_boot.h | 2 - arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-kirkwood/include/mach/config.h | 6 +- arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 1 + arch/arm/mach-tegra/Kconfig | 16 ++ arch/powerpc/Kconfig | 3 + arch/powerpc/cpu/mpc5xxx/ide.c | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 32 +++ arch/powerpc/cpu/ppc4xx/Kconfig | 6 + arch/powerpc/include/asm/fsl_secure_boot.h | 1 - arch/powerpc/lib/Kconfig | 8 + arch/powerpc/lib/Makefile | 3 +- {cmd => arch/powerpc/lib}/immap.c | 0 board/freescale/common/Kconfig | 10 + board/freescale/m5253demo/m5253demo.c | 4 +- board/freescale/m5253evbe/m5253evbe.c | 4 +- board/freescale/m54455evb/m54455evb.c | 2 +- board/gateworks/gw_ventana/Kconfig | 13 ++ board/gdsys/405ep/dlvision-10g.c | 10 +- board/gdsys/405ep/io.c | 10 +- board/gdsys/405ep/neo.c | 10 +- board/gdsys/405ex/io64.c | 10 +- board/gdsys/mpc8308/Kconfig | 5 + board/intercontrol/digsy_mtc/digsy_mtc.c | 4 +- board/jupiter/jupiter.c | 2 +- board/phytec/pcm030/pcm030.c | 4 +- board/tqc/tqm5200/tqm5200.c | 2 +- board/v38b/v38b.c | 2 +- board/work-microwave/work_92105/Kconfig | 5 + .../work-microwave/work_92105/work_92105_display.c | 2 +- cmd/Kconfig | 225 +++++++++++++++++++++ cmd/Makefile | 4 - cmd/cramfs.c | 4 +- cmd/dtt.c | 120 ----------- cmd/eeprom.c | 4 - cmd/fdt.c | 8 +- cmd/pcmcia.c | 2 +- common/Kconfig | 12 ++ common/Makefile | 3 +- common/board_r.c | 10 +- common/hash.c | 4 +- configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 2 + configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5253EVBE_defconfig | 1 + configs/M54455EVB_a66_defconfig | 2 + configs/M54455EVB_defconfig | 2 + configs/M54455EVB_i66_defconfig | 2 + configs/M54455EVB_intel_defconfig | 2 + configs/M54455EVB_stm33_defconfig | 2 + configs/MIP405T_defconfig | 3 + configs/MIP405_defconfig | 3 + configs/MPC8323ERDB_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MiniFAP_defconfig | 2 + configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 3 + configs/PLU405_defconfig | 2 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/Sinovoip_BPI_M2_Plus_defconfig | 1 - configs/T1040D4RDB_NAND_defconfig | 1 + configs/T1040D4RDB_SDCARD_defconfig | 1 + configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1040D4RDB_SPIFLASH_defconfig | 1 + configs/T1040D4RDB_defconfig | 1 + configs/T1040QDS_DDR4_defconfig | 1 + configs/T1040QDS_SECURE_BOOT_defconfig | 1 + configs/T1040QDS_defconfig | 1 + configs/T1040RDB_NAND_defconfig | 1 + configs/T1040RDB_SDCARD_defconfig | 1 + configs/T1040RDB_SECURE_BOOT_defconfig | 1 + configs/T1040RDB_SPIFLASH_defconfig | 1 + configs/T1040RDB_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 2 + configs/TQM5200S_defconfig | 2 + configs/TQM5200_B_HIGHBOOT_defconfig | 2 + configs/TQM5200_B_defconfig | 2 + configs/TQM5200_STK100_defconfig | 2 + configs/TQM5200_defconfig | 2 + configs/TQM823L_LCD_defconfig | 3 + configs/TQM823L_defconfig | 3 + configs/TQM823M_defconfig | 3 + configs/TQM834x_defconfig | 2 + configs/TQM850L_defconfig | 3 + configs/TQM850M_defconfig | 3 + configs/TQM855L_defconfig | 3 + configs/TQM855M_defconfig | 4 + configs/TQM860L_defconfig | 3 + configs/TQM860M_defconfig | 3 + configs/TQM862L_defconfig | 3 + configs/TQM862M_defconfig | 3 + configs/TQM866M_defconfig | 4 + configs/TQM885D_defconfig | 3 + configs/TTTech_defconfig | 3 + configs/TWR-P1025_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/ac14xx_defconfig | 2 + configs/acadia_defconfig | 1 + configs/am335x_baltos_defconfig | 5 +- configs/am335x_evm_defconfig | 1 - configs/am335x_hs_evm_defconfig | 3 - configs/am335x_igep003x_defconfig | 6 +- configs/am335x_shc_defconfig | 4 +- configs/am335x_shc_ict_defconfig | 4 +- configs/am335x_shc_netboot_defconfig | 4 +- configs/am335x_shc_prompt_defconfig | 4 +- configs/am335x_shc_sdboot_defconfig | 4 +- configs/am335x_shc_sdboot_prompt_defconfig | 4 +- configs/am335x_sl50_defconfig | 5 +- configs/am3517_crane_defconfig | 1 + configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/ap325rxa_defconfig | 1 + configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/apf27_defconfig | 1 + configs/arches_defconfig | 1 + configs/aria_defconfig | 2 + configs/astro_mcf5373l_defconfig | 2 + configs/at91sam9263ek_norflash_boot_defconfig | 2 +- configs/at91sam9263ek_norflash_defconfig | 2 +- configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/birdland_bav335a_defconfig | 3 +- configs/birdland_bav335b_defconfig | 3 +- configs/bk4r1_defconfig | 1 + configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/bubinga_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/canmb_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/charon_defconfig | 2 + configs/chiliboard_defconfig | 4 +- configs/chromebook_minnie_defconfig | 2 +- configs/cl-som-am57x_defconfig | 1 + configs/cm5200_defconfig | 1 + configs/cm_fx6_defconfig | 3 +- configs/cm_t335_defconfig | 3 +- configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 3 +- configs/cm_t54_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + configs/colibri_imx7_defconfig | 2 +- configs/colibri_vf_defconfig | 3 +- configs/comtrend_ar5387un_ram_defconfig | 65 +++--- configs/comtrend_vr3032u_ram_defconfig | 66 +++--- .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_defconfig | 1 + .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 + configs/controlcenterd_TRAILBLAZER_defconfig | 2 + configs/coreboot-x86_defconfig | 1 + configs/d2net_v2_defconfig | 2 + configs/dbau1000_defconfig | 1 + configs/dbau1100_defconfig | 1 + configs/dbau1500_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dns325_defconfig | 2 + configs/dockstar_defconfig | 1 + configs/dra7xx_evm_defconfig | 11 +- configs/dra7xx_hs_evm_defconfig | 8 +- configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/ethernut5_defconfig | 1 + configs/evb-ast2500_defconfig | 12 +- configs/evb-rk3399_defconfig | 5 +- configs/firefly-rk3399_defconfig | 1 - configs/fo300_defconfig | 2 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/goflexhome_defconfig | 2 + configs/grasshopper_defconfig | 1 + configs/guruplug_defconfig | 3 + configs/gwventana_emmc_defconfig | 5 +- configs/gwventana_gw5904_defconfig | 5 +- configs/gwventana_nand_defconfig | 5 +- configs/haleakala_defconfig | 1 + configs/hrcon_defconfig | 2 + configs/hrcon_dh_defconfig | 2 + configs/huawei_hg556a_ram_defconfig | 67 +++--- configs/ib62x0_defconfig | 3 + configs/icon_defconfig | 1 + configs/iconnect_defconfig | 2 + configs/ids8313_defconfig | 2 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/imx6dl_icore_mmc_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_mmc_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/inetspace_v2_defconfig | 2 + configs/inka4x0_defconfig | 2 +- configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/iocon_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/k2e_evm_defconfig | 5 +- configs/k2e_hs_evm_defconfig | 3 +- configs/k2g_evm_defconfig | 4 +- configs/k2g_hs_evm_defconfig | 5 +- configs/k2hk_evm_defconfig | 4 +- configs/k2hk_hs_evm_defconfig | 3 +- configs/k2l_evm_defconfig | 4 +- configs/katmai_defconfig | 2 + configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 2 + configs/km_kirkwood_defconfig | 2 + configs/km_kirkwood_pci_defconfig | 2 + configs/kmcoge4_defconfig | 3 + configs/kmcoge5ne_defconfig | 3 + configs/kmcoge5un_defconfig | 2 + configs/kmeter1_defconfig | 3 + configs/kmlion1_defconfig | 3 + configs/kmnusa_defconfig | 2 + configs/kmopti2_defconfig | 3 + configs/kmsugp1_defconfig | 2 + configs/kmsupx5_defconfig | 3 + configs/kmsuv31_defconfig | 2 + configs/kmtegr1_defconfig | 3 + configs/kmtepr2_defconfig | 3 + configs/kmvect1_defconfig | 3 + configs/ls1012aqds_qspi_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/m53evk_defconfig | 2 +- configs/makalu_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mecp5123_defconfig | 2 + configs/mgcoge3ne_defconfig | 3 + configs/mgcoge3un_defconfig | 2 + configs/mgcoge_defconfig | 3 + configs/microblaze-generic_defconfig | 1 + configs/motionpro_defconfig | 3 + configs/mpc5121ads_defconfig | 3 + configs/mpc5121ads_rev2_defconfig | 3 + configs/ms7720se_defconfig | 1 + configs/ms7722se_defconfig | 1 + configs/mt_ventoux_defconfig | 2 + configs/munices_defconfig | 1 + configs/mvebu_db-88f7040-nand_defconfig | 7 +- configs/mx51evk_defconfig | 3 +- configs/mx53cx9020_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/mx6cuboxi_defconfig | 3 +- configs/mx6qsabrelite_defconfig | 1 + configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx7dsabresd_defconfig | 2 +- configs/mx7dsabresd_secure_defconfig | 2 +- configs/nanopi_neo_air_defconfig | 2 +- configs/nanopi_neo_defconfig | 2 +- configs/nas220_defconfig | 2 + configs/net2big_v2_defconfig | 2 + configs/netspace_lite_v2_defconfig | 2 + configs/netspace_max_v2_defconfig | 2 + configs/netspace_mini_v2_defconfig | 2 + configs/netspace_v2_defconfig | 2 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 4 +- configs/nsa310s_defconfig | 3 + configs/omap3_evm_defconfig | 1 + configs/openrd_base_defconfig | 2 + configs/openrd_client_defconfig | 2 + configs/openrd_ultimate_defconfig | 2 + configs/opos6uldev_defconfig | 2 +- configs/orangepi_2_defconfig | 1 - configs/orangepi_lite_defconfig | 1 - configs/orangepi_one_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_pc_defconfig | 1 - configs/orangepi_pc_plus_defconfig | 1 - configs/orangepi_plus2e_defconfig | 1 - configs/orangepi_plus_defconfig | 1 - configs/orangepi_zero_defconfig | 2 +- configs/ot1200_defconfig | 1 + configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pcm051_rev1_defconfig | 3 +- configs/pcm051_rev3_defconfig | 3 +- configs/pcm052_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/pengwyn_defconfig | 3 +- configs/pepper_defconfig | 2 +- configs/pine64_plus_defconfig | 1 - configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 2 + configs/pxm2_defconfig | 2 +- configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/qemu_mips64_defconfig | 2 + configs/qemu_mips64el_defconfig | 2 + configs/qemu_mips_defconfig | 2 + configs/qemu_mipsel_defconfig | 2 + configs/r2dplus_defconfig | 1 + configs/r7780mp_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/rut_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 4 +- configs/sama5d2_xplained_spiflash_defconfig | 2 +- configs/sandbox_defconfig | 12 +- configs/sandbox_noblk_defconfig | 7 +- configs/sandbox_spl_defconfig | 7 +- configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/sfr_nb4-ser_ram_defconfig | 67 +++--- configs/sh7763rdp_defconfig | 1 + configs/sheevaplug_defconfig | 3 + configs/socfpga_vining_fpga_defconfig | 1 + configs/stm32f746-disco_defconfig | 14 +- configs/strider_con_defconfig | 2 + configs/strider_con_dp_defconfig | 2 + configs/strider_cpu_defconfig | 2 + configs/strider_cpu_dp_defconfig | 2 + configs/suvd3_defconfig | 3 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 2 + configs/tbs2910_defconfig | 2 +- configs/tplink_wdr4300_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/tuge1_defconfig | 3 + configs/tuxx1_defconfig | 3 + configs/twister_defconfig | 1 + configs/usbarmory_defconfig | 1 + configs/v38b_defconfig | 2 + configs/vct_platinum_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 2 + configs/vct_platinum_onenand_small_defconfig | 1 + configs/vct_platinumavc_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 2 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_defconfig | 1 + configs/vct_premium_onenand_defconfig | 2 + configs/vct_premium_onenand_small_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + configs/walnut_defconfig | 1 + configs/wandboard_defconfig | 1 + configs/work_92105_defconfig | 2 + configs/wtk_defconfig | 3 + configs/x600_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 3 +- configs/xpedite1000_defconfig | 2 + configs/xpedite517x_defconfig | 3 + configs/xpedite520x_defconfig | 2 + configs/xpedite537x_defconfig | 3 + configs/xpedite550x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zipitz2_defconfig | 1 + configs/zynq_microzed_defconfig | 4 + configs/zynq_picozed_defconfig | 4 + configs/zynq_zc702_defconfig | 5 + configs/zynq_zc706_defconfig | 5 + configs/zynq_zc770_xm010_defconfig | 4 + configs/zynq_zc770_xm011_defconfig | 4 + configs/zynq_zc770_xm012_defconfig | 4 + configs/zynq_zc770_xm013_defconfig | 4 + configs/zynq_zed_defconfig | 4 + configs/zynq_zybo_defconfig | 5 + doc/README.JFFS2 | 3 + drivers/Kconfig | 2 - drivers/Makefile | 2 - drivers/block/Kconfig | 8 + drivers/block/Makefile | 1 + {common => drivers/block}/ide.c | 0 drivers/block/sil680.c | 2 +- drivers/hwmon/Kconfig | 0 drivers/hwmon/Makefile | 22 -- drivers/hwmon/adm1021.c | 164 --------------- drivers/hwmon/adt7460.c | 73 ------- drivers/hwmon/ds1621.c | 155 -------------- drivers/hwmon/ds1722.c | 137 ------------- drivers/hwmon/ds1775.c | 126 ------------ drivers/hwmon/ds620.c | 65 ------ drivers/hwmon/lm63.c | 160 --------------- drivers/hwmon/lm73.c | 146 ------------- drivers/hwmon/lm75.c | 143 ------------- drivers/hwmon/lm81.c | 111 ---------- drivers/misc/Kconfig | 8 + drivers/misc/ds4510.c | 53 +---- {include => drivers/misc}/ds4510.h | 10 - drivers/pcmcia/marubun_pcmcia.c | 2 +- drivers/pcmcia/mpc8xx_pcmcia.c | 2 +- drivers/pcmcia/tqm8xx_pcmcia.c | 2 +- drivers/rtc/Makefile | 1 - drivers/rtc/rtc4543.c | 101 --------- drivers/twserial/Makefile | 8 - drivers/twserial/soft_tws.c | 94 --------- fs/Makefile | 2 +- fs/fat/fat.c | 2 +- fs/jffs2/Kconfig | 7 + include/config_cmd_all.h | 12 -- include/config_distro_bootcmd.h | 6 +- include/config_fallbacks.h | 2 +- include/configs/B4860QDS.h | 4 - include/configs/BSC9131RDB.h | 4 - include/configs/BSC9132QDS.h | 4 - include/configs/C29XPCIE.h | 4 - include/configs/CPCI2DP.h | 2 - include/configs/CPCI4052.h | 3 - include/configs/M52277EVB.h | 1 - include/configs/M5253DEMO.h | 3 +- include/configs/M5253EVBE.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 2 - include/configs/MIP405.h | 4 - include/configs/MPC8323ERDB.h | 1 - include/configs/MPC8349ITX.h | 5 - include/configs/MPC8536DS.h | 2 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 2 - include/configs/P1010RDB.h | 4 - include/configs/P1022DS.h | 2 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 3 - include/configs/PATI.h | 2 - include/configs/PIP405.h | 4 - include/configs/PLU405.h | 3 - include/configs/PMC405DE.h | 2 - include/configs/PMC440.h | 22 -- include/configs/T102xQDS.h | 4 - include/configs/T102xRDB.h | 4 - include/configs/T1040QDS.h | 5 - include/configs/T104xRDB.h | 4 - include/configs/T208xQDS.h | 3 - include/configs/T208xRDB.h | 2 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 3 - include/configs/TQM5200.h | 2 - include/configs/TQM823L.h | 2 - include/configs/TQM823M.h | 2 - include/configs/TQM834x.h | 10 - include/configs/TQM850L.h | 2 - include/configs/TQM850M.h | 2 - include/configs/TQM855L.h | 2 - include/configs/TQM855M.h | 3 - include/configs/TQM860L.h | 2 - include/configs/TQM860M.h | 2 - include/configs/TQM862L.h | 2 - include/configs/TQM862M.h | 2 - include/configs/TQM866M.h | 3 - include/configs/TQM885D.h | 2 - include/configs/UCP1020.h | 24 --- include/configs/VOM405.h | 2 - include/configs/a4m072.h | 1 - include/configs/ac14xx.h | 3 - include/configs/acadia.h | 9 - include/configs/advantech_dms-ba16.h | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/amcc-common.h | 2 - include/configs/ap121.h | 1 - include/configs/ap143.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/ap_sh4a_4a.h | 1 - include/configs/apalis_imx6.h | 2 - include/configs/apf27.h | 2 - include/configs/aria.h | 3 - include/configs/astro_mcf5373l.h | 4 - include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/bcm_ep_board.h | 1 - include/configs/calimain.h | 1 - include/configs/canmb.h | 1 - include/configs/canyonlands.h | 15 -- include/configs/cl-som-am57x.h | 2 - include/configs/clearfog.h | 1 - include/configs/cm5200.h | 1 - include/configs/cm_fx6.h | 4 - include/configs/cm_t335.h | 4 - include/configs/cm_t35.h | 4 - include/configs/cm_t3517.h | 4 - include/configs/cm_t43.h | 4 - include/configs/cm_t54.h | 4 - include/configs/colibri_imx6.h | 2 - include/configs/colibri_pxa270.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/controlcenterd.h | 3 - include/configs/controlcenterdc.h | 1 - include/configs/corenet_ds.h | 3 - include/configs/cyrus.h | 2 - include/configs/da850evm.h | 2 - include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dbau1x00.h | 6 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 1 - include/configs/digsy_mtc.h | 2 - include/configs/dlvision-10g.h | 10 - include/configs/dlvision.h | 3 - include/configs/dns325.h | 2 - include/configs/dockstar.h | 2 - include/configs/dragonboard410c.h | 1 - include/configs/ds414.h | 1 - include/configs/ea20.h | 2 - include/configs/ecovec.h | 1 - include/configs/edb93xx.h | 1 - include/configs/edminiv2.h | 3 +- include/configs/espt.h | 1 - include/configs/ethernut5.h | 1 - include/configs/exynos5-common.h | 5 - include/configs/gdppc440etx.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/goflexhome.h | 2 - include/configs/grasshopper.h | 1 - include/configs/gw_ventana.h | 4 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 3 - include/configs/ib62x0.h | 6 +- include/configs/iconnect.h | 3 - include/configs/ids8313.h | 3 - include/configs/imx27lite-common.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/inka4x0.h | 81 -------- include/configs/intip.h | 8 - include/configs/io.h | 8 - include/configs/io64.h | 9 - include/configs/iocon.h | 3 - include/configs/ipam390.h | 1 - include/configs/ipek01.h | 2 - include/configs/katmai.h | 26 --- include/configs/kilauea.h | 5 - include/configs/km/keymile-common.h | 3 - include/configs/km/km-powerpc.h | 1 - include/configs/km/km83xx-common.h | 7 - include/configs/km/kmp204x-common.h | 1 - include/configs/km82xx.h | 7 - include/configs/lacie_kw.h | 3 - include/configs/ls1012a_common.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1021aiot.h | 3 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 4 - include/configs/ls1046a_common.h | 4 - include/configs/ls2080a_common.h | 2 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lsxl.h | 4 +- include/configs/lwmon5.h | 2 - include/configs/makalu.h | 6 - include/configs/malta.h | 1 - include/configs/maxbcm.h | 1 - include/configs/mcx.h | 1 - include/configs/mecp5123.h | 3 - include/configs/meson-gxbb-common.h | 2 - include/configs/microblaze-generic.h | 3 - include/configs/motionpro.h | 4 - include/configs/mpc5121ads.h | 8 +- include/configs/ms7720se.h | 1 - include/configs/ms7722se.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/munices.h | 1 - include/configs/mv-common.h | 1 - include/configs/mv-plug-common.h | 3 - include/configs/mx51evk.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/mx7_common.h | 1 - include/configs/nas220.h | 2 - include/configs/neo.h | 10 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 2 - include/configs/nsa310s.h | 6 +- include/configs/odroid_xu3.h | 1 - include/configs/omap3_evm.h | 2 - include/configs/omapl138_lcdk.h | 2 - include/configs/openrd.h | 2 - include/configs/ot1200.h | 2 - include/configs/p1_p2_rdb_pc.h | 2 - include/configs/p1_twr.h | 2 - include/configs/pb1x00.h | 2 - include/configs/pcm030.h | 1 - include/configs/pcm051.h | 1 - include/configs/pcm052.h | 1 - include/configs/pcm058.h | 3 - include/configs/pdm360ng.h | 2 - include/configs/pengwyn.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pogo_e02.h | 2 - include/configs/qemu-mips.h | 4 - include/configs/qemu-mips64.h | 4 - include/configs/qemu-ppce500.h | 1 - include/configs/qemu-x86.h | 5 +- include/configs/r0p7734.h | 1 - include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 5 +- include/configs/s32v234evb.h | 1 - include/configs/sandbox.h | 10 - include/configs/sequoia.h | 9 - include/configs/sh7763rdp.h | 1 - include/configs/sheevaplug.h | 4 +- include/configs/shmin.h | 1 - include/configs/socfpga_vining_fpga.h | 2 - include/configs/socrates.h | 9 - include/configs/spear-common.h | 1 - include/configs/strider.h | 3 - include/configs/t3corp.h | 1 - include/configs/t4qds.h | 2 - include/configs/tam3517-common.h | 1 - include/configs/tbs2910.h | 1 - include/configs/tegra-common.h | 2 - include/configs/theadorable.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/topic_miami.h | 4 - include/configs/tplink_wdr4300.h | 1 - include/configs/tqma6.h | 11 - include/configs/tqma6_mba6.h | 2 - include/configs/tqma6_wru4.h | 4 - include/configs/tricorder.h | 3 - include/configs/usbarmory.h | 1 - include/configs/v38b.h | 3 - include/configs/vct.h | 6 - include/configs/vexpress_aemv8a.h | 1 - include/configs/vf610twr.h | 1 - include/configs/vme8349.h | 4 - include/configs/wandboard.h | 1 - include/configs/work_92105.h | 10 - include/configs/x600.h | 2 - include/configs/x86-common.h | 4 - include/configs/xilinx-ppc.h | 5 - include/configs/xilinx_zynqmp.h | 2 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite1000.h | 3 - include/configs/xpedite517x.h | 24 --- include/configs/xpedite520x.h | 2 - include/configs/xpedite537x.h | 22 -- include/configs/xpedite550x.h | 5 - include/configs/yosemite.h | 9 - include/configs/zipitz2.h | 2 - include/configs/zynq-common.h | 5 - include/configs/zynq_zybo.h | 1 - include/dtt.h | 47 ----- include/i2c.h | 3 - include/pcmcia.h | 4 +- include/tws.h | 21 -- lib/Kconfig | 8 + scripts/config_whitelist.txt | 71 ------- 733 files changed, 1237 insertions(+), 3127 deletions(-) create mode 100644 arch/powerpc/lib/Kconfig rename {cmd => arch/powerpc/lib}/immap.c (100%) delete mode 100644 cmd/dtt.c rename {common => drivers/block}/ide.c (100%) delete mode 100644 drivers/hwmon/Kconfig delete mode 100644 drivers/hwmon/Makefile delete mode 100644 drivers/hwmon/adm1021.c delete mode 100644 drivers/hwmon/adt7460.c delete mode 100644 drivers/hwmon/ds1621.c delete mode 100644 drivers/hwmon/ds1722.c delete mode 100644 drivers/hwmon/ds1775.c delete mode 100644 drivers/hwmon/ds620.c delete mode 100644 drivers/hwmon/lm63.c delete mode 100644 drivers/hwmon/lm73.c delete mode 100644 drivers/hwmon/lm75.c delete mode 100644 drivers/hwmon/lm81.c rename {include => drivers/misc}/ds4510.h (75%) delete mode 100644 drivers/rtc/rtc4543.c delete mode 100644 drivers/twserial/Makefile delete mode 100644 drivers/twserial/soft_tws.c delete mode 100644 include/dtt.h delete mode 100644 include/tws.h
Run moveconfig.py -s to get defconfig files back in sync.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
configs/Sinovoip_BPI_M2_Plus_defconfig | 1 - configs/am335x_baltos_defconfig | 4 +- configs/am335x_evm_defconfig | 1 - configs/am335x_hs_evm_defconfig | 3 -- configs/am335x_igep003x_defconfig | 6 +-- configs/am335x_shc_defconfig | 4 +- configs/am335x_shc_ict_defconfig | 4 +- configs/am335x_shc_netboot_defconfig | 4 +- configs/am335x_shc_prompt_defconfig | 4 +- configs/am335x_shc_sdboot_defconfig | 4 +- configs/am335x_shc_sdboot_prompt_defconfig | 4 +- configs/am335x_sl50_defconfig | 4 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 4 +- configs/am57xx_hs_evm_defconfig | 4 +- configs/at91sam9263ek_norflash_boot_defconfig | 2 +- configs/at91sam9263ek_norflash_defconfig | 2 +- configs/birdland_bav335a_defconfig | 2 +- configs/birdland_bav335b_defconfig | 2 +- configs/brppt1_mmc_defconfig | 2 +- configs/brppt1_nand_defconfig | 2 +- configs/brppt1_spi_defconfig | 2 +- configs/brxre1_defconfig | 2 +- configs/chiliboard_defconfig | 4 +- configs/chromebook_minnie_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/cm_t335_defconfig | 2 +- configs/cm_t43_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- configs/colibri_vf_defconfig | 2 +- configs/comtrend_ar5387un_ram_defconfig | 65 ++++++++++------------- configs/comtrend_vr3032u_ram_defconfig | 66 ++++++++++------------- configs/dra7xx_evm_defconfig | 11 ++-- configs/dra7xx_hs_evm_defconfig | 8 ++- configs/evb-ast2500_defconfig | 12 ++--- configs/evb-rk3399_defconfig | 5 +- configs/firefly-rk3399_defconfig | 1 - configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/huawei_hg556a_ram_defconfig | 67 ++++++++++-------------- configs/imx6dl_icore_mmc_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_mmc_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/k2e_evm_defconfig | 5 +- configs/k2e_hs_evm_defconfig | 3 +- configs/k2g_evm_defconfig | 4 +- configs/k2g_hs_evm_defconfig | 5 +- configs/k2hk_evm_defconfig | 4 +- configs/k2hk_hs_evm_defconfig | 3 +- configs/k2l_evm_defconfig | 4 +- configs/m53evk_defconfig | 2 +- configs/mvebu_db-88f7040-nand_defconfig | 7 ++- configs/mx51evk_defconfig | 2 +- configs/mx53cx9020_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx7dsabresd_defconfig | 2 +- configs/mx7dsabresd_secure_defconfig | 2 +- configs/nanopi_neo_air_defconfig | 2 +- configs/nanopi_neo_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/orangepi_2_defconfig | 1 - configs/orangepi_lite_defconfig | 1 - configs/orangepi_one_defconfig | 1 - configs/orangepi_pc2_defconfig | 1 - configs/orangepi_pc_defconfig | 1 - configs/orangepi_pc_plus_defconfig | 1 - configs/orangepi_plus2e_defconfig | 1 - configs/orangepi_plus_defconfig | 1 - configs/orangepi_zero_defconfig | 2 +- configs/pcm051_rev1_defconfig | 2 +- configs/pcm051_rev3_defconfig | 2 +- configs/pengwyn_defconfig | 2 +- configs/pepper_defconfig | 2 +- configs/pine64_plus_defconfig | 1 - configs/pxm2_defconfig | 2 +- configs/rut_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 4 +- configs/sama5d2_xplained_spiflash_defconfig | 2 +- configs/sandbox_defconfig | 8 +-- configs/sandbox_noblk_defconfig | 4 +- configs/sandbox_spl_defconfig | 4 +- configs/sfr_nb4-ser_ram_defconfig | 67 ++++++++++-------------- configs/stm32f746-disco_defconfig | 14 ++--- configs/tbs2910_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 2 +- 95 files changed, 227 insertions(+), 306 deletions(-)
diff --git a/configs/Sinovoip_BPI_M2_Plus_defconfig b/configs/Sinovoip_BPI_M2_Plus_defconfig index e8cd4fb9ec..651a2ff4ce 100644 --- a/configs/Sinovoip_BPI_M2_Plus_defconfig +++ b/configs/Sinovoip_BPI_M2_Plus_defconfig @@ -8,7 +8,6 @@ CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index dfbb812d65..186aa7b074 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -10,9 +10,8 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SPL_FAT_SUPPORT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="NAND" @@ -24,6 +23,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index c3237f51e4..962bb65443 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -48,4 +48,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_RSA=y -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 73c9d012fd..435862b71c 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y @@ -54,6 +53,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_USE_TINY_PRINTF=y CONFIG_RSA=y -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index fa468f05e7..9d36cb7a07 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -3,17 +3,16 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_AM33XX=y CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_AM33XX=y CONFIG_TARGET_AM335X_IGEP003X=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SPL_FAT_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0033" CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -23,6 +22,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/am335x_shc_defconfig b/configs/am335x_shc_defconfig index 1068678a7c..aab5b47737 100644 --- a/configs/am335x_shc_defconfig +++ b/configs/am335x_shc_defconfig @@ -9,10 +9,9 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -20,6 +19,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot# " diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig index 85b24a548a..ddd3005e2d 100644 --- a/configs/am335x_shc_ict_defconfig +++ b/configs/am335x_shc_ict_defconfig @@ -9,11 +9,10 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SHC_ICT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -21,6 +20,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig index 9117407065..83ec41f7fa 100644 --- a/configs/am335x_shc_netboot_defconfig +++ b/configs/am335x_shc_netboot_defconfig @@ -9,11 +9,10 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SHC_NETBOOT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -22,6 +21,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/am335x_shc_prompt_defconfig b/configs/am335x_shc_prompt_defconfig index e71e54b3f5..180314c57a 100644 --- a/configs/am335x_shc_prompt_defconfig +++ b/configs/am335x_shc_prompt_defconfig @@ -9,10 +9,9 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -20,6 +19,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n" diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig index bd66fbc7b1..215e3247df 100644 --- a/configs/am335x_shc_sdboot_defconfig +++ b/configs/am335x_shc_sdboot_defconfig @@ -9,11 +9,10 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SHC_SDBOOT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -21,6 +20,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/am335x_shc_sdboot_prompt_defconfig b/configs/am335x_shc_sdboot_prompt_defconfig index bd66fbc7b1..215e3247df 100644 --- a/configs/am335x_shc_sdboot_prompt_defconfig +++ b/configs/am335x_shc_sdboot_prompt_defconfig @@ -9,11 +9,10 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y CONFIG_SHC_SDBOOT=y CONFIG_SERIES=y -CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -21,6 +20,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_SYS_PROMPT="U-Boot# " CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 994540d6f0..d3cdbdd229 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -9,9 +9,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SPL_FAT_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -22,6 +21,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 4d9ec8841f..b175388d40 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_AM43XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_AM43XX_EVM=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 6f3cb516fd..2a581b18bd 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_AM43XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_AM43XX_EVM=y CONFIG_ISW_ENTRY_ADDR=0x403018e0 diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 5dc9f4fdce..23ddce997b 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -1,14 +1,14 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OMAP54XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_AM57XX_EVM=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 517f7505db..8d30467b67 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OMAP54XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_AM57XX_EVM=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 @@ -11,8 +11,8 @@ CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000 # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 21480c5d07..7f3d937e45 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_MTD_NOR_FLASH=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y @@ -43,7 +44,6 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y -CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index 824c366c44..63dffd8e3a 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y CONFIG_AT91_GPIO=y CONFIG_DM_MMC=y CONFIG_GENERIC_ATMEL_MCI=y +CONFIG_MTD_NOR_FLASH=y CONFIG_DM_ETH=y CONFIG_MACB=y CONFIG_PINCTRL=y @@ -43,7 +44,6 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y -CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 17c6008669..680a88cde5 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_BAV_VERSION=1 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -21,6 +20,7 @@ CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 225271cd96..ac04004cf3 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_BAV_VERSION=2 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -21,6 +20,7 @@ CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 1bdbf90495..9b3b459cf9 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_BRPPT1=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" CONFIG_BOOTDELAY=-2 @@ -23,6 +22,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index ed7432d7f4..29cd8a21e1 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_BRPPT1=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" CONFIG_BOOTDELAY=-2 @@ -23,6 +22,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 02b5ff60e2..d7ad0138dd 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -9,7 +9,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT" CONFIG_SPI_BOOT=y @@ -26,6 +25,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 940793b5a6..f2b5e757ce 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_BOOTDELAY=-2 # CONFIG_CONSOLE_MUX is not set @@ -20,6 +19,7 @@ CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x300 CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 2f4c694a0a..d8b0106bc6 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -9,14 +9,14 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SPL_FAT_SUPPORT=y CONFIG_BOOTDELAY=1 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index ef333c0011..09f7ec3d2f 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -72,8 +72,8 @@ CONFIG_SYSRESET=y CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_ROCKCHIP=y -CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_DISPLAY_ROCKCHIP_EDP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 5a371c7e81..f7af33f0bf 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -9,8 +9,8 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_BOOTDELAY=3 diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 4d0d03e68b..dd84e81f65 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -11,13 +11,13 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index 6ef980ab69..c3b84cc796 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set @@ -21,6 +20,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x480 CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T43 # " CONFIG_CMD_BOOTZ=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index d5838acbcc..2ba6aea312 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -2,9 +2,9 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX7=y CONFIG_TARGET_COLIBRI_IMX7=y +CONFIG_VIDEO=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y -CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" CONFIG_BOOTDELAY=1 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index b69ce65224..8be632fb8e 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y -CONFIG_TARGET_COLIBRI_VF=y CONFIG_VIDEO=y +CONFIG_TARGET_COLIBRI_VF=y CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" CONFIG_BOOTDELAY=1 diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig index 5b05fd20d7..7b5b7ccac0 100644 --- a/configs/comtrend_ar5387un_ram_defconfig +++ b/configs/comtrend_ar5387un_ram_defconfig @@ -1,54 +1,43 @@ +CONFIG_MIPS=y +CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_ARCH_BMIPS=y -CONFIG_BAUDRATE=115200 -CONFIG_BCM6328_POWER_DOMAIN=y -CONFIG_BCM6345_CLK=y -CONFIG_BCM6345_SERIAL=y -CONFIG_BMIPS_BOOT_RAM=y -CONFIG_BOARD_COMTREND_AR5387UN=y -# CONFIG_CMD_BOOTD is not set -CONFIG_CMD_BOOTM=y +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set +CONFIG_MIPS_BOOT_FDT=y +CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5387un" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_DISPLAY_CPUINFO=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="AR-5387un # " CONFIG_CMD_CPU=y -# CONFIG_CMD_CRC32 is not set -# CONFIG_CMD_EDITENV is not set +CONFIG_CMD_LICENSE=y +# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_ELF is not set -# CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_GPIO is not set # CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_LED=y -CONFIG_CMD_LICENSE=y -CONFIG_CMD_LOADB=y -# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_MISC is not set +# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_XIMG is not set -CONFIG_DEFAULT_DEVICE_TREE="comtrend,ar-5387un" -CONFIG_DISPLAY_CPUINFO=y +# CONFIG_CMD_MISC is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y -CONFIG_DM_RESET=y -CONFIG_DM_SERIAL=y -CONFIG_HUSH_PARSER=y CONFIG_LED=y CONFIG_LED_BCM6328=y CONFIG_LED_BLINK=y -CONFIG_MIPS=y -# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set -# CONFIG_MIPS_BOOT_ENV_LEGACY is not set -CONFIG_MIPS_BOOT_FDT=y -CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_POWER_DOMAIN=y -CONFIG_RESET=y +CONFIG_BCM6328_POWER_DOMAIN=y +CONFIG_DM_RESET=y CONFIG_RESET_BCM6345=y -CONFIG_SOC_BMIPS_BCM6328=y # CONFIG_SPL_SERIAL_PRESENT is not set -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_NO_FLASH=y -CONFIG_SYS_PROMPT="AR-5387un # " -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_DM_SERIAL=y +CONFIG_BCM6345_SERIAL=y diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig index c056d73f18..97f1c6259e 100644 --- a/configs/comtrend_vr3032u_ram_defconfig +++ b/configs/comtrend_vr3032u_ram_defconfig @@ -1,54 +1,44 @@ +CONFIG_MIPS=y +CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_ARCH_BMIPS=y -CONFIG_BAUDRATE=115200 -CONFIG_BCM6328_POWER_DOMAIN=y -CONFIG_BCM6345_CLK=y -CONFIG_BCM6345_SERIAL=y -CONFIG_BMIPS_BOOT_RAM=y -CONFIG_BOARD_COMTREND_VR3032U=y -# CONFIG_CMD_BOOTD is not set -CONFIG_CMD_BOOTM=y +CONFIG_SOC_BMIPS_BCM63268=y +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set +CONFIG_MIPS_BOOT_FDT=y +CONFIG_DEFAULT_DEVICE_TREE="comtrend,vr-3032u" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_DISPLAY_CPUINFO=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="VR-3032u # " CONFIG_CMD_CPU=y -# CONFIG_CMD_CRC32 is not set -# CONFIG_CMD_EDITENV is not set +CONFIG_CMD_LICENSE=y +# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_ELF is not set -# CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_EXPORTENV is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_GPIO is not set # CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_LED=y -CONFIG_CMD_LICENSE=y -CONFIG_CMD_LOADB=y -# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_MISC is not set +# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_XIMG is not set -CONFIG_DEFAULT_DEVICE_TREE="comtrend,vr-3032u" -CONFIG_DISPLAY_CPUINFO=y +# CONFIG_CMD_MISC is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y -CONFIG_DM_RESET=y -CONFIG_DM_SERIAL=y -CONFIG_HUSH_PARSER=y CONFIG_LED=y CONFIG_LED_BCM6328=y CONFIG_LED_BLINK=y -CONFIG_MIPS=y -# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set -# CONFIG_MIPS_BOOT_ENV_LEGACY is not set -CONFIG_MIPS_BOOT_FDT=y -CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_POWER_DOMAIN=y -CONFIG_RESET=y +CONFIG_BCM6328_POWER_DOMAIN=y +CONFIG_DM_RESET=y CONFIG_RESET_BCM6345=y -CONFIG_SOC_BMIPS_BCM63268=y # CONFIG_SPL_SERIAL_PRESENT is not set -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_NO_FLASH=y -CONFIG_SYS_PROMPT="VR-3032u # " -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_DM_SERIAL=y +CONFIG_BCM6345_SERIAL=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index be04402572..12c528367e 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -1,14 +1,14 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OMAP54XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TARGET_DRA7XX_EVM=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="dra7-evm" CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y @@ -43,10 +43,9 @@ CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y -CONFIG_BLK=y +CONFIG_SPL_OF_TRANSLATE=y CONFIG_DM_SCSI=y CONFIG_DWC_AHCI=y -CONFIG_SPL_OF_TRANSLATE=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y @@ -61,6 +60,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_DM_ETH=y +CONFIG_SPL_PHY=y CONFIG_DM_PMIC=y CONFIG_PMIC_PALMAS=y CONFIG_PMIC_LP873X=y @@ -90,6 +90,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_SPL_PHY=y -CONFIG_PIPE3_PHY=y -CONFIG_SPL_PIPE3_PHY=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 84dd26beee..41125d719c 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_OMAP54XX=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_DRA7XX_EVM=y CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 @@ -11,8 +11,8 @@ CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000 # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="dra7-evm" CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y @@ -63,6 +63,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_DM_ETH=y +CONFIG_SPL_PHY=y CONFIG_DM_PMIC=y CONFIG_PMIC_PALMAS=y CONFIG_PMIC_LP873X=y @@ -92,6 +93,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_SPL_PHY=y -CONFIG_PIPE3_PHY=y -CONFIG_SPL_PIPE3_PHY=y diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 08b5f85a34..f71d0c10c3 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -3,21 +3,21 @@ CONFIG_ARCH_ASPEED=y CONFIG_ASPEED_AST2500=y CONFIG_TARGET_EVB_AST2500=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" +CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_PRE_CON_BUF_ADDR=0x1e720000 # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_I2C=y CONFIG_REGMAP=y CONFIG_CLK=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_ASPEED=y +CONFIG_PINCTRL=y CONFIG_RAM=y +CONFIG_DM_RESET=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y CONFIG_TIMER=y CONFIG_WDT=y -CONFIG_DM_RESET=y -CONFIG_PINCTRL=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_ASPEED=y -CONFIG_CMD_I2C=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index c189e750ff..0008e7b886 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y @@ -34,12 +35,8 @@ CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ROCKCHIP=y -CONFIG_DM_PMIC=y -CONFIG_PMIC_RK808=y -CONFIG_REGULATOR_RK808=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index f30f131f34..bb5c859e62 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -39,7 +39,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_ROCKCHIP_RK3399_PINCTRL=y CONFIG_DM_PMIC=y CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index dfabb6bb39..061f15ed2a 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_GW_VENTANA=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_FIT=y @@ -23,6 +22,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index f95aa44390..931572aa67 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_GW_VENTANA=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_FIT=y @@ -23,6 +22,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 169570d8fd..37d0e10569 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -8,7 +8,6 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_FIT=y @@ -24,6 +23,7 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig index c2e64723c3..a0a70b294f 100644 --- a/configs/huawei_hg556a_ram_defconfig +++ b/configs/huawei_hg556a_ram_defconfig @@ -1,55 +1,44 @@ +CONFIG_MIPS=y +CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_ARCH_BMIPS=y -CONFIG_BAUDRATE=115200 -CONFIG_BCM6345_CLK=y -CONFIG_BCM6345_GPIO=y -CONFIG_BCM6345_SERIAL=y -CONFIG_BMIPS_BOOT_RAM=y -CONFIG_BOARD_HUAWEI_HG556A=y -CONFIG_CFI_FLASH=y -# CONFIG_CMD_BOOTD is not set -CONFIG_CMD_BOOTM=y +CONFIG_SOC_BMIPS_BCM6358=y +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set +CONFIG_MIPS_BOOT_FDT=y +CONFIG_DEFAULT_DEVICE_TREE="huawei,hg556a" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_DISPLAY_CPUINFO=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="HG556a # " CONFIG_CMD_CPU=y -# CONFIG_CMD_CRC32 is not set -# CONFIG_CMD_EDITENV is not set +CONFIG_CMD_LICENSE=y +# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_ELF is not set -# CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_EXPORTENV is not set -CONFIG_CMD_FLASH=y -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_GPIO is not set # CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_LED=y -CONFIG_CMD_LICENSE=y -CONFIG_CMD_LOADB=y -# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_MISC is not set +# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_XIMG is not set -CONFIG_DEFAULT_DEVICE_TREE="huawei,hg556a" -CONFIG_DISPLAY_CPUINFO=y +# CONFIG_CMD_MISC is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y -CONFIG_DM_RESET=y -CONFIG_DM_SERIAL=y -CONFIG_HUSH_PARSER=y +CONFIG_BCM6345_GPIO=y CONFIG_LED=y CONFIG_LED_GPIO=y -CONFIG_MIPS=y -# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set -# CONFIG_MIPS_BOOT_ENV_LEGACY is not set -CONFIG_MIPS_BOOT_FDT=y CONFIG_MTD=y -CONFIG_MTD_DEVICE=y CONFIG_MTD_NOR_FLASH=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_RESET=y +CONFIG_CFI_FLASH=y +CONFIG_DM_RESET=y CONFIG_RESET_BCM6345=y -CONFIG_SOC_BMIPS_BCM6358=y # CONFIG_SPL_SERIAL_PRESENT is not set -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_PROMPT="HG556a # " -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_DM_SERIAL=y +CONFIG_BCM6345_SERIAL=y diff --git a/configs/imx6dl_icore_mmc_defconfig b/configs/imx6dl_icore_mmc_defconfig index 6b67156ca5..c1044a1e74 100644 --- a/configs/imx6dl_icore_mmc_defconfig +++ b/configs/imx6dl_icore_mmc_defconfig @@ -7,8 +7,8 @@ CONFIG_TARGET_MX6Q_ICORE=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig index 2099370aa3..5ddce564a7 100644 --- a/configs/imx6dl_icore_nand_defconfig +++ b/configs/imx6dl_icore_nand_defconfig @@ -6,8 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX6Q_ICORE=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/imx6q_icore_mmc_defconfig b/configs/imx6q_icore_mmc_defconfig index adb0472811..35073e80f0 100644 --- a/configs/imx6q_icore_mmc_defconfig +++ b/configs/imx6q_icore_mmc_defconfig @@ -7,8 +7,8 @@ CONFIG_TARGET_MX6Q_ICORE=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig index 45d5fcec58..67741a70c7 100644 --- a/configs/imx6q_icore_nand_defconfig +++ b/configs/imx6q_icore_nand_defconfig @@ -6,8 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_MX6Q_ICORE=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 83e21380b8..f09eb84ebc 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -1,14 +1,13 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000000 +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2E_EVM=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -16,8 +15,8 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_GPT is not set diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index d4ec83efc5..55eab61cc3 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -1,9 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000060 -CONFIG_TARGET_K2E_EVM=y CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_K2E_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 674ddcc9fe..c065cbcac4 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -1,14 +1,13 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000000 +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2G_EVM=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -16,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 2e06c8c46d..2ff9700d2a 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -1,12 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000060 -CONFIG_TARGET_K2G_EVM=y CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_K2G_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" -CONFIG_FIT=y -CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 7dc5cf51cf..0afdb6e2cb 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -1,14 +1,13 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000000 +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2HK_EVM=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -16,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 67807e4ba8..a66a256346 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -1,9 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000060 -CONFIG_TARGET_K2HK_EVM=y CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_K2HK_EVM=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 6be4941f66..fd8c173185 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -1,14 +1,13 @@ CONFIG_ARM=y CONFIG_ARCH_KEYSTONE=y CONFIG_SYS_TEXT_BASE=0x0c000000 +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_K2L_EVM=y -CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2l-evm" CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y @@ -16,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index b0379b8e63..27212479d6 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -6,8 +6,8 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_M53EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aries/m53evk/imximage.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/mvebu_db-88f7040-nand_defconfig b/configs/mvebu_db-88f7040-nand_defconfig index d86c18ed08..d12b87a5af 100644 --- a/configs/mvebu_db-88f7040-nand_defconfig +++ b/configs/mvebu_db-88f7040-nand_defconfig @@ -7,7 +7,6 @@ CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_EARLY_INIT_R=y @@ -16,12 +15,12 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_NAND=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y @@ -31,6 +30,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_MVEBU_BUBT=y +CONFIG_MVEBU_NAND_BOOT=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y @@ -45,12 +45,11 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_XENON=y +CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y -CONFIG_MVEBU_NAND_BOOT=y -CONFIG_NAND_PXA3XX=y CONFIG_PHYLIB=y CONFIG_PCI=y CONFIG_DM_PCI=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index d7e5404048..e84272d68c 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y CONFIG_TARGET_MX51EVK=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig index d947d9fd5b..e0c597cbe2 100644 --- a/configs/mx53cx9020_defconfig +++ b/configs/mx53cx9020_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53CX9020=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg" CONFIG_BOOTDELAY=1 diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index b71c3ae719..572735616b 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53LOCO=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index c34beb74e2..f31d9bcc46 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -8,8 +8,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" # CONFIG_SYS_STDIO_DEREGISTER is not set diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index ff23345c1e..2522eb770b 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SXSABRESD=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index c08cadab4d..6d4fe6370f 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -8,8 +8,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 0701e1d324..69b480c7e9 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_MX7=y CONFIG_TARGET_MX7DSABRESD=y +CONFIG_VIDEO=y # CONFIG_ARMV7_VIRT is not set CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y # CONFIG_CMD_BMODE is not set -CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig index 2e8b5bedd3..316662d351 100644 --- a/configs/mx7dsabresd_secure_defconfig +++ b/configs/mx7dsabresd_secure_defconfig @@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_MX7=y CONFIG_TARGET_MX7DSABRESD=y +CONFIG_VIDEO=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y # CONFIG_CMD_BMODE is not set -CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig index 5400d37bd1..a73640e88f 100644 --- a/configs/nanopi_neo_air_defconfig +++ b/configs/nanopi_neo_air_defconfig @@ -4,6 +4,7 @@ CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y +# CONFIG_VIDEO_DE2 is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y @@ -15,4 +16,3 @@ CONFIG_SPL=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_USB_EHCI_HCD=y -# CONFIG_VIDEO_DE2 is not set diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig index 5afd5d565a..8b55497250 100644 --- a/configs/nanopi_neo_defconfig +++ b/configs/nanopi_neo_defconfig @@ -4,6 +4,7 @@ CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y +# CONFIG_VIDEO_DE2 is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y @@ -16,4 +17,3 @@ CONFIG_SPL=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y -# CONFIG_VIDEO_DE2 is not set diff --git a/configs/novena_defconfig b/configs/novena_defconfig index a970eb5961..b759fa2767 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -9,8 +9,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y CONFIG_VIDEO=y +CONFIG_SPL_FAT_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index 1a9d6cddc3..f08e1dd404 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -7,8 +7,8 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -# CONFIG_CMD_BMODE is not set CONFIG_VIDEO=y +# CONFIG_CMD_BMODE is not set CONFIG_DEFAULT_DEVICE_TREE="imx6ul-opos6uldev" CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig index 201771ee8f..dffba8cad1 100644 --- a/configs/orangepi_2_defconfig +++ b/configs/orangepi_2_defconfig @@ -8,7 +8,6 @@ CONFIG_DRAM_ODT_EN=y CONFIG_USB1_VBUS_PIN="PG13" CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index 38f4583fd0..448a1619c0 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -6,7 +6,6 @@ CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 56c9a871b1..97d0e06276 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -6,7 +6,6 @@ CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig index 8e01284f75..5a64ad3f41 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -6,7 +6,6 @@ CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881977 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-pc2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 9d4cb0e673..af7568fddf 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -6,7 +6,6 @@ CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index 0addd1938d..935e96d10a 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -7,7 +7,6 @@ CONFIG_DRAM_ODT_EN=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig index 52ec86a4bf..3301ca05a4 100644 --- a/configs/orangepi_plus2e_defconfig +++ b/configs/orangepi_plus2e_defconfig @@ -8,7 +8,6 @@ CONFIG_MACPWR="PD6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus2e" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig index 5e028691c1..34c57509c5 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -10,7 +10,6 @@ CONFIG_USB1_VBUS_PIN="PG13" CONFIG_SATAPWR="PG11" CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index 97ef08994a..c650ce87d9 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -5,6 +5,7 @@ CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y +# CONFIG_VIDEO_DE2 is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y @@ -15,4 +16,3 @@ CONFIG_SPL=y CONFIG_SPL_SPI_SUNXI=y CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y -# CONFIG_VIDEO_DE2 is not set diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 4392c6e1d3..e8912c08c2 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y @@ -23,6 +22,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 72a263187f..ec719b687e 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -10,7 +10,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y @@ -23,6 +22,7 @@ CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 4c46f1ebdd..0845575ac1 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -11,7 +11,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y @@ -24,6 +23,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig index a7d67bf472..0699b931da 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -10,12 +10,12 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SPL_POWER_SUPPORT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_POWER_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="pepper# " CONFIG_CMD_BOOTZ=y diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig index 92bda60095..db063268bd 100644 --- a/configs/pine64_plus_defconfig +++ b/configs/pine64_plus_defconfig @@ -4,7 +4,6 @@ CONFIG_MACH_SUN50I=y CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y CONFIG_SPL=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 67bdfd63f2..9c49ae9b43 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -13,8 +13,8 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y CONFIG_VIDEO=y +CONFIG_SPL_FAT_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am335x-pxm50" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/rut_defconfig b/configs/rut_defconfig index f09a67e62c..f3f5e4dbf3 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -13,8 +13,8 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SPL_FAT_SUPPORT=y CONFIG_VIDEO=y +CONFIG_SPL_FAT_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="am335x-rut" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index f064a43c6b..8e7b296ee3 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -4,12 +4,12 @@ CONFIG_TARGET_SAMA5D2_XPLAINED=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_FAT_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 70a17ed135..1573ff852c 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -6,9 +6,9 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_xplained" CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 5417057664..e24012c8ae 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -115,6 +115,8 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_SANDBOX=y +CONFIG_PHY=y +CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_PINCTRL_ROCKCHIP_RK3036=y @@ -170,10 +172,10 @@ CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y +CONFIG_WDT=y +CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y -CONFIG_PHY=y -CONFIG_PHY_SANDBOX=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_LZ4=y @@ -182,5 +184,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_WDT=y -CONFIG_WDT_SANDBOX=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 6c6e6596b3..de10d48ef0 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -120,6 +120,8 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_SANDBOX=y +CONFIG_PHY=y +CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_PINCTRL_ROCKCHIP_RK3036=y @@ -173,8 +175,6 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y -CONFIG_PHY=y -CONFIG_PHY_SANDBOX=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_LZ4=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 3061e5a9d9..25e4da258c 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -125,6 +125,8 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_SANDBOX=y +CONFIG_PHY=y +CONFIG_PHY_SANDBOX=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_PINCTRL_SANDBOX=y @@ -178,8 +180,6 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y -CONFIG_PHY=y -CONFIG_PHY_SANDBOX=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_LZ4=y diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig index d7c8329731..55f89f4f54 100644 --- a/configs/sfr_nb4-ser_ram_defconfig +++ b/configs/sfr_nb4-ser_ram_defconfig @@ -1,56 +1,45 @@ +CONFIG_MIPS=y +CONFIG_SYS_TEXT_BASE=0x80010000 CONFIG_ARCH_BMIPS=y -CONFIG_BAUDRATE=115200 -CONFIG_BCM6345_CLK=y -CONFIG_BCM6345_GPIO=y -CONFIG_BCM6345_SERIAL=y -CONFIG_BMIPS_BOOT_RAM=y -CONFIG_BOARD_SFR_NB4_SER=y -CONFIG_CFI_FLASH=y -# CONFIG_CMD_BOOTD is not set -CONFIG_CMD_BOOTM=y +CONFIG_SOC_BMIPS_BCM6358=y +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set +CONFIG_MIPS_BOOT_FDT=y +CONFIG_DEFAULT_DEVICE_TREE="sfr,nb4-ser" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_DISPLAY_CPUINFO=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="NB4-SER # " CONFIG_CMD_CPU=y -# CONFIG_CMD_CRC32 is not set -# CONFIG_CMD_EDITENV is not set +CONFIG_CMD_LICENSE=y +# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_ELF is not set -# CONFIG_CMD_ENV_EXISTS is not set -# CONFIG_CMD_EXPORTENV is not set -CONFIG_CMD_FLASH=y -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_GPIO is not set # CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set -CONFIG_CMD_LED=y -CONFIG_CMD_LICENSE=y -CONFIG_CMD_LOADB=y -# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_MISC is not set +# CONFIG_CMD_LOADS is not set +# CONFIG_CMD_FPGA is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set -# CONFIG_CMD_SAVEENV is not set -# CONFIG_CMD_XIMG is not set -CONFIG_DEFAULT_DEVICE_TREE="sfr,nb4-ser" -CONFIG_DISPLAY_CPUINFO=y +# CONFIG_CMD_MISC is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y -CONFIG_DM_RESET=y -CONFIG_DM_SERIAL=y -CONFIG_HUSH_PARSER=y +CONFIG_BCM6345_GPIO=y CONFIG_LED=y CONFIG_LED_BCM6358=y CONFIG_LED_GPIO=y -CONFIG_MIPS=y -# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set -# CONFIG_MIPS_BOOT_ENV_LEGACY is not set -CONFIG_MIPS_BOOT_FDT=y CONFIG_MTD=y -CONFIG_MTD_DEVICE=y CONFIG_MTD_NOR_FLASH=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_RESET=y +CONFIG_CFI_FLASH=y +CONFIG_DM_RESET=y CONFIG_RESET_BCM6345=y -CONFIG_SOC_BMIPS_BCM6358=y # CONFIG_SPL_SERIAL_PRESENT is not set -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_PROMPT="NB4-SER # " -CONFIG_SYS_TEXT_BASE=0x80010000 +CONFIG_DM_SERIAL=y +CONFIG_BCM6345_SERIAL=y diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 4322aad14d..ca8d605f9e 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_STM32=y +CONFIG_SYS_MALLOC_F_LEN=0xC00 CONFIG_STM32F7=y CONFIG_TARGET_STM32F746_DISCO=y CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco" @@ -24,10 +25,10 @@ CONFIG_CMD_DNS=y CONFIG_CMD_LINK_LOCAL=y CONFIG_CMD_TIMER=y CONFIG_OF_CONTROL=y -CONFIG_DM_SEQ_ALIAS=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_CLK=y +CONFIG_DM_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y @@ -39,17 +40,10 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_FULL is not set CONFIG_PINCTRL_STM32=y +CONFIG_RAM=y +CONFIG_STM32_SDRAM=y # CONFIG_SPL_SERIAL_PRESENT is not set CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set -CONFIG_CLK=y -CONFIG_PINCTRL=y -# CONFIG_PINCTRL_FULL is not set -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_GPIO=y -CONFIG_STM32F7_GPIO=y -CONFIG_SYS_MALLOC_F_LEN=0xC00 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index e4622830ca..c8b5d46dbb 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -2,10 +2,10 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TBS2910=y -CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_VIDEO=y CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_PRE_CON_BUF_ADDR=0x7c000000 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index fbeabdee4e..996143536b 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -3,8 +3,8 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 -CONFIG_ZYNQMP_USB=y CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm015 dc1" +CONFIG_ZYNQMP_USB=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1" CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index 6682b679b3..01882bf3dd 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -4,9 +4,9 @@ CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 # CONFIG_SPL_LIBDISK_SUPPORT is not set +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm016 dc2" # CONFIG_SPL_FAT_SUPPORT is not set CONFIG_ZYNQMP_USB=y -CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm016 dc2" CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm016-dc2" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 0796e81b90..1811e3215c 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -3,8 +3,8 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 -CONFIG_ZYNQMP_USB=y CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102" +CONFIG_ZYNQMP_USB=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102" CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 3711ac86db..94a843546e 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -3,8 +3,8 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 -CONFIG_ZYNQMP_USB=y CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102" +CONFIG_ZYNQMP_USB=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB" CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y
This option is only used in one driver and two boards. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 1 - drivers/misc/ds4510.c | 8 -------- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 12 deletions(-)
diff --git a/README b/README index 864bf8bc22..3eb2be8922 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_INFO * ds4510 I2C info command CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index d7c9bd73c8..940e2ce6a0 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -186,7 +186,6 @@ int ds4510_gpio_read_val(uint8_t chip) }
#ifdef CONFIG_CMD_DS4510 -#ifdef CONFIG_CMD_DS4510_INFO /* * Display DS4510 information */ @@ -240,7 +239,6 @@ static int ds4510_info(uint8_t chip)
return 0; } -#endif /* CONFIG_CMD_DS4510_INFO */
cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)DS4510_CMD_DEVICE, "", ""), @@ -248,9 +246,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(output, 4, 0, (void *)DS4510_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), -#ifdef CONFIG_CMD_DS4510_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#endif #ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), #endif @@ -324,10 +320,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else tmp &= ~(1 << ul_arg2); return ds4510_pullup_write(chip, tmp); -#ifdef CONFIG_CMD_DS4510_INFO case DS4510_CMD_INFO: return ds4510_info(chip); -#endif #ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); @@ -378,10 +372,8 @@ U_BOOT_CMD( "ds4510 eeprom/seeprom/sram/gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_DS4510_INFO "ds4510 info\n" " - display ds4510 info\n" -#endif "ds4510 output pin 0|1\n" " - set pin low or high-Z\n" "ds4510 input pin\n" diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 447fd9557a..dae61b11e4 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -503,7 +503,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 48f07b08c0..ce1ff86135 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -355,7 +355,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa9c3fc8cb..38a73477fe 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_INFO CONFIG_CMD_DS4510_MEM CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT
On Wed, May 17, 2017 at 03:24:58AM -0600, Simon Glass wrote:
This option is only used in one driver and two boards. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 1 - drivers/misc/ds4510.c | 10 ---------- scripts/config_whitelist.txt | 1 - 3 files changed, 12 deletions(-)
diff --git a/README b/README index 3eb2be8922..142de27b98 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 940e2ce6a0..936fb3ead4 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -250,11 +250,9 @@ cmd_tbl_t cmd_ds4510[] = { #ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), #endif -#ifdef CONFIG_CMD_DS4510_MEM U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""), U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""), U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), -#endif };
int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -264,13 +262,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong ul_arg2 = 0; ulong ul_arg3 = 0; int tmp; -#ifdef CONFIG_CMD_DS4510_MEM ulong addr; ulong off; ulong cnt; int end; int (*rw_func)(uint8_t, int, uint8_t *, int); -#endif
c = find_cmd_tbl(argv[1], cmd_ds4510, ARRAY_SIZE(cmd_ds4510));
@@ -326,7 +322,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); #endif -#ifdef CONFIG_CMD_DS4510_MEM case DS4510_CMD_EEPROM: end = DS4510_EEPROM + DS4510_EEPROM_SIZE; off = DS4510_EEPROM; @@ -339,13 +334,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) end = DS4510_SRAM + DS4510_SRAM_SIZE; off = DS4510_SRAM; break; -#endif default: /* We should never get here... */ return 1; }
-#ifdef CONFIG_CMD_DS4510_MEM /* Only eeprom, seeprom, and sram commands should make it here */ if (strcmp(argv[2], "read") == 0) rw_func = ds4510_mem_read; @@ -364,7 +357,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
return rw_func(chip, off, (uint8_t *)addr, cnt); -#endif }
U_BOOT_CMD( @@ -387,7 +379,6 @@ U_BOOT_CMD( "ds4510 rstdelay 0-3\n" " - set reset output delay" #endif -#ifdef CONFIG_CMD_DS4510_MEM "\n" "ds4510 eeprom read addr off cnt\n" "ds4510 eeprom write addr off cnt\n" @@ -398,6 +389,5 @@ U_BOOT_CMD( "ds4510 sram read addr off cnt\n" "ds4510 sram write addr off cnt\n" " - read/write 'cnt' bytes at SRAM offset 'off'" -#endif ); #endif /* CONFIG_CMD_DS4510 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 38a73477fe..6e190a87be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_MEM CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT CONFIG_CMD_ECCTEST
On Wed, May 17, 2017 at 03:24:59AM -0600, Simon Glass wrote:
This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 1 - drivers/misc/ds4510.c | 6 ------ scripts/config_whitelist.txt | 1 - 3 files changed, 8 deletions(-)
diff --git a/README b/README index 142de27b98..455d0d293a 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 936fb3ead4..c08a0bee63 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -247,9 +247,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), -#endif U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""), U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""), U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), @@ -318,10 +316,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return ds4510_pullup_write(chip, tmp); case DS4510_CMD_INFO: return ds4510_info(chip); -#ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); -#endif case DS4510_CMD_EEPROM: end = DS4510_EEPROM + DS4510_EEPROM_SIZE; off = DS4510_EEPROM; @@ -374,11 +370,9 @@ U_BOOT_CMD( " - disable/enable pullup on specified pin\n" "ds4510 nv 0|1\n" " - make gpio and seeprom writes volatile/non-volatile" -#ifdef CONFIG_CMD_DS4510_RST "\n" "ds4510 rstdelay 0-3\n" " - set reset output delay" -#endif "\n" "ds4510 eeprom read addr off cnt\n" "ds4510 eeprom write addr off cnt\n" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6e190a87be..451e3066ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG
On Wed, May 17, 2017 at 03:25:00AM -0600, Simon Glass wrote:
This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support.
Drop the option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This option enables a command in the driver. But the functions defined by the driver are not called anywhere else in U-Boot. So it does not seem useful to have this driver without its commands.
Drop this option, move the header file out of the common include/ directory and make all the function static.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
drivers/misc/ds4510.c | 22 ++++++++++------------ {include => drivers/misc}/ds4510.h | 10 ---------- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 25 deletions(-) rename {include => drivers/misc}/ds4510.h (75%)
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index c08a0bee63..9ffdafc992 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -12,7 +12,7 @@ #include <common.h> #include <i2c.h> #include <command.h> -#include <ds4510.h> +#include "ds4510.h"
/* Default to an address that hopefully won't corrupt other i2c devices */ #ifndef CONFIG_SYS_I2C_DS4510_ADDR @@ -35,7 +35,7 @@ enum { /* * Write to DS4510, taking page boundaries into account */ -int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) { int wrlen; int i = 0; @@ -64,7 +64,7 @@ int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) /* * General read from DS4510 */ -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) { return i2c_read(chip, offset, 1, buf, count); } @@ -74,7 +74,7 @@ int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) * nv = 0 - Writes to SEEPROM registers behave like EEPROM * nv = 1 - Writes to SEEPROM registers behave like SRAM */ -int ds4510_see_write(uint8_t chip, uint8_t nv) +static int ds4510_see_write(uint8_t chip, uint8_t nv) { uint8_t data;
@@ -92,7 +92,7 @@ int ds4510_see_write(uint8_t chip, uint8_t nv) /* * Write de-assertion of reset signal delay */ -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) +static int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) { uint8_t data;
@@ -108,7 +108,7 @@ int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) /* * Write pullup characteristics of IO pins */ -int ds4510_pullup_write(uint8_t chip, uint8_t val) +static int ds4510_pullup_write(uint8_t chip, uint8_t val) { val &= DS4510_IO_MASK;
@@ -118,7 +118,7 @@ int ds4510_pullup_write(uint8_t chip, uint8_t val) /* * Read pullup characteristics of IO pins */ -int ds4510_pullup_read(uint8_t chip) +static int ds4510_pullup_read(uint8_t chip) { uint8_t val;
@@ -131,7 +131,7 @@ int ds4510_pullup_read(uint8_t chip) /* * Write drive level of IO pins */ -int ds4510_gpio_write(uint8_t chip, uint8_t val) +static int ds4510_gpio_write(uint8_t chip, uint8_t val) { uint8_t data; int i; @@ -155,7 +155,7 @@ int ds4510_gpio_write(uint8_t chip, uint8_t val) /* * Read drive level of IO pins */ -int ds4510_gpio_read(uint8_t chip) +static int ds4510_gpio_read(uint8_t chip) { uint8_t data; int val = 0; @@ -175,7 +175,7 @@ int ds4510_gpio_read(uint8_t chip) /* * Read physical level of IO pins */ -int ds4510_gpio_read_val(uint8_t chip) +static int ds4510_gpio_read_val(uint8_t chip) { uint8_t val;
@@ -185,7 +185,6 @@ int ds4510_gpio_read_val(uint8_t chip) return val & DS4510_IO_MASK; }
-#ifdef CONFIG_CMD_DS4510 /* * Display DS4510 information */ @@ -384,4 +383,3 @@ U_BOOT_CMD( "ds4510 sram write addr off cnt\n" " - read/write 'cnt' bytes at SRAM offset 'off'" ); -#endif /* CONFIG_CMD_DS4510 */ diff --git a/include/ds4510.h b/drivers/misc/ds4510.h similarity index 75% rename from include/ds4510.h rename to drivers/misc/ds4510.h index e54db35265..a6c6c58cc4 100644 --- a/include/ds4510.h +++ b/drivers/misc/ds4510.h @@ -50,14 +50,4 @@ #define DS4510_SRAM 0xfa #define DS4510_SRAM_SIZE 0x06
-int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_see_write(uint8_t chip, uint8_t nv); -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay); -int ds4510_pullup_write(uint8_t chip, uint8_t val); -int ds4510_pullup_read(uint8_t chip); -int ds4510_gpio_write(uint8_t chip, uint8_t val); -int ds4510_gpio_read(uint8_t chip); -int ds4510_gpio_read_val(uint8_t chip); - #endif /* __DS4510_H_ */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index dae61b11e4..822f70e7ac 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -502,7 +502,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DS4510 #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index ce1ff86135..a12a3f8347 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -354,7 +354,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DS4510 #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 451e3066ec..02f7536c00 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_DS4510 CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG
On Wed, May 17, 2017 at 03:25:01AM -0600, Simon Glass wrote:
This option enables a command in the driver. But the functions defined by the driver are not called anywhere else in U-Boot. So it does not seem useful to have this driver without its commands.
Drop this option, move the header file out of the common include/ directory and make all the function static.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_DS4510
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 1 - configs/xpedite517x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + drivers/misc/Kconfig | 8 ++++++++ include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/README b/README index 455d0d293a..0ef706f78d 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32 * crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DS4510 * ds4510 I2C gpio commands CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 909efb1c08..69fd8fa004 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 41dee5d839..641ef8ff09 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_SYS_FSL_DDR2=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1aae4bcd07..ecca159d14 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -75,6 +75,14 @@ config CROS_EC_SPI provides a faster and more robust interface than I2C but the bugs are less interesting.
+config DS4510 + bool "Enable support for DS4510 CPU supervisor" + help + Enable support for the Maxim DS4510 CPU supervisor. It has an + integrated 64-byte EEPROM, four programmable non-volatile I/O pins + and a configurable timer for the supervisor function. The device is + connected over I2C. + config FSL_SEC_MON bool "Enable FSL SEC_MON Driver" help diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 822f70e7ac..bd1d0c75d9 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -249,7 +249,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000
/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR 0x51
/* GPIO */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index a12a3f8347..a290cf3463 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -246,7 +246,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000
/* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR 0x51
/* GPIO */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 02f7536c00..e9ba613c2c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -681,7 +681,6 @@ CONFIG_DRIVE_MMC CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB -CONFIG_DS4510 CONFIG_DSP_CLUSTER_START CONFIG_DTT CONFIG_DTT_AD7414
On Wed, May 17, 2017 at 03:25:02AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_DS4510
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This option is only defined to a non-default value by canyonlands, which needs conversion to driver model (where the I2C address would be defined by the device tree).
Drop this option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
README | 6 ------ drivers/hwmon/ds1775.c | 2 +- drivers/hwmon/lm75.c | 4 ---- include/configs/canyonlands.h | 4 ---- include/configs/kilauea.h | 1 - include/configs/makalu.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/README b/README index 0ef706f78d..b58911da49 100644 --- a/README +++ b/README @@ -2329,12 +2329,6 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the DTT. If not defined, then U-Boot assumes that DTT is on I2C bus 0.
- CONFIG_SYS_I2C_DTT_ADDR: - - If defined, specifies the I2C address of the DTT device. - If not defined, then U-Boot uses predefined value for - specified DTT device. - CONFIG_SOFT_I2C_READ_REPEATED_START
defining this will force the i2c_read() function in diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c index b95b130d92..4c0c0b82a0 100644 --- a/drivers/hwmon/ds1775.c +++ b/drivers/hwmon/ds1775.c @@ -11,7 +11,7 @@ #include <i2c.h> #include <dtt.h>
-#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */ +#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1775 device code */ #define DTT_READ_TEMP 0x0 #define DTT_CONFIG 0x1 #define DTT_TEMP_HYST 0x2 diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 462f902dad..aafa4757b1 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -16,11 +16,7 @@ /* * Device code */ -#if defined(CONFIG_SYS_I2C_DTT_ADDR) -#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR -#else #define DTT_I2C_DEV_CODE 0x48 /* ON Semi's LM75 device */ -#endif #define DTT_READ_TEMP 0x0 #define DTT_CONFIG 0x1 #define DTT_TEMP_HYST 0x2 diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index a330372d19..ea440d6e16 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -269,10 +269,6 @@ #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3
-#if defined(CONFIG_ARCHES) -#define CONFIG_SYS_I2C_DTT_ADDR 0x4a /* AD7414 I2C address */ -#endif - #if !defined(CONFIG_ARCHES) /* RTC configuration */ #define CONFIG_RTC_M41T62 diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 1f5c2ad234..b8c0d0d8f0 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -320,7 +320,6 @@ /* Standard DTT sensor configuration */ #define CONFIG_DTT_DS1775 1 #define CONFIG_DTT_SENSORS { 0 } -#define CONFIG_SYS_I2C_DTT_ADDR 0x48
/* RTC configuration */ #define CONFIG_RTC_DS1338 1 diff --git a/include/configs/makalu.h b/include/configs/makalu.h index da5cfa19d3..cdb02f3693 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -192,7 +192,6 @@ /* Standard DTT sensor configuration */ #define CONFIG_DTT_DS1775 1 #define CONFIG_DTT_SENSORS { 0 } -#define CONFIG_SYS_I2C_DTT_ADDR 0x48
/* RTC configuration */ #define CONFIG_RTC_X1205 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e9ba613c2c..29ec43dd1c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4206,7 +4206,6 @@ CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR CONFIG_SYS_I2C_DSPIC_KEYB_ADDR -CONFIG_SYS_I2C_DTT_ADDR CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM CONFIG_SYS_I2C_EARLY_INIT
On Wed, May 17, 2017 at 03:25:03AM -0600, Simon Glass wrote:
This option is only defined to a non-default value by canyonlands, which needs conversion to driver model (where the I2C address would be defined by the device tree).
Drop this option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This subsystem has not been converted to driver model, there is only one driver and only one board that uses it. Drop it and its CONFIG option.
Also drop the rtc4543 RTC driver since it uses TWS.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: None
configs/inka4x0_defconfig | 1 - drivers/Makefile | 1 - drivers/rtc/Makefile | 1 - drivers/rtc/rtc4543.c | 101 ------------------------------------------- drivers/twserial/Makefile | 8 ---- drivers/twserial/soft_tws.c | 94 ---------------------------------------- include/configs/inka4x0.h | 80 ---------------------------------- include/tws.h | 21 --------- scripts/config_whitelist.txt | 2 - 9 files changed, 309 deletions(-) delete mode 100644 drivers/rtc/rtc4543.c delete mode 100644 drivers/twserial/Makefile delete mode 100644 drivers/twserial/soft_tws.c delete mode 100644 include/tws.h
diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig index 174719c367..9b30244e3c 100644 --- a/configs/inka4x0_defconfig +++ b/configs/inka4x0_defconfig @@ -8,7 +8,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y diff --git a/drivers/Makefile b/drivers/Makefile index 64c39d3a3e..f16d7fdb4f 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -87,7 +87,6 @@ obj-y += spmi/ obj-y += sysreset/ obj-y += timer/ obj-y += tpm/ -obj-y += twserial/ obj-y += video/ obj-y += watchdog/ obj-$(CONFIG_QE) += qe/ diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 87c3d9cae2..438681da7a 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -48,7 +48,6 @@ obj-$(CONFIG_RTC_PCF2127) += pcf2127.o obj-$(CONFIG_RTC_PL031) += pl031.o obj-$(CONFIG_RTC_PT7C4338) += pt7c4338.o obj-$(CONFIG_RTC_RS5C372A) += rs5c372.o -obj-$(CONFIG_RTC_RTC4543) += rtc4543.o obj-$(CONFIG_RTC_RV3029) += rv3029.o obj-$(CONFIG_RTC_RX8025) += rx8025.o obj-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o diff --git a/drivers/rtc/rtc4543.c b/drivers/rtc/rtc4543.c deleted file mode 100644 index 8d36edd65a..0000000000 --- a/drivers/rtc/rtc4543.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * (C) Copyright 2008, 2009 - * Andreas Pfefferle, DENX Software Engineering, ap@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <asm/io.h> -#include <common.h> -#include <command.h> -#include <config.h> -#include <rtc.h> -#include <tws.h> - -#if defined(CONFIG_CMD_DATE) - -/* - * Note: The acrobatics below is due to the hideously ingenius idea of - * the chip designers. As the chip does not allow register - * addressing, all values need to be read and written in one go. Sure - * enough, the 'wday' field (0-6) is transferred using the economic - * number of 4 bits right in the middle of the packet..... - */ - -int rtc_get(struct rtc_time *tm) -{ - int rel = 0; - uchar buffer[7]; - - memset(buffer, 0, 7); - - /* Read 52 bits into our buffer */ - tws_read(buffer, 52); - - tm->tm_sec = bcd2bin( buffer[0] & 0x7F); - tm->tm_min = bcd2bin( buffer[1] & 0x7F); - tm->tm_hour = bcd2bin( buffer[2] & 0x3F); - tm->tm_wday = bcd2bin( buffer[3] & 0x07); - tm->tm_mday = bcd2bin((buffer[3] & 0xF0) >> 4 | (buffer[4] & 0x0F) << 4); - tm->tm_mon = bcd2bin((buffer[4] & 0x30) >> 4 | (buffer[5] & 0x0F) << 4); - tm->tm_year = bcd2bin((buffer[5] & 0xF0) >> 4 | (buffer[6] & 0x0F) << 4) + 2000; - tm->tm_yday = 0; - tm->tm_isdst = 0; - - if (tm->tm_sec & 0x80) { - puts("### Warning: RTC Low Voltage - date/time not reliable\n"); - rel = -1; - } - - debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", - tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - return rel; -} - -int rtc_set(struct rtc_time *tm) -{ - uchar buffer[7]; - uchar tmp; - - debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", - tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - memset(buffer, 0, 7); - buffer[0] = bin2bcd(tm->tm_sec); - buffer[1] = bin2bcd(tm->tm_min); - buffer[2] = bin2bcd(tm->tm_hour); - buffer[3] = bin2bcd(tm->tm_wday); - tmp = bin2bcd(tm->tm_mday); - buffer[3] |= (tmp & 0x0F) << 4; - buffer[4] = (tmp & 0xF0) >> 4; - tmp = bin2bcd(tm->tm_mon); - buffer[4] |= (tmp & 0x0F) << 4; - buffer[5] = (tmp & 0xF0) >> 4; - tmp = bin2bcd(tm->tm_year % 100); - buffer[5] |= (tmp & 0x0F) << 4; - buffer[6] = (tmp & 0xF0) >> 4; - - /* Write the resulting 52 bits to device */ - tws_write(buffer, 52); - - return 0; -} - -void rtc_reset(void) -{ - struct rtc_time tmp; - - tmp.tm_sec = 0; - tmp.tm_min = 0; - tmp.tm_hour = 0; - tmp.tm_wday = 4; - tmp.tm_mday = 1; - tmp.tm_mon = 1; - tmp.tm_year = 2000; - rtc_set(&tmp); -} - -#endif diff --git a/drivers/twserial/Makefile b/drivers/twserial/Makefile deleted file mode 100644 index 7cc7c4de82..0000000000 --- a/drivers/twserial/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2009 -# Detlev Zundel, DENX Software Engineering, dzu@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SOFT_TWS) += soft_tws.o diff --git a/drivers/twserial/soft_tws.c b/drivers/twserial/soft_tws.c deleted file mode 100644 index d0bf93d902..0000000000 --- a/drivers/twserial/soft_tws.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * (C) Copyright 2009 - * Detlev Zundel, DENX Software Engineering, dzu@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#define TWS_IMPLEMENTATION -#include <common.h> - -/*=====================================================================*/ -/* Public Functions */ -/*=====================================================================*/ - -/*----------------------------------------------------------------------- - * Read bits - */ -int tws_read(uchar *buffer, int len) -{ - int rem = len; - uchar accu, shift; - - debug("tws_read: buffer %p len %d\n", buffer, len); - - /* Configure the data pin for input */ - tws_data_config_output(0); - - /* Disable WR, i.e. setup a read */ - tws_wr(0); - udelay(1); - - /* Rise CE */ - tws_ce(1); - udelay(1); - - for (; rem > 0; ) { - for (shift = 0, accu = 0; - (rem > 0) && (shift < 8); - rem--, shift++) { - tws_clk(1); - udelay(10); - accu |= (tws_data_read() << shift); /* LSB first */ - tws_clk(0); - udelay(10); - } - *buffer++ = accu; - } - - /* Lower CE */ - tws_ce(0); - - return len - rem; -} - - -/*----------------------------------------------------------------------- - * Write bits - */ -int tws_write(uchar *buffer, int len) -{ - int rem = len; - uchar accu, shift; - - debug("tws_write: buffer %p len %d\n", buffer, len); - - /* Configure the data pin for output */ - tws_data_config_output(1); - - /* Enable WR, i.e. setup a write */ - tws_wr(1); - udelay(1); - - /* Rise CE */ - tws_ce(1); - udelay(1); - - for (; rem > 0; ) { - for (shift = 0, accu = *buffer++; - (rem > 0) && (shift < 8); - rem--, shift++) { - tws_data(accu & 0x01); /* LSB first */ - tws_clk(1); - udelay(10); - tws_clk(0); - udelay(10); - accu >>= 1; - } - } - - /* Lower CE */ - tws_ce(0); - - return len - rem; -} diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 5ee9c2bcb4..3bdab3310b 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -219,86 +219,6 @@ #define CONFIG_SYS_GPS_PORT_CONFIG 0x01501444
/* - * RTC configuration - */ -#define CONFIG_RTC_RTC4543 1 /* use external RTC */ - -/* - * Software (bit-bang) three wire serial configuration - * - * Note that we need the ifdefs because otherwise compilation of - * mkimage.c fails. - */ -#define CONFIG_SOFT_TWS 1 - -#ifdef TWS_IMPLEMENTATION -#include <mpc5xxx.h> -#include <asm/io.h> - -#define TWS_CE MPC5XXX_GPIO_WKUP_PSC1_4 /* GPIO_WKUP_0 */ -#define TWS_WR MPC5XXX_GPIO_WKUP_PSC2_4 /* GPIO_WKUP_1 */ -#define TWS_DATA MPC5XXX_GPIO_SINT_PSC3_4 /* GPIO_SINT_0 */ -#define TWS_CLK MPC5XXX_GPIO_SINT_PSC3_5 /* GPIO_SINT_1 */ - -static inline void tws_ce(unsigned bit) -{ - struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - if (bit) - setbits_8(&wu_gpio->dvo, TWS_CE); - else - clrbits_8(&wu_gpio->dvo, TWS_CE); -} - -static inline void tws_wr(unsigned bit) -{ - struct mpc5xxx_wu_gpio *wu_gpio = - (struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO; - if (bit) - setbits_8(&wu_gpio->dvo, TWS_WR); - else - clrbits_8(&wu_gpio->dvo, TWS_WR); -} - -static inline void tws_clk(unsigned bit) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (bit) - setbits_8(&gpio->sint_dvo, TWS_CLK); - else - clrbits_8(&gpio->sint_dvo, TWS_CLK); -} - -static inline void tws_data(unsigned bit) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (bit) - setbits_8(&gpio->sint_dvo, TWS_DATA); - else - clrbits_8(&gpio->sint_dvo, TWS_DATA); -} - -static inline unsigned tws_data_read(void) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - return !!(in_8(&gpio->sint_ival) & TWS_DATA); -} - -static inline void tws_data_config_output(unsigned output) -{ - struct mpc5xxx_gpio *gpio = - (struct mpc5xxx_gpio *)MPC5XXX_GPIO; - if (output) - setbits_8(&gpio->sint_ddr, TWS_DATA); - else - clrbits_8(&gpio->sint_ddr, TWS_DATA); -} -#endif /* TWS_IMPLEMENTATION */ - -/* * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/tws.h b/include/tws.h deleted file mode 100644 index 7dd5268125..0000000000 --- a/include/tws.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * (C) Copyright 2009 - * Detlev Zundel, DENX Software Engineering, dzu@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _TWS_H_ -#define _TWS_H_ - -/* - * Read/Write interface: - * buffer: Where to read/write the data - * len: How many bits to read/write - * - * Returns: 0 on success, not 0 on failure - */ -int tws_read(uchar *buffer, int len); -int tws_write(uchar *buffer, int len); - -#endif /* _TWS_H_ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 29ec43dd1c..4bdf2c6f13 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2347,7 +2347,6 @@ CONFIG_RTC_MV CONFIG_RTC_MXS CONFIG_RTC_PCF8563 CONFIG_RTC_PT7C4338 -CONFIG_RTC_RTC4543 CONFIG_RTC_RV3029 CONFIG_RTC_RX8025 CONFIG_RTC_X1205 @@ -2580,7 +2579,6 @@ CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA CONFIG_SOFT_I2C_READ_REPEATED_START CONFIG_SOFT_SPI -CONFIG_SOFT_TWS CONFIG_SOURCE CONFIG_SPARSE_RCU_POINTER CONFIG_SPDDRAM_SILENT
On Wed, May 17, 2017 at 03:25:04AM -0600, Simon Glass wrote:
This subsystem has not been converted to driver model, there is only one driver and only one board that uses it. Drop it and its CONFIG option.
Also drop the rtc4543 RTC driver since it uses TWS.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This subsystem is quite old. It has been replaced with a driver-model version (UCLASS_THERMAL). Boards are free to convert to that if required, but here is a removal patch that could be applied in the meantime.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: None
README | 6 -- board/gdsys/405ep/dlvision-10g.c | 10 ++- board/gdsys/405ep/io.c | 10 ++- board/gdsys/405ep/neo.c | 10 ++- board/gdsys/405ex/io64.c | 10 ++- cmd/Makefile | 1 - cmd/dtt.c | 120 --------------------------- drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/hwmon/Kconfig | 0 drivers/hwmon/Makefile | 22 ----- drivers/hwmon/adm1021.c | 164 ------------------------------------- drivers/hwmon/adt7460.c | 73 ----------------- drivers/hwmon/ds1621.c | 155 ----------------------------------- drivers/hwmon/ds1722.c | 137 ------------------------------- drivers/hwmon/ds1775.c | 126 ---------------------------- drivers/hwmon/ds620.c | 65 --------------- drivers/hwmon/lm63.c | 160 ------------------------------------ drivers/hwmon/lm73.c | 146 --------------------------------- drivers/hwmon/lm75.c | 139 ------------------------------- drivers/hwmon/lm81.c | 111 ------------------------- include/config_cmd_all.h | 1 - include/configs/PMC440.h | 21 ----- include/configs/TQM834x.h | 8 -- include/configs/UCP1020.h | 21 ----- include/configs/acadia.h | 9 -- include/configs/canyonlands.h | 11 --- include/configs/dlvision-10g.h | 8 -- include/configs/dlvision.h | 1 - include/configs/exynos5-common.h | 2 - include/configs/intip.h | 8 -- include/configs/io.h | 6 -- include/configs/io64.h | 9 -- include/configs/katmai.h | 25 ------ include/configs/kilauea.h | 4 - include/configs/km/km-powerpc.h | 1 - include/configs/km/km83xx-common.h | 7 -- include/configs/km82xx.h | 7 -- include/configs/makalu.h | 5 -- include/configs/motionpro.h | 8 +- include/configs/neo.h | 8 -- include/configs/odroid_xu3.h | 1 - include/configs/sequoia.h | 9 -- include/configs/socrates.h | 8 -- include/configs/tqma6.h | 10 --- include/configs/tqma6_mba6.h | 2 - include/configs/tqma6_wru4.h | 4 - include/configs/work_92105.h | 8 -- include/configs/xilinx-ppc.h | 1 - include/configs/xpedite517x.h | 3 - include/configs/xpedite537x.h | 3 - include/configs/xpedite550x.h | 3 - include/configs/yosemite.h | 9 -- include/dtt.h | 47 ----------- include/i2c.h | 3 - scripts/config_whitelist.txt | 22 ----- 56 files changed, 35 insertions(+), 1736 deletions(-) delete mode 100644 cmd/dtt.c delete mode 100644 drivers/hwmon/Kconfig delete mode 100644 drivers/hwmon/Makefile delete mode 100644 drivers/hwmon/adm1021.c delete mode 100644 drivers/hwmon/adt7460.c delete mode 100644 drivers/hwmon/ds1621.c delete mode 100644 drivers/hwmon/ds1722.c delete mode 100644 drivers/hwmon/ds1775.c delete mode 100644 drivers/hwmon/ds620.c delete mode 100644 drivers/hwmon/lm63.c delete mode 100644 drivers/hwmon/lm73.c delete mode 100644 drivers/hwmon/lm75.c delete mode 100644 drivers/hwmon/lm81.c delete mode 100644 include/dtt.h
diff --git a/README b/README index b58911da49..3d45b29bd5 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32 * crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_EEPROM * EEPROM read/write support @@ -2324,11 +2323,6 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the RTC. If not defined, then U-Boot assumes that RTC is on I2C bus 0.
- CONFIG_SYS_DTT_BUS_NUM - - If defined, then this indicates the I2C bus number for the DTT. - If not defined, then U-Boot assumes that DTT is on I2C bus 0. - CONFIG_SOFT_I2C_READ_REPEATED_START
defining this will force the i2c_read() function in diff --git a/board/gdsys/405ep/dlvision-10g.c b/board/gdsys/405ep/dlvision-10g.c index e400d1945a..b531786653 100644 --- a/board/gdsys/405ep/dlvision-10g.c +++ b/board/gdsys/405ep/dlvision-10g.c @@ -10,7 +10,6 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/ppc4xx-gpio.h> -#include <dtt.h>
#include "405ep.h" #include <gdsys_fpga.h> @@ -61,8 +60,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */
return 0; } diff --git a/board/gdsys/405ep/io.c b/board/gdsys/405ep/io.c index 81b49659ff..1484469bb0 100644 --- a/board/gdsys/405ep/io.c +++ b/board/gdsys/405ep/io.c @@ -11,7 +11,6 @@ #include <asm/io.h> #include <asm/ppc4xx-gpio.h>
-#include <dtt.h> #include <miiphy.h>
#include "405ep.h" @@ -41,8 +40,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */
return 0; } diff --git a/board/gdsys/405ep/neo.c b/board/gdsys/405ep/neo.c index ff0edb2547..ad88af2d46 100644 --- a/board/gdsys/405ep/neo.c +++ b/board/gdsys/405ep/neo.c @@ -10,7 +10,6 @@ #include <asm/processor.h> #include <asm/io.h> #include <asm/ppc4xx-gpio.h> -#include <dtt.h>
#include "405ep.h" #include <gdsys_fpga.h> @@ -32,8 +31,13 @@ struct ihs_fpga *fpga_ptr[] = CONFIG_SYS_FPGA_PTR;
int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */
return 0; } diff --git a/board/gdsys/405ex/io64.c b/board/gdsys/405ex/io64.c index 0a7baaa9db..9ef965bbfa 100644 --- a/board/gdsys/405ex/io64.c +++ b/board/gdsys/405ex/io64.c @@ -26,7 +26,6 @@
#include <miiphy.h> #include <i2c.h> -#include <dtt.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -70,8 +69,13 @@ static inline void blank_string(int size) */ int misc_init_r(void) { - /* startup fans */ - dtt_init(); + /* + * Note: DTT has been removed. Please use UCLASS_THERMAL. + * + * startup fans + * + * dtt_init(); + */
#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ diff --git a/cmd/Makefile b/cmd/Makefile index e98786807b..f043407656 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -43,7 +43,6 @@ ifdef CONFIG_POST obj-$(CONFIG_CMD_DIAG) += diag.o endif obj-$(CONFIG_CMD_DISPLAY) += display.o -obj-$(CONFIG_CMD_DTT) += dtt.o obj-$(CONFIG_CMD_ECHO) += echo.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o obj-$(CONFIG_CMD_EEPROM) += eeprom.o diff --git a/cmd/dtt.c b/cmd/dtt.c deleted file mode 100644 index dd427a3d0b..0000000000 --- a/cmd/dtt.c +++ /dev/null @@ -1,120 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <config.h> -#include <command.h> - -#include <dtt.h> -#include <i2c.h> -#include <tmu.h> -#include <linux/bug.h> - -#if defined CONFIG_DTT_SENSORS -static unsigned long sensor_initialized; - -static void _initialize_dtt(void) -{ - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - - for (i = 0; i < sizeof(sensors); i++) { - if ((sensor_initialized & (1 << i)) == 0) { - if (dtt_init_one(sensors[i]) != 0) { - printf("DTT%d: Failed init!\n", i); - continue; - } - sensor_initialized |= (1 << i); - } - } -} - -void dtt_init(void) -{ - int old_bus; - - /* switch to correct I2C bus */ - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - - _initialize_dtt(); - - /* switch back to original I2C bus */ - I2C_SET_BUS(old_bus); -} -#endif - -int dtt_i2c(void) -{ -#if defined CONFIG_DTT_SENSORS - int i; - unsigned char sensors[] = CONFIG_DTT_SENSORS; - int old_bus; - - /* Force a compilation error, if there are more then 32 sensors */ - BUILD_BUG_ON(sizeof(sensors) > 32); - /* switch to correct I2C bus */ -#ifdef CONFIG_SYS_I2C - old_bus = i2c_get_bus_num(); - i2c_set_bus_num(CONFIG_SYS_DTT_BUS_NUM); -#else - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); -#endif - - _initialize_dtt(); - - /* - * Loop through sensors, read - * temperature, and output it. - */ - for (i = 0; i < sizeof(sensors); i++) - printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i])); - - /* switch back to original I2C bus */ -#ifdef CONFIG_SYS_I2C - i2c_set_bus_num(old_bus); -#else - I2C_SET_BUS(old_bus); -#endif -#endif - - return 0; -} - -int dtt_tmu(void) -{ -#if defined CONFIG_TMU_CMD_DTT - int cur_temp; - - /* Sense and return latest thermal info */ - if (tmu_monitor(&cur_temp) == TMU_STATUS_INIT) { - puts("TMU is in unknown state, temperature is invalid\n"); - return -1; - } - printf("Current temperature: %u degrees Celsius\n", cur_temp); -#endif - return 0; -} - -int do_dtt(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) -{ - int err = 0; - - err |= dtt_i2c(); - err |= dtt_tmu(); - - return err; -} /* do_dtt() */ - -/***************************************************/ - -U_BOOT_CMD( - dtt, 1, 1, do_dtt, - "Read temperature from Digital Thermometer and Thermostat", - "" -); diff --git a/drivers/Kconfig b/drivers/Kconfig index a5f24d72da..a736386a0d 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -30,8 +30,6 @@ source "drivers/fpga/Kconfig"
source "drivers/gpio/Kconfig"
-source "drivers/hwmon/Kconfig" - source "drivers/i2c/Kconfig"
source "drivers/input/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index f16d7fdb4f..058bccb761 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -74,7 +74,6 @@ obj-$(CONFIG_CPU) += cpu/ obj-y += crypto/ obj-y += firmware/ obj-$(CONFIG_FPGA) += fpga/ -obj-y += hwmon/ obj-y += misc/ obj-$(CONFIG_MMC) += mmc/ obj-y += pcmcia/ diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile deleted file mode 100644 index b4fb057c16..0000000000 --- a/drivers/hwmon/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2001 -# Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -#ccflags-y += -DDEBUG - -obj-$(CONFIG_DTT_ADM1021) += adm1021.o -obj-$(CONFIG_DTT_ADT7460) += adt7460.o -obj-$(CONFIG_DTT_DS1621) += ds1621.o -obj-$(CONFIG_DTT_DS1722) += ds1722.o -obj-$(CONFIG_DTT_DS1775) += ds1775.o -obj-$(CONFIG_DTT_DS620) += ds620.o -obj-$(CONFIG_DTT_LM63) += lm63.o -obj-$(CONFIG_DTT_LM73) += lm73.o -obj-$(CONFIG_DTT_LM75) += lm75.o -obj-$(CONFIG_DTT_LM81) += lm81.o diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c deleted file mode 100644 index 99e942b499..0000000000 --- a/drivers/hwmon/adm1021.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * (C) Copyright 2003 - * Murray Jensen, CSIRO-MIT, Murray.Jensen@csiro.au - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Analog Devices's ADM1021 - * "Low Cost Microprocessor System Temperature Monitor" - */ - -#include <common.h> - -#include <i2c.h> -#include <dtt.h> - -#define DTT_READ_LOC_VALUE 0x00 -#define DTT_READ_REM_VALUE 0x01 -#define DTT_READ_STATUS 0x02 -#define DTT_READ_CONFIG 0x03 -#define DTT_READ_CONVRATE 0x04 -#define DTT_READ_LOC_HIGHLIM 0x05 -#define DTT_READ_LOC_LOWLIM 0x06 -#define DTT_READ_REM_HIGHLIM 0x07 -#define DTT_READ_REM_LOWLIM 0x08 -#define DTT_READ_DEVID 0xfe - -#define DTT_WRITE_CONFIG 0x09 -#define DTT_WRITE_CONVRATE 0x0a -#define DTT_WRITE_LOC_HIGHLIM 0x0b -#define DTT_WRITE_LOC_LOWLIM 0x0c -#define DTT_WRITE_REM_HIGHLIM 0x0d -#define DTT_WRITE_REM_LOWLIM 0x0e -#define DTT_WRITE_ONESHOT 0x0f - -#define DTT_STATUS_BUSY 0x80 /* 1=ADC Converting */ -#define DTT_STATUS_LHIGH 0x40 /* 1=Local High Temp Limit Tripped */ -#define DTT_STATUS_LLOW 0x20 /* 1=Local Low Temp Limit Tripped */ -#define DTT_STATUS_RHIGH 0x10 /* 1=Remote High Temp Limit Tripped */ -#define DTT_STATUS_RLOW 0x08 /* 1=Remote Low Temp Limit Tripped */ -#define DTT_STATUS_OPEN 0x04 /* 1=Remote Sensor Open-Circuit */ - -#define DTT_CONFIG_ALERT_MASKED 0x80 /* 0=ALERT Enabled, 1=ALERT Masked */ -#define DTT_CONFIG_STANDBY 0x40 /* 0=Run, 1=Standby */ - -#define DTT_ADM1021_DEVID 0x41 - -typedef - struct { - uint i2c_addr:7; /* 7bit i2c chip address */ - uint conv_rate:3; /* conversion rate */ - uint enable_alert:1; /* enable alert output pin */ - uint enable_local:1; /* enable internal temp sensor */ - uint max_local:8; /* internal temp maximum */ - uint min_local:8; /* internal temp minimum */ - uint enable_remote:1; /* enable remote temp sensor */ - uint max_remote:8; /* remote temp maximum */ - uint min_remote:8; /* remote temp minimum */ - } -dtt_cfg_t; - -dtt_cfg_t dttcfg[] = CONFIG_SYS_DTT_ADM1021; - -int -dtt_read (int sensor, int reg) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - uchar data; - - if (i2c_read(dcp->i2c_addr, reg, 1, &data, 1) != 0) - return -1; - - return (int)data; -} /* dtt_read() */ - -int -dtt_write (int sensor, int reg, int val) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - uchar data; - - data = (uchar)(val & 0xff); - - if (i2c_write(dcp->i2c_addr, reg, 1, &data, 1) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -int -dtt_init_one(int sensor) -{ - dtt_cfg_t *dcp = &dttcfg[sensor >> 1]; - int reg, val; - - if (((sensor & 1) == 0 ? dcp->enable_local : dcp->enable_remote) == 0) - return 1; /* sensor is disabled (or rather ignored) */ - - /* - * Setup High Limit register - */ - if ((sensor & 1) == 0) { - reg = DTT_WRITE_LOC_HIGHLIM; - val = dcp->max_local; - } - else { - reg = DTT_WRITE_REM_HIGHLIM; - val = dcp->max_remote; - } - if (dtt_write (sensor, reg, val) != 0) - return 1; - - /* - * Setup Low Limit register - */ - if ((sensor & 1) == 0) { - reg = DTT_WRITE_LOC_LOWLIM; - val = dcp->min_local; - } - else { - reg = DTT_WRITE_REM_LOWLIM; - val = dcp->min_remote; - } - if (dtt_write (sensor, reg, val) != 0) - return 1; - - /* shouldn't hurt if the rest gets done twice */ - - /* - * Setup Conversion Rate register - */ - if (dtt_write (sensor, DTT_WRITE_CONVRATE, dcp->conv_rate) != 0) - return 1; - - /* - * Setup configuraton register - */ - val = 0; /* running */ - if (dcp->enable_alert == 0) - val |= DTT_CONFIG_ALERT_MASKED; /* mask ALERT pin */ - if (dtt_write (sensor, DTT_WRITE_CONFIG, val) != 0) - return 1; - - return 0; -} /* dtt_init_one() */ - -int -dtt_get_temp (int sensor) -{ - signed char val; - - if ((sensor & 1) == 0) - val = dtt_read(sensor, DTT_READ_LOC_VALUE); - else - val = dtt_read(sensor, DTT_READ_REM_VALUE); - - return (int) val; -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c deleted file mode 100644 index 9b2c5b69ce..0000000000 --- a/drivers/hwmon/adt7460.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * (C) Copyright 2008 - * Ricado Ribalda-Universidad Autonoma de Madrid, ricardo.ribalda@gmail.com - * This work has been supported by: QTechnology http://qtec.com/ - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -#define ADT7460_ADDRESS 0x2c -#define ADT7460_INVALID 128 -#define ADT7460_CONFIG 0x40 -#define ADT7460_REM1_TEMP 0x25 -#define ADT7460_LOCAL_TEMP 0x26 -#define ADT7460_REM2_TEMP 0x27 - -int dtt_read(int sensor, int reg) -{ - u8 dir = reg; - u8 data; - - if (i2c_read(ADT7460_ADDRESS, dir, 1, &data, 1) == -1) - return -1; - if (data == ADT7460_INVALID) - return -1; - - return data; -} - -int dtt_write(int sensor, int reg, int val) -{ - u8 dir = reg; - u8 data = val; - - if (i2c_write(ADT7460_ADDRESS, dir, 1, &data, 1) == -1) - return -1; - - return 0; -} - -int dtt_init_one(int sensor) -{ - printf("ADT7460 at I2C address 0x%2x\n", ADT7460_ADDRESS); - - if (dtt_write(0, ADT7460_CONFIG, 1) == -1) { - puts("Error initialiting ADT7460\n"); - return -1; - } - - return 0; -} - -int dtt_get_temp(int sensor) -{ - int aux; - u8 table[] = - { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; - - if (sensor > 2) { - puts("DTT sensor does not exist\n"); - return -1; - } - - aux = dtt_read(0, table[sensor]); - if (aux == -1) { - puts("DTT temperature read failed\n"); - return -1; - } - - return aux; -} diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c deleted file mode 100644 index 66947a664e..0000000000 --- a/drivers/hwmon/ds1621.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1621/1631 Digital Thermometer and Thermostat. - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1621 */ -#define DTT_READ_TEMP 0xAA -#define DTT_READ_COUNTER 0xA8 -#define DTT_READ_SLOPE 0xA9 -#define DTT_WRITE_START_CONV 0xEE -#define DTT_WRITE_STOP_CONV 0x22 -#define DTT_TEMP_HIGH 0xA1 -#define DTT_TEMP_LOW 0xA2 -#define DTT_CONFIG 0xAC - -/* - * Config register bits - */ -#define DTT_CONFIG_1SHOT 0x01 -#define DTT_CONFIG_POLARITY 0x02 -#define DTT_CONFIG_R0 0x04 /* ds1631 only */ -#define DTT_CONFIG_R1 0x08 /* ds1631 only */ -#define DTT_CONFIG_NVB 0x10 -#define DTT_CONFIG_TLF 0x20 -#define DTT_CONFIG_THF 0x40 -#define DTT_CONFIG_DONE 0x80 - - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* Calculate sensor address and command */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1621*/ - - /* Prepare to handle 2 byte result */ - switch(reg) { - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - break; - default: - dlen = 1; - } - - /* Now try to read the register */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* Handle 2 byte result */ - if (dlen == 2) - return (short)((data[0] << 8) | data[1]); - - return (int)data[0]; -} - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* Calculate sensor address and register */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Handle various data sizes. */ - switch(reg) { - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - break; - case DTT_WRITE_START_CONV: - case DTT_WRITE_STOP_CONV: - dlen = 0; - data[0] = (char)0; - data[1] = (char)0; - break; - default: - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* Write value to device */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* Poll NV memory busy bit in case write was to register stored in EEPROM */ - while(i2c_reg_read(sensor, DTT_CONFIG) & DTT_CONFIG_NVB) - ; - - return 0; -} - - -int dtt_init_one(int sensor) -{ - int val; - - /* Setup High Temp */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HIGH, val) != 0) - return 1; - - /* Setup Low Temp - hysteresis */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_LOW, val) != 0) - return 1; - - /* - * Setup configuraton register - * - * Clear THF & TLF, Reserved = 1, Polarity = Active Low, One Shot = YES - * - * We run in polled mode, since there isn't any way to know if this - * lousy device is ready to provide temperature readings on power up. - */ - val = 0x9; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} - -int dtt_get_temp(int sensor) -{ - int i; - - /* Start a conversion, may take up to 1 second. */ - dtt_write(sensor, DTT_WRITE_START_CONV, 0); - for (i = 0; i <= 10; i++) { - udelay(100000); - if (dtt_read(sensor, DTT_CONFIG) & DTT_CONFIG_DONE) - break; - } - - return (dtt_read(sensor, DTT_READ_TEMP) / 256); -} diff --git a/drivers/hwmon/ds1722.c b/drivers/hwmon/ds1722.c deleted file mode 100644 index c46958846c..0000000000 --- a/drivers/hwmon/ds1722.c +++ /dev/null @@ -1,137 +0,0 @@ -#include <common.h> -#include <asm/ic/ssi.h> -#include <ds1722.h> - -static void ds1722_select(int dev) -{ - ssi_set_interface(4096, 0, 0, 0); - ssi_chip_select(0); - udelay(1); - ssi_chip_select(dev); - udelay(1); -} - - -u8 ds1722_read(int dev, int addr) -{ - u8 res; - - ds1722_select(dev); - - ssi_tx_byte(addr); - res = ssi_rx_byte(); - - ssi_chip_select(0); - - return res; -} - -void ds1722_write(int dev, int addr, u8 data) -{ - ds1722_select(dev); - - ssi_tx_byte(0x80|addr); - ssi_tx_byte(data); - - ssi_chip_select(0); -} - - -u16 ds1722_temp(int dev, int resolution) -{ - static int useconds[] = { - 75000, 150000, 300000, 600000, 1200000 - }; - char temp; - u16 res; - - - /* set up the desired resulotion ... */ - ds1722_write(dev, 0, 0xe0 | (resolution << 1)); - - /* wait while the chip measures the tremperature */ - udelay(useconds[resolution]); - - res = (temp = ds1722_read(dev, 2)) << 8; - - if (temp < 0) { - temp = (16 - (ds1722_read(dev, 1) >> 4)) & 0x0f; - } else { - temp = (ds1722_read(dev, 1) >> 4); - } - - switch (temp) { - case 0: - /* .0000 */ - break; - case 1: - /* .0625 */ - res |=1; - break; - case 2: - /* .1250 */ - res |=1; - break; - case 3: - /* .1875 */ - res |=2; - break; - case 4: - /* .2500 */ - res |=3; - break; - case 5: - /* .3125 */ - res |=3; - break; - case 6: - /* .3750 */ - res |=4; - break; - case 7: - /* .4375 */ - res |=4; - break; - case 8: - /* .5000 */ - res |=5; - break; - case 9: - /* .5625 */ - res |=6; - break; - case 10: - /* .6250 */ - res |=6; - break; - case 11: - /* .6875 */ - res |=7; - break; - case 12: - /* .7500 */ - res |=8; - break; - case 13: - /* .8125 */ - res |=8; - break; - case 14: - /* .8750 */ - res |=9; - break; - case 15: - /* .9375 */ - res |=9; - break; - } - return res; - -} - -int ds1722_probe(int dev) -{ - u16 temp = ds1722_temp(dev, DS1722_RESOLUTION_12BIT); - printf("%d.%d deg C\n\n", (char)(temp >> 8), temp & 0xff); - return 0; -} diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c deleted file mode 100644 index 4c0c0b82a0..0000000000 --- a/drivers/hwmon/ds1775.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1775 Digital Thermometer and Thermostat - */ - -#include <common.h> - -#include <i2c.h> -#include <dtt.h> - -#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1775 device code */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HYST 0x2 -#define DTT_TEMP_OS 0x3 - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and command - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1775 */ - - /* - * Prepare to handle 2 byte result - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_OS) || (reg == DTT_TEMP_HYST)) - dlen = 2; - else - dlen = 1; - - /* - * Now try to read the register - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return 1; - - /* - * Handle 2 byte result - */ - if (dlen == 2) - return ((int)((short)data[1] + (((short)data[0]) << 8))); - - return (int) data[0]; -} - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* - * Handle various data sizes - */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_OS) || (reg == DTT_TEMP_HYST)) { - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - } else { - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* - * Write value to device - */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} - - -int dtt_init_one(int sensor) -{ - int val; - - /* - * Setup High Temp - */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_OS, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - /* - * Setup Low Temp - hysteresis - */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - /* - * Setup configuraton register - * - * Fault Tolerance limits 4, Thermometer resolution bits is 9, - * Polarity = Active Low,continuous conversion mode, Thermostat - * mode is interrupt mode - */ - val = 0xa; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - udelay(50000); /* Max 50ms */ - - return 0; -} - -int dtt_get_temp(int sensor) -{ - return (dtt_read(sensor, DTT_READ_TEMP) / 256); -} diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c deleted file mode 100644 index 1ecc3da799..0000000000 --- a/drivers/hwmon/ds620.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * DS620 DTT support - * - * (C) Copyright 2014 3ADEV http://www.3adev.com - * Written-by: Albert ARIBAUD albert.aribaud@3adev.fr - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Dallas Semiconductor's DS1621/1631 Digital Thermometer and Thermostat. - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 -#define DTT_START_CONVERT 0x51 -#define DTT_TEMP 0xAA -#define DTT_CONFIG 0xAC - -/* - * Config register MSB bits - */ -#define DTT_CONFIG_1SHOT 0x01 -#define DTT_CONFIG_AUTOC 0x02 -#define DTT_CONFIG_R0 0x04 /* always 1 */ -#define DTT_CONFIG_R1 0x08 /* always 1 */ -#define DTT_CONFIG_TLF 0x10 -#define DTT_CONFIG_THF 0x20 -#define DTT_CONFIG_NVB 0x40 -#define DTT_CONFIG_DONE 0x80 - -#define CHIP(sensor) (DTT_I2C_DEV_CODE + (sensor & 0x07)) - -int dtt_init_one(int sensor) -{ - uint8_t config = DTT_CONFIG_1SHOT - | DTT_CONFIG_R0 - | DTT_CONFIG_R1; - return i2c_write(CHIP(sensor), DTT_CONFIG, 1, &config, 1); -} - -int dtt_get_temp(int sensor) -{ - uint8_t status; - uint8_t temp[2]; - - /* Start a conversion, may take up to 1 second. */ - i2c_write(CHIP(sensor), DTT_START_CONVERT, 1, NULL, 0); - do { - if (i2c_read(CHIP(sensor), DTT_CONFIG, 1, &status, 1)) - /* bail out if I2C error */ - status |= DTT_CONFIG_DONE; - } while (!(status & DTT_CONFIG_DONE)); - if (i2c_read(CHIP(sensor), DTT_TEMP, 1, temp, 2)) - /* bail out if I2C error */ - return -274; /* below absolute zero == error */ - - return ((int16_t)(temp[1] | (temp[0] << 8))) >> 7; -} diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c deleted file mode 100644 index 053c785fc5..0000000000 --- a/drivers/hwmon/lm63.c +++ /dev/null @@ -1,160 +0,0 @@ -/* - * (C) Copyright 2007-2008 - * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de - * based on lm75.c by Bill Hunter - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * National LM63/LM64 Temperature Sensor - * Main difference: LM 64 has -16 Kelvin temperature offset - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -#define DTT_I2C_LM63_ADDR 0x4C /* National LM63 device */ - -#define DTT_READ_TEMP_RMT_MSB 0x01 -#define DTT_CONFIG 0x03 -#define DTT_READ_TEMP_RMT_LSB 0x10 -#define DTT_TACHLIM_LSB 0x48 -#define DTT_TACHLIM_MSB 0x49 -#define DTT_FAN_CONFIG 0x4A -#define DTT_PWM_FREQ 0x4D -#define DTT_PWM_LOOKUP_BASE 0x50 - -struct pwm_lookup_entry { - u8 temp; - u8 pwm; -}; - -/* - * Device code - */ - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - if (!sensor) - sensor = DTT_I2C_LM63_ADDR; /* legacy config */ - - dlen = 1; - - /* - * Now try to read the register. - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - return (int)data[0]; -} /* dtt_read() */ - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - if (!sensor) - sensor = DTT_I2C_LM63_ADDR; /* legacy config */ - - dlen = 1; - data[0] = (char)(val & 0xff); - - /* - * Write value to register. - */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -static int is_lm64(int sensor) -{ - return sensor && (sensor != DTT_I2C_LM63_ADDR); -} - -int dtt_init_one(int sensor) -{ - int i; - int val; - - struct pwm_lookup_entry pwm_lookup[] = CONFIG_DTT_PWM_LOOKUPTABLE; - - /* - * Set PWM Frequency to 2.5% resolution - */ - val = 20; - if (dtt_write(sensor, DTT_PWM_FREQ, val) != 0) - return 1; - - /* - * Set Tachometer Limit - */ - val = CONFIG_DTT_TACH_LIMIT; - if (dtt_write(sensor, DTT_TACHLIM_LSB, val & 0xff) != 0) - return 1; - if (dtt_write(sensor, DTT_TACHLIM_MSB, (val >> 8) & 0xff) != 0) - return 1; - - /* - * Make sure PWM Lookup-Table is writeable - */ - if (dtt_write(sensor, DTT_FAN_CONFIG, 0x20) != 0) - return 1; - - /* - * Setup PWM Lookup-Table - */ - for (i = 0; i < ARRAY_SIZE(pwm_lookup); i++) { - int address = DTT_PWM_LOOKUP_BASE + 2 * i; - val = pwm_lookup[i].temp; - if (is_lm64(sensor)) - val -= 16; - if (dtt_write(sensor, address, val) != 0) - return 1; - val = dtt_read(sensor, address); - val = pwm_lookup[i].pwm; - if (dtt_write(sensor, address + 1, val) != 0) - return 1; - } - - /* - * Enable PWM Lookup-Table, PWM Clock 360 kHz, Tachometer Mode 2 - */ - val = 0x02; - if (dtt_write(sensor, DTT_FAN_CONFIG, val) != 0) - return 1; - - /* - * Enable Tach input - */ - val = dtt_read(sensor, DTT_CONFIG) | 0x04; - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} - -int dtt_get_temp(int sensor) -{ - s16 temp = (dtt_read(sensor, DTT_READ_TEMP_RMT_MSB) << 8) - | (dtt_read(sensor, DTT_READ_TEMP_RMT_LSB)); - - if (is_lm64(sensor)) - temp += 16 << 8; - - /* Ignore LSB for now, U-Boot only prints natural numbers */ - return temp >> 8; -} diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c deleted file mode 100644 index c15c7514d8..0000000000 --- a/drivers/hwmon/lm73.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * (C) Copyright 2007-2008 - * Larry Johnson, lrj@acm.org - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * National Semiconductor LM73 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* National Semi's LM73 device */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HIGH 0x2 -#define DTT_TEMP_LOW 0x3 -#define DTT_CONTROL 0x4 -#define DTT_ID 0x7 - -int dtt_read(int const sensor, int const reg) -{ - int dlen; - uint8_t data[2]; - - /* - * Validate 'reg' param and get register size. - */ - switch (reg) { - case DTT_CONFIG: - case DTT_CONTROL: - dlen = 1; - break; - case DTT_READ_TEMP: - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - case DTT_ID: - dlen = 2; - break; - default: - return -1; - } - /* - * Try to read the register at the calculated sensor address. - */ - if (0 != - i2c_read(DTT_I2C_DEV_CODE + (sensor & 0x07), reg, 1, data, dlen)) - return -1; - /* - * Handle 2 byte result. - */ - if (2 == dlen) - return (int)((unsigned)data[0] << 8 | (unsigned)data[1]); - - return (int)data[0]; -} /* dtt_read() */ - -int dtt_write(int const sensor, int const reg, int const val) -{ - int dlen; - uint8_t data[2]; - - /* - * Validate 'reg' param and handle register size - */ - switch (reg) { - case DTT_CONFIG: - case DTT_CONTROL: - dlen = 1; - data[0] = (uint8_t) val; - break; - case DTT_TEMP_HIGH: - case DTT_TEMP_LOW: - dlen = 2; - data[0] = (uint8_t) (val >> 8); /* MSB first */ - data[1] = (uint8_t) val; - break; - default: - return -1; - } - /* - * Write value to register at the calculated sensor address. - */ - return 0 != i2c_write(DTT_I2C_DEV_CODE + (sensor & 0x07), reg, 1, data, - dlen); -} /* dtt_write() */ - -int dtt_init_one(int const sensor) -{ - int val; - - /* - * Validate the Identification register - */ - if (0x0190 != dtt_read(sensor, DTT_ID)) - return -1; - /* - * Setup THIGH (upper-limit) and TLOW (lower-limit) registers - */ - val = CONFIG_SYS_DTT_MAX_TEMP << 7; - if (dtt_write(sensor, DTT_TEMP_HIGH, val)) - return -1; - - val = CONFIG_SYS_DTT_MIN_TEMP << 7; - if (dtt_write(sensor, DTT_TEMP_LOW, val)) - return -1; - /* - * Setup configuraton register - */ - /* config = alert active low, disabled, and reset */ - val = 0x64; - if (dtt_write(sensor, DTT_CONFIG, val)) - return -1; - /* - * Setup control/status register - */ - /* control = temp resolution 0.25C */ - val = 0x00; - if (dtt_write(sensor, DTT_CONTROL, val)) - return -1; - - dtt_read(sensor, DTT_CONTROL); /* clear temperature flags */ - return 0; -} /* dtt_init_one() */ - -int dtt_get_temp(int const sensor) -{ - int const ret = dtt_read(sensor, DTT_READ_TEMP); - - if (ret < 0) { - printf("DTT temperature read failed.\n"); - return 0; - } - return (int)((int16_t) ret + 0x0040) >> 7; -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c deleted file mode 100644 index aafa4757b1..0000000000 --- a/drivers/hwmon/lm75.c +++ /dev/null @@ -1,139 +0,0 @@ -/* - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * On Semiconductor's LM75 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x48 /* ON Semi's LM75 device */ -#define DTT_READ_TEMP 0x0 -#define DTT_CONFIG 0x1 -#define DTT_TEMP_HYST 0x2 -#define DTT_TEMP_SET 0x3 - -int dtt_read(int sensor, int reg) -{ - int dlen; - uchar data[2]; - -#ifdef CONFIG_DTT_AD7414 - /* - * On AD7414 the first value upon bootup is not read correctly. - * This is most likely because of the 800ms update time of the - * temp register in normal update mode. To get current values - * each time we issue the "dtt" command including upon powerup - * we switch into one-short mode. - * - * Issue one-shot mode command - */ - dtt_write(sensor, DTT_CONFIG, 0x64); -#endif - - /* Validate 'reg' param */ - if((reg < 0) || (reg > 3)) - return -1; - - /* Calculate sensor address and register. */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Prepare to handle 2 byte result. */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) - dlen = 2; - else - dlen = 1; - - /* Now try to read the register. */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - /* Handle 2 byte result. */ - if (dlen == 2) - return ((int)((short)data[1] + (((short)data[0]) << 8))); - - return (int)data[0]; -} /* dtt_read() */ - - -int dtt_write(int sensor, int reg, int val) -{ - int dlen; - uchar data[2]; - - /* Validate 'reg' param */ - if ((reg < 0) || (reg > 3)) - return 1; - - /* Calculate sensor address and register. */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); - - /* Handle 2 byte values. */ - if ((reg == DTT_READ_TEMP) || - (reg == DTT_TEMP_HYST) || - (reg == DTT_TEMP_SET)) { - dlen = 2; - data[0] = (char)((val >> 8) & 0xff); /* MSB first */ - data[1] = (char)(val & 0xff); - } else { - dlen = 1; - data[0] = (char)(val & 0xff); - } - - /* Write value to register. */ - if (i2c_write(sensor, reg, 1, data, dlen) != 0) - return 1; - - return 0; -} /* dtt_write() */ - - -int dtt_init_one(int sensor) -{ - int val; - - /* Setup TSET ( trip point ) register */ - val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ - if (dtt_write(sensor, DTT_TEMP_SET, val) != 0) - return 1; - - /* Setup THYST ( untrip point ) register - Hysteresis */ - val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; - if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0) - return 1; - - /* Setup configuraton register */ -#ifdef CONFIG_DTT_AD7414 - /* config = alert active low and disabled */ - val = 0x60; -#else - /* config = 6 sample integration, int mode, active low, and enable */ - val = 0x18; -#endif - if (dtt_write(sensor, DTT_CONFIG, val) != 0) - return 1; - - return 0; -} /* dtt_init_one() */ - -int dtt_get_temp(int sensor) -{ - int const ret = dtt_read(sensor, DTT_READ_TEMP); - - if (ret < 0) { - printf("DTT temperature read failed.\n"); - return 0; - } - return (int)((int16_t) ret / 256); -} /* dtt_get_temp() */ diff --git a/drivers/hwmon/lm81.c b/drivers/hwmon/lm81.c deleted file mode 100644 index bcc8d3293b..0000000000 --- a/drivers/hwmon/lm81.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * (C) Copyright 2006 - * Heiko Schocher, DENX Software Enginnering hs@denx.de - * - * based on dtt/lm75.c which is ... - * - * (C) Copyright 2001 - * Bill Hunter, Wave 7 Optics, williamhunter@mediaone.net - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * On Semiconductor's LM81 Temperature Sensor - */ - -#include <common.h> -#include <i2c.h> -#include <dtt.h> - -/* - * Device code - */ -#define DTT_I2C_DEV_CODE 0x2c /* ON Semi's LM81 device */ -#define DTT_READ_TEMP 0x27 -#define DTT_CONFIG_TEMP 0x4b -#define DTT_TEMP_MAX 0x39 -#define DTT_TEMP_HYST 0x3a -#define DTT_CONFIG 0x40 - -int dtt_read(int sensor, int reg) -{ - int dlen = 1; - uchar data[2]; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x03); /* calculate address of lm81 */ - - /* - * Now try to read the register. - */ - if (i2c_read(sensor, reg, 1, data, dlen) != 0) - return -1; - - return (int)data[0]; -} /* dtt_read() */ - - -int dtt_write(int sensor, int reg, int val) -{ - uchar data; - - /* - * Calculate sensor address and register. - */ - sensor = DTT_I2C_DEV_CODE + (sensor & 0x03); /* calculate address of lm81 */ - - data = (char)(val & 0xff); - - /* - * Write value to register. - */ - if (i2c_write(sensor, reg, 1, &data, 1) != 0) - return 1; - - return 0; -} /* dtt_write() */ - -#define DTT_MANU 0x3e -#define DTT_REV 0x3f -#define DTT_CONFIG 0x40 -#define DTT_ADR 0x48 - -int dtt_init_one(int sensor) -{ - int man; - int adr; - int rev; - - if (dtt_write (sensor, DTT_CONFIG, 0x01) < 0) - return 1; - /* The LM81 needs 400ms to get the correct values ... */ - udelay (400000); - man = dtt_read (sensor, DTT_MANU); - if (man != 0x01) - return 1; - adr = dtt_read (sensor, DTT_ADR); - if (adr < 0) - return 1; - rev = dtt_read (sensor, DTT_REV); - if (rev < 0) - return 1; - - debug ("DTT: Found LM81@%x Rev: %d\n", adr, rev); - return 0; -} /* dtt_init_one() */ - - -#define TEMP_FROM_REG(temp) \ - ((temp)<256?((((temp)&0x1fe) >> 1) * 10) + ((temp) & 1) * 5: \ - ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5) \ - -int dtt_get_temp(int sensor) -{ - int val = dtt_read (sensor, DTT_READ_TEMP); - int tmpcnf = dtt_read (sensor, DTT_CONFIG_TEMP); - - return (TEMP_FROM_REG((val << 1) + ((tmpcnf & 0x80) >> 7))) / 10; -} /* dtt_get_temp() */ diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index bc0bc2b6c8..95c05350cd 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_DTT /* Digital Therm and Thermostat */ #define CONFIG_CMD_EEPROM /* EEPROM read/write support */ #define CONFIG_CMD_FDC /* Floppy Disk Support */ #define CONFIG_CMD_FUSE /* Device fuse support */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index b9599b5e3b..8628b7ed18 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -163,26 +163,6 @@ #define CONFIG_SYS_EEPROM_WREN 1 #define CONFIG_SYS_I2C_BOOT_EEPROM_ADDR 0x52
-/* - * standard dtt sensor configuration - bottom bit will determine local or - * remote sensor of the TMP401 - */ -#define CONFIG_DTT_SENSORS { 0, 1 } - -/* - * The PMC440 uses a TI TMP401 temperature sensor. This part - * is basically compatible to the ADM1021 that is supported - * by U-Boot. - * - * - i2c addr 0x4c - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT ouput disabled - * - local temp sensor enabled, min set to 0 deg, max set to 70 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 70 deg - */ -#define CONFIG_DTT_ADM1021 -#define CONFIG_SYS_DTT_ADM1021 { { 0x4c, 0x02, 0, 1, 70, 0, 1, 70, 0} } - #define CONFIG_PREBOOT "echo Add \"run fpga\" and " \ "\"painit\" to preboot command"
@@ -258,7 +238,6 @@
/* Partitions */
-#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index e3c2cca3c3..df6386c602 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -184,13 +184,6 @@ #define CONFIG_RTC_DS1337 /* use ds1337 rtc via i2c */ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 /* at address 0x68 */
-/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - /* * TSEC */ @@ -280,7 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index cd46db4f6f..8265f3c1ab 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -129,27 +129,6 @@
#define CONFIG_HWCONFIG
-#define CONFIG_DTT_ADM1021 1 /* ADM1021 temp sensor support */ -#define CONFIG_SYS_DTT_BUS_NUM 1 /* The I2C bus for DTT */ -#define CONFIG_DTT_SENSORS { 0, 1 } /* Sensor index */ -/* - * ADM1021/NCT72 temp sensor configuration (see dtt/adm1021.c for details). - * there will be one entry in this array for each two (dummy) sensors in - * CONFIG_DTT_SENSORS. - * - * For uCP1020 module: - * - only one ADM1021/NCT72 - * - i2c addr 0x41 - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT output disabled - * - local temp sensor enabled, min set to 0 deg, max set to 85 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 85 deg - */ -#define CONFIG_SYS_DTT_ADM1021 { { CONFIG_SYS_I2C_NCT72_ADDR, \ - 0x02, 0, 1, 0, 85, 1, 0, 85} } - -#define CONFIG_CMD_DTT - /* * These can be toggled for performance analysis, otherwise use default. */ diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 9f35e71d0c..0be310d4a3 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -124,14 +124,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - /*----------------------------------------------------------------------- * Ethernet *----------------------------------------------------------------------*/ @@ -160,7 +152,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND
/*----------------------------------------------------------------------- diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index ea440d6e16..b495d0645b 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -261,14 +261,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 /* use AD7414 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - #if !defined(CONFIG_ARCHES) /* RTC configuration */ #define CONFIG_RTC_M41T62 @@ -369,17 +361,14 @@ * Commands additional to the ones defined in amcc-common.h */ #if defined(CONFIG_ARCHES) -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM #elif defined(CONFIG_CANYONLANDS) -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA #define CONFIG_CMD_SDRAM #elif defined(CONFIG_GLACIER) -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index e32651f541..89f24e0980 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
@@ -111,13 +110,6 @@ #define CONFIG_SYS_SPD_BUS_NUM 4
/* Temp sensor/hwmon/dtt */ -#define CONFIG_SYS_DTT_BUS_NUM 4 -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0x4c, 0x4e, 0x18 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 46, 10 }, { 48, 14 }, { 50, 19 }, { 52, 23 },\ - { 54, 27 }, { 56, 31 }, { 58, 36 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10
#define CONFIG_SYS_ICS8N3QV01_I2C {1, 3} #define CONFIG_SYS_SIL1178_I2C {0, 2} diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 2b7d62b034..ec21a8347a 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -55,7 +55,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 5411e5ff49..91976a75bc 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -46,8 +46,6 @@
/* Thermal Management Unit */ #define CONFIG_EXYNOS_TMU -#define CONFIG_CMD_DTT -#define CONFIG_TMU_CMD_DTT
/* MMC SPL */ #define COPY_BL2_FNPTR_ADDR 0x02020030 diff --git a/include/configs/intip.h b/include/configs/intip.h index f1f840923b..036fd20eb4 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -218,13 +218,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16
-/* I2C SYSMON */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /* RTC configuration */ #define CONFIG_RTC_DS1337 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 @@ -272,7 +265,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM
diff --git a/include/configs/io.h b/include/configs/io.h index 3e44a8c607..dd195ffeed 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
@@ -93,11 +92,6 @@ #define CONFIG_SYS_I2C_PPC4XX_SPEED_0 100000
/* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10
/* * FLASH organization diff --git a/include/configs/io64.h b/include/configs/io64.h index 8e754fc10b..1b58f04540 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -327,14 +327,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16
-/* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0x18, 0x4c, 0x4e } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 43, 13 }, { 46, 16 }, \ - { 50, 20 }, { 53, 27 }, { 56, 34 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /*----------------------------------------------------------------------- * Ethernet *----------------------------------------------------------------------*/ @@ -373,7 +365,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT
#define CONFIG_SYS_POST_MEMORY_ON CONFIG_SYS_POST_MEMORY
diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 3143b631ce..c3b9da0d96 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -123,31 +123,6 @@ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 1900 /* play along with linux */
-/* I2C DTT */ -#define CONFIG_DTT_ADM1021 1 /* ADM1021 temp sensor support */ -#define CONFIG_SYS_DTT_BUS_NUM 1 /* The I2C bus for DTT */ -/* - * standard dtt sensor configuration - bottom bit will determine local or - * remote sensor of the ADM1021, the rest determines index into - * CONFIG_SYS_DTT_ADM1021 array below. - */ -#define CONFIG_DTT_SENSORS { 0, 1 } - -/* - * ADM1021 temp sensor configuration (see dtt/adm1021.c for details). - * there will be one entry in this array for each two (dummy) sensors in - * CONFIG_DTT_SENSORS. - * - * For Katmai board: - * - only one ADM1021 - * - i2c addr 0x18 - * - conversion rate 0x02 = 0.25 conversions/second - * - ALERT ouput disabled - * - local temp sensor enabled, min set to 0 deg, max set to 85 deg - * - remote temp sensor enabled, min set to 0 deg, max set to 85 deg - */ -#define CONFIG_SYS_DTT_ADM1021 { { 0x18, 0x02, 0, 1, 0, 85, 1, 0, 58} } - /*----------------------------------------------------------------------- * Environment *----------------------------------------------------------------------*/ diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index b8c0d0d8f0..a91a6a9ee5 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -317,10 +317,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16
-/* Standard DTT sensor configuration */ -#define CONFIG_DTT_DS1775 1 -#define CONFIG_DTT_SENSORS { 0 } - /* RTC configuration */ #define CONFIG_RTC_DS1338 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x68 diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 8293607c9c..0d50538a8e 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -14,7 +14,6 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE
/* standard km ethernet_present for piggy */ diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h index 35ec0972bf..7d69224bd1 100644 --- a/include/configs/km/km83xx-common.h +++ b/include/configs/km/km83xx-common.h @@ -215,13 +215,6 @@
#define CONFIG_KM_IVM_BUS 2 /* I2C2 (Mux-Port 1)*/
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0, 1, 2, 3} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_HYSTERESIS 3 -#define CONFIG_SYS_DTT_BUS_NUM 1 - #if defined(CONFIG_CMD_NAND) #define CONFIG_NAND_KMETER1 #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index aeece20bda..09c3aa9ca8 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -268,13 +268,6 @@ int get_sda(void); int get_scl(void); #endif
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 /* ON Semi's LM75 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_HYSTERESIS 3 -#define CONFIG_SYS_DTT_BUS_NUM 2 - #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
#define CONFIG_SYS_IMMR 0xF0000000 diff --git a/include/configs/makalu.h b/include/configs/makalu.h index cdb02f3693..a92bc43538 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -189,10 +189,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 /* I2C boot EEPROM (24C02BN) */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* Bytes of address */
-/* Standard DTT sensor configuration */ -#define CONFIG_DTT_DS1775 1 -#define CONFIG_DTT_SENSORS { 0 } - /* RTC configuration */ #define CONFIG_RTC_X1205 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x6f @@ -231,7 +227,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI
/* POST support */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index cb5c346807..aaa8962fd2 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_IDE #define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 @@ -268,6 +267,13 @@ #define LED_ON 0x00000010
/* +<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae +======= + * Temperature sensor + */ + +/* +>>>>>>> Drop digital thermometer and thermostat (DTT) drivers * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/neo.h b/include/configs/neo.h index 9115e251b1..29ce61c326 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
@@ -100,13 +99,6 @@ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_I2C_RTC_ADDR 0x68
-/* Temp sensor/hwmon/dtt */ -#define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ -#define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } -#define CONFIG_DTT_TACH_LIMIT 0xa10 - /* * FLASH organization */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 246fb808a9..ba29f3e7d1 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -61,7 +61,6 @@
/* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */ #undef CONFIG_EXYNOS_TMU -#undef CONFIG_TMU_CMD_DTT
#define CONFIG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index c39bb24420..7a120ed5a6 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -159,14 +159,6 @@ #define CONFIG_4xx_CONFIG_I2C_EEPROM_OFFSET 0 #define CONFIG_4xx_CONFIG_BLOCKSIZE 16
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - /* * Default environment variables */ @@ -219,7 +211,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 76b4038d50..b37e796d33 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -210,13 +210,6 @@ /* I2C W83782G HW-Monitoring IC */ #define CONFIG_SYS_I2C_W83782G_ADDR 0x28 /* W83782G address */
-/* I2C temp sensor */ -/* Socrates uses Maxim's DS75, which is compatible with LM75 */ -#define CONFIG_DTT_LM75 1 -#define CONFIG_DTT_SENSORS {4} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 125 -#define CONFIG_SYS_DTT_LOW_TEMP -55 -#define CONFIG_SYS_DTT_HYSTERESIS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4
/* @@ -286,7 +279,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM #define CONFIG_CMD_SDRAM #define CONFIG_CMD_REGINFO diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 738693c0c0..799c45e2d7 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -57,13 +57,6 @@ #define CONFIG_I2C_MULTI_BUS #define CONFIG_SYS_I2C_SPEED 100000
-/* I2C SYSMON (LM75) */ -#define CONFIG_DTT_LM75 -#define CONFIG_DTT_MAX_TEMP 70 -#define CONFIG_DTT_MIN_TEMP -30 -#define CONFIG_DTT_HYSTERESIS 3 -#define CONFIG_CMD_DTT - /* I2C EEPROM (M24C64) */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 @@ -371,8 +364,5 @@ #endif
/* Support at least the sensor on TQMa6 SOM */ -#if !defined(CONFIG_DTT_SENSORS) -#define CONFIG_DTT_SENSORS { 0 } -#endif
#endif /* __CONFIG_H */ diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index 3d6e4383e1..69e9079339 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_TQMA6_MBA6_H #define __CONFIG_TQMA6_MBA6_H
-#define CONFIG_DTT_SENSORS { 0, 1 } - #define CONFIG_FEC_XCV_TYPE RGMII #define CONFIG_ETHPRIME "FEC"
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index b9cc5d632f..4ab4c6559d 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -7,10 +7,6 @@ #ifndef __CONFIG_TQMA6_WRU4_H #define __CONFIG_TQMA6_WRU4_H
-/* DTT sensors */ -#define CONFIG_DTT_SENSORS { 0, 1 } -#define CONFIG_SYS_DTT_BUS_NUM 2 - /* Ethernet */ #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 82f4af9c93..458acf59af 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -85,14 +85,6 @@ #define CONFIG_RTC_DS1374
/* - * I2C Temperature Sensor (DTT) - */ - -#define CONFIG_CMD_DTT -#define CONFIG_DTT_SENSORS { 0, 1 } -#define CONFIG_DTT_DS620 - -/* * U-Boot General Configurations */ #define CONFIG_SYS_LONGHELP diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index ea4b739d0b..c4efae67a7 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -28,7 +28,6 @@ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS -#undef CONFIG_CMD_DTT #undef CONFIG_CMD_EEPROM
/*Misc*/ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index bd1d0c75d9..97a9d71e8b 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -233,8 +233,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/* I2C DS1631 temperature sensor */ #define CONFIG_SYS_I2C_DS1621_ADDR 0x48 -#define CONFIG_DTT_DS1621 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM90_ADDR 0x4c
/* I2C EEPROM - AT24C128B */ @@ -501,7 +499,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index a290cf3463..fa1971db20 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -230,8 +230,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/* I2C DS1631 temperature sensor */ #define CONFIG_SYS_I2C_DS1621_ADDR 0x48 -#define CONFIG_DTT_DS1621 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM90_ADDR 0x4c
/* I2C EEPROM - AT24C128B */ @@ -353,7 +351,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index ad4247ab48..e3f0b939c3 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -219,8 +219,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100
/* I2C DS7505 temperature sensor */ -#define CONFIG_DTT_LM75 -#define CONFIG_DTT_SENSORS { 0 } #define CONFIG_SYS_I2C_LM75_ADDR 0x48
/* I2C ADT7461 temperature sensor */ @@ -338,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 77648d78bc..d9c09b80cd 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -131,14 +131,6 @@ #define CONFIG_ENV_OFFSET 0x0 #endif /* CONFIG_ENV_IS_IN_EEPROM */
-/* I2C SYSMON (LM75, AD7414 is almost compatible) */ -#define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ -#define CONFIG_DTT_AD7414 1 /* use AD7414 */ -#define CONFIG_DTT_SENSORS {0} /* Sensor addresses */ -#define CONFIG_SYS_DTT_MAX_TEMP 70 -#define CONFIG_SYS_DTT_LOW_TEMP -30 -#define CONFIG_SYS_DTT_HYSTERESIS 3 - /* * Default environment variables */ @@ -184,7 +176,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_PCI
#ifdef CONFIG_440EP diff --git a/include/dtt.h b/include/dtt.h deleted file mode 100644 index 173159dc62..0000000000 --- a/include/dtt.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Digital Thermometers and Thermostats. - */ -#ifndef _DTT_H_ -#define _DTT_H_ - -#if defined(CONFIG_DTT_ADM1021) || \ - defined(CONFIG_DTT_ADT7460) || \ - defined(CONFIG_DTT_DS1621) || \ - defined(CONFIG_DTT_DS1775) || \ - defined(CONFIG_DTT_DS620) || \ - defined(CONFIG_DTT_LM63) || \ - defined(CONFIG_DTT_LM73) || \ - defined(CONFIG_DTT_LM75) || \ - defined(CONFIG_DTT_LM81) - -#define CONFIG_DTT /* We have a DTT */ - -#ifndef CONFIG_DTT_ADM1021 -#define DTT_COMMERCIAL_MAX_TEMP 70 /* 0 - +70 C */ -#define DTT_INDUSTRIAL_MAX_TEMP 85 /* -40 - +85 C */ -#define DTT_AUTOMOTIVE_MAX_TEMP 105 /* -40 - +105 C */ - -#ifndef CONFIG_SYS_DTT_MAX_TEMP -#define CONFIG_SYS_DTT_MAX_TEMP DTT_COMMERCIAL_MAX_TEMP -#endif - -#ifndef CONFIG_SYS_DTT_HYSTERESIS -#define CONFIG_SYS_DTT_HYSTERESIS 5 /* 5 C */ -#endif -#endif /* CONFIG_DTT_ADM1021 */ - -extern void dtt_init(void); -extern int dtt_init_one(int); -extern int dtt_read(int sensor, int reg); -extern int dtt_write(int sensor, int reg, int val); -extern int dtt_get_temp(int sensor); -#endif - -#endif /* _DTT_H_ */ diff --git a/include/i2c.h b/include/i2c.h index a88cc7cddf..2c1643d650 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -571,9 +571,6 @@ void i2c_dump_msgs(struct i2c_msg *msg, int nmsgs); #if !defined(CONFIG_SYS_RTC_BUS_NUM) #define CONFIG_SYS_RTC_BUS_NUM 0 #endif -#if !defined(CONFIG_SYS_DTT_BUS_NUM) -#define CONFIG_SYS_DTT_BUS_NUM 0 -#endif #if !defined(CONFIG_SYS_SPD_BUS_NUM) #define CONFIG_SYS_SPD_BUS_NUM 0 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4bdf2c6f13..8233c7e54d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG CONFIG_CMD_EEPROM @@ -682,20 +681,6 @@ CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB CONFIG_DSP_CLUSTER_START -CONFIG_DTT -CONFIG_DTT_AD7414 -CONFIG_DTT_ADM1021 -CONFIG_DTT_DS1621 -CONFIG_DTT_DS1775 -CONFIG_DTT_DS620 -CONFIG_DTT_HYSTERESIS -CONFIG_DTT_LM63 -CONFIG_DTT_LM75 -CONFIG_DTT_MAX_TEMP -CONFIG_DTT_MIN_TEMP -CONFIG_DTT_PWM_LOOKUPTABLE -CONFIG_DTT_SENSORS -CONFIG_DTT_TACH_LIMIT CONFIG_DUOVERO CONFIG_DV_USBPHY_CTL CONFIG_DWC2_DFLT_SPEED_FULL @@ -3451,12 +3436,6 @@ CONFIG_SYS_DSPI_CTAR4 CONFIG_SYS_DSPI_CTAR5 CONFIG_SYS_DSPI_CTAR6 CONFIG_SYS_DSPI_CTAR7 -CONFIG_SYS_DTT_ADM1021 -CONFIG_SYS_DTT_BUS_NUM -CONFIG_SYS_DTT_HYSTERESIS -CONFIG_SYS_DTT_LOW_TEMP -CONFIG_SYS_DTT_MAX_TEMP -CONFIG_SYS_DTT_MIN_TEMP CONFIG_SYS_DUART_RST CONFIG_SYS_DV_CLKMODE CONFIG_SYS_DV_NOR_BOOT_CFG @@ -6116,7 +6095,6 @@ CONFIG_TIZEN CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP -CONFIG_TMU_CMD_DTT CONFIG_TMU_TIMER CONFIG_TOTAL5200 CONFIG_TPL_DRIVERS_MISC_SUPPORT
On Wed, May 17, 2017 at 03:25:05AM -0600, Simon Glass wrote:
This subsystem is quite old. It has been replaced with a driver-model version (UCLASS_THERMAL). Boards are free to convert to that if required, but here is a removal patch that could be applied in the meantime.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Now that dtt is gone, this is not used. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: None
include/configs/xpedite517x.h | 12 ------------ include/configs/xpedite537x.h | 11 ----------- scripts/config_whitelist.txt | 1 - 3 files changed, 24 deletions(-)
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 97a9d71e8b..94aad2519e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -87,17 +87,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY |\ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ - CONFIG_SYS_I2C_DS4510_ADDR, \ - CONFIG_SYS_I2C_EEPROM_ADDR, \ - CONFIG_SYS_I2C_LM90_ADDR, \ - CONFIG_SYS_I2C_PCA9553_ADDR, \ - CONFIG_SYS_I2C_PCA953X_ADDR0, \ - CONFIG_SYS_I2C_PCA953X_ADDR1, \ - CONFIG_SYS_I2C_PCA953X_ADDR2, \ - CONFIG_SYS_I2C_PCA953X_ADDR3, \ - CONFIG_SYS_I2C_PEX8518_ADDR, \ - CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5170 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50}
@@ -232,7 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70
/* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 #define CONFIG_SYS_I2C_LM90_ADDR 0x4c
/* I2C EEPROM - AT24C128B */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index fa1971db20..826cd9aa5f 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -81,16 +81,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END 0x20000000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR, \ - CONFIG_SYS_I2C_DS4510_ADDR, \ - CONFIG_SYS_I2C_EEPROM_ADDR, \ - CONFIG_SYS_I2C_LM90_ADDR, \ - CONFIG_SYS_I2C_PCA953X_ADDR0, \ - CONFIG_SYS_I2C_PCA953X_ADDR1, \ - CONFIG_SYS_I2C_PCA953X_ADDR2, \ - CONFIG_SYS_I2C_PCA953X_ADDR3, \ - CONFIG_SYS_I2C_PEX8518_ADDR, \ - CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5370 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50}
@@ -229,7 +219,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70
/* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 #define CONFIG_SYS_I2C_LM90_ADDR 0x4c
/* I2C EEPROM - AT24C128B */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8233c7e54d..3469deb589 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4177,7 +4177,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS1621_ADDR CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR
On Wed, May 17, 2017 at 03:25:06AM -0600, Simon Glass wrote:
Now that dtt is gone, this is not used. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Heiko Schocher hs@denx.de Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This is only used by one board and always set to 0x51. Drop this option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de ---
Changes in v3: None Changes in v2: None
drivers/misc/ds4510.c | 7 +------ include/configs/xpedite517x.h | 3 --- include/configs/xpedite537x.h | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 9ffdafc992..55f8936513 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -14,11 +14,6 @@ #include <command.h> #include "ds4510.h"
-/* Default to an address that hopefully won't corrupt other i2c devices */ -#ifndef CONFIG_SYS_I2C_DS4510_ADDR -#define CONFIG_SYS_I2C_DS4510_ADDR (~0) -#endif - enum { DS4510_CMD_INFO, DS4510_CMD_DEVICE, @@ -254,7 +249,7 @@ cmd_tbl_t cmd_ds4510[] = {
int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR; + static uint8_t chip = 0x51; cmd_tbl_t *c; ulong ul_arg2 = 0; ulong ul_arg3 = 0; diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 94aad2519e..cf84e1f99a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -234,9 +234,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000
-/* GPIO/EEPROM/SRAM */ -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 826cd9aa5f..d630f2a9c9 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -232,9 +232,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000
-/* GPIO/EEPROM/SRAM */ -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3469deb589..d015fc84e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4177,7 +4177,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR
On Wed, May 17, 2017 at 03:25:07AM -0600, Simon Glass wrote:
This is only used by one board and always set to 0x51. Drop this option.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ECCTEST
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/powerpc/cpu/ppc4xx/Kconfig | 6 ++++++ configs/katmai_defconfig | 1 + configs/t3corp_defconfig | 1 + include/configs/katmai.h | 1 - include/configs/t3corp.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig index 38121c1427..77e8fd458e 100644 --- a/arch/powerpc/cpu/ppc4xx/Kconfig +++ b/arch/powerpc/cpu/ppc4xx/Kconfig @@ -137,6 +137,12 @@ config CMD_CHIP_CONFIG and control the CPU and peripehrals clocks. The programmed configuration is then used when the board boots.
+config CMD_ECCTEST + bool "Enable the 'ecctest' command" + help + This command tests memory ECC by single and double error bit + injection. + source "board/amcc/acadia/Kconfig" source "board/amcc/bamboo/Kconfig" source "board/amcc/bubinga/Kconfig" diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig index 406bdcd696..baa266e167 100644 --- a/configs/katmai_defconfig +++ b/configs/katmai_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_KATMAI=y CONFIG_CMD_CHIP_CONFIG=y +CONFIG_CMD_ECCTEST=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig index 21c4c89212..2e5416e03b 100644 --- a/configs/t3corp_defconfig +++ b/configs/t3corp_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_4xx=y CONFIG_TARGET_T3CORP=y CONFIG_CMD_CHIP_CONFIG=y +CONFIG_CMD_ECCTEST=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/include/configs/katmai.h b/include/configs/katmai.h index c3b9da0d96..3f39a26d3b 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -145,7 +145,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM
diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index 964115f980..ed5aaa2a63 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -349,7 +349,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_ECCTEST #define CONFIG_CMD_PCI #define CONFIG_CMD_SDRAM
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d015fc84e1..2c032b7059 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT
On Wed, May 17, 2017 at 03:25:08AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ECCTEST
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_EECONFIG
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
board/gateworks/gw_ventana/Kconfig | 5 +++++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/pcm058.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/board/gateworks/gw_ventana/Kconfig b/board/gateworks/gw_ventana/Kconfig index ccce98e2ed..c5779846da 100644 --- a/board/gateworks/gw_ventana/Kconfig +++ b/board/gateworks/gw_ventana/Kconfig @@ -9,4 +9,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gw_ventana"
+config CMD_EECONFIG + bool "Enable the 'econfig' command" + help + Provides access to EEPROM configuration on Gateworks Ventana + endif diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 061f15ed2a..289134e854 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 931572aa67..5e5f1f6d37 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 37d0e10569..eedccfc999 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y +CONFIG_CMD_EECONFIG=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 1c18a380fe..661d8c38c8 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -143,7 +143,6 @@ /* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_GSC -#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index f622be62b7..041d84018f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -88,7 +88,6 @@ /* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_GSC -#define CONFIG_CMD_EECONFIG /* Gateworks EEPROM config cmd */ #define CONFIG_RBTREE
/* Physical Memory Map */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2c032b7059..149793579b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_EECONFIG CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT CONFIG_CMD_ENTERRCM
On Wed, May 17, 2017 at 03:25:09AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_EECONFIG
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT CONFIG_EEPROM_LAYOUT_HELP_STRING
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: None
README | 2 - arch/arm/Kconfig | 1 + arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 24 +++++++++++ cmd/Kconfig | 48 ++++++++++++++++++++++ cmd/eeprom.c | 4 -- configs/C29XPCIE_NAND_defconfig | 1 + configs/C29XPCIE_NOR_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 1 + configs/C29XPCIE_SPIFLASH_defconfig | 1 + configs/C29XPCIE_defconfig | 1 + configs/CPCI2DP_defconfig | 1 + configs/CPCI4052_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8323ERDB_defconfig | 1 + configs/PATI_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/PMC405DE_defconfig | 1 + configs/PMC440_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TWR-P1025_defconfig | 1 + configs/VOM405_defconfig | 1 + configs/acadia_defconfig | 1 + configs/am335x_baltos_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/apf27_defconfig | 1 + configs/arches_defconfig | 1 + configs/bamboo_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/bk4r1_defconfig | 1 + configs/bubinga_defconfig | 1 + configs/canyonlands_defconfig | 1 + configs/cl-som-am57x_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/cm_t54_defconfig | 1 + .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 1 + configs/controlcenterd_36BIT_SDCARD_defconfig | 1 + .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 + configs/controlcenterd_TRAILBLAZER_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/devconcenter_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/glacier_defconfig | 1 + configs/glacier_ramboot_defconfig | 1 + configs/haleakala_defconfig | 1 + configs/icon_defconfig | 1 + configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/intip_defconfig | 1 + configs/io64_defconfig | 1 + configs/katmai_defconfig | 1 + configs/kilauea_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + configs/ls2080aqds_SECURE_BOOT_defconfig | 1 + configs/ls2080aqds_defconfig | 1 + configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080aqds_qspi_defconfig | 1 + configs/ls2080ardb_SECURE_BOOT_defconfig | 1 + configs/ls2080ardb_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + configs/luan_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/makalu_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/novena_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pcm052_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/portl2_defconfig | 1 + configs/rainier_defconfig | 1 + configs/rainier_ramboot_defconfig | 1 + configs/redwood_defconfig | 1 + configs/sequoia_defconfig | 1 + configs/sequoia_ramboot_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/sycamore_defconfig | 1 + configs/t3corp_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/twister_defconfig | 1 + configs/vct_platinum_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinumavc_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_premium_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/walnut_defconfig | 1 + configs/work_92105_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/yellowstone_defconfig | 1 + configs/yosemite_defconfig | 1 + configs/yucca_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8323ERDB.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/PATI.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/TQM834x.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/TQM885D.h | 1 - include/configs/VOM405.h | 1 - include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/amcc-common.h | 1 - include/configs/apf27.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/cl-som-am57x.h | 2 - include/configs/cm_fx6.h | 4 -- include/configs/cm_t335.h | 4 -- include/configs/cm_t35.h | 4 -- include/configs/cm_t3517.h | 4 -- include/configs/cm_t43.h | 4 -- include/configs/cm_t54.h | 4 -- include/configs/controlcenterd.h | 1 - include/configs/dlvision-10g.h | 1 - include/configs/dlvision.h | 1 - include/configs/gdppc440etx.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/io.h | 1 - include/configs/iocon.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lwmon5.h | 1 - include/configs/neo.h | 1 - include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/pcm051.h | 1 - include/configs/pcm052.h | 1 - include/configs/pengwyn.h | 1 - include/configs/socfpga_vining_fpga.h | 2 - include/configs/socrates.h | 1 - include/configs/tam3517-common.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - include/configs/tqma6.h | 1 - include/configs/tricorder.h | 1 - include/configs/vct.h | 3 -- include/configs/work_92105.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - include/configs/zynq-common.h | 1 - include/configs/zynq_zybo.h | 1 - scripts/config_whitelist.txt | 3 -- 225 files changed, 216 insertions(+), 107 deletions(-)
diff --git a/README b/README index 3d45b29bd5..841869dec7 100644 --- a/README +++ b/README @@ -832,8 +832,6 @@ The following options need to be configured: CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable - CONFIG_CMD_EEPROM * EEPROM read/write support - CONFIG_CMD_EEPROM_LAYOUT* EEPROM layout aware commands CONFIG_CMD_ELF * bootelf, bootvx CONFIG_CMD_ENV_CALLBACK * display details about env callbacks CONFIG_CMD_ENV_FLAGS * display details about env flags diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a17ba2c60a..96dec83e22 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -549,6 +549,7 @@ config ARCH_KEYSTONE select SYS_THUMB_BUILD select CMD_POWEROFF imply FIT + imply CMD_EEPROM
config ARCH_OMAP2PLUS bool "TI OMAP2+" diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 408b62c663..e43ae19203 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -125,6 +125,7 @@ config AM43XX imply SPL_SEPARATE_BSS imply SPL_SYS_MALLOC_SIMPLE imply SYS_THUMB_BUILD + imply CMD_EEPROM help Support for AM43xx SOC from Texas Instruments. The AM43xx high performance SOC features a Cortex-A9 diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 5c4168fefc..fb9448bd80 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -34,6 +34,7 @@ config TARGET_AM335X_EVM imply SPL_DM imply SPL_DM_SEQ_ALIAS imply SPL_OF_LIBFDT + imply CMD_EEPROM help This option specifies support for the AM335x GP and HS EVM development platforms. The AM335x diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 31c0964994..a87430cdbc 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -124,6 +124,7 @@ config TARGET_P1010RDB_PA select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select SUPPORT_TPL + imply CMD_EEPROM
config TARGET_P1010RDB_PB bool "Support P1010RDB_PB" @@ -131,6 +132,7 @@ config TARGET_P1010RDB_PB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select SUPPORT_TPL + imply CMD_EEPROM
config TARGET_P1022DS bool "Support P1022DS" @@ -141,54 +143,63 @@ config TARGET_P1022DS config TARGET_P1023RDB bool "Support P1023RDB" select ARCH_P1023 + imply CMD_EEPROM
config TARGET_P1020MBG bool "Support P1020MBG-PC" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1020 + imply CMD_EEPROM
config TARGET_P1020RDB_PC bool "Support P1020RDB-PC" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1020 + imply CMD_EEPROM
config TARGET_P1020RDB_PD bool "Support P1020RDB-PD" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1020 + imply CMD_EEPROM
config TARGET_P1020UTM bool "Support P1020UTM" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1020 + imply CMD_EEPROM
config TARGET_P1021RDB bool "Support P1021RDB" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1021 + imply CMD_EEPROM
config TARGET_P1024RDB bool "Support P1024RDB" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1024 + imply CMD_EEPROM
config TARGET_P1025RDB bool "Support P1025RDB" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P1025 + imply CMD_EEPROM
config TARGET_P2020RDB bool "Support P2020RDB-PC" select SUPPORT_SPL select SUPPORT_TPL select ARCH_P2020 + imply CMD_EEPROM
config TARGET_P1_TWR bool "Support p1_twr" @@ -211,6 +222,7 @@ config TARGET_T1024QDS select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + imply CMD_EEPROM
config TARGET_T1023RDB bool "Support T1023RDB" @@ -218,6 +230,7 @@ config TARGET_T1023RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + imply CMD_EEPROM
config TARGET_T1024RDB bool "Support T1024RDB" @@ -225,12 +238,14 @@ config TARGET_T1024RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + imply CMD_EEPROM
config TARGET_T1040QDS bool "Support T1040QDS" select ARCH_T1040 select BOARD_LATE_INIT if CHAIN_OF_TRUST select PHYS_64BIT + imply CMD_EEPROM
config TARGET_T1040RDB bool "Support T1040RDB" @@ -377,6 +392,7 @@ config ARCH_B4420 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC64 select FSL_IFC + imply CMD_EEPROM
config ARCH_B4860 bool @@ -402,6 +418,7 @@ config ARCH_B4860 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC64 select FSL_IFC + imply CMD_EEPROM
config ARCH_BSC9131 bool @@ -415,6 +432,7 @@ config ARCH_BSC9131 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 select FSL_IFC + imply CMD_EEPROM
config ARCH_BSC9132 bool @@ -432,6 +450,7 @@ config ARCH_BSC9132 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_IFC + imply CMD_EEPROM
config ARCH_C29X bool @@ -565,6 +584,7 @@ config ARCH_P1010 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_IFC + imply CMD_EEPROM
config ARCH_P1011 bool @@ -649,6 +669,7 @@ config ARCH_P1024 select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_ELBC + imply CMD_EEPROM
config ARCH_P1025 bool @@ -678,6 +699,7 @@ config ARCH_P2020 select SYS_FSL_SEC_COMPAT_2 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_ELBC + imply CMD_EEPROM
config ARCH_P2041 bool @@ -821,6 +843,7 @@ config ARCH_T1023 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 select FSL_IFC + imply CMD_EEPROM
config ARCH_T1024 bool @@ -838,6 +861,7 @@ config ARCH_T1024 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 select FSL_IFC + imply CMD_EEPROM
config ARCH_T1040 bool diff --git a/cmd/Kconfig b/cmd/Kconfig index d9f7151bac..6b9feff94c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -338,6 +338,54 @@ config CMD_CRC32 help Compute CRC32.
+config CMD_EEPROM + bool "eeprom - EEPROM subsystem" + help + (deprecated, needs conversion to driver model) + Provides commands to read and write EEPROM (Electrically Erasable + Programmable Read Only Memory) chips that are connected over an + I2C bus. + +config CMD_EEPROM_LAYOUT + bool "Enable layout-aware eeprom commands" + depends on CMD_EEPROM + help + (deprecated, needs conversion to driver model) + When enabled, additional eeprom sub-commands become available. + + eeprom print - prints the contents of the eeprom in a human-readable + way (eeprom layout fields, and data formatted to be fit for human + consumption). + + eeprom update - allows user to update eeprom fields by specifying + the field name, and providing the new data in a human readable format + (same format as displayed by the eeprom print command). + + Both commands can either auto detect the layout, or be told which + layout to use. + + Feature API: + __weak int parse_layout_version(char *str) + - override to provide your own layout name parsing + __weak void __eeprom_layout_assign(struct eeprom_layout *layout, + int layout_version); + - override to setup the layout metadata based on the version + __weak int eeprom_layout_detect(unsigned char *data) + - override to provide your own algorithm for detecting layout + version + eeprom_field.c + - contains various printing and updating functions for common + types of eeprom fields. Can be used for defining + custom layouts. + +config EEPROM_LAYOUT_HELP_STRING + string "Tells user what layout names are supported" + depends on CMD_EEPROM_LAYOUT + default "<not defined>" + help + Help printed with the LAYOUT VERSIONS part of the 'eeprom' + command's help. + config CMD_MD5SUM bool "md5sum" default n diff --git a/cmd/eeprom.c b/cmd/eeprom.c index e43566bc56..c61b396a62 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -265,10 +265,6 @@ __weak int eeprom_parse_layout_version(char *str)
static unsigned char eeprom_buf[CONFIG_SYS_EEPROM_SIZE];
-#ifndef CONFIG_EEPROM_LAYOUT_HELP_STRING -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "<not defined>" -#endif - #endif
enum eeprom_action { diff --git a/configs/C29XPCIE_NAND_defconfig b/configs/C29XPCIE_NAND_defconfig index 88964b30bd..42f085a47c 100644 --- a/configs/C29XPCIE_NAND_defconfig +++ b/configs/C29XPCIE_NAND_defconfig @@ -20,6 +20,7 @@ CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C_SUPPORT=y CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/C29XPCIE_NOR_SECBOOT_defconfig b/configs/C29XPCIE_NOR_SECBOOT_defconfig index 58e618b628..99e2b33ac7 100644 --- a/configs/C29XPCIE_NOR_SECBOOT_defconfig +++ b/configs/C29XPCIE_NOR_SECBOOT_defconfig @@ -10,6 +10,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig index d0565032e8..26544f4ab6 100644 --- a/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig +++ b/configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/C29XPCIE_SPIFLASH_defconfig b/configs/C29XPCIE_SPIFLASH_defconfig index 5b595b8425..41bf176650 100644 --- a/configs/C29XPCIE_SPIFLASH_defconfig +++ b/configs/C29XPCIE_SPIFLASH_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH" CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/C29XPCIE_defconfig b/configs/C29XPCIE_defconfig index 62881024a8..70b447863d 100644 --- a/configs/C29XPCIE_defconfig +++ b/configs/C29XPCIE_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=-1 CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_MII=y diff --git a/configs/CPCI2DP_defconfig b/configs/CPCI2DP_defconfig index 96a7643ca4..735993b76d 100644 --- a/configs/CPCI2DP_defconfig +++ b/configs/CPCI2DP_defconfig @@ -5,6 +5,7 @@ CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig index 4d818d7b7c..630598111d 100644 --- a/configs/CPCI4052_defconfig +++ b/configs/CPCI4052_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 833c263bb6..65a4dea66b 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 3da515295e..76ba77cfe3 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MPC8323ERDB_defconfig b/configs/MPC8323ERDB_defconfig index 6470850e4e..54d8a3ea1d 100644 --- a/configs/MPC8323ERDB_defconfig +++ b/configs/MPC8323ERDB_defconfig @@ -6,6 +6,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y diff --git a/configs/PATI_defconfig b/configs/PATI_defconfig index fbf3227fc0..0560866c6c 100644 --- a/configs/PATI_defconfig +++ b/configs/PATI_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="pati=> " # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index 4c2d558b85..bd421eab9c 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -11,6 +11,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig index 5b679760e6..ffad41fae8 100644 --- a/configs/PLU405_defconfig +++ b/configs/PLU405_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/PMC405DE_defconfig b/configs/PMC405DE_defconfig index 0dd9ca7ff6..cdc54aedcb 100644 --- a/configs/PMC405DE_defconfig +++ b/configs/PMC405DE_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig index 6b8854b5d8..00edbeef82 100644 --- a/configs/PMC440_defconfig +++ b/configs/PMC440_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index b03f79ef39..c4b9091586 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -6,6 +6,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index ea0ad4df9f..37e740ff45 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index c3297773af..a2f0f00b61 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig index 4ecdf6db83..fc9319696a 100644 --- a/configs/TQM885D_defconfig +++ b/configs/TQM885D_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig index 2efc09d534..3c79c3809e 100644 --- a/configs/TWR-P1025_defconfig +++ b/configs/TWR-P1025_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="TWR_P1025" CONFIG_BOOTDELAY=10 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/VOM405_defconfig b/configs/VOM405_defconfig index 23d33a649f..c19c11d162 100644 --- a/configs/VOM405_defconfig +++ b/configs/VOM405_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/acadia_defconfig b/configs/acadia_defconfig index a30e34dea3..652d01eb08 100644 --- a/configs/acadia_defconfig +++ b/configs/acadia_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 186aa7b074..155a16687a 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -29,6 +29,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index d3cdbdd229..4b04017b07 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y # CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index 71839f575e..7474fdd994 100644 --- a/configs/apf27_defconfig +++ b/configs/apf27_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="BIOS> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/arches_defconfig b/configs/arches_defconfig index 4477bab5ee..e0621f0ca7 100644 --- a/configs/arches_defconfig +++ b/configs/arches_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig index 44d91984bb..41ce230481 100644 --- a/configs/bamboo_defconfig +++ b/configs/bamboo_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 680a88cde5..6b98e0f15a 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -26,6 +26,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index ac04004cf3..c9a6dcc5d6 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -26,6 +26,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index c15070e804..c5b1e9c062 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/bubinga_defconfig b/configs/bubinga_defconfig index e2e7ce0e62..69cf9e09b2 100644 --- a/configs/bubinga_defconfig +++ b/configs/bubinga_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/canyonlands_defconfig b/configs/canyonlands_defconfig index e76736afc4..2b59fd329b 100644 --- a/configs/canyonlands_defconfig +++ b/configs/canyonlands_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index ed419a34d1..3b8862f94f 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index f7af33f0bf..ab985b505f 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index dd84e81f65..c2bad388cd 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -23,6 +23,7 @@ CONFIG_SYS_PROMPT="CM-T335 # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index c1cb2c0421..075a942a96 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3517 # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 868d175d22..434d7b45de 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -12,6 +12,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-T3x # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index c3b84cc796..7cc4997704 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -26,6 +26,7 @@ CONFIG_SYS_PROMPT="CM-T43 # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index 067945636f..1735d477b4 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="CM-T54 # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig index 6c46ac8bf7..b75a12faaa 100644 --- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig index 0c1181f67d..b53bfd08c5 100644 --- a/configs/controlcenterd_36BIT_SDCARD_defconfig +++ b/configs/controlcenterd_36BIT_SDCARD_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index bc2e7b4331..b197116f1c 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig index 7ec77a1102..aee0f3af71 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 67a791d991..58af17c5c8 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="d2v2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/devconcenter_defconfig b/configs/devconcenter_defconfig index 1c16ed2a4b..b75807d113 100644 --- a/configs/devconcenter_defconfig +++ b/configs/devconcenter_defconfig @@ -14,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 61ac94bbba..d567b899ca 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ECO5-PK # " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/glacier_defconfig b/configs/glacier_defconfig index b47bfb5c24..6886298ff6 100644 --- a/configs/glacier_defconfig +++ b/configs/glacier_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/glacier_ramboot_defconfig b/configs/glacier_ramboot_defconfig index 7e6957053d..ccb77bc2fd 100644 --- a/configs/glacier_ramboot_defconfig +++ b/configs/glacier_ramboot_defconfig @@ -13,6 +13,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/haleakala_defconfig b/configs/haleakala_defconfig index 9ff43da384..6833e477d2 100644 --- a/configs/haleakala_defconfig +++ b/configs/haleakala_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/icon_defconfig b/configs/icon_defconfig index b47b15d8d6..0a28a95e75 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -13,6 +13,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig index ed3e7c56d6..224bedb1d6 100644 --- a/configs/imx31_phycore_defconfig +++ b/configs/imx31_phycore_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_IMX31_PHYCORE=y CONFIG_BOOTDELAY=3 CONFIG_SYS_PROMPT="uboot> " +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig index 7de703e4c1..c881b8fdcc 100644 --- a/configs/imx31_phycore_eet_defconfig +++ b/configs/imx31_phycore_eet_defconfig @@ -4,6 +4,7 @@ CONFIG_VIDEO=y CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index bee04903fe..ba468bd494 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/intip_defconfig b/configs/intip_defconfig index da4f3f4730..d6c85c8de1 100644 --- a/configs/intip_defconfig +++ b/configs/intip_defconfig @@ -16,6 +16,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/io64_defconfig b/configs/io64_defconfig index 9026ac8702..c586f00bf9 100644 --- a/configs/io64_defconfig +++ b/configs/io64_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/katmai_defconfig b/configs/katmai_defconfig index baa266e167..43b0c418a4 100644 --- a/configs/katmai_defconfig +++ b/configs/katmai_defconfig @@ -11,6 +11,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/kilauea_defconfig b/configs/kilauea_defconfig index 0ed41c388e..5eaa7e3c86 100644 --- a/configs/kilauea_defconfig +++ b/configs/kilauea_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 49080a8abc..0884688f49 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 678558e549..d34174db08 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 2c5ed605b7..83e9d04c4a 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index e9f4414dfc..4d6718dd31 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -15,6 +15,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 3a351ef78b..233943c0d7 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 9f5f6674d9..d41fae022c 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 01d940a388..d92e6b2934 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index a8bd490509..13f5c1e304 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -15,6 +15,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 0b4f10a257..cb06ba0cbf 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index f14e37a27a..0b112ffb48 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index a35aee97d1..40b5f9628c 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index ce4b97e545..ba02124ccb 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index bb932c0037..242fc1a904 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 746af8c724..16b7b18062 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 0f5fca78d7..3f73346208 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 83650558b9..8b9180b6a6 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index a6995abc60..2124273e1c 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -13,6 +13,7 @@ CONFIG_BOOTDELAY=10 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index a680706fa2..617c522851 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index fd889580a4..0106e9ad0d 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 26c9210545..99df6e0818 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -17,6 +17,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 447808040c..f08e7bfa87 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT" CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index a5ebe0e4a5..70839e6f01 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index efdb0f105d..ed79c97121 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=10 CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index f642fc7206..5ce37fdfb4 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -17,6 +17,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/luan_defconfig b/configs/luan_defconfig index 1ee1e6f135..16b3a9c005 100644 --- a/configs/luan_defconfig +++ b/configs/luan_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig index 5fc5916124..09365d4c9c 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/makalu_defconfig b/configs/makalu_defconfig index 47198fc56a..b462ee9c93 100644 --- a/configs/makalu_defconfig +++ b/configs/makalu_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index 22c8b31810..d66fffe47e 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 341c56c755..1fba301af8 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index 875c17e61b..c9f07d11a4 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 484086837a..e426772b15 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="mt_ventoux => " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index b43ad161f8..ff222a1176 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="2big2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 3c3fc99e94..cec9389b6c 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 4605be3cd2..fd4525e30f 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index 0a00e0529a..d6e70db41e 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 2103a1c8db..3ccbf657a4 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -9,6 +9,7 @@ CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index b759fa2767..d14d36a477 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 213f036266..d6271b8d55 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -7,6 +7,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index e8912c08c2..e5574942bc 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index ec719b687e..39e9ee3ccf 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 1dbc0a8ce8..1e72e91ede 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 0845575ac1..56b5084a4c 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -29,6 +29,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 77aeb9239f..0d15fb8a0c 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -12,6 +12,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/rainier_defconfig b/configs/rainier_defconfig index be2beb72a9..7c62f6956c 100644 --- a/configs/rainier_defconfig +++ b/configs/rainier_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/rainier_ramboot_defconfig b/configs/rainier_ramboot_defconfig index 0c0559a3af..621e414e7a 100644 --- a/configs/rainier_ramboot_defconfig +++ b/configs/rainier_ramboot_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/redwood_defconfig b/configs/redwood_defconfig index 425b2fe98c..78b004f462 100644 --- a/configs/redwood_defconfig +++ b/configs/redwood_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/sequoia_defconfig b/configs/sequoia_defconfig index b21e369473..a0163792e4 100644 --- a/configs/sequoia_defconfig +++ b/configs/sequoia_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/sequoia_ramboot_defconfig b/configs/sequoia_ramboot_defconfig index ffdf6c4787..b6802f23f5 100644 --- a/configs/sequoia_ramboot_defconfig +++ b/configs/sequoia_ramboot_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index fb9bae404b..18186e83db 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index f476a23dd0..68fee8ce79 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/sycamore_defconfig b/configs/sycamore_defconfig index 5f56a516ff..d34634381e 100644 --- a/configs/sycamore_defconfig +++ b/configs/sycamore_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/t3corp_defconfig b/configs/t3corp_defconfig index 2e5416e03b..3b37eb9e5f 100644 --- a/configs/t3corp_defconfig +++ b/configs/t3corp_defconfig @@ -13,6 +13,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/tqma6dl_mba6_mmc_defconfig b/configs/tqma6dl_mba6_mmc_defconfig index 6e4e6f7c44..cd31cf39aa 100644 --- a/configs/tqma6dl_mba6_mmc_defconfig +++ b/configs/tqma6dl_mba6_mmc_defconfig @@ -11,6 +11,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6dl_mba6_spi_defconfig b/configs/tqma6dl_mba6_spi_defconfig index 9cd54811e1..dee295ee35 100644 --- a/configs/tqma6dl_mba6_spi_defconfig +++ b/configs/tqma6dl_mba6_spi_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 5b4c506557..6e8e84225e 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index c842af7720..3ec25c8217 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -11,6 +11,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index cff6e1045e..eb609e12a4 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -11,6 +11,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 740d01f989..f824018849 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig index e24912e0c2..4dc6b9e291 100644 --- a/configs/tqma6s_wru4_mmc_defconfig +++ b/configs/tqma6s_wru4_mmc_defconfig @@ -16,6 +16,7 @@ CONFIG_AUTOBOOT_ENCRYPTION=y CONFIG_AUTOBOOT_STOP_STR_SHA256="36a9e7f1c95b82ffb99743e0c5c4ce95d83c9a430aac59f84ef3cbfab6145068" CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 14a8eb4ea6..65b2b5a210 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP3 Tricorder # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 290e97902c..a5d1bab015 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index fa998f81b6..a5579e4f33 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index a6093bc029..519472f247 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 62d7d17ca9..124506a448 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="twister => " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig index 259b48f5aa..f8b9d7e61b 100644 --- a/configs/vct_platinum_defconfig +++ b/configs/vct_platinum_defconfig @@ -4,6 +4,7 @@ CONFIG_VCT_PLATINUM=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 6d2d14f8a2..707ede5901 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig index aff3d2be65..5efe2236a3 100644 --- a/configs/vct_platinumavc_defconfig +++ b/configs/vct_platinumavc_defconfig @@ -4,6 +4,7 @@ CONFIG_VCT_PLATINUMAVC=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="VCT# " +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index d690e19a1d..979c554d22 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig index 3996d9da50..24f776b49f 100644 --- a/configs/vct_premium_defconfig +++ b/configs/vct_premium_defconfig @@ -4,6 +4,7 @@ CONFIG_VCT_PREMIUM=y CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index 6bbdc3b0e6..2a4a0552fc 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/walnut_defconfig b/configs/walnut_defconfig index 5f56a516ff..d34634381e 100644 --- a/configs/walnut_defconfig +++ b/configs/walnut_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index ebcae43e3f..edfe107e72 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 1811e3215c..e7433198dd 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 94a843546e..afad4fa1e7 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig index 9dd082bfdd..54b74ff65f 100644 --- a/configs/xpedite1000_defconfig +++ b/configs/xpedite1000_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 69fd8fa004..6457d1952b 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig index e1fdfeb759..b6cebe9146 100644 --- a/configs/xpedite520x_defconfig +++ b/configs/xpedite520x_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 641ef8ff09..c575cc4121 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -8,6 +8,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig index 1eb3eef3ad..d15ee20ba7 100644 --- a/configs/yellowstone_defconfig +++ b/configs/yellowstone_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig index 237a7ca5a7..935854cb80 100644 --- a/configs/yosemite_defconfig +++ b/configs/yosemite_defconfig @@ -10,6 +10,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/yucca_defconfig b/configs/yucca_defconfig index 10fbafcb4b..127f1e0da1 100644 --- a/configs/yucca_defconfig +++ b/configs/yucca_defconfig @@ -9,6 +9,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index c59d7f5c54..83e8f65082 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index c73bacb18f..9dbf47f496 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index af7fe65be1..8bed4e6809 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 95c05350cd..a824204913 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_EEPROM /* EEPROM read/write support */ #define CONFIG_CMD_FDC /* Floppy Disk Support */ #define CONFIG_CMD_FUSE /* Device fuse support */ #define CONFIG_CMD_GETTIME /* Get time since boot */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 2041b7bb3e..3dff45cd6e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 72dc8ba710..36633bde6e 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -228,7 +228,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
/* I2C EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 1b956fc7da..28658e4894 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -417,7 +417,6 @@ combinations. this should be removed later #define CONFIG_SYS_EEPROM_BUS_NUM 0
/* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index f95c3b9eeb..84365f11df 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -371,7 +371,6 @@
/* I2C EEPROM */ /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c3b2353f5f..561ff894b3 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -47,7 +47,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index deb6f826e1..43bf127a2a 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -63,7 +63,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE -#define CONFIG_CMD_EEPROM
#define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 30db7edde8..64c6ed100f 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index d782fc3cf1..ea99aead45 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -320,7 +320,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM
#if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 867004fb48..5b7d6adad3 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -589,7 +589,6 @@ extern unsigned long get_sdram_size(void); #define MAX_NUM_PORTS 9 /* for 128Bytes EEPROM */ #endif /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/PATI.h b/include/configs/PATI.h index e53db2485b..1b2cb3dd22 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,7 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ
#define CONFIG_BOOTCOMMAND "" /* autoboot command */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 6c74b00cd5..84b1a73033 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -40,7 +40,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_REGINFO #define CONFIG_CMD_FDC #define CONFIG_SCSI diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 4bb07d8bd4..74cb8abafb 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -58,7 +58,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE #define CONFIG_CMD_NAND -#define CONFIG_CMD_EEPROM
#define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index d889306653..2f05a5a176 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,7 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 8628b7ed18..54a1a2546f 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -238,7 +238,6 @@
/* Partitions */
-#define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 42e692c4a0..d8ad914515 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index c2175bda34..5e35ceb89a 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 25658871e4..cba7404c31 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index df6386c602..a90e2ac8d9 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -273,7 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 7cfc351191..ffb514bb85 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 2906fcfca4..f11e23a6a3 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index eaf0741071..e91070ae30 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,7 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE
/* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index fbadcd17f1..5255b6d688 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -54,7 +54,6 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index b6b14d38bd..0c6d2880da 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 6855f62865..2c4033ca59 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 1feb946834..25f63e8311 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -23,7 +23,6 @@ #endif
/* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 01406640b0..eca90cf750 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,7 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 40a82b884b..3450751054 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,7 +54,6 @@ /* * U-Boot Commands */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IMX_FUSE /* imx iim fuse */ #define CONFIG_CMD_MTDPARTS /* MTD partition support */ #define CONFIG_CMD_NAND /* NAND support */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index c65eeedb53..fe4ac05f38 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -229,7 +229,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 924a351c38..71b1b96ec4 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -330,7 +330,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
-#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 3000453563..96e5c9cdd5 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -60,8 +60,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 3
-#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EEPROM_LAYOUT #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_EEPROM_SIZE 256
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f5f3df3ad6..dd8010cd48 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -258,14 +258,10 @@ #define CONFIG_VIDEO_BMP_LOGO
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_FX6_H */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 9a8e1302c5..3fb9daebbc 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -153,16 +153,12 @@ /* Status LED polarity is inversed, so init it in the "off" state */
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #ifndef CONFIG_SPL_BUILD /* * Enable PCA9555 at I2C0-0x26. diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 1898e3837d..8f201534ef 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -306,14 +306,10 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "legacy, v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 0df7d4269c..dd78b0c7e8 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -257,14 +257,10 @@ #define CONFIG_OMAP3_SPI
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4f44a6752e..1e63098d5f 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -150,14 +150,10 @@ #define CONFIG_SPL_SPI_LOAD
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_T43_H */ diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index ccaa568009..14042ada7d 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -67,16 +67,12 @@ /* Enabled commands */
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256
-#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - /* USB Networking options */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 7535ad5a62..97faed8cca 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -185,7 +185,6 @@
#define CONFIG_PCA9698 /* NXP PCA9698 */
-#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 89f24e0980..5597e27516 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index ec21a8347a..e5a8b3232d 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -55,7 +55,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index fee46add80..7e03dd63ee 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -147,7 +147,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_PCI -#undef CONFIG_CMD_EEPROM
/* * PCI stuff diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 0a66720a7d..739af03e88 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -48,7 +48,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#define CONFIG_CMD_EEPROM
#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:128k(uboot)ro," \ diff --git a/include/configs/io.h b/include/configs/io.h index dd195ffeed..767acf2773 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 9c3be78bc7..e15adfcbb0 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -58,7 +58,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_FPGAD -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 872e2b3403..506ce51236 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -14,7 +14,6 @@ * Command line configuration. */ #define CONFIG_CMD_IMMAP -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 9e9d879541..0737a3e2ce 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -120,7 +120,6 @@ */ #ifdef CONFIG_CMD_I2C /* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 8-bit device address */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 2b3833d61b..5b8500b91b 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -61,7 +61,6 @@
/* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index f50ad42917..dc52b223cb 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -332,7 +332,6 @@ unsigned long get_board_ddr_clk(void);
/* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index d0bf5520b7..2e0d95efd7 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -278,7 +278,6 @@ unsigned long get_board_sys_clk(void);
/* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 6893bf24ff..f36ec3d3f8 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,7 +381,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM diff --git a/include/configs/neo.h b/include/configs/neo.h index 29ce61c326..609f7e17ee 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/novena.h b/include/configs/novena.h index e0ed304586..753b59f6ec 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -17,7 +17,6 @@ #include "mx6_common.h"
/* U-Boot Commands */ -#define CONFIG_CMD_EEPROM #define CONFIG_FAT_WRITE #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 34da90f20b..2052075a54 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -91,7 +91,6 @@ #define CONFIG_PHY_SMSC
#ifndef CONFIG_SPL -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_BUS 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 638e9da028..24f751c839 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -631,7 +631,6 @@ #define CONFIG_SYS_I2C_PCA9557_ADDR 0x18
/* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 427629f409..a6501520f5 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -230,7 +230,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PCA9555_ADDR 0x23
/* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index ea3872f5c9..fc75ca85c5 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -108,7 +108,6 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 51b489a809..8c0e26486f 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_RTC_BUS_NUM 2
/* EEPROM (24FC256) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_BUS 2 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 2cb6f56f7d..9c8720bee9 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -107,7 +107,6 @@
/* I2C Configuration */ #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index e208f45649..251dd0e901 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -12,8 +12,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG
-#define CONFIG_CMD_EEPROM - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h index b37e796d33..bfd4e5fe3f 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -279,7 +279,6 @@ /* * Command line configuration. */ -#undef CONFIG_CMD_EEPROM #define CONFIG_CMD_SDRAM #define CONFIG_CMD_REGINFO
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 34ce122489..72bcdf869d 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -71,7 +71,6 @@
/* commands to include */ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_EEPROM
#define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 868464cd32..3161c50abb 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -208,7 +208,6 @@ /* U-Boot command configuration */ #define CONFIG_CMD_SAVES #define CONFIG_CMD_UBIFS -#define CONFIG_CMD_EEPROM
/* U-Boot general configuration */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 799c45e2d7..0b362559f2 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS 5 /* 32 Bytes */ #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS 20 -#define CONFIG_CMD_EEPROM
#define CONFIG_POWER #define CONFIG_POWER_I2C diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 8fe4165a77..9bce1ac1a0 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -66,7 +66,6 @@
/* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_BUS_NUM 1
diff --git a/include/configs/vct.h b/include/configs/vct.h index b1dccdf666..e4ae9cdb2e 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -77,7 +77,6 @@ /* * Commands */ -#define CONFIG_CMD_EEPROM
/* * Only Premium/Platinum have ethernet support right now @@ -254,8 +253,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 458acf59af..f99f305524 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -74,7 +74,6 @@ * I2C EEPROM */
-#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x56 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index c4efae67a7..efb3038d9a 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -28,7 +28,6 @@ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS -#undef CONFIG_CMD_EEPROM
/*Misc*/ #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 30b5b34520..3a6a4972e6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -184,7 +184,6 @@
/* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 8d018da23e..4194b66c66 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -44,7 +44,6 @@ #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_EEPROM_BUS 5 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0x20 diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 2a7a48d21d..6d9500619e 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,7 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index cf84e1f99a..4ecceb2a9f 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index ffc0d009ba..3e21c96bc2 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index d630f2a9c9..526bff6cff 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index e3f0b939c3..ee033ef01d 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 51edd463a1..223637952d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -145,7 +145,6 @@
/* EEPROM */ #ifdef CONFIG_ZYNQ_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 1488fd8b2f..808967cee3 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -14,7 +14,6 @@ #define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA #define CONFIG_DISPLAY diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 149793579b..73e2a3fd31 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,8 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_EEPROM -CONFIG_CMD_EEPROM_LAYOUT CONFIG_CMD_ENTERRCM CONFIG_CMD_ENV CONFIG_CMD_ENV_CALLBACK @@ -743,7 +741,6 @@ CONFIG_EDB93XX_SDCS2 CONFIG_EDB93XX_SDCS3 CONFIG_EEPRO100 CONFIG_EEPRO100_SROM_WRITE -CONFIG_EEPROM_LAYOUT_HELP_STRING CONFIG_EFLASH_PROTSECTORS CONFIG_EHCI_DESC_BIG_ENDIAN CONFIG_EHCI_HCD_INIT_AFTER_RESET
On Wed, May 17, 2017 at 03:25:10AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_EEPROM CONFIG_CMD_EEPROM_LAYOUT CONFIG_EEPROM_LAYOUT_HELP_STRING
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ENTERRCM
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/arm/mach-tegra/Kconfig | 16 ++++++++++++++++ include/configs/tegra-common.h | 2 -- scripts/config_whitelist.txt | 1 - 3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index c67ffa5a23..e029607ce6 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -126,4 +126,20 @@ source "arch/arm/mach-tegra/tegra124/Kconfig" source "arch/arm/mach-tegra/tegra210/Kconfig" source "arch/arm/mach-tegra/tegra186/Kconfig"
+config CMD_ENTERRCM + bool "Enable 'enterrcm' command" + default y + help + Tegra's boot ROM supports a mode whereby code may be downloaded and + flash-programmed over a USB connection. On dev boards, this is + typically entered by holding down a "force recovery" button and + resetting the CPU. However, not all boards have such a button (one + example is the Compulab Trimslice), so a method to enter RCM from + software is useful. + + Even on boards other than Trimslice, controlling this over a UART + may be useful, e.g. to allow simple remote control without the need + for mechanical button actuators, or hooking up relays/... to the + button. + endif diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 5107a1f609..06ea218f8d 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -87,8 +87,6 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE)
-#define CONFIG_CMD_ENTERRCM - /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 73e2a3fd31..c59c5ce42a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENTERRCM CONFIG_CMD_ENV CONFIG_CMD_ENV_CALLBACK CONFIG_CMD_ENV_FLAGS
On Wed, May 17, 2017 at 03:25:11AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ENTERRCM
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: - Reword to indicate this option is being dropped
include/configs/ap_sh4a_4a.h | 1 - include/configs/calimain.h | 1 - include/configs/clearfog.h | 1 - include/configs/colibri_pxa270.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/da850evm.h | 2 -- include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 1 - include/configs/db-88f6820-gp.h | 1 - include/configs/db-mv784mp-gp.h | 1 - include/configs/dns325.h | 1 - include/configs/dockstar.h | 1 - include/configs/dragonboard410c.h | 1 - include/configs/ds414.h | 1 - include/configs/ea20.h | 2 -- include/configs/ecovec.h | 1 - include/configs/espt.h | 1 - include/configs/goflexhome.h | 1 - include/configs/hikey.h | 1 - include/configs/iconnect.h | 1 - include/configs/ipam390.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/ls1012a_common.h | 1 - include/configs/ls1043a_common.h | 3 --- include/configs/ls1046a_common.h | 3 --- include/configs/ls2080a_common.h | 1 - include/configs/lsxl.h | 1 - include/configs/maxbcm.h | 1 - include/configs/meson-gxbb-common.h | 2 -- include/configs/mv-plug-common.h | 1 - include/configs/omapl138_lcdk.h | 2 -- include/configs/openrd.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/r0p7734.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/shmin.h | 1 - include/configs/spear-common.h | 1 - include/configs/theadorable.h | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/vme8349.h | 4 ---- include/configs/x600.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zipitz2.h | 1 - scripts/config_whitelist.txt | 1 - 44 files changed, 55 deletions(-)
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index d3d72b634d..440505dd1f 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8BFC0000
#define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV
#define CONFIG_BOOTARGS "console=ttySC4,115200"
diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 6e2fd33563..f5d108e359 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -299,7 +299,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES
#ifndef CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 0c51d2a288..3397aaf2eb 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI
/* I2C */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 62a404a7b1..587963963a 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -51,7 +51,6 @@ /* * Bootloader Components Configuration */ -#define CONFIG_CMD_ENV
/* I2C support */ #ifdef CONFIG_SYS_I2C diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index add5f90cc2..710bae8519 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -33,7 +33,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_I2C #define CONFIG_CMD_PCI #define CONFIG_CMD_SCSI diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 9442c05943..c2a2cb1bdb 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -273,7 +273,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES
#ifdef CONFIG_CMD_BDI @@ -302,7 +301,6 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif
#ifndef CONFIG_DIRECT_NOR_BOOT diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 6e2561cb5a..699c03f844 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV
/* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 1cdefa0549..0f0ab01f62 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI
/* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 676dfc996b..0890a4db62 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -24,7 +24,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_PCI #define CONFIG_SCSI
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index fc8a3ec7dc..821aa9dec1 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -25,7 +25,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 9450b62e4a..de682334eb 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 69429ed34e..2db31d3c11 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index b97c6c4240..11c842d952 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -46,7 +46,6 @@ #define CONFIG_USB_ETHER_SMSC95XX
/* Extra Commands */ -#define CONFIG_CMD_ENV /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 2c83a716a3..aaba5d8eab 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV
/* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 3a5b5c7285..53ee1adc0b 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -128,7 +128,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES
#ifdef CONFIG_CMD_BDI @@ -169,7 +168,6 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif
/* additions for new relocation code, must added to all boards */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index f8fb97b08e..2404441860 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV
#define CONFIG_BOOTARGS "console=ttySC0,115200"
diff --git a/include/configs/espt.h b/include/configs/espt.h index ace71862dd..845bcc1c9a 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -18,7 +18,6 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index f9bced3f8f..dbcd2b2dbe 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -43,7 +43,6 @@ * Commands configuration */
-#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 584ce52bd0..0fb6fb3b60 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -73,7 +73,6 @@ #define CONFIG_FS_EXT4
/* Command line configuration */ -#define CONFIG_CMD_ENV
#define CONFIG_MTD_PARTITIONS
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 950a7195fd..46374f2c37 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -32,7 +32,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND
/* diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 5caf02e8d9..0beb31b5c0 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -241,7 +241,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES
#ifdef CONFIG_CMD_BDI diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 0737a3e2ce..69c08c69da 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,7 +43,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_IDE #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #endif diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 09f890d55c..561b81a6f4 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/* Command line configuration */ -#define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS
#define CONFIG_SYS_HZ 1000 diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e26924877d..78c34eba3e 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -174,9 +174,6 @@ #endif
/* Command line configuration */ -#ifndef SPL_NO_ENV -#define CONFIG_CMD_ENV -#endif
/* MMC */ #ifndef SPL_NO_MMC diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 957ffd3634..c380fedf27 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -139,9 +139,6 @@ #define CONFIG_SYS_I2C_MXC_I2C4
/* Command line configuration */ -#ifndef SPL_NO_ENV -#define CONFIG_CMD_ENV -#endif
/* MMC */ #ifndef SPL_NO_MMC diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 427f623e8c..53686e3412 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -160,7 +160,6 @@ unsigned long long get_qixis_addr(void); #endif
/* Command line configuration */ -#define CONFIG_CMD_ENV
/* Miscellaneous configurable options */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DDR_SDRAM_BASE + 0x10000000) diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index ce6d7c9998..59542a62e4 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -38,7 +38,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_IDE
/* diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index cdb3a473ea..b82a684cc9 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV
/* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index f1734c0e21..12a4dfce6b 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -26,8 +26,6 @@ #define GICD_BASE 0xc4301000 #define GICC_BASE 0xc4302000
-#define CONFIG_CMD_ENV - /* Monitor Command Prompt */ /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 83c559ed66..ce85e38875 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_IDE
/* diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 0cc0042bca..5995c662b6 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -284,7 +284,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS @@ -309,7 +308,6 @@ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE (16 << 10) -#undef CONFIG_CMD_ENV #endif
/* SD/MMC */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 19660db080..6c17f3b24b 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -26,7 +26,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND #define CONFIG_CMD_IDE
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 36f6e95ced..e62e21704c 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_NAND
/* diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index b159b1ed8d..6212dbae21 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_TEXT_BASE 0x8FFC0000
#define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV
#define CONFIG_BOOTARGS "console=ttySC3,115200"
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 33487cd86f..b25a7ea344 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -117,7 +117,6 @@ #define CONFIG_LOADADDR 0xC307FFC0 #define CONFIG_BOOTARGS "console=ttyLF0 root=/dev/ram rw"
-#define CONFIG_CMD_ENV #define CONFIG_EXTRA_ENV_SETTINGS \ "boot_scripts=boot.scr.uimg boot.scr\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index bc1eba32ff..995f76a1ea 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -16,7 +16,6 @@ /* #define CONFIG_T_SH7706LSR 1 */
#define CONFIG_CMD_SDRAM -#define CONFIG_CMD_ENV
#define CONFIG_BOOTARGS "console=ttySC0,115200"
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 75fd27a373..86e14ffac8 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -97,7 +97,6 @@ * Command support defines */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES
/* diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 2a671e84ec..27cae9d528 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -23,7 +23,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_SATA
/* diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index ae13246478..11cb53587c 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,7 +125,6 @@ #endif
/*#define CONFIG_MENU_SHOW*/ -#define CONFIG_CMD_ENV
/* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index ae18bd6338..1aed81fc14 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -351,10 +351,6 @@ #define CONFIG_CMD_PCI #endif
-#if defined(CONFIG_SYS_RAMBOOT) - #undef CONFIG_CMD_ENV -#endif - /* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0
diff --git a/include/configs/x600.h b/include/configs/x600.h index bf6fafce98..afbd837cb8 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -106,7 +106,6 @@ /* * Command support defines */ -#define CONFIG_CMD_ENV #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 3a6a4972e6..8a433691f4 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -52,7 +52,6 @@ { 4800, 9600, 19200, 38400, 57600, 115200 }
/* Command line configuration */ -#define CONFIG_CMD_ENV #define CONFIG_MP
/* BOOTP options */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 841cc6dbb2..8a745e5097 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -54,7 +54,6 @@ /* * Bootloader Components Configuration */ -#define CONFIG_CMD_ENV
/* * MMC Card Configuration diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c59c5ce42a..73475e598b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENV CONFIG_CMD_ENV_CALLBACK CONFIG_CMD_ENV_FLAGS CONFIG_CMD_ERRATA
On Wed, May 17, 2017 at 03:25:12AM -0600, Simon Glass wrote:
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ENV_CALLBACK
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 8 ++++++++ configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + include/configs/sandbox.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/README b/README index 841869dec7..74e1e5473f 100644 --- a/README +++ b/README @@ -833,7 +833,6 @@ The following options need to be configured: CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_ELF * bootelf, bootvx - CONFIG_CMD_ENV_CALLBACK * display details about env callbacks CONFIG_CMD_ENV_FLAGS * display details about env flags CONFIG_CMD_ENV_EXISTS * check existence of env variable CONFIG_CMD_EXPORTENV * export the environment diff --git a/cmd/Kconfig b/cmd/Kconfig index 6b9feff94c..3ac876403c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -314,6 +314,14 @@ config CMD_ENV_EXISTS Check if a variable is defined in the environment for use in shell scripting.
+config CMD_ENV_CALLBACK + bool "env callbacks - print callbacks and their associated variables" + help + Some environment variable have callbacks defined by + U_BOOT_ENV_CALLBACK. These are called when the variable changes. + For example changing "baudrate" adjust the serial baud rate. This + command lists the currently defined callbacks. + endmenu
menu "Memory commands" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index e24012c8ae..b63da46c87 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index de10d48ef0..3349697b67 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 25e4da258c..79eb83719e 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 37c6132b8a..1743055f15 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -110,7 +110,6 @@ #define CONFIG_CMD_SANDBOX
#define CONFIG_CMD_ENV_FLAGS -#define CONFIG_CMD_ENV_CALLBACK
#define CONFIG_BOOTARGS ""
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 73475e598b..deb98c9db7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENV_CALLBACK CONFIG_CMD_ENV_FLAGS CONFIG_CMD_ERRATA CONFIG_CMD_ESBC_VALIDATE
On Wed, May 17, 2017 at 03:25:13AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ENV_CALLBACK
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ENV_FLAGS
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 8 ++++++++ configs/ids8313_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + include/configs/ids8313.h | 1 - include/configs/sandbox.h | 2 -- scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/README b/README index 74e1e5473f..9381510402 100644 --- a/README +++ b/README @@ -833,7 +833,6 @@ The following options need to be configured: CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENV edit env variable CONFIG_CMD_ELF * bootelf, bootvx - CONFIG_CMD_ENV_FLAGS * display details about env flags CONFIG_CMD_ENV_EXISTS * check existence of env variable CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_EXT2 * ext2 command support diff --git a/cmd/Kconfig b/cmd/Kconfig index 3ac876403c..ab09a9f528 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -322,6 +322,14 @@ config CMD_ENV_CALLBACK For example changing "baudrate" adjust the serial baud rate. This command lists the currently defined callbacks.
+config CMD_ENV_FLAGS + bool "env flags -print variables that have non-default flags" + help + Some environment variables have special flags that control their + behaviour. For example, serial# can only be written once and cannot + be deleted. This command shows the variables that have special + flags. + endmenu
menu "Memory commands" diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 165e2eb495..2accd31229 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -13,6 +13,7 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter password - autoboot in %d seconds...\n" CONFIG_AUTOBOOT_DELAY_STR="ids" +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index b63da46c87..f8e1b3ad99 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 3349697b67..312834bf40 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 79eb83719e..7f262dc327 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y +CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_MD5SUM=y CONFIG_LOOPW=y CONFIG_CMD_MEMTEST=y diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 7ffc9d1dd9..be96834c76 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -444,7 +444,6 @@ #define CONFIG_UBOOTPATH "ids8313/u-boot.bin" #define CONFIG_FDTFILE "ids8313/ids8313.dtb" #define CONFIG_LOADADDR 0x400000 -#define CONFIG_CMD_ENV_FLAGS #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo"
/* Initial Memory map for Linux*/ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1743055f15..da547c5bb2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -109,8 +109,6 @@
#define CONFIG_CMD_SANDBOX
-#define CONFIG_CMD_ENV_FLAGS - #define CONFIG_BOOTARGS ""
#ifndef SANDBOX_NO_SDL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index deb98c9db7..d6de1d774b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ENV_FLAGS CONFIG_CMD_ERRATA CONFIG_CMD_ESBC_VALIDATE CONFIG_CMD_ETHSW
On Wed, May 17, 2017 at 03:25:14AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ENV_FLAGS
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ERRATA
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: - Change 'default y if MPC85xx' to 'default y' - Fix defconfig ordering in controlcenterd_TRAILBLAZER boards
arch/powerpc/cpu/mpc85xx/Kconfig | 8 ++++++++ configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 + configs/controlcenterd_TRAILBLAZER_defconfig | 1 + include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/km/kmp204x-common.h | 1 - include/configs/t4qds.h | 1 - scripts/config_whitelist.txt | 1 - 25 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index a87430cdbc..88d56a9a32 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -4,6 +4,14 @@ menu "mpc85xx CPU" config SYS_CPU default "mpc85xx"
+config CMD_ERRATA + bool "Enable the 'errata' command" + depends on MPC85xx + default y + help + This enables the 'errata' command which displays a list of errata + work-arounds which are enabled for the current board. + choice prompt "Target select" optional diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig index b197116f1c..95e4839b6d 100644 --- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" controlcenterd trailblazer 0.01" CONFIG_MPC85xx=y +# CONFIG_CMD_ERRATA is not set CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP" CONFIG_BOOTDELAY=-2 diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig index aee0f3af71..ce29fc9104 100644 --- a/configs/controlcenterd_TRAILBLAZER_defconfig +++ b/configs/controlcenterd_TRAILBLAZER_defconfig @@ -1,6 +1,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" controlcenterd trailblazer 0.01" CONFIG_MPC85xx=y +# CONFIG_CMD_ERRATA is not set CONFIG_TARGET_CONTROLCENTERD=y CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH" CONFIG_BOOTDELAY=-2 diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 3dff45cd6e..3ed66fa455 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 36633bde6e..64875f3116 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -293,7 +293,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 28658e4894..506fb79b35 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -520,7 +520,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 84365f11df..c6afb9a208 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -436,7 +436,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2c1be228ee..59f1cc7c8d 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,7 +547,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 5b7d6adad3..9850fb80a0 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -724,7 +724,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0763cf312e..2d1564a835 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7629fe8eb4..bcc9cc8f9c 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -580,7 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index d8ad914515..427b6f23ae 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 5e35ceb89a..7af377a8d9 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index cba7404c31..d7af902858 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index d2ece40d4a..6e27e513a9 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -772,7 +772,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 02fd37d5cb..bd6c47cca5 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,7 +744,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index faa1111e9f..fa1c9a74fc 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -690,7 +690,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 8ebfde19f9..f1144b2039 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -272,7 +272,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 8265f3c1ab..9cede19d4f 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -424,7 +424,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_ERRATA
/* * USB diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 97faed8cca..40117b9a7f 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -343,7 +343,6 @@
#ifndef CONFIG_TRAILBLAZER
-#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 7e606cd794..af1573de92 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 435929723b..9210770d7b 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -411,7 +411,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 9bfcfdefe9..664a64c55a 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -370,7 +370,6 @@ int get_scl(void); * additionnal command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_ERRATA
/* we don't need flash support */ #undef CONFIG_FLASH_CFI_MTD diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 55b8e3ebfc..f4f9a38b2c 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -241,7 +241,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d6de1d774b..0eecde12b2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ERRATA CONFIG_CMD_ESBC_VALIDATE CONFIG_CMD_ETHSW CONFIG_CMD_FDC
On Wed, May 17, 2017 at 03:25:15AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ERRATA
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Wed, May 17, 2017 at 03:25:15AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ERRATA
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ESBC_VALIDATE
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: - Add 'default y if CHAIN_OF_TRUST' to drop defconfig options
arch/arm/include/asm/fsl_secure_boot.h | 1 - arch/powerpc/include/asm/fsl_secure_boot.h | 1 - board/freescale/common/Kconfig | 9 +++++++++ scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index b0ca4bcf04..3212defcf0 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -8,7 +8,6 @@ #define __FSL_SECURE_BOOT_H
#ifdef CONFIG_CHAIN_OF_TRUST -#define CONFIG_CMD_ESBC_VALIDATE #define CONFIG_FSL_SEC_MON #define CONFIG_SHA_HW_ACCEL #define CONFIG_SHA_PROG_HW_ACCEL diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 62ce816b13..f188c8ca2c 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -99,7 +99,6 @@ #define CONFIG_SPL_UBOOT_KEY_HASH NULL #endif /* ifdef CONFIG_SPL_BUILD */
-#define CONFIG_CMD_ESBC_VALIDATE #define CONFIG_FSL_SEC_MON #define CONFIG_SHA_PROG_HW_ACCEL
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 8a9a9be8ce..cac06ee316 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -4,3 +4,12 @@ config CHAIN_OF_TRUST select FSL_CAAM bool default y + +config CMD_ESBC_VALIDATE + bool "Enable the 'esbc_validate' and 'esbc_halt' commands" + default y if CHAIN_OF_TRUST + help + This option enables two commands used for secure booting: + + esbc_validate - validate signature using RSA verification + esbc_halt - put the core in spin loop (Secure Boot Only) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0eecde12b2..a7efc841ec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ESBC_VALIDATE CONFIG_CMD_ETHSW CONFIG_CMD_FDC CONFIG_CMD_FDT_MAX_DUMP
On Wed, May 17, 2017 at 03:25:16AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ESBC_VALIDATE
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_ETHSW
Also enable it for sandbox to increase build coverage.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
cmd/Kconfig | 8 ++++++++ configs/T1040D4RDB_NAND_defconfig | 1 + configs/T1040D4RDB_SDCARD_defconfig | 1 + configs/T1040D4RDB_SECURE_BOOT_defconfig | 1 + configs/T1040D4RDB_SPIFLASH_defconfig | 1 + configs/T1040D4RDB_defconfig | 1 + configs/T1040QDS_DDR4_defconfig | 1 + configs/T1040QDS_SECURE_BOOT_defconfig | 1 + configs/T1040QDS_defconfig | 1 + configs/T1040RDB_NAND_defconfig | 1 + configs/T1040RDB_SDCARD_defconfig | 1 + configs/T1040RDB_SECURE_BOOT_defconfig | 1 + configs/T1040RDB_SPIFLASH_defconfig | 1 + configs/T1040RDB_defconfig | 1 + configs/sandbox_defconfig | 1 + include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - scripts/config_whitelist.txt | 1 - 18 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index ab09a9f528..cc959f6a4a 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -711,6 +711,14 @@ config CMD_LINK_LOCAL help Acquire a network IP address using the link-local protocol
+config CMD_ETHSW + bool "ethsw" + help + Allow control of L2 Ethernet switch commands. These are supported + by the vsc9953 Ethernet driver at present. Sub-commands allow + operations such as enabling / disabling a port and + viewing/maintaining the filtering database (FDB) + endmenu
menu "Misc commands" diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig index bf239bd104..c22bf9ce8c 100644 --- a/configs/T1040D4RDB_NAND_defconfig +++ b/configs/T1040D4RDB_NAND_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig index e6a5b83f7f..63010c546c 100644 --- a/configs/T1040D4RDB_SDCARD_defconfig +++ b/configs/T1040D4RDB_SDCARD_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040D4RDB_SECURE_BOOT_defconfig b/configs/T1040D4RDB_SECURE_BOOT_defconfig index b0edffaacf..47582578cf 100644 --- a/configs/T1040D4RDB_SECURE_BOOT_defconfig +++ b/configs/T1040D4RDB_SECURE_BOOT_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_DM=y diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig index e99809be3d..2a872b930f 100644 --- a/configs/T1040D4RDB_SPIFLASH_defconfig +++ b/configs/T1040D4RDB_SPIFLASH_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig index 355d6ab3f0..82d6140518 100644 --- a/configs/T1040D4RDB_defconfig +++ b/configs/T1040D4RDB_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040QDS_DDR4_defconfig b/configs/T1040QDS_DDR4_defconfig index 6ebde4d2df..063ae20c83 100644 --- a/configs/T1040QDS_DDR4_defconfig +++ b/configs/T1040QDS_DDR4_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y diff --git a/configs/T1040QDS_SECURE_BOOT_defconfig b/configs/T1040QDS_SECURE_BOOT_defconfig index e437cdac35..a75ee03bcf 100644 --- a/configs/T1040QDS_SECURE_BOOT_defconfig +++ b/configs/T1040QDS_SECURE_BOOT_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y diff --git a/configs/T1040QDS_defconfig b/configs/T1040QDS_defconfig index 7b96193c85..5d8cdf1383 100644 --- a/configs/T1040QDS_defconfig +++ b/configs/T1040QDS_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y diff --git a/configs/T1040RDB_NAND_defconfig b/configs/T1040RDB_NAND_defconfig index a427cf18c4..b3e9c412b9 100644 --- a/configs/T1040RDB_NAND_defconfig +++ b/configs/T1040RDB_NAND_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040RDB_SDCARD_defconfig b/configs/T1040RDB_SDCARD_defconfig index 2d2585f8c1..7b2187cf9c 100644 --- a/configs/T1040RDB_SDCARD_defconfig +++ b/configs/T1040RDB_SDCARD_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040RDB_SECURE_BOOT_defconfig b/configs/T1040RDB_SECURE_BOOT_defconfig index c15f600d50..f16834b85c 100644 --- a/configs/T1040RDB_SECURE_BOOT_defconfig +++ b/configs/T1040RDB_SECURE_BOOT_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_DM=y diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig index f0c60001c3..9f5a8c4e9c 100644 --- a/configs/T1040RDB_SPIFLASH_defconfig +++ b/configs/T1040RDB_SPIFLASH_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/T1040RDB_defconfig b/configs/T1040RDB_defconfig index 1fca4a411b..7d6ed1bb72 100644 --- a/configs/T1040RDB_defconfig +++ b/configs/T1040RDB_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_FSL_CAAM=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index f8e1b3ad99..720f0ee9dc 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -186,3 +186,4 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y +CONFIG_CMD_ETHSW=y diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index d7af902858..5ce06ce5d7 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -629,7 +629,6 @@ unsigned long get_board_ddr_clk(void);
/* Enable VSC9953 L2 Switch driver */ #define CONFIG_VSC9953 -#define CONFIG_CMD_ETHSW #define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR 0x14 #define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR 0x18
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 6e27e513a9..1b17525197 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -748,7 +748,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* Enable VSC9953 L2 Switch driver on T1040 SoC */ #if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1040D4RDB) #define CONFIG_VSC9953 -#define CONFIG_CMD_ETHSW #ifdef CONFIG_TARGET_T1040RDB #define CONFIG_SYS_FM1_QSGMII11_PHY_ADDR 0x04 #define CONFIG_SYS_FM1_QSGMII21_PHY_ADDR 0x08 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a7efc841ec..4134a16452 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ETHSW CONFIG_CMD_FDC CONFIG_CMD_FDT_MAX_DUMP CONFIG_CMD_FPGAD
On Wed, May 17, 2017 at 03:25:17AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_ETHSW
Also enable it for sandbox to increase build coverage.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_FDC
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 5 +++++ configs/PIP405_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/PIP405.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/README b/README index 9381510402..1b5aabbeb6 100644 --- a/README +++ b/README @@ -841,7 +841,6 @@ The following options need to be configured: that work for multiple fs types CONFIG_CMD_FS_UUID * Look up a filesystem UUID CONFIG_CMD_SAVEENV saveenv - CONFIG_CMD_FDC * Floppy Disk Support CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support diff --git a/cmd/Kconfig b/cmd/Kconfig index cc959f6a4a..99082c14f2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -604,6 +604,11 @@ config CMD_GPIO help GPIO support.
+config CMD_FDC + bool "fdcboot - Boot from floppy device" + help + The 'fdtboot' command allows booting an image from a floppy disk. + endmenu
diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index bd421eab9c..e366ac1355 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -14,6 +14,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FDC=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index a824204913..9b3d88a1f8 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_FDC /* Floppy Disk Support */ #define CONFIG_CMD_FUSE /* Device fuse support */ #define CONFIG_CMD_GETTIME /* Get time since boot */ #define CONFIG_CMD_HASH /* calculate hash / digest */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 84b1a73033..eb1f0e26c5 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FDC #define CONFIG_SCSI #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVES diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4134a16452..e8b83e5bea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FDC CONFIG_CMD_FDT_MAX_DUMP CONFIG_CMD_FPGAD CONFIG_CMD_FPGA_LOADBP
On Wed, May 17, 2017 at 03:25:18AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_FDC
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This option is not used by any board. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
cmd/fdt.c | 8 +++----- scripts/config_whitelist.txt | 1 - 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/cmd/fdt.c b/cmd/fdt.c index 95dd673b95..a21415dab4 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -20,9 +20,7 @@
#define MAX_LEVEL 32 /* how deeply nested we will go */ #define SCRATCHPAD 1024 /* bytes of scratchpad memory */ -#ifndef CONFIG_CMD_FDT_MAX_DUMP -#define CONFIG_CMD_FDT_MAX_DUMP 64 -#endif +#define CMD_FDT_MAX_DUMP 64
/* * Global data (for the gd->bd) @@ -901,7 +899,7 @@ static void print_data(const void *data, int len) }
if ((len %4) == 0) { - if (len > CONFIG_CMD_FDT_MAX_DUMP) + if (len > CMD_FDT_MAX_DUMP) printf("* 0x%p [0x%08x]", data, len); else { const __be32 *p; @@ -913,7 +911,7 @@ static void print_data(const void *data, int len) printf(">"); } } else { /* anything else... hexdump */ - if (len > CONFIG_CMD_FDT_MAX_DUMP) + if (len > CMD_FDT_MAX_DUMP) printf("* 0x%p [0x%08x]", data, len); else { const u8 *s; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e8b83e5bea..cb537d8637 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FDT_MAX_DUMP CONFIG_CMD_FPGAD CONFIG_CMD_FPGA_LOADBP CONFIG_CMD_FPGA_LOADFS
On Wed, May 17, 2017 at 03:25:19AM -0600, Simon Glass wrote:
This option is not used by any board. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_FPGAD
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
cmd/Kconfig | 8 ++++++++ configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/iocon_defconfig | 1 + configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + include/configs/hrcon.h | 1 - include/configs/iocon.h | 1 - include/configs/strider.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index 99082c14f2..99e42e4b36 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -593,6 +593,14 @@ config CMD_FPGA help FPGA support.
+config CMD_FPGAD + bool "fpgad - dump FPGA registers" + help + (legacy, needs conversion to driver model) + Provides a way to dump FPGA registers by calling the board-specific + fpga_get_reg() function. This functions similarly to the 'md' + command. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index afb0154fcd..cf89ebe145 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -15,6 +15,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index ce8b7972a4..c5512e71c4 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -14,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y diff --git a/configs/iocon_defconfig b/configs/iocon_defconfig index c74df944a6..b3ee66d7f6 100644 --- a/configs/iocon_defconfig +++ b/configs/iocon_defconfig @@ -16,6 +16,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_LOOPW=y +CONFIG_CMD_FPGAD=y CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_MII=y diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 51a50856a9..099d40714f 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 9524c9c6f2..754db3d2d8 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index 090d7e8efc..692e883e75 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index ec715f1180..18e33a2e6b 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -17,6 +17,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FPGAD=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 5574e7715a..cfebd2d26e 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,7 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
-#define CONFIG_CMD_FPGAD #define CONFIG_CMD_IOLOOP
/* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index e15adfcbb0..0d81ac1b2f 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#define CONFIG_CMD_FPGAD #undef CONFIG_CMD_IRQ
/* diff --git a/include/configs/strider.h b/include/configs/strider.h index 1298808b13..539557d972 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -28,7 +28,6 @@
#define CONFIG_SYS_ALT_MEMTEST
-#define CONFIG_CMD_FPGAD #define CONFIG_CMD_IOLOOP
/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb537d8637..e8212938bb 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FPGAD CONFIG_CMD_FPGA_LOADBP CONFIG_CMD_FPGA_LOADFS CONFIG_CMD_FPGA_LOADMK
On Wed, May 17, 2017 at 03:25:20AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_FPGAD
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_FPGA_LOADBP CONFIG_CMD_FPGA_LOADFS CONFIG_CMD_FPGA_LOADMK CONFIG_CMD_FPGA_LOADP
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 13 ------------- arch/Kconfig | 1 + cmd/Kconfig | 26 ++++++++++++++++++++++++++ configs/astro_mcf5373l_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/x600_defconfig | 1 + configs/zynq_microzed_defconfig | 4 ++++ configs/zynq_picozed_defconfig | 4 ++++ configs/zynq_zc702_defconfig | 4 ++++ configs/zynq_zc706_defconfig | 4 ++++ configs/zynq_zc770_xm010_defconfig | 4 ++++ configs/zynq_zc770_xm011_defconfig | 4 ++++ configs/zynq_zc770_xm012_defconfig | 4 ++++ configs/zynq_zc770_xm013_defconfig | 4 ++++ configs/zynq_zed_defconfig | 4 ++++ configs/zynq_zybo_defconfig | 4 ++++ include/configs/astro_mcf5373l.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/topic_miami.h | 4 ---- include/configs/x600.h | 1 - include/configs/x86-common.h | 1 - include/configs/zynq-common.h | 4 ---- scripts/config_whitelist.txt | 4 ---- 23 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/README b/README index 1b5aabbeb6..4758dff0d1 100644 --- a/README +++ b/README @@ -2384,19 +2384,6 @@ The following options need to be configured:
Specify the number of FPGA devices to support.
- CONFIG_CMD_FPGA_LOADMK - - Enable support for fpga loadmk command - - CONFIG_CMD_FPGA_LOADP - - Enable support for fpga loadp command - load partial bitstream - - CONFIG_CMD_FPGA_LOADBP - - Enable support for fpga loadbp command - load partial bitstream - (Xilinx only) - CONFIG_SYS_FPGA_PROG_FEEDBACK
Enable printing of hash marks during FPGA configuration. diff --git a/arch/Kconfig b/arch/Kconfig index 826e346f98..ce47078d6a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -85,6 +85,7 @@ config X86 select DM_SPI select DM_SPI_FLASH select USB_EHCI_HCD + imply CMD_FPGA_LOADMK
config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 99e42e4b36..16cf961f3e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -593,6 +593,32 @@ config CMD_FPGA help FPGA support.
+config CMD_FPGA_LOADBP + bool "fpga loadbp - load partial bitstream (Xilinx only)" + depends on CMD_FPGA + help + Supports loading an FPGA device from a bitstream buffer containing + a partial bitstream. + +config CMD_FPGA_LOADFS + bool "fpga loadfs - load bitstream from FAT filesystem (Xilinx only)" + depends on CMD_FPGA + help + Supports loading an FPGA device from a FAT filesystem. + +config CMD_FPGA_LOADMK + bool "fpga loadmk - load bitstream from image" + depends on CMD_FPGA + help + Supports loading an FPGA device from a image generated by mkimage. + +config CMD_FPGA_LOADP + bool "fpga loadp - load partial bitstream" + depends on CMD_FPGA + help + Supports loading an FPGA device from a bitstream buffer containing + a partial bitstream. + config CMD_FPGAD bool "fpgad - dump FPGA registers" help diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index d5e84308d6..c35222b244 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -5,6 +5,7 @@ CONFIG_BOOTDELAY=1 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="URMEL > " CONFIG_CMD_I2C=y +CONFIG_CMD_FPGA_LOADMK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index e426772b15..c4a6f2063f 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_EEPROM=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 3aaba16c2e..2e5d5f1ae8 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -20,6 +20,7 @@ CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 4093618325..2d7fffc1f4 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -16,6 +16,10 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 3c3a5b29b0..7ca69a973c 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -12,6 +12,10 @@ CONFIG_SYS_PROMPT="Zynq> " CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 83e8f65082..44e6850d8b 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -19,6 +19,10 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 9dbf47f496..825346abd6 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -19,6 +19,10 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index ececcb4f95..a1ef49f250 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -15,6 +15,10 @@ CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index 980382ce69..dc49372e48 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -14,6 +14,10 @@ CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 48caf31683..16cd613110 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -11,6 +11,10 @@ CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 23bcb0e446..4396db0eb1 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -13,6 +13,10 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 26a5320b61..2887ca4167 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -16,6 +16,10 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 8bed4e6809..e5be0d141e 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -19,6 +19,10 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_FPGA_LOADBP=y +CONFIG_CMD_FPGA_LOADFS=y +CONFIG_CMD_FPGA_LOADMK=y +CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8899579faa..084b78c1e3 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -63,7 +63,6 @@ #define CONFIG_CMD_JFFS2 #endif #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMDLINE_EDITING
#define CONFIG_MCFRTC diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 2e373175dc..ed83eeba54 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -39,7 +39,6 @@ /* * FPGA */ -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_SPARTAN3 diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 23160bd88d..a28922585c 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -44,10 +44,6 @@ #undef CONFIG_SPL_FPGA_SUPPORT
/* FPGA commands that we don't use */ -#undef CONFIG_CMD_FPGA_LOADMK -#undef CONFIG_CMD_FPGA_LOADP -#undef CONFIG_CMD_FPGA_LOADBP -#undef CONFIG_CMD_FPGA_LOADFS
/* Extras */ #define CONFIG_CMD_MEMTEST diff --git a/include/configs/x600.h b/include/configs/x600.h index afbd837cb8..c7d32fedb3 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -106,7 +106,6 @@ /* * Command support defines */ -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND #define CONFIG_CMD_SAVES diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 29be55a840..8284076b08 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,7 +70,6 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMD_IO #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 223637952d..c958f2de22 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -259,10 +259,6 @@ #define CONFIG_FPGA #define CONFIG_FPGA_XILINX #define CONFIG_FPGA_ZYNQPL -#define CONFIG_CMD_FPGA_LOADMK -#define CONFIG_CMD_FPGA_LOADP -#define CONFIG_CMD_FPGA_LOADBP -#define CONFIG_CMD_FPGA_LOADFS
/* FIT support */ #define CONFIG_IMAGE_FORMAT_LEGACY /* enable also legacy image format */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e8212938bb..1a62d3e362 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,10 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FPGA_LOADBP -CONFIG_CMD_FPGA_LOADFS -CONFIG_CMD_FPGA_LOADMK -CONFIG_CMD_FPGA_LOADP CONFIG_CMD_FUSE CONFIG_CMD_GETTIME CONFIG_CMD_GSC
On Wed, May 17, 2017 at 03:25:21AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_FPGA_LOADBP CONFIG_CMD_FPGA_LOADFS CONFIG_CMD_FPGA_LOADMK CONFIG_CMD_FPGA_LOADP
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_FUSE
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - arch/arm/cpu/armv7/mx6/Kconfig | 1 + arch/arm/cpu/armv7/mx7/Kconfig | 2 ++ cmd/Kconfig | 8 ++++++++ configs/colibri_vf_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/sandbox_defconfig | 2 +- configs/usbarmory_defconfig | 1 + configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/ac14xx.h | 1 - include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aria.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/colibri_vf.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/mecp5123.h | 1 - include/configs/mpc5121ads.h | 2 -- include/configs/mx51evk.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/usbarmory.h | 1 - include/configs/vf610twr.h | 1 - scripts/config_whitelist.txt | 1 - 27 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/README b/README index 4758dff0d1..ba9691a895 100644 --- a/README +++ b/README @@ -844,7 +844,6 @@ The following options need to be configured: CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support - CONFIG_CMD_FUSE * Device fuse support CONFIG_CMD_GETTIME * Get time since boot CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index af6dad3aa9..5ecca47a98 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -7,6 +7,7 @@ config MX6 select ARM_ERRATA_751472 if !MX6UL select ARM_ERRATA_761320 if !MX6UL select ARM_ERRATA_794072 if !MX6UL + imply CMD_FUSE
config MX6D bool diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index 8dfb4c9646..80c129019a 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -6,10 +6,12 @@ config MX7 select CPU_V7_HAS_VIRT select CPU_V7_HAS_NONSEC select ARCH_SUPPORT_PSCI + imply CMD_FUSE default y
config MX7D select ROM_UNIFIED_SECTIONS + imply CMD_FUSE bool
choice diff --git a/cmd/Kconfig b/cmd/Kconfig index 16cf961f3e..495080fc01 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -627,6 +627,14 @@ config CMD_FPGAD fpga_get_reg() function. This functions similarly to the 'md' command.
+config CMD_FUSE + bool "fuse - support for the fuse subssystem" + help + (deprecated - needs conversion to driver model) + This allows reading, sensing, programming or overriding fuses + which control the behaviour of the device. The command uses the + fuse_...() API. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 8be632fb8e..3b510c3e6d 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index e84272d68c..8f09c04ceb 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_FUSE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 720f0ee9dc..a573d52b7f 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -44,6 +44,7 @@ CONFIG_CMD_CDP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DNS=y CONFIG_CMD_LINK_LOCAL=y +CONFIG_CMD_ETHSW=y CONFIG_CMD_BMP=y CONFIG_CMD_TIME=y CONFIG_CMD_TIMER=y @@ -186,4 +187,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_ETHSW=y diff --git a/configs/usbarmory_defconfig b/configs/usbarmory_defconfig index 43256177be..a71a75751f 100644 --- a/configs/usbarmory_defconfig +++ b/configs/usbarmory_defconfig @@ -8,6 +8,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_FUSE=y # CONFIG_CMD_SETEXPR is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/vf610twr_defconfig b/configs/vf610twr_defconfig index 9198f65eaa..47193094dd 100644 --- a/configs/vf610twr_defconfig +++ b/configs/vf610twr_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/vf610twr_nand_defconfig b/configs/vf610twr_nand_defconfig index ba4e5965ca..f1dc19a543 100644 --- a/configs/vf610twr_nand_defconfig +++ b/configs/vf610twr_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 9b3d88a1f8..7e9983e150 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_FUSE /* Device fuse support */ #define CONFIG_CMD_GETTIME /* Get time since boot */ #define CONFIG_CMD_HASH /* calculate hash / digest */ #define CONFIG_CMD_IDE /* IDE harddisk support */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 2a46e9b864..3d3c216d61 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#undef CONFIG_CMD_FUSE #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index b76f376a04..f320792cfd 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -36,7 +36,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART
-#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
/* SATA Configs */ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c1c0f592d2..8eddb68d3b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_I2C_SPEED 100000
/* OCOTP Configs */ -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/include/configs/aria.h b/include/configs/aria.h index 4d946fc44a..3b5d56c6bb 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#undef CONFIG_CMD_FUSE #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9c4085245a..6189a6191f 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_I2C_SPEED 100000
/* OCOTP Configs */ -#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 28383f49da..6e8cd914b3 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -20,7 +20,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 198259b3c0..f60a0298d6 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -47,7 +47,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART
-#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
/* SATA Configs */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index fe94e663c5..6e10cafe6e 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
#define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_FUSE #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 7919320c88..bd7c4a64e2 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -382,8 +382,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_FUSE - #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI #endif diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 54bc563467..4513adf2c4 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -33,7 +33,6 @@ * Hardware drivers */ #define CONFIG_FSL_IIM -#define CONFIG_CMD_FUSE
#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 21ac3fc357..1a8ab4ee33 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -78,7 +78,6 @@ #define CONFIG_FSL_USDHC
/* Fuses */ -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
/* Secure boot (HAB) support */ diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 9a20c7732d..fe460109d1 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -59,7 +59,6 @@ #define CONFIG_FSL_USDHC
/* Fuses */ -#define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP
#define CONFIG_ARMV7_SECURE_BASE 0x00900000 diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 4bd8236b33..676d55f5e8 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -340,8 +340,6 @@
#define CONFIG_CMD_REGINFO
-#undef CONFIG_CMD_FUSE - /* * Miscellaneous configurable options */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index f725b79cd4..e25bf99e1c 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
/* Fuse */ -#define CONFIG_CMD_FUSE #define CONFIG_FSL_IIM
/* U-Boot memory offsets */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 3e7dc9b685..2460294d88 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -20,7 +20,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG
-#define CONFIG_CMD_FUSE #ifdef CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1a62d3e362..ba8ac3ebcc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_FUSE CONFIG_CMD_GETTIME CONFIG_CMD_GSC CONFIG_CMD_HASH
On Wed, May 17, 2017 at 03:25:22AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_FUSE
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_GETTIME
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: - Imply CMD_TIME on x86 to remove defconfig changes
README | 1 - arch/Kconfig | 1 + cmd/Kconfig | 8 ++++++++ include/config_cmd_all.h | 1 - include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/README b/README index ba9691a895..efb1512e17 100644 --- a/README +++ b/README @@ -844,7 +844,6 @@ The following options need to be configured: CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FLASH flinfo, erase, protect CONFIG_CMD_FPGA FPGA device initialization support - CONFIG_CMD_GETTIME * Get time since boot CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment CONFIG_CMD_HASH * calculate hash / digest diff --git a/arch/Kconfig b/arch/Kconfig index ce47078d6a..4f8409ca1b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -86,6 +86,7 @@ config X86 select DM_SPI_FLASH select USB_EHCI_HCD imply CMD_FPGA_LOADMK + imply CMD_GETTIME
config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 495080fc01..7243f78d1e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -846,6 +846,14 @@ config CMD_TIME help Run commands and summarize execution time.
+config CMD_GETTIME + bool "gettime - read elapsed time" + help + Enable the 'gettime' command which reads the elapsed time since + U-Boot started running. This shows the time in seconds and + milliseconds. See also the 'bootstage' command which provides more + flexibility for boot timing. + # TODO: rename to CMD_SLEEP config CMD_MISC bool "sleep" diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 7e9983e150..2c633e6727 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_GETTIME /* Get time since boot */ #define CONFIG_CMD_HASH /* calculate hash / digest */ #define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IMMAP /* IMMR dump support */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8284076b08..e9d5f3d053 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -73,7 +73,6 @@ #define CONFIG_CMD_IO #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI -#define CONFIG_CMD_GETTIME #define CONFIG_SCSI
#define CONFIG_CMD_ZBOOT diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ba8ac3ebcc..718a8ede2a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_GETTIME CONFIG_CMD_GSC CONFIG_CMD_HASH CONFIG_CMD_HD44760
On Wed, May 17, 2017 at 03:25:23AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_GETTIME
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_GSC
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
board/gateworks/gw_ventana/Kconfig | 8 ++++++++ configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/pcm058.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/board/gateworks/gw_ventana/Kconfig b/board/gateworks/gw_ventana/Kconfig index c5779846da..5d1bae41ac 100644 --- a/board/gateworks/gw_ventana/Kconfig +++ b/board/gateworks/gw_ventana/Kconfig @@ -14,4 +14,12 @@ config CMD_EECONFIG help Provides access to EEPROM configuration on Gateworks Ventana
+config CMD_GSC + bool "Enable the 'gsc' command" + help + Provides access to the GSC configuration: + + gsc sleep - sleeps for a period of seconds + gsc wd - enables / disables the watchdog + endif diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 289134e854..12de448115 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 5e5f1f6d37..6d8cd6030c 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index eedccfc999..62b9b575ca 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_GW_VENTANA=y CONFIG_CMD_EECONFIG=y +CONFIG_CMD_GSC=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 661d8c38c8..4dcff0347f 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -142,7 +142,6 @@
/* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 041d84018f..44b4ffdf99 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -87,7 +87,6 @@
/* Various command support */ #define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ -#define CONFIG_CMD_GSC #define CONFIG_RBTREE
/* Physical Memory Map */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 718a8ede2a..0a5cd1595f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_GSC CONFIG_CMD_HASH CONFIG_CMD_HD44760 CONFIG_CMD_HD44780
On Wed, May 17, 2017 at 03:25:24AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_GSC
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_HASH
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Drop CMD_HASH for boards which don't define CHAIN_OF_TRUST - Add 'imply CMD_HASH' for CHAIN_OF_TRUST
Changes in v2: None
README | 6 ------ arch/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm/include/asm/fsl_secure_boot.h | 1 - arch/arm/mach-exynos/Kconfig | 1 + arch/powerpc/Kconfig | 1 + board/freescale/common/Kconfig | 1 + cmd/Kconfig | 8 ++++++++ include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/bcm_ep_board.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/exynos5-common.h | 3 --- include/configs/ids8313.h | 1 - include/configs/ls1021aiot.h | 3 --- include/configs/ls1021aqds.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/ls1046a_common.h | 1 - include/configs/ls2080a_common.h | 1 - include/configs/sandbox.h | 1 - scripts/config_whitelist.txt | 1 - 35 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/README b/README index efb1512e17..d53607ac1e 100644 --- a/README +++ b/README @@ -846,7 +846,6 @@ The following options need to be configured: CONFIG_CMD_FPGA FPGA device initialization support CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment - CONFIG_CMD_HASH * calculate hash / digest CONFIG_CMD_I2C * I2C serial bus support CONFIG_CMD_IDE * IDE harddisk support CONFIG_CMD_IMI iminfo @@ -2710,11 +2709,6 @@ The following options need to be configured: but sometimes that is not allowed.
- Hashing support: - CONFIG_CMD_HASH - - This enables a generic 'hash' command which can produce - hashes / digests from a few algorithms (e.g. SHA1, SHA256). - CONFIG_HASH_VERIFY
Enable the hash verify command (hash -v). This adds to code diff --git a/arch/Kconfig b/arch/Kconfig index 4f8409ca1b..61c08fffa4 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -68,6 +68,7 @@ config SANDBOX select DM_SPI select DM_GPIO select DM_MMC + imply CMD_HASH
config SH bool "SuperH architecture" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 96dec83e22..7c54f99899 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -502,6 +502,7 @@ config TARGET_BCM28155_AP config TARGET_BCMCYGNUS bool "Support bcmcygnus" select CPU_V7 + imply CMD_HASH
config TARGET_BCMNSP bool "Support bcmnsp" diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 3212defcf0..0410f7f14e 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -29,7 +29,6 @@ #define CONFIG_KEY_REVOCATION
#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_HASH #ifndef CONFIG_SYS_RAMBOOT /* The key used for verification of next level images * is picked up from an Extension Table which has diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 46981a5933..849f199fb9 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -17,6 +17,7 @@ config ARCH_EXYNOS5 bool "Exynos5 SoC family" select CPU_V7 select BOARD_EARLY_INIT_F + imply CMD_HASH help Samsung Exynos5 SoC family are based on ARM Cortex-A15 CPU (and Cortex-A7 CPU in big.LITTLE configuration). There are multiple SoCs diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 01e9008d0a..3d2c1319c9 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -33,6 +33,7 @@ config MPC85xx select SYS_FSL_DDR select SYS_FSL_DDR_BE imply USB_EHCI_HCD if USB + imply CMD_HASH
config MPC86xx bool "MPC86xx" diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index cac06ee316..03449d76ea 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -1,6 +1,7 @@ config CHAIN_OF_TRUST depends on !FIT_SIGNATURE && SECURE_BOOT imply CMD_BLOB + imply CMD_HASH select FSL_CAAM bool default y diff --git a/cmd/Kconfig b/cmd/Kconfig index 7243f78d1e..b05e69a8b7 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -996,6 +996,14 @@ config CMD_BLOB generation/use as key for cryptographic operation. Key modifier should be 16 byte long.
+config CMD_HASH + bool "Support 'hash' command" + help + This provides a way to hash data in memory using various supported + algorithms (such as SHA1, MD5, CRC32). The computed digest can be + saved to memory or to an environment variable. It is also possible + to verify a hash against data in memory. + config CMD_TPM bool "Enable the 'tpm' command" depends on TPM diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 2c633e6727..3c238d929f 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_HASH /* calculate hash / digest */ #define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IMMAP /* IMMR dump support */ #define CONFIG_CMD_IO /* Access to X86 IO space */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 3ed66fa455..377b8998a4 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -711,7 +711,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 64875f3116..65d8f126b2 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -328,7 +328,6 @@ extern unsigned long get_sdram_size(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 506fb79b35..59da85d0c9 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -525,7 +525,6 @@ combinations. this should be removed later
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index c6afb9a208..eaa42545fc 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -441,7 +441,6 @@
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9850fb80a0..9c12c5d21a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -735,7 +735,6 @@ extern unsigned long get_sdram_size(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index bcc9cc8f9c..92dcd2c418 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -605,7 +605,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 427b6f23ae..d97ec0ef95 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -865,7 +865,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 7af377a8d9..99537d58e6 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -884,7 +884,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 5ce06ce5d7..977b7b6d63 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -667,7 +667,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 1b17525197..fa691b5883 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -780,7 +780,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index bd6c47cca5..1ca13b595d 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -753,7 +753,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index fa1c9a74fc..47eb3a7fac 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -698,7 +698,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 5d030d1179..de987d52e7 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -500,7 +500,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index f1144b2039..e2f1863bdc 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -697,7 +697,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index d9b88fa2d3..14a7638aef 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -67,7 +67,6 @@ #define CONFIG_FAT_WRITE
/* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY #define CONFIG_SHA1 #define CONFIG_SHA256 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index af1573de92..64ae67e592 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -619,7 +619,6 @@
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 91976a75bc..ed9d713eef 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -42,8 +42,6 @@ /* select serial console configuration */ #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
-#define CONFIG_CMD_HASH - /* Thermal Management Unit */ #define CONFIG_EXYNOS_TMU
@@ -135,7 +133,6 @@ #endif /*CONFIG_CMD_NET*/
/* SHA hashing */ -#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY #define CONFIG_SHA1 #define CONFIG_SHA256 diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index be96834c76..5e85cc6d4c 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -540,7 +540,6 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9
#define CONFIG_IMAGE_FORMAT_LEGACY -#define CONFIG_CMD_HASH #define CONFIG_SHA1 #define CONFIG_SHA256
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 35d17b96f4..48186f525b 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -308,9 +308,6 @@ /* Hash command with SHA acceleration supported in hardware */
#ifdef CONFIG_FSL_CAAM - -#define CONFIG_CMD_HASH - #define CONFIG_SHA_HW_ACCEL
#endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 333bb26623..3fc7d30d0b 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -572,7 +572,6 @@ unsigned long get_board_ddr_clk(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 81f38a30a4..099aaaceda 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -436,7 +436,6 @@
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 78c34eba3e..3cd8554ae9 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -300,7 +300,6 @@
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index c380fedf27..d1df75ab78 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -229,7 +229,6 @@
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 53686e3412..b5c3495dfb 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -231,7 +231,6 @@ unsigned long long get_qixis_addr(void);
/* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH #define CONFIG_SHA_HW_ACCEL #endif
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index da547c5bb2..cd7a82630e 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -102,7 +102,6 @@
/* Can't boot elf images */
-#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY #define CONFIG_SHA1 #define CONFIG_SHA256 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0a5cd1595f..f2400f8764 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_HASH CONFIG_CMD_HD44760 CONFIG_CMD_HD44780 CONFIG_CMD_HDMIDETECT
On Wed, May 17, 2017 at 03:25:25AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_HASH
Signed-off-by: Simon Glass sjg@chromium.org
Reviewed-by: Tom Rini trini@konsulko.com
On Wed, May 17, 2017 at 03:25:25AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_HASH
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
At present CONFIG_CMD_HASH enables the 'hash' command which also brings in the hashing API. Some boards may wish to enable the API without the command. Add a separate CONFIG to permit this.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
cmd/Kconfig | 2 ++ common/Kconfig | 12 ++++++++++++ common/Makefile | 2 +- common/hash.c | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index b05e69a8b7..1e3cd02703 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -350,6 +350,7 @@ config CMD_MEMORY
config CMD_CRC32 bool "crc32" + select HASH default y help Compute CRC32. @@ -998,6 +999,7 @@ config CMD_BLOB
config CMD_HASH bool "Support 'hash' command" + select HASH help This provides a way to hash data in memory using various supported algorithms (such as SHA1, MD5, CRC32). The computed digest can be diff --git a/common/Kconfig b/common/Kconfig index 1879aefaf8..23bcf99a2c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -493,4 +493,16 @@ config BOARD_EARLY_INIT_F
endmenu
+menu "Security support" + +config HASH + bool "Support hashing API (SHA1, SHA256, etc.)" + help + This provides a way to hash data in memory using various supported + algorithms (such as SHA1, MD5, CRC32). The API is defined in hash.h + and the algorithms it supports are defined in common/hash.c. See + also CMD_HASH for command-line access. + +endmenu + source "common/spl/Kconfig" diff --git a/common/Makefile b/common/Makefile index 14d01844ad..b2d663530d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -10,7 +10,7 @@ ifndef CONFIG_SPL_BUILD obj-y += init/ obj-y += main.o obj-y += exports.o -obj-y += hash.o +obj-$(CONFIG_HASH) += hash.o obj-$(CONFIG_HUSH_PARSER) += cli_hush.o obj-$(CONFIG_AUTOBOOT) += autoboot.o
diff --git a/common/hash.c b/common/hash.c index b645298afc..a0eded98d0 100644 --- a/common/hash.c +++ b/common/hash.c @@ -473,5 +473,5 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
return 0; } -#endif -#endif +#endif /* CONFIG_CMD_HASH || CONFIG_CMD_SHA1SUM || CONFIG_CMD_CRC32) */ +#endif /* !USE_HOSTCC */
On Wed, May 17, 2017 at 03:25:26AM -0600, Simon Glass wrote:
At present CONFIG_CMD_HASH enables the 'hash' command which also brings in the hashing API. Some boards may wish to enable the API without the command. Add a separate CONFIG to permit this.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v3: None Changes in v2: None
cmd/Kconfig | 2 ++ common/Kconfig | 12 ++++++++++++ common/Makefile | 2 +- common/hash.c | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index b05e69a8b7..1e3cd02703 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -350,6 +350,7 @@ config CMD_MEMORY
config CMD_CRC32 bool "crc32"
- select HASH default y help Compute CRC32.
@@ -998,6 +999,7 @@ config CMD_BLOB
config CMD_HASH bool "Support 'hash' command"
- select HASH help This provides a way to hash data in memory using various supported algorithms (such as SHA1, MD5, CRC32). The computed digest can be
diff --git a/common/Kconfig b/common/Kconfig index 1879aefaf8..23bcf99a2c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -493,4 +493,16 @@ config BOARD_EARLY_INIT_F
endmenu
+menu "Security support"
+config HASH
- bool "Support hashing API (SHA1, SHA256, etc.)"
- help
This provides a way to hash data in memory using various supportedalgorithms (such as SHA1, MD5, CRC32). The API is defined in hash.hand the algorithms it supports are defined in common/hash.c. Seealso CMD_HASH for command-line access.
No need to resend the whole series. But I think we should make this a hidden (but with the help!) option. It's framework, so if you say y here and then don't use it anywhere (in say a command or another framework) it will just get discarded at link time.
Hi Tom,
On 17 May 2017 at 07:13, Tom Rini trini@konsulko.com wrote:
On Wed, May 17, 2017 at 03:25:26AM -0600, Simon Glass wrote:
At present CONFIG_CMD_HASH enables the 'hash' command which also brings in the hashing API. Some boards may wish to enable the API without the command. Add a separate CONFIG to permit this.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v3: None Changes in v2: None
cmd/Kconfig | 2 ++ common/Kconfig | 12 ++++++++++++ common/Makefile | 2 +- common/hash.c | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index b05e69a8b7..1e3cd02703 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -350,6 +350,7 @@ config CMD_MEMORY
config CMD_CRC32 bool "crc32"
select HASH default y help Compute CRC32.@@ -998,6 +999,7 @@ config CMD_BLOB
config CMD_HASH bool "Support 'hash' command"
select HASH help This provides a way to hash data in memory using various supported algorithms (such as SHA1, MD5, CRC32). The computed digest can bediff --git a/common/Kconfig b/common/Kconfig index 1879aefaf8..23bcf99a2c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -493,4 +493,16 @@ config BOARD_EARLY_INIT_F
endmenu
+menu "Security support"
+config HASH
bool "Support hashing API (SHA1, SHA256, etc.)"helpThis provides a way to hash data in memory using various supportedalgorithms (such as SHA1, MD5, CRC32). The API is defined in hash.hand the algorithms it supports are defined in common/hash.c. Seealso CMD_HASH for command-line access.No need to resend the whole series. But I think we should make this a hidden (but with the help!) option. It's framework, so if you say y here and then don't use it anywhere (in say a command or another framework) it will just get discarded at link time.
OK I just resent that one patch/
Regards, Simon
This converts the following to Kconfig: CONFIG_CMD_HD44760
Also drop CONFIG_CMD_HD44780 which appears to be a typo.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
board/work-microwave/work_92105/Kconfig | 5 +++++ board/work-microwave/work_92105/work_92105_display.c | 2 +- configs/work_92105_defconfig | 1 + include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/board/work-microwave/work_92105/Kconfig b/board/work-microwave/work_92105/Kconfig index 74f004f53c..1fde4b29aa 100644 --- a/board/work-microwave/work_92105/Kconfig +++ b/board/work-microwave/work_92105/Kconfig @@ -12,4 +12,9 @@ config SYS_SOC config SYS_CONFIG_NAME default "work_92105"
+config CMD_HD44760 + bool "Enable 'hd44780' LCD-control comand" + help + This controls the LCD driver. + endif diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c index 3d7438e527..37a736351c 100644 --- a/board/work-microwave/work_92105/work_92105_display.c +++ b/board/work-microwave/work_92105/work_92105_display.c @@ -346,4 +346,4 @@ U_BOOT_CMD( "HD44780 LCD driver control", hd44780_help_text ); -#endif /* CONFIG_CMD_HD44780 */ +#endif /* CONFIG_CMD_HD44760 */ diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index edfe107e72..03d62dc3d5 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y +CONFIG_CMD_HD44760=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index f99f305524..89261065e2 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -134,7 +134,6 @@ #define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 100000 #define CONFIG_CMD_MAX6957 -#define CONFIG_CMD_HD44760 /* * Environment */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2400f8764..157487cfa6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_HD44760 CONFIG_CMD_HD44780 CONFIG_CMD_HDMIDETECT CONFIG_CMD_IDE
On Wed, May 17, 2017 at 03:25:27AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_HD44760
Also drop CONFIG_CMD_HD44780 which appears to be a typo.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_HDMIDETECT
Note that we cannot do 'default y if VIDEO' because this option is only enabled for a small subset of mx6 boards. Also this command is is not a great implementation (it doesn't use driver model).
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: - Update commit message to explain why we can't 'default y if VIDEO'
README | 5 ----- arch/arm/imx-common/Kconfig | 6 ++++++ configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/colibri_imx6_defconfig | 1 + configs/colibri_imx6_nospl_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/wandboard_defconfig | 1 + include/configs/apalis_imx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/gw_ventana.h | 2 -- include/configs/mx6cuboxi.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/pcm058.h | 1 - include/configs/tbs2910.h | 1 - include/configs/wandboard.h | 1 - scripts/config_whitelist.txt | 2 -- 31 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/README b/README index d53607ac1e..3a4288d472 100644 --- a/README +++ b/README @@ -2731,11 +2731,6 @@ The following options need to be configured: be deprecated in favour of 'hash sha1'.
- Freescale i.MX specific commands: - CONFIG_CMD_HDMIDETECT - This enables 'hdmidet' command which returns true if an - HDMI monitor is detected. This command is i.MX 6 specific. - -- bootcount support: CONFIG_BOOTCOUNT_LIMIT
This enables the bootcounter support, see: diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index 25cbd12c89..cd8b8d2882 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -55,3 +55,9 @@ config CMD_DEKBLOB Freescale secure boot mechanism. This command encapsulates and creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for more information. + +config CMD_HDMIDETECT + bool "Support the 'hdmidet' command" + help + This enables the 'hdmidet' command which detects if an HDMI monitor + is connected. diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 90829b4949..f586773761 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_APALIS_IMX6=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig index ef9ca60b42..42abbbd49d 100644 --- a/configs/apalis_imx6_nospl_com_defconfig +++ b/configs/apalis_imx6_nospl_com_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_APALIS_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig index f48bd17c42..18f0d02e55 100644 --- a/configs/apalis_imx6_nospl_it_defconfig +++ b/configs/apalis_imx6_nospl_it_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_APALIS_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 47e8198e77..6c105767fc 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_COLIBRI_IMX6=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig index 52e0d50411..bd2ac24d4a 100644 --- a/configs/colibri_imx6_nospl_defconfig +++ b/configs/colibri_imx6_nospl_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX6=y CONFIG_TARGET_COLIBRI_IMX6=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,MX6DL,DDR_MB=256" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 12de448115..5667aea188 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 6d8cd6030c..8cc212b55b 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 62b9b575ca..251e16a26c 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig index f31d9bcc46..7530de1519 100644 --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y # CONFIG_CMD_BMODE is not set +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" # CONFIG_SYS_STDIO_DEREGISTER is not set diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index c4301e1f0a..a54279978f 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 9b16bf48b0..5744ede776 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 83bbf8e02f..dca89ec34e 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 69cf637eea..a19d093710 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 2e9ee2e293..edf4b6377a 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index f3dd324dce..0f7532062a 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 5a825d6e22..45a5acb96c 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_NITROGEN6X=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index d14d36a477..888680f0e4 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_SPL_FAT_SUPPORT=y +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index c8219b5543..c55537c032 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_CMD_HDMIDETECT=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index f4c9b6bc76..b4b3283829 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y +CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" # CONFIG_CONSOLE_MUX is not set diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 8eddb68d3b..9220d04e79 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -133,7 +133,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 6189a6191f..0882ef8f89 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -114,7 +114,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 4dcff0347f..ae98333b0c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -141,7 +141,6 @@ #define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c
/* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_CMD_UNZIP /* gzwrite */ #define CONFIG_RBTREE
@@ -174,7 +173,6 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_VIDEO_BMP_LOGO diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index b2cecc5d0e..bc22f56d1d 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -40,7 +40,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_VIDEO_SKIP
/* USB */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 13625286c5..00b84f757a 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) #define CONFIG_BMP_16BPP #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP
diff --git a/include/configs/novena.h b/include/configs/novena.h index 753b59f6ec..6cb1807a8e 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -156,7 +156,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #endif diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 44b4ffdf99..39018ac62f 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -86,7 +86,6 @@ #define MTDPARTS_DEFAULT "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
/* Various command support */ -#define CONFIG_CMD_HDMIDETECT /* detect HDMI output device */ #define CONFIG_RBTREE
/* Physical Memory Map */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 9720a09b32..84ca1c443e 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -69,7 +69,6 @@ #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_CMD_HDMIDETECT #endif
/* PCI */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 3e0ea71e69..2a6c6fbb70 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -74,7 +74,6 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IPUV3_CLK 260000000 -#define CONFIG_CMD_HDMIDETECT #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 157487cfa6..6d54d0b4ea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,8 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_HD44780 -CONFIG_CMD_HDMIDETECT CONFIG_CMD_IDE CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP
On Wed, May 17, 2017 at 03:25:28AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_HDMIDETECT
Note that we cannot do 'default y if VIDEO' because this option is only enabled for a small subset of mx6 boards. Also this command is is not a great implementation (it doesn't use driver model).
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IDE
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 8 ++++++++ configs/CPCI4052_defconfig | 1 + configs/M5253DEMO_defconfig | 1 + configs/M5253EVBE_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/PLU405_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/a4m072_defconfig | 1 + configs/ap325rxa_defconfig | 1 + configs/charon_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/dbau1000_defconfig | 1 + configs/dbau1100_defconfig | 1 + configs/dbau1500_defconfig | 1 + configs/digsy_mtc_RAMBOOT_defconfig | 1 + configs/digsy_mtc_defconfig | 1 + configs/digsy_mtc_rev5_RAMBOOT_defconfig | 1 + configs/digsy_mtc_rev5_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/fo300_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/inka4x0_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/ms7720se_defconfig | 1 + configs/nas220_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + configs/qemu-x86_efi_payload32_defconfig | 1 + configs/qemu-x86_efi_payload64_defconfig | 1 + configs/qemu_mips64_defconfig | 1 + configs/qemu_mips64el_defconfig | 1 + configs/qemu_mips_defconfig | 1 + configs/qemu_mipsel_defconfig | 1 + configs/r2dplus_defconfig | 1 + configs/r7780mp_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_noblk_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/v38b_defconfig | 1 + configs/wtk_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5253EVBE.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8349ITX.h | 4 ---- include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/TQM5200.h | 1 - include/configs/TQM823L.h | 1 - include/configs/TQM823M.h | 1 - include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 1 - include/configs/TQM855L.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM860L.h | 1 - include/configs/TQM860M.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/TQM885D.h | 1 - include/configs/a4m072.h | 1 - include/configs/ac14xx.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/aria.h | 1 - include/configs/dbau1x00.h | 6 ------ include/configs/digsy_mtc.h | 1 - include/configs/dns325.h | 1 - include/configs/edminiv2.h | 1 - include/configs/goflexhome.h | 1 - include/configs/ib62x0.h | 1 - include/configs/inka4x0.h | 1 - include/configs/ipek01.h | 1 - include/configs/lacie_kw.h | 1 - include/configs/lsxl.h | 1 - include/configs/malta.h | 1 - include/configs/mecp5123.h | 1 - include/configs/motionpro.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/ms7720se.h | 1 - include/configs/mv-plug-common.h | 1 - include/configs/nas220.h | 1 - include/configs/nsa310s.h | 1 - include/configs/openrd.h | 1 - include/configs/pb1x00.h | 2 -- include/configs/qemu-mips.h | 2 -- include/configs/qemu-mips64.h | 2 -- include/configs/qemu-x86.h | 1 - include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - include/configs/sandbox.h | 1 - include/configs/v38b.h | 1 - scripts/config_whitelist.txt | 1 - 150 files changed, 102 insertions(+), 66 deletions(-)
diff --git a/README b/README index 3a4288d472..e5d5e48018 100644 --- a/README +++ b/README @@ -847,7 +847,6 @@ The following options need to be configured: CONFIG_CMD_GO * the 'go' command (exec code) CONFIG_CMD_GREPENV * search environment CONFIG_CMD_I2C * I2C serial bus support - CONFIG_CMD_IDE * IDE harddisk support CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash diff --git a/cmd/Kconfig b/cmd/Kconfig index 1e3cd02703..2c89a773d0 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -484,6 +484,14 @@ config CMD_DEMO option is to use sandbox and pass the -d point to sandbox's u-boot.dtb file.
+config CMD_IDE + bool "ide - Support for IDE drivers" + help + Provides an 'ide' command which allows accessing the IDE drive, + reseting the IDE interface, printing the partition table and + geting device info. It also enables the 'diskboot' command which + permits booting from an IDE drive. + config CMD_LOADB bool "loadb" default y diff --git a/configs/CPCI4052_defconfig b/configs/CPCI4052_defconfig index 630598111d..550db77a17 100644 --- a/configs/CPCI4052_defconfig +++ b/configs/CPCI4052_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig index 789dddb901..09640de1ec 100644 --- a/configs/M5253DEMO_defconfig +++ b/configs/M5253DEMO_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xFF800000 CONFIG_TARGET_M5253DEMO=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig index 5b3a2fe742..79941a1253 100644 --- a/configs/M5253EVBE_defconfig +++ b/configs/M5253EVBE_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0xFFE00000 CONFIG_TARGET_M5253EVBE=y CONFIG_BOOTDELAY=5 # CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index 3aed04e813..d681d32140 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x04000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index 6f624e6a00..e57323d594 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 CONFIG_SYS_PROMPT="-> " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index ecc610b74b..2a5da64a3a 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=66666666" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 93756b2e27..97024333db 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_INTEL_BOOT,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index f10027693d..1f5fb14402 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x4FE00000 CONFIG_TARGET_M54455EVB=y CONFIG_SYS_EXTRA_OPTIONS="SYS_STMICRO_BOOT,CF_SBF,SYS_INPUT_CLKSRC=33333333" CONFIG_BOOTDELAY=1 +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 65a4dea66b..743b74b40b 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 76ba77cfe3..254cd41224 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index 4a7ff1b9eb..9cec452cd5 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX,SYS_TEXT_BASE=0xFE000000" CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig index 7c67d8c01e..9145ada7c7 100644 --- a/configs/MPC8349ITX_defconfig +++ b/configs/MPC8349ITX_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MPC8349ITX" CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 02ca577e28..5d88a27180 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index e366ac1355..07f1b54ae9 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_FDC=y diff --git a/configs/PLU405_defconfig b/configs/PLU405_defconfig index ffad41fae8..e30a720688 100644 --- a/configs/PLU405_defconfig +++ b/configs/PLU405_defconfig @@ -10,6 +10,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig index d07596add0..1b3e91f9d5 100644 --- a/configs/TQM5200S_HIGHBOOT_defconfig +++ b/configs/TQM5200S_HIGHBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig index af3225554b..4ed119dbe7 100644 --- a/configs/TQM5200S_defconfig +++ b/configs/TQM5200S_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig index 37d6767f28..2e6b4dd272 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index 5e0cf9ea47..8eb3d4099e 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 7b4b030d74..146c3bf514 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index 4792639653..c7bc5383ba 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 89f2ecb104..61601a5a41 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index e2681ad715..89d1df4c72 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index 829942ef62..b7c6462436 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 2c24844683..75ecade55b 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index a6882aab4d..be45efd00e 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index 8be81ae2a4..b3e9325253 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index 37e740ff45..bf1186a6cd 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index e65b01fc36..978540bb1a 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index 5c69085fdb..8daee064da 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index f3d077c4bd..9b7c8b8903 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index 3069dcbadd..ffb23d3364 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -5,6 +5,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index a2f0f00b61..db70ca121e 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig index fc9319696a..48421e3cfe 100644 --- a/configs/TQM885D_defconfig +++ b/configs/TQM885D_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index e0493a12fb..5b4000e266 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/configs/a4m072_defconfig b/configs/a4m072_defconfig index 0054d4cddb..4fbffb6edc 100644 --- a/configs/a4m072_defconfig +++ b/configs/a4m072_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="asdfg" +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index fd30665753..ebefd126a8 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FPGA is not set # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set diff --git a/configs/charon_defconfig b/configs/charon_defconfig index 8a1429037a..89a5d08541 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 90cf139a79..8b51073030 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 58af17c5c8..a0b5c752cc 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="d2v2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/dbau1000_defconfig b/configs/dbau1000_defconfig index 703f1a5c72..bb65369aaa 100644 --- a/configs/dbau1000_defconfig +++ b/configs/dbau1000_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/dbau1100_defconfig b/configs/dbau1100_defconfig index 3fb0967e67..98b0d40c7b 100644 --- a/configs/dbau1100_defconfig +++ b/configs/dbau1100_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/dbau1500_defconfig b/configs/dbau1500_defconfig index ad095cfdbe..cdf5477407 100644 --- a/configs/dbau1500_defconfig +++ b/configs/dbau1500_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_PROMPT="DbAu1xx0 # " # CONFIG_CMD_ELF is not set # CONFIG_CMD_RUN is not set # CONFIG_CMD_SAVEENV is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/digsy_mtc_RAMBOOT_defconfig b/configs/digsy_mtc_RAMBOOT_defconfig index 86b2b0d804..cda75d6e03 100644 --- a/configs/digsy_mtc_RAMBOOT_defconfig +++ b/configs/digsy_mtc_RAMBOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_defconfig b/configs/digsy_mtc_defconfig index 85b7f850f7..da9cec81a3 100644 --- a/configs/digsy_mtc_defconfig +++ b/configs/digsy_mtc_defconfig @@ -11,6 +11,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_rev5_RAMBOOT_defconfig b/configs/digsy_mtc_rev5_RAMBOOT_defconfig index 7ec8650aca..1bba630083 100644 --- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig +++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/digsy_mtc_rev5_defconfig b/configs/digsy_mtc_rev5_defconfig index b4b8533063..3491fdd5f1 100644 --- a/configs/digsy_mtc_rev5_defconfig +++ b/configs/digsy_mtc_rev5_defconfig @@ -13,6 +13,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 87ef896591..53be09aede 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -7,6 +7,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index e30ba0dace..8f3ffcf5ba 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_USB=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index e9f67ae455..46ac56797f 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,7 @@ CONFIG_KIRKWOOD=y CONFIG_TARGET_DS109=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 51c9ba5f0e..03c30ec0c4 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="EDMiniV2> " +CONFIG_CMD_IDE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig index 00418153be..d51e31d8ed 100644 --- a/configs/fo300_defconfig +++ b/configs/fo300_defconfig @@ -12,6 +12,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 046435a995..07d88b1a36 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -7,6 +7,7 @@ CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="GoFlexHome> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index f2c22bfd54..090ff03dc5 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index f454277678..bcdf6f8dac 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -8,6 +8,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ib62x0 => " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index ba468bd494..8daf4332ca 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/inka4x0_defconfig b/configs/inka4x0_defconfig index 9b30244e3c..c263cf61c5 100644 --- a/configs/inka4x0_defconfig +++ b/configs/inka4x0_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y CONFIG_TARGET_INKA4X0=y CONFIG_BOOTDELAY=1 CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig index 690bc0f461..e424d47bf2 100644 --- a/configs/ipek01_defconfig +++ b/configs/ipek01_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_LOOPW=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 124bf24c4b..1d55003d67 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 398c6b59ec..75fe55d819 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index a7f14bde19..a342bec808 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -6,6 +6,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 9b04e0be31..ac560460eb 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -7,6 +7,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/malta_defconfig b/configs/malta_defconfig index 237b3ab333..e4e21d0f0f 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -5,6 +5,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="malta # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index fe5e00c259..0b9f665f10 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -6,6 +6,7 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="maltael # " # CONFIG_AUTOBOOT is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index 5040ea5742..ab9ea81021 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -8,6 +8,7 @@ CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press "<Esc><Esc>" to stop\n" CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index a6bfc71f5e..a6f65d8bac 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -6,6 +6,7 @@ CONFIG_BOOTDELAY=5 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index 61c366a294..022e67b249 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index b31962a8f8..30e52692d0 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 8e9c13a37c..abf71a5914 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="nas220> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index ff222a1176..ab8eb958ca 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="2big2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index cec9389b6c..66db6447ac 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index fd4525e30f..04abc9405b 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index d6e70db41e..5f79e6f0e2 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 3ccbf657a4..a81ad0b1e8 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ns2> " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_I2C=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 3269b85e88..74bb72ad83 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -7,6 +7,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="nsa310s => " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y CONFIG_CMD_USB=y diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index 84d3f89850..cd3991ad15 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index 57cbb3a0b9..db034b6ba8 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index 4bc2dcee4e..bf3ac8111a 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 02e6af1342..36d0185268 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 73ee7b69ba..b648326041 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index 4f6803d448..e092dbdef6 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index b354ba1c7c..f8f6295617 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig index e748f02c1d..45513be56f 100644 --- a/configs/qemu_mips64_defconfig +++ b/configs/qemu_mips64_defconfig @@ -4,6 +4,7 @@ CONFIG_CPU_MIPS64_R1=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips64 # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig index b2d2a0bc76..5f6ea3e2e7 100644 --- a/configs/qemu_mips64el_defconfig +++ b/configs/qemu_mips64el_defconfig @@ -5,6 +5,7 @@ CONFIG_CPU_MIPS64_R1=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips64el # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig index 3ef02a40c9..b87b0c571c 100644 --- a/configs/qemu_mips_defconfig +++ b/configs/qemu_mips_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_QEMU_MIPS=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mips # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig index 08415958e2..281cf667da 100644 --- a/configs/qemu_mipsel_defconfig +++ b/configs/qemu_mipsel_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_LITTLE_ENDIAN=y CONFIG_BOOTDELAY=10 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="qemu-mipsel # " +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig index 3bd3d213bf..ba68b504d0 100644 --- a/configs/r2dplus_defconfig +++ b/configs/r2dplus_defconfig @@ -1,6 +1,7 @@ CONFIG_SH=y CONFIG_TARGET_R2DPLUS=y CONFIG_BOOTDELAY=-1 +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig index 999470c26c..2a37db824d 100644 --- a/configs/r7780mp_defconfig +++ b/configs/r7780mp_defconfig @@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_CMD_XIMG is not set # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a573d52b7f..56903a3f83 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 312834bf40..3981d4db56 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_PART=y CONFIG_CMD_SF=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 7f262dc327..d80e78901b 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_MEMTEST=y CONFIG_CMD_MX_CYCLIC=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_DEMO=y +CONFIG_CMD_IDE=y CONFIG_CMD_GPT=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index fa99d51505..80cc62ebd6 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_IDE=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig index 18dc039d93..3d0065ea84 100644 --- a/configs/v38b_defconfig +++ b/configs/v38b_defconfig @@ -3,6 +3,7 @@ CONFIG_MPC5xxx=y CONFIG_TARGET_V38B=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_CMD_IDE=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index ad9100e0f5..ce3745a221 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=5 # CONFIG_CONSOLE_MUX is not set CONFIG_HUSH_PARSER=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 3c238d929f..b00f96ef6e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IMMAP /* IMMR dump support */ #define CONFIG_CMD_IO /* Access to X86 IO space */ #define CONFIG_CMD_IRQ /* irqinfo */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 43bf127a2a..c444198778 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -62,7 +62,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE
#define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index b1a49b07c3..e7c6f8b558 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -37,7 +37,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE
#ifdef CONFIG_CMD_IDE /* ATA */ diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 380221e732..4f7a19b5d3 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE
/* ATA */ #define CONFIG_IDE_RESET 1 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 806f00555f..9b6bd1025d 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME
/* Command line configuration */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 64c6ed100f..e758f1947b 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 6d35d705ec..7cf27fa96d 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -486,10 +486,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SUPPORT_VFAT #endif
-#ifdef CONFIG_COMPACT_FLASH - #define CONFIG_CMD_IDE -#endif - #ifdef CONFIG_SATA_SIL3114 #define CONFIG_CMD_SATA #endif diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index eb1f0e26c5..029de2a1a9 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -37,7 +37,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 74cb8abafb..ef20eee201 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -56,7 +56,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_IDE #define CONFIG_CMD_NAND
#define CONFIG_SUPPORT_VFAT diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 19e0b1be1b..8d165290eb 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -153,7 +153,6 @@
#if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) - #define CONFIG_CMD_IDE #endif
#if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index f56bd239af..685cb5146e 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,7 +91,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index ed08d972f8..88ee42fe00 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index c2b35fd196..621a4b1def 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 76b52ab6b1..34e9520c3c 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 10ba21d97d..bf96d0989b 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index ffb514bb85..f47b0baba0 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 7569cd1e83..4617740336 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index d2cb4b9a87..9c445fdadc 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 03ad2e63a0..7f384cda97 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 485bd6c8a6..31392e0561 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index f11e23a6a3..baa65c0dec 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index e91070ae30..184cb62e19 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,7 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE
/* * Miscellaneous configurable options diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index 2ea43ffce1..6a26269807 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -81,7 +81,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE
#if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 3d3c216d61..8b55dee498 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 1cd4d32c6d..b3c22cf4a4 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -14,7 +14,6 @@ #define CONFIG_AP325RXA 1
#define CONFIG_CMD_SDRAM -#define CONFIG_CMD_IDE
#define CONFIG_BOOTARGS "console=ttySC2,38400"
diff --git a/include/configs/aria.h b/include/configs/aria.h index 3b5d56c6bb..1564b40832 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index e788f9c635..9db3380a95 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -69,13 +69,7 @@
#ifdef CONFIG_DBAU1550
-#undef CONFIG_CMD_IDE #undef CONFIG_CMD_PCMCIA - -#else - -#define CONFIG_CMD_IDE - #endif
/* diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index ab546c50cd..7800e81116 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,7 +85,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/dns325.h b/include/configs/dns325.h index de682334eb..470e26256a 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS
#define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index d1c7b937e3..2f2e930b4e 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -120,7 +120,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE
/* * Network diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index dbcd2b2dbe..d1635b098e 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -44,7 +44,6 @@ */
#define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */
/* diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 2cf0027d9c..36a66bb463 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -29,7 +29,6 @@ * Commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 3bdab3310b..d651eff4b2 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -72,7 +72,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index ece72c6aa1..485b989b4a 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,7 +88,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE /* IDE harddisk support */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 69c08c69da..66e65c878c 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -43,7 +43,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE #ifndef CONFIG_NETSPACE_MINI_V2 /* No USB ports on Network Space v2 Mini */ #endif
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 59542a62e4..d2c210119b 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -38,7 +38,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/malta.h b/include/configs/malta.h index fcee37400d..1f977cb71a 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -101,7 +101,6 @@ /* * Commands */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_PCI
#define CONFIG_SYS_LONGHELP /* verbose help, undef to save memory */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 6e10cafe6e..fcc1c68236 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
#define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2
/* diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index aaa8962fd2..02ac7b3089 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index bd7c4a64e2..14cf2e8cb9 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -378,7 +378,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
-#define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 0015be980b..2855c00723 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -14,7 +14,6 @@
#define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCMCIA -#define CONFIG_CMD_IDE
#define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index ce85e38875..90ad0a654b 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -28,7 +28,6 @@ /* * Commands configuration */ -#define CONFIG_CMD_IDE
/* * Extra file system diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 7004176c4a..9ecc28811b 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -42,7 +42,6 @@ * Commands configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE #define CONFIG_SYS_LONGHELP #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index eba31c4abf..b988d3d7f9 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -25,7 +25,6 @@
/* commands configuration */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_IDE
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 6c17f3b24b..89e963d524 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -27,7 +27,6 @@ */ #define CONFIG_SYS_MVFS #define CONFIG_CMD_NAND -#define CONFIG_CMD_IDE
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index f6bd4fec88..efbcbd2e05 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -148,6 +148,4 @@ * Command line configuration. */
-#undef CONFIG_CMD_IDE - #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index 59a793babe..aeaf88a686 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -50,8 +50,6 @@ #define CONFIG_SYS_NS16550_COM1 0xb40003f8 #define CONFIG_CONS_INDEX 1
-#define CONFIG_CMD_IDE - #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO #endif diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 28b791acdd..d201c848ff 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -50,8 +50,6 @@ #define CONFIG_SYS_NS16550_COM1 0xffffffffb40003f8 #define CONFIG_CONS_INDEX 1
-#define CONFIG_CMD_IDE - #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO #endif diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 687befdad3..b751ad5e14 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -27,7 +27,6 @@ * Default configuraion is to support the QEMU default x86 target * Undefine CONFIG_CMD_IDE to support q35 target */ -#define CONFIG_CMD_IDE #ifdef CONFIG_CMD_IDE #define CONFIG_SYS_IDE_MAXBUS 2 #define CONFIG_SYS_IDE_MAXDEVICE 4 diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 64fc5b2f03..744d567805 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -12,7 +12,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IDE #define CONFIG_CMD_SH_ZIMAGEBOOT
/* SCIF */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 2efe36f854..26c5f0feeb 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -22,7 +22,6 @@ */ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCI -#define CONFIG_CMD_IDE
#define CONFIG_SCIF_CONSOLE 1 #define CONFIG_CONS_SCIF0 1 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index cd7a82630e..dccfaf6a0d 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -160,7 +160,6 @@ #define CONFIG_CMD_LZMADEC
#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_IDE #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_ATA_IDE0_OFFSET 0 #define CONFIG_SYS_IDE_MAXDEVICE 2 diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 0bc0ae517a..8b2f39c910 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,7 +73,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6d54d0b4ea..6111c49c17 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IDE CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE
On Wed, May 17, 2017 at 03:25:29AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IDE
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
At present IDE support is controlled by CONFIG_CMD_IDE. Add a separate CONFIG_IDE option so that IDE support can be enabled without requiring the 'ide' command.
Update existing users and move the ide driver into drivers/block since it should not be in common/.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 2 +- api/api_storage.c | 2 +- arch/arm/mach-kirkwood/include/mach/config.h | 6 +++--- arch/powerpc/cpu/mpc5xxx/ide.c | 2 +- arch/powerpc/lib/Makefile | 2 +- board/freescale/m5253demo/m5253demo.c | 4 ++-- board/freescale/m5253evbe/m5253evbe.c | 4 ++-- board/freescale/m54455evb/m54455evb.c | 2 +- board/intercontrol/digsy_mtc/digsy_mtc.c | 4 ++-- board/jupiter/jupiter.c | 2 +- board/phytec/pcm030/pcm030.c | 4 ++-- board/tqc/tqm5200/tqm5200.c | 2 +- board/v38b/v38b.c | 2 +- cmd/Kconfig | 1 + cmd/pcmcia.c | 2 +- common/Makefile | 1 - common/board_r.c | 10 ++++------ drivers/block/Kconfig | 8 ++++++++ drivers/block/Makefile | 1 + {common => drivers/block}/ide.c | 0 drivers/block/sil680.c | 2 +- drivers/pcmcia/marubun_pcmcia.c | 2 +- drivers/pcmcia/mpc8xx_pcmcia.c | 2 +- drivers/pcmcia/tqm8xx_pcmcia.c | 2 +- fs/fat/fat.c | 2 +- include/config_distro_bootcmd.h | 6 +++--- include/config_fallbacks.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/edminiv2.h | 2 +- include/configs/ib62x0.h | 4 ++-- include/configs/lsxl.h | 2 +- include/configs/mpc5121ads.h | 4 ++-- include/configs/nsa310s.h | 4 ++-- include/configs/qemu-x86.h | 4 ++-- include/configs/r7780mp.h | 4 ++-- include/configs/sheevaplug.h | 4 ++-- include/pcmcia.h | 4 ++-- 37 files changed, 60 insertions(+), 53 deletions(-) rename {common => drivers/block}/ide.c (100%)
diff --git a/README b/README index e5d5e48018..2dafe21f0d 100644 --- a/README +++ b/README @@ -1081,7 +1081,7 @@ The following options need to be configured: disk/part_efi.c CONFIG_MTD_PARTITIONS Memory Technology Device partition table.
- If IDE or SCSI support is enabled (CONFIG_CMD_IDE or + If IDE or SCSI support is enabled (CONFIG_IDE or CONFIG_SCSI) you must configure support for at least one non-MTD partition type as well.
diff --git a/api/api_storage.c b/api/api_storage.c index a5357bc9cf..f858f09f1a 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -46,7 +46,7 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
void dev_stor_init(void) { -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) specs[ENUM_IDE].max_dev = CONFIG_SYS_IDE_MAXDEVICE; specs[ENUM_IDE].enum_started = 0; specs[ENUM_IDE].enum_ended = 0; diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index c7beb58e80..ba6007186e 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -95,7 +95,7 @@ /* * IDE Support on SATA ports */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_MVSATA_IDE #define CONFIG_IDE_PREINIT @@ -110,12 +110,12 @@ #define CONFIG_SYS_ATA_STRIDE 4 /* Controller supports 48-bits LBA addressing */ #define CONFIG_LBA48 -/* CONFIG_CMD_IDE requires some #defines for ATA registers */ +/* CONFIG_IDE requires some #defines for ATA registers */ #define CONFIG_SYS_IDE_MAXBUS 2 #define CONFIG_SYS_IDE_MAXDEVICE 2 /* ATA registers base is at SATA controller base */ #define CONFIG_SYS_ATA_BASE_ADDR MV_SATA_BASE -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
/* * I2C related stuff diff --git a/arch/powerpc/cpu/mpc5xxx/ide.c b/arch/powerpc/cpu/mpc5xxx/ide.c index 9003b774ff..d1f4349184 100644 --- a/arch/powerpc/cpu/mpc5xxx/ide.c +++ b/arch/powerpc/cpu/mpc5xxx/ide.c @@ -8,7 +8,7 @@ */ #include <common.h>
-#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) #include <mpc5xxx.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 4f68613a41..88adb26e2e 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -35,7 +35,7 @@ obj-y += cache.o obj-y += extable.o obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o -obj-$(CONFIG_CMD_IDE) += ide.o +obj-$(CONFIG_IDE) += ide.o obj-y += stack.o obj-y += time.o
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c index c2cc2d76e4..3318368623 100644 --- a/board/freescale/m5253demo/m5253demo.c +++ b/board/freescale/m5253demo/m5253demo.c @@ -88,7 +88,7 @@ int testdram(void) return (0); }
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #include <ata.h> int ide_preinit(void) { @@ -133,7 +133,7 @@ void ide_set_reset(int idereset) setbits_8(&ata->cr, 0x01); } } -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
#ifdef CONFIG_DRIVER_DM9000 diff --git a/board/freescale/m5253evbe/m5253evbe.c b/board/freescale/m5253evbe/m5253evbe.c index c1ed431190..2c6afadb9a 100644 --- a/board/freescale/m5253evbe/m5253evbe.c +++ b/board/freescale/m5253evbe/m5253evbe.c @@ -81,7 +81,7 @@ int testdram(void) return (0); }
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #include <ata.h> int ide_preinit(void) { @@ -126,4 +126,4 @@ void ide_set_reset(int idereset) setbits_8(&ata->cr, 0x01); } } -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */ diff --git a/board/freescale/m54455evb/m54455evb.c b/board/freescale/m54455evb/m54455evb.c index d6b0650b99..1e35970023 100644 --- a/board/freescale/m54455evb/m54455evb.c +++ b/board/freescale/m54455evb/m54455evb.c @@ -88,7 +88,7 @@ int testdram(void) return (0); }
-#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) #include <ata.h>
int ide_preinit(void) diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c index b8bc0459f8..6c33eeb022 100644 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c @@ -325,7 +325,7 @@ void pci_init_board(void) } #endif
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE
#ifdef CONFIG_IDE_RESET
@@ -369,7 +369,7 @@ void ide_set_reset(int idereset) setbits_be32((void *)MPC5XXX_WU_GPIO_ENABLE, (1 << 25)); } #endif /* CONFIG_IDE_RESET */ -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
#ifdef CONFIG_OF_BOARD_SETUP static void ft_delete_node(void *fdt, const char *compat) diff --git a/board/jupiter/jupiter.c b/board/jupiter/jupiter.c index ea24eaa5c0..52d2766e9a 100644 --- a/board/jupiter/jupiter.c +++ b/board/jupiter/jupiter.c @@ -259,7 +259,7 @@ void pci_init_board(void) } #endif
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) { diff --git a/board/phytec/pcm030/pcm030.c b/board/phytec/pcm030/pcm030.c index 983559e81e..bdd980da91 100644 --- a/board/phytec/pcm030/pcm030.c +++ b/board/phytec/pcm030/pcm030.c @@ -176,7 +176,7 @@ int ft_board_setup(void *blob, bd_t *bd) } #endif /* CONFIG_OF_BOARD_SETUP */
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET)
#define GPIO_PSC2_4 0x02000000UL
@@ -206,4 +206,4 @@ void ide_set_reset(int idereset) } else setbits_be32(&wu_gpio->dvo, GPIO_PSC2_4); } -#endif /* defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) */ +#endif /* defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET) */ diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c index c48ab11fc4..cb99afdb90 100644 --- a/board/tqc/tqm5200/tqm5200.c +++ b/board/tqc/tqm5200/tqm5200.c @@ -312,7 +312,7 @@ void pci_init_board(void) } #endif
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET)
#if defined (CONFIG_MINIFAP) #define SM501_POWER_MODE0_GATE 0x00000040UL diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c index 73227c1b15..e680b7b8ff 100644 --- a/board/v38b/v38b.c +++ b/board/v38b/v38b.c @@ -224,7 +224,7 @@ int misc_init_r(void) return 0; }
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_RESET) void init_ide_reset(void) { debug("init_ide_reset\n"); diff --git a/cmd/Kconfig b/cmd/Kconfig index 2c89a773d0..1268e38b59 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -486,6 +486,7 @@ config CMD_DEMO
config CMD_IDE bool "ide - Support for IDE drivers" + select IDE help Provides an 'ide' command which allows accessing the IDE drive, reseting the IDE interface, printing the partition table and diff --git a/cmd/pcmcia.c b/cmd/pcmcia.c index 682d18f55d..044fb9e618 100644 --- a/cmd/pcmcia.c +++ b/cmd/pcmcia.c @@ -83,7 +83,7 @@ U_BOOT_CMD(
#undef CHECK_IDE_DEVICE
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD) #define CHECK_IDE_DEVICE #endif
diff --git a/common/Makefile b/common/Makefile index b2d663530d..c7c8ea42c6 100644 --- a/common/Makefile +++ b/common/Makefile @@ -145,7 +145,6 @@ obj-y += dlmalloc.o ifdef CONFIG_SYS_MALLOC_F_LEN obj-y += malloc_simple.o endif -obj-$(CONFIG_CMD_IDE) += ide.o obj-y += image.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o obj-$(CONFIG_$(SPL_)OF_LIBFDT) += image-fdt.o diff --git a/common/board_r.c b/common/board_r.c index 28f32c3885..fe7a70b589 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,9 +23,7 @@ #include <dm.h> #include <environment.h> #include <fdtdec.h> -#if defined(CONFIG_CMD_IDE) #include <ide.h> -#endif #include <initcall.h> #include <init_helpers.h> #ifdef CONFIG_PS2KBD @@ -611,7 +609,7 @@ static int initr_post(void) } #endif
-#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) +#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) static int initr_pcmcia(void) { puts("PCMCIA:"); @@ -620,7 +618,7 @@ static int initr_pcmcia(void) } #endif
-#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) static int initr_ide(void) { #ifdef CONFIG_IDE_8xx_PCCARD @@ -870,10 +868,10 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_POST initr_post, #endif -#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) +#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) initr_pcmcia, #endif -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) initr_ide, #endif #ifdef CONFIG_LAST_STAGE_INIT diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 6cbe1454b8..931defd2ae 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -59,3 +59,11 @@ config DWC_AHCI Synopsys DWC AHCI module.
endmenu + +config IDE + bool "Support IDE controllers" + help + Enables support for IDE (Integrated Drive Electronics) hard drives. + This allows access to raw blocks and filesystems on an IDE drive + from U-Boot. See also CMD_IDE which provides an 'ide' command for + performing various IDE operations. diff --git a/drivers/block/Makefile b/drivers/block/Makefile index d89c8b0574..06450966b1 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_DM_SCSI) += scsi-uclass.o obj-$(CONFIG_SCSI_AHCI) += ahci.o obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o obj-$(CONFIG_FSL_SATA) += fsl_sata.o +obj-$(CONFIG_IDE) += ide.o obj-$(CONFIG_IDE_FTIDE020) += ftide020.o obj-$(CONFIG_LIBATA) += libata.o obj-$(CONFIG_MVSATA_IDE) += mvsata_ide.o diff --git a/common/ide.c b/drivers/block/ide.c similarity index 100% rename from common/ide.c rename to drivers/block/ide.c diff --git a/drivers/block/sil680.c b/drivers/block/sil680.c index 3ca64b980d..b1db257838 100644 --- a/drivers/block/sil680.c +++ b/drivers/block/sil680.c @@ -17,7 +17,7 @@ * incorrect for the target board (e.g. the sequoia board requires 0). * #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 0 * - * #define CONFIG_CMD_IDE + * #define CONFIG_IDE * #undef CONFIG_IDE_8xx_DIRECT * #undef CONFIG_IDE_LED * #undef CONFIG_IDE_RESET diff --git a/drivers/pcmcia/marubun_pcmcia.c b/drivers/pcmcia/marubun_pcmcia.c index afd6df6440..739d7545da 100644 --- a/drivers/pcmcia/marubun_pcmcia.c +++ b/drivers/pcmcia/marubun_pcmcia.c @@ -17,7 +17,7 @@ #define CONFIG_PCMCIA #endif
-#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) #define CONFIG_PCMCIA #endif
diff --git a/drivers/pcmcia/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c index 1b41e39158..dae5560f8c 100644 --- a/drivers/pcmcia/mpc8xx_pcmcia.c +++ b/drivers/pcmcia/mpc8xx_pcmcia.c @@ -9,7 +9,7 @@ #define CONFIG_PCMCIA #endif
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif
diff --git a/drivers/pcmcia/tqm8xx_pcmcia.c b/drivers/pcmcia/tqm8xx_pcmcia.c index 45dcb54d71..edff50f630 100644 --- a/drivers/pcmcia/tqm8xx_pcmcia.c +++ b/drivers/pcmcia/tqm8xx_pcmcia.c @@ -15,7 +15,7 @@ #define CONFIG_PCMCIA #endif
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif
diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 56540031d6..a71bad1cbc 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1250,7 +1250,7 @@ int file_fat_detectfs(void) return 1; }
-#if defined(CONFIG_CMD_IDE) || \ +#if defined(CONFIG_IDE) || \ defined(CONFIG_CMD_SATA) || \ defined(CONFIG_SCSI) || \ defined(CONFIG_CMD_USB) || \ diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 0e01e8240d..4b2c493ae3 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -186,16 +186,16 @@ BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_SCSI #endif
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define BOOTENV_SHARED_IDE BOOTENV_SHARED_BLKDEV(ide) #define BOOTENV_DEV_IDE BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_NAME_IDE BOOTENV_DEV_NAME_BLKDEV #else #define BOOTENV_SHARED_IDE #define BOOTENV_DEV_IDE \ - BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE + BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #define BOOTENV_DEV_NAME_IDE \ - BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE + BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif
#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 7aa5b02396..5a698a8349 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -43,7 +43,7 @@ #endif
/* Rather than repeat this expression each time, add a define for it */ -#if defined(CONFIG_CMD_IDE) || \ +#if defined(CONFIG_IDE) || \ defined(CONFIG_CMD_SATA) || \ defined(CONFIG_SCSI) || \ defined(CONFIG_CMD_USB) || \ diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index e7c6f8b558..3efd7e59cf 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -38,7 +38,7 @@ * Command line configuration. */
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE /* ATA */ # define CONFIG_IDE_RESET 1 # define CONFIG_IDE_PREINIT 1 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 2f2e930b4e..a46e86e5b2 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -140,7 +140,7 @@ /* * IDE */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT /* ED Mini V has an IDE-compatible SATA connector for port 1 */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 36a66bb463..0b92d7b2ca 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -87,14 +87,14 @@ /* * SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
/* * RTC driver configuration diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index d2c210119b..43e4a325b4 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -145,7 +145,7 @@ #undef CONFIG_RESET_PHY_R #endif /* CONFIG_CMD_NET */
-#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #undef CONFIG_IDE_LED #undef CONFIG_SYS_IDE_MAXBUS #define CONFIG_SYS_IDE_MAXBUS 1 diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 14cf2e8cb9..5c9a2d939b 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -411,10 +411,10 @@ "1m(u-boot);" \ "mpc5121.nand:-(data)"
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) +#if defined(CONFIG_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) #define CONFIG_SUPPORT_VFAT
-#endif /* defined(CONFIG_CMD_IDE) */ +#endif /* defined(CONFIG_IDE) */
/* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index b988d3d7f9..9b99b0e44f 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -79,12 +79,12 @@ #endif /* CONFIG_CMD_NET */
/* SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
/* RTC driver configuration */ #ifdef CONFIG_CMD_DATE diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index b751ad5e14..3509c2f659 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -25,9 +25,9 @@ * - AHCI controller is supported for QEMU '-M q35' target * * Default configuraion is to support the QEMU default x86 target - * Undefine CONFIG_CMD_IDE to support q35 target + * Undefine CONFIG_IDE to support q35 target */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define CONFIG_SYS_IDE_MAXBUS 2 #define CONFIG_SYS_IDE_MAXDEVICE 4 #define CONFIG_SYS_ATA_BASE_ADDR 0 diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 26c5f0feeb..bb79a9ffea 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -119,7 +119,7 @@ #endif
/* Compact flash Support */ -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) #define CONFIG_IDE_RESET 1 #define CONFIG_SYS_PIO_MODE 1 #define CONFIG_SYS_IDE_MAXBUS 1 /* IDE bus */ @@ -130,6 +130,6 @@ #define CONFIG_SYS_ATA_REG_OFFSET 0x1000 /* reg offset */ #define CONFIG_SYS_ATA_ALT_OFFSET 0x800 /* alternate register offset */ #define CONFIG_IDE_SWAP_IO -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
#endif /* __R7780RP_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index a111057313..9d2c106d46 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -90,13 +90,13 @@ /* * SATA driver configuration */ -#ifdef CONFIG_CMD_IDE +#ifdef CONFIG_IDE #define __io #define CONFIG_IDE_PREINIT #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /* CONFIG_CMD_IDE */ +#endif /* CONFIG_IDE */
#endif /* _CONFIG_SHEEVAPLUG_H */ diff --git a/include/pcmcia.h b/include/pcmcia.h index c8a730c4d0..aaaf6511a8 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -16,7 +16,7 @@ * or try to generate a useful default */ #if defined(CONFIG_CMD_PCMCIA) || \ - (defined(CONFIG_CMD_IDE) && \ + (defined(CONFIG_IDE) && \ (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
#if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) @@ -268,7 +268,7 @@ extern u_int *pcmcia_pgcrx[]; #define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot]) #endif
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if defined(CONFIG_IDE) && defined(CONFIG_IDE_8xx_PCCARD) extern int check_ide_device(int slot); #endif
On Wed, May 17, 2017 at 03:25:30AM -0600, Simon Glass wrote:
At present IDE support is controlled by CONFIG_CMD_IDE. Add a separate CONFIG_IDE option so that IDE support can be enabled without requiring the 'ide' command.
Update existing users and move the ide driver into drivers/block since it should not be in common/.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IMMAP
Also move this command out of the cmd/ directory since it is PowerPC-specific.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - arch/powerpc/Kconfig | 2 ++ arch/powerpc/lib/Kconfig | 8 ++++++++ arch/powerpc/lib/Makefile | 1 + {cmd => arch/powerpc/lib}/immap.c | 0 cmd/Makefile | 1 - configs/canmb_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/munices_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/canmb.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/motionpro.h | 1 - include/configs/munices.h | 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 arch/powerpc/lib/Kconfig rename {cmd => arch/powerpc/lib}/immap.c (100%)
diff --git a/README b/README index 2dafe21f0d..5f3ccbe112 100644 --- a/README +++ b/README @@ -850,7 +850,6 @@ The following options need to be configured: CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash - CONFIG_CMD_IMMAP * IMMR dump support CONFIG_CMD_IOTRACE * I/O tracing for debugging CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3d2c1319c9..eae94c8fd5 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -49,6 +49,8 @@ config 4xx
endchoice
+source "arch/powerpc/lib/Kconfig" + source "arch/powerpc/cpu/mpc512x/Kconfig" source "arch/powerpc/cpu/mpc5xx/Kconfig" source "arch/powerpc/cpu/mpc5xxx/Kconfig" diff --git a/arch/powerpc/lib/Kconfig b/arch/powerpc/lib/Kconfig new file mode 100644 index 0000000000..987cec99cb --- /dev/null +++ b/arch/powerpc/lib/Kconfig @@ -0,0 +1,8 @@ +config CMD_IMMAP + bool "Enable various commands to dump IMMR information" + help + This enables various commands such as: + + siuinfo - print System Interface Unit (SIU) registers + memcinfo - print Memory Controller registers + sitinfo - print System Integration Timers (SIT) registers diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 88adb26e2e..e09bd9a88a 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_BAT_RW) += bat_rw.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += cache.o obj-y += extable.o +obj-$(CONFIG_CMD_IMMAP) += immap.o obj-y += interrupts.o obj-$(CONFIG_CMD_KGDB) += kgdb.o obj-$(CONFIG_IDE) += ide.o diff --git a/cmd/immap.c b/arch/powerpc/lib/immap.c similarity index 100% rename from cmd/immap.c rename to arch/powerpc/lib/immap.c diff --git a/cmd/Makefile b/cmd/Makefile index f043407656..1293d24e39 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -68,7 +68,6 @@ obj-$(CONFIG_CMD_I2C) += i2c.o obj-$(CONFIG_CMD_IOTRACE) += iotrace.o obj-$(CONFIG_CMD_HASH) += hash.o obj-$(CONFIG_CMD_IDE) += ide.o disk.o -obj-$(CONFIG_CMD_IMMAP) += immap.o obj-$(CONFIG_CMD_INI) += ini.o obj-$(CONFIG_CMD_IRQ) += irq.o obj-$(CONFIG_CMD_ITEST) += itest.o diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig index 1f6f18d601..87eb205d0c 100644 --- a/configs/canmb_defconfig +++ b/configs/canmb_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_CANMB=y CONFIG_BOOTDELAY=5 CONFIG_CMD_ASKENV=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 4d6718dd31..63ad7edf48 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 233943c0d7..31cad022ef 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index d92e6b2934..bb8a0fe292 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM8360=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index 13f5c1e304..e5b7ba67a4 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC85xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KMP204X=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 0b112ffb48..9e9c0b9843 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index ba02124ccb..5235530725 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 16b7b18062..464a125c39 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 3f73346208..ca64a6e99e 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 8b9180b6a6..04a3e48d53 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index d66fffe47e..0d4a1e102d 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index c9f07d11a4..f4f8ae5452 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC8260=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_KM82XX=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index ab9ea81021..5521e6d01b 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MOTIONPRO=y CONFIG_OF_BOARD_SETUP=y CONFIG_VERSION_VARIABLE=y diff --git a/configs/munices_defconfig b/configs/munices_defconfig index ddd5c43de2..0e2b188a51 100644 --- a/configs/munices_defconfig +++ b/configs/munices_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC5xxx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_MUNICES=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=5 diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 68fee8ce79..68cfe65a5e 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_SUVD3=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index a5579e4f33..3cb1404c92 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 519472f247..18b124a58c 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -1,5 +1,6 @@ CONFIG_PPC=y CONFIG_MPC83xx=y +CONFIG_CMD_IMMAP=y CONFIG_TARGET_TUXX1=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index b00f96ef6e..8ab46ca47e 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_IMMAP /* IMMR dump support */ #define CONFIG_CMD_IO /* Access to X86 IO space */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index c70979ed1a..b7c74b4264 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 506ce51236..08ccaa200c 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 02ac7b3089..035f1dc5f9 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
diff --git a/include/configs/munices.h b/include/configs/munices.h index 1679430951..ad2d69e6a5 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -26,7 +26,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IMMAP #define CONFIG_CMD_REGINFO
#if defined(CONFIG_CMD_KGDB) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6111c49c17..1558d73e2b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMMAP CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO
On Wed, May 17, 2017 at 03:25:31AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IMMAP
Also move this command out of the cmd/ directory since it is PowerPC-specific.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
include/configs/ot1200.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 2052075a54..0582fa3688 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_I2C_SPEED 100000
/* OCOTP Configs */ -#define CONFIG_CMD_IMXOTP #define CONFIG_IMX_OTP #define IMX_OTP_BASE OCOTP_BASE_ADDR #define IMX_OTP_ADDR_MAX 0x7F diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1558d73e2b..a8896f2304 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMXOTP CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO CONFIG_CMD_IOLOOP
On Wed, May 17, 2017 at 03:25:32AM -0600, Simon Glass wrote:
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
include/configs/apf27.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 3450751054..073f3b4fef 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,7 +54,6 @@ /* * U-Boot Commands */ -#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */ #define CONFIG_CMD_MTDPARTS /* MTD partition support */ #define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a8896f2304..cdb10f9964 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IMX_FUSE CONFIG_CMD_IO CONFIG_CMD_IOLOOP CONFIG_CMD_IOTRACE
On Wed, May 17, 2017 at 03:25:33AM -0600, Simon Glass wrote:
This option is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IO
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - arch/Kconfig | 2 ++ cmd/Kconfig | 8 ++++++++ include/config_cmd_all.h | 1 - include/configs/sandbox.h | 1 - include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/README b/README index 5f3ccbe112..f0020fbf33 100644 --- a/README +++ b/README @@ -850,7 +850,6 @@ The following options need to be configured: CONFIG_CMD_IMI iminfo CONFIG_CMD_IMLS List all images found in NOR flash CONFIG_CMD_IMLS_NAND * List all images found in NAND flash - CONFIG_CMD_IOTRACE * I/O tracing for debugging CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env CONFIG_CMD_IRQ * irqinfo diff --git a/arch/Kconfig b/arch/Kconfig index 61c08fffa4..c10f0a9b71 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -69,6 +69,7 @@ config SANDBOX select DM_GPIO select DM_MMC imply CMD_HASH + imply CMD_IO
config SH bool "SuperH architecture" @@ -88,6 +89,7 @@ config X86 select USB_EHCI_HCD imply CMD_FPGA_LOADMK imply CMD_GETTIME + imply CMD_IO
config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 1268e38b59..0f54ae35f9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -493,6 +493,14 @@ config CMD_IDE geting device info. It also enables the 'diskboot' command which permits booting from an IDE drive.
+config CMD_IO + bool "io - Support for performing I/O accesses" + help + Provides an 'iod' command to display I/O space and an 'iow' command + to write values to the I/O space. This can be useful for manually + checking the state of devices during boot when debugging device + drivers, etc. + config CMD_LOADB bool "loadb" default y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 8ab46ca47e..27fcc5e28d 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_IO /* Access to X86 IO space */ #define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_KGDB /* kgdb */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index dccfaf6a0d..8973494f9b 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -29,7 +29,6 @@ #define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_CMD_PCI -#define CONFIG_CMD_IO
#define CONFIG_FS_FAT #define CONFIG_FAT_WRITE diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index e9d5f3d053..d8b3f1ad67 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,7 +70,6 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_IO #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_SCSI diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cdb10f9964..5240cfe6c5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IO CONFIG_CMD_IOLOOP CONFIG_CMD_IOTRACE CONFIG_CMD_IRQ
On Wed, May 17, 2017 at 03:25:34AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IO
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IOLOOP
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
board/gdsys/mpc8308/Kconfig | 5 +++++ configs/hrcon_defconfig | 1 + configs/hrcon_dh_defconfig | 1 + configs/strider_con_defconfig | 1 + configs/strider_con_dp_defconfig | 1 + configs/strider_cpu_defconfig | 1 + configs/strider_cpu_dp_defconfig | 1 + include/configs/hrcon.h | 2 -- include/configs/strider.h | 2 -- scripts/config_whitelist.txt | 1 - 10 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/board/gdsys/mpc8308/Kconfig b/board/gdsys/mpc8308/Kconfig index 9a1a3a2f28..cb29c25c65 100644 --- a/board/gdsys/mpc8308/Kconfig +++ b/board/gdsys/mpc8308/Kconfig @@ -23,3 +23,8 @@ config SYS_CONFIG_NAME default "strider"
endif + +config CMD_IOLOOP + bool "Enable 'ioloop' and 'ioreflect' commands" + help + These commands provide FPGA tests. diff --git a/configs/hrcon_defconfig b/configs/hrcon_defconfig index cf89ebe145..aea06769f4 100644 --- a/configs/hrcon_defconfig +++ b/configs/hrcon_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" hrcon 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_HRCON=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/hrcon_dh_defconfig b/configs/hrcon_dh_defconfig index c5512e71c4..8e911d49a0 100644 --- a/configs/hrcon_dh_defconfig +++ b/configs/hrcon_dh_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" hrcon dh 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_HRCON=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_con_defconfig b/configs/strider_con_defconfig index 099d40714f..d293d39d7b 100644 --- a/configs/strider_con_defconfig +++ b/configs/strider_con_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider con 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_con_dp_defconfig b/configs/strider_con_dp_defconfig index 754db3d2d8..e0040e9e38 100644 --- a/configs/strider_con_dp_defconfig +++ b/configs/strider_con_dp_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider con dp 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_cpu_defconfig b/configs/strider_cpu_defconfig index 692e883e75..7d372ffac7 100644 --- a/configs/strider_cpu_defconfig +++ b/configs/strider_cpu_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider cpu 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/strider_cpu_dp_defconfig b/configs/strider_cpu_dp_defconfig index 18e33a2e6b..5d304b3f8b 100644 --- a/configs/strider_cpu_dp_defconfig +++ b/configs/strider_cpu_dp_defconfig @@ -2,6 +2,7 @@ CONFIG_PPC=y CONFIG_IDENT_STRING=" strider cpu dp 0.01" CONFIG_MPC83xx=y CONFIG_TARGET_STRIDER=y +CONFIG_CMD_IOLOOP=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index cfebd2d26e..405129b7e2 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,8 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR
-#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 539557d972..994ac73e13 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -28,8 +28,6 @@
#define CONFIG_SYS_ALT_MEMTEST
-#define CONFIG_CMD_IOLOOP - /* * System Clock Setup */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5240cfe6c5..8e1d61d62c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IOLOOP CONFIG_CMD_IOTRACE CONFIG_CMD_IRQ CONFIG_CMD_JFFS2
On Wed, May 17, 2017 at 03:25:35AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IOLOOP
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IOTRACE
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/Kconfig | 1 + cmd/Kconfig | 34 ++++++++++++++++++++++++++++++++++ include/configs/sandbox.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index c10f0a9b71..2b194b3049 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -70,6 +70,7 @@ config SANDBOX select DM_MMC imply CMD_HASH imply CMD_IO + imply CMD_IOTRACE
config SH bool "SuperH architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 0f54ae35f9..c1e271d329 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -501,6 +501,40 @@ config CMD_IO checking the state of devices during boot when debugging device drivers, etc.
+config CMD_IOTRACE + bool "iotrace - Support for tracing I/O activity" + help + Provides an 'iotrace' command which supports recording I/O reads and + writes in a trace buffer in memory . It also maintains a checksum + of the trace records (even if space is exhausted) so that the + sequence of I/O accesses can be verified. + + When debugging drivers it is useful to see what I/O accesses were + done and in what order. + + Even if the individual accesses are of little interest it can be + useful to verify that the access pattern is consistent each time + an operation is performed. In this case a checksum can be used to + characterise the operation of a driver. The checksum can be compared + across different runs of the operation to verify that the driver is + working properly. + + In particular, when performing major refactoring of the driver, where + the access pattern should not change, the checksum provides assurance + that the refactoring work has not broken the driver. + + This works by sneaking into the io.h heder for an architecture and + redirecting I/O accesses through iotrace's tracing mechanism. + + For now no commands are provided to examine the trace buffer. The + format is fairly simple, so 'md' is a reasonable substitute. + + Note: The checksum feature is only useful for I/O regions where the + contents do not change outside of software control. Where this is not + suitable you can fall back to manually comparing the addresses. It + might be useful to enhance tracing to only checksum the accesses and + not the data read/written. + config CMD_LOADB bool "loadb" default y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 8973494f9b..d640949dd9 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -18,7 +18,6 @@
#ifndef CONFIG_SPL_BUILD #define CONFIG_IO_TRACE -#define CONFIG_CMD_IOTRACE #endif
#ifndef CONFIG_TIMER diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8e1d61d62c..083daca785 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IOTRACE CONFIG_CMD_IRQ CONFIG_CMD_JFFS2 CONFIG_CMD_KGDB
On Wed, May 17, 2017 at 03:25:36AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IOTRACE
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_JFFS2
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 8 ++++++++ configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/TQM5200S_HIGHBOOT_defconfig | 1 + configs/TQM5200S_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM834x_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/aria_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/atngw100_defconfig | 1 + configs/atngw100mkii_defconfig | 1 + configs/atstk1002_defconfig | 1 + configs/cam5200_defconfig | 1 + configs/cam5200_niosflash_defconfig | 1 + configs/charon_defconfig | 1 + configs/cm5200_defconfig | 1 + configs/devkit3250_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dns325_defconfig | 1 + configs/dockstar_defconfig | 1 + configs/ds414_defconfig | 1 + configs/edb9315a_defconfig | 1 + configs/ethernut5_defconfig | 1 + configs/fo300_defconfig | 1 + configs/goflexhome_defconfig | 1 + configs/grasshopper_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge4_defconfig | 1 + configs/kmcoge5ne_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmeter1_defconfig | 1 + configs/kmlion1_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmopti2_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/kmtegr1_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/kmvect1_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/mgcoge3ne_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mgcoge_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/motionpro_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/ms7722se_defconfig | 1 + configs/nas220_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/openrd_base_defconfig | 1 + configs/openrd_client_defconfig | 1 + configs/openrd_ultimate_defconfig | 1 + configs/pcm030_LOWBOOT_defconfig | 1 + configs/pcm030_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/pogo_e02_defconfig | 1 + configs/portl2_defconfig | 1 + configs/sh7763rdp_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/suvd3_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + configs/v38b_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinum_onenand_small_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/vct_premium_onenand_small_defconfig | 1 + configs/wtk_defconfig | 1 + configs/xilinx-ppc405-generic_defconfig | 1 + configs/xilinx-ppc440-generic_defconfig | 1 + configs/xpedite1000_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/TQM5200.h | 1 - include/configs/TQM823L.h | 1 - include/configs/TQM823M.h | 1 - include/configs/TQM834x.h | 1 - include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 1 - include/configs/TQM855L.h | 1 - include/configs/TQM855M.h | 1 - include/configs/TQM860L.h | 1 - include/configs/TQM860M.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/TQM866M.h | 1 - include/configs/ac14xx.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/aria.h | 1 - include/configs/astro_mcf5373l.h | 3 --- include/configs/atngw100.h | 1 - include/configs/atngw100mkii.h | 1 - include/configs/atstk1002.h | 1 - include/configs/cm5200.h | 1 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dockstar.h | 1 - include/configs/edb93xx.h | 1 - include/configs/ethernut5.h | 1 - include/configs/grasshopper.h | 1 - include/configs/iconnect.h | 1 - include/configs/ids8313.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/km/keymile-common.h | 1 - include/configs/mcx.h | 1 - include/configs/mecp5123.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/motionpro.h | 8 -------- include/configs/mpc5121ads.h | 1 - include/configs/ms7722se.h | 1 - include/configs/mv-common.h | 1 - include/configs/nas220.h | 1 - include/configs/omap3_evm.h | 2 -- include/configs/pcm030.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/sh7763rdp.h | 1 - include/configs/tricorder.h | 2 -- include/configs/v38b.h | 1 - include/configs/vct.h | 1 - include/configs/xilinx-ppc.h | 2 -- include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 176 files changed, 121 insertions(+), 75 deletions(-)
diff --git a/README b/README index f0020fbf33..c493d72fad 100644 --- a/README +++ b/README @@ -854,7 +854,6 @@ The following options need to be configured: CONFIG_CMD_INI * import data from an ini file into the env CONFIG_CMD_IRQ * irqinfo CONFIG_CMD_ITEST Integer/string test of 2 values - CONFIG_CMD_JFFS2 * JFFS2 Support CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration diff --git a/cmd/Kconfig b/cmd/Kconfig index c1e271d329..e4cb6c92b0 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1145,6 +1145,14 @@ config CMD_FS_UUID help Enables fsuuid command for filesystem UUID.
+config CMD_JFFS2 + bool "jffs2 command" + help + Enables commands to support the JFFS2 (Journalling Flash File System + version 2) filesystem. This enables fsload, ls and fsinfo which + provide the ability to load files, list directories and obtain + filesystem information. + config CMD_MTDPARTS depends on ARCH_SUNXI bool "MTD partition support" diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index e756401162..903eef536c 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig index 4f9d97ee55..d657f863d0 100644 --- a/configs/M52277EVB_stmicro_defconfig +++ b/configs/M52277EVB_stmicro_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index d681d32140..221c70750b 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index e57323d594..557b87b78c 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index 2a5da64a3a..9ad0564788 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 97024333db..dc7af6cb19 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index 1f5fb14402..eed2eabe68 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index 743b74b40b..da3bbaeb14 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_BSP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 254cd41224..461416773c 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BSP=y CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 5d88a27180..b9cbafc887 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200S_HIGHBOOT_defconfig b/configs/TQM5200S_HIGHBOOT_defconfig index 1b3e91f9d5..5e6f9c951f 100644 --- a/configs/TQM5200S_HIGHBOOT_defconfig +++ b/configs/TQM5200S_HIGHBOOT_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200S_defconfig b/configs/TQM5200S_defconfig index 4ed119dbe7..d0c352faa1 100644 --- a/configs/TQM5200S_defconfig +++ b/configs/TQM5200S_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig index 2e6b4dd272..ed74408b98 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index 8eb3d4099e..cc9968cacb 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 146c3bf514..35d486033b 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index c7bc5383ba..783c39a052 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index 61601a5a41..ccb68b24c5 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index 89d1df4c72..c588948e11 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index b7c6462436..0490828504 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig index c4b9091586..ef73ed40c8 100644 --- a/configs/TQM834x_defconfig +++ b/configs/TQM834x_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 75ecade55b..0e42d8c4fe 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index be45efd00e..a464fe507a 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index b3e9325253..aa370012f5 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index bf1186a6cd..faab826a24 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index 978540bb1a..b18cf31ddd 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index 8daee064da..fe2fe6d38c 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index 9b7c8b8903..6f5f772d32 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index ffb23d3364..44307760ee 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index db70ca121e..d8922900d4 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_IDE=y CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index 5b4000e266..9d26e94615 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig index 930ec8acf2..6855331860 100644 --- a/configs/ac14xx_defconfig +++ b/configs/ac14xx_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 81fec1e082..2a0987e555 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/aria_defconfig b/configs/aria_defconfig index 0f1432f9a8..0613dd16fb 100644 --- a/configs/aria_defconfig +++ b/configs/aria_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index c35222b244..888bb334bf 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -11,4 +11,5 @@ CONFIG_CMD_FPGA_LOADMK=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 1e85f0af33..17db763867 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/atngw100mkii_defconfig b/configs/atngw100mkii_defconfig index 2fa5b6954d..887c5fb8d7 100644 --- a/configs/atngw100mkii_defconfig +++ b/configs/atngw100mkii_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/atstk1002_defconfig b/configs/atstk1002_defconfig index 49182e33c4..0fa7969e47 100644 --- a/configs/atstk1002_defconfig +++ b/configs/atstk1002_defconfig @@ -17,5 +17,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/cam5200_defconfig b/configs/cam5200_defconfig index 46a24f56ab..d8a419cda2 100644 --- a/configs/cam5200_defconfig +++ b/configs/cam5200_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/cam5200_niosflash_defconfig b/configs/cam5200_niosflash_defconfig index 6b9877ff21..d7577a44ff 100644 --- a/configs/cam5200_niosflash_defconfig +++ b/configs/cam5200_niosflash_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/charon_defconfig b/configs/charon_defconfig index 89a5d08541..2e4ad658e0 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/cm5200_defconfig b/configs/cm5200_defconfig index d3369f4455..860d23e553 100644 --- a/configs/cm5200_defconfig +++ b/configs/cm5200_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BSP=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 074be13c04..79623e1be5 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_GPIO=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 7edcb08324..617228f91f 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 53be09aede..abe6a6379f 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index 14eee484e0..a70458872d 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index b637483720..4e17bb91a3 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SPL_OF_TRANSLATE=y diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig index e7b4810b5a..bb67881a25 100644 --- a/configs/edb9315a_defconfig +++ b/configs/edb9315a_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y # CONFIG_DOS_PARTITION is not set CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index d5e08889d0..197052dba6 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig index d51e31d8ed..24470f311a 100644 --- a/configs/fo300_defconfig +++ b/configs/fo300_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_BSP=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 07d88b1a36..4dfb895351 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig index 2944d73af5..024231dbc6 100644 --- a/configs/grasshopper_defconfig +++ b/configs/grasshopper_defconfig @@ -14,4 +14,5 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 090ff03dc5..361293af53 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index bcdf6f8dac..a8107e264d 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 7e0b444b54..32994ec0cb 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 2accd31229..2a8c239d69 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 0884688f49..df7dac8c37 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index d34174db08..4b9cdb7f47 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 83e9d04c4a..79952774ae 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig index 63ad7edf48..a6ec1d8ee0 100644 --- a/configs/kmcoge4_defconfig +++ b/configs/kmcoge4_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 31cad022ef..0a22f8d204 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index d41fae022c..af0df7ef22 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index bb8a0fe292..6cbecf600f 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig index e5b7ba67a4..fdb6cf63c4 100644 --- a/configs/kmlion1_defconfig +++ b/configs/kmlion1_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index cb06ba0cbf..eb70cd600a 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 9e9c0b9843..6874e02315 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index 40b5f9628c..ed90f9d5b6 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index 5235530725..ecd297d8c6 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 242fc1a904..c5edce8e4f 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig index 464a125c39..9e20c026fa 100644 --- a/configs/kmtegr1_defconfig +++ b/configs/kmtegr1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index ca64a6e99e..2c6e00e296 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig index 04a3e48d53..a0a723861f 100644 --- a/configs/kmvect1_defconfig +++ b/configs/kmvect1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 349df80f05..09dbc781c6 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig index db52077e1a..3937fe8b44 100644 --- a/configs/mecp5123_defconfig +++ b/configs/mecp5123_defconfig @@ -11,6 +11,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig index 0d4a1e102d..58d6656df3 100644 --- a/configs/mgcoge3ne_defconfig +++ b/configs/mgcoge3ne_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 1fba301af8..2add8828b8 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig index f4f8ae5452..c4f39b38c7 100644 --- a/configs/mgcoge_defconfig +++ b/configs/mgcoge_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 131d6f5862..bcb0e88054 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig index 5521e6d01b..c4006bca5f 100644 --- a/configs/motionpro_defconfig +++ b/configs/motionpro_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_BEDBUG=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index a6f65d8bac..5bb78076ad 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index 022e67b249..e28fa19227 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index cb50b46148..92f3158dae 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -20,5 +20,6 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index abf71a5914..a57cc9724c 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 74bb72ad83..2ba87642b3 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1b61d1d8b9..227f1d1ca3 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig index cd3991ad15..1471872833 100644 --- a/configs/openrd_base_defconfig +++ b/configs/openrd_base_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig index db034b6ba8..b62852a10c 100644 --- a/configs/openrd_client_defconfig +++ b/configs/openrd_client_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig index bf3ac8111a..d57b6962d5 100644 --- a/configs/openrd_ultimate_defconfig +++ b/configs/openrd_ultimate_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/pcm030_LOWBOOT_defconfig b/configs/pcm030_LOWBOOT_defconfig index 2933326e5d..0ef8750d66 100644 --- a/configs/pcm030_LOWBOOT_defconfig +++ b/configs/pcm030_LOWBOOT_defconfig @@ -7,6 +7,7 @@ CONFIG_BOOTDELAY=3 # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pcm030_defconfig b/configs/pcm030_defconfig index ff9f4e9f4f..3869991f9e 100644 --- a/configs/pcm030_defconfig +++ b/configs/pcm030_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_PROMPT="uboot> " # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 92441b3c23..7cf2722740 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 7235922a94..954908e9aa 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 7699e0c5e6..57ebc0694c 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 0d15fb8a0c..a0faba50ff 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index ec0275ee55..028616666c 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -21,5 +21,6 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_MTD_NOR_FLASH=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 80cc62ebd6..19acc7de3c 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_SYS_NS16550=y diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig index 68cfe65a5e..e5e100a950 100644 --- a/configs/suvd3_defconfig +++ b/configs/suvd3_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 3cb1404c92..c3e5a9eace 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 18b124a58c..515656de1c 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/v38b_defconfig b/configs/v38b_defconfig index 3d0065ea84..6876f6585a 100644 --- a/configs/v38b_defconfig +++ b/configs/v38b_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_MAC_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 707ede5901..5d4cccccba 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 0e4964b5b3..5a5edd8260 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index 979c554d22..1f0a3f8b49 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_NET is not set CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index 5b443cfbb5..9e2fcbf6d0 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index 2a4a0552fc..ac9cf36f68 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 8eca0a5597..6e649ec0d7 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_SYS_NS16550=y diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index ce3745a221..2b81535c29 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +CONFIG_CMD_JFFS2=y CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/xilinx-ppc405-generic_defconfig b/configs/xilinx-ppc405-generic_defconfig index 6aa049c450..1f90e3db26 100644 --- a/configs/xilinx-ppc405-generic_defconfig +++ b/configs/xilinx-ppc405-generic_defconfig @@ -18,6 +18,7 @@ CONFIG_LOOPW=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_OF_EMBED=y # CONFIG_MMC is not set diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c9a1e2b087..f1f723490f 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y +CONFIG_CMD_JFFS2=y CONFIG_CMD_DIAG=y CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y diff --git a/configs/xpedite1000_defconfig b/configs/xpedite1000_defconfig index 54b74ff65f..b89e2471db 100644 --- a/configs/xpedite1000_defconfig +++ b/configs/xpedite1000_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 6457d1952b..848d27ea81 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig index b6cebe9146..0fec4cf00d 100644 --- a/configs/xpedite520x_defconfig +++ b/configs/xpedite520x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index c575cc4121..2f3fec217c 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y CONFIG_SYS_FSL_DDR2=y CONFIG_DS4510=y # CONFIG_MMC is not set diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig index 785eeef875..6c478ce5ee 100644 --- a/configs/xpedite550x_defconfig +++ b/configs/xpedite550x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_CMD_JFFS2=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 27fcc5e28d..34f9167cfe 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -14,7 +14,6 @@ */
#define CONFIG_CMD_IRQ /* irqinfo */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_KGDB /* kgdb */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 3f7c1c9988..fc9b26ff46 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME
/* Command line configuration */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#define CONFIG_HOSTNAME M52277EVB diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 7b162cccef..cb7ea8639d 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -37,7 +37,6 @@ #define CONFIG_BOOTP_HOSTNAME
/* Command line configuration */ -#undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_NAND #define CONFIG_CMD_REGINFO
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 553e877ae7..7d6edda361 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME
/* Command line configuration */ -#undef CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
/* Network configuration */ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 9b6bd1025d..39ba94065a 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -36,7 +36,6 @@ #define CONFIG_BOOTP_HOSTNAME
/* Command line configuration */ -#define CONFIG_CMD_JFFS2 #undef CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index e758f1947b..efab6457b3 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -47,7 +47,6 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 8d165290eb..e1f04459c4 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -143,7 +143,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 685cb5146e..74636b9162 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -91,7 +91,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 88ee42fe00..6b345c427c 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index a90e2ac8d9..a79dabef61 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -273,7 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 621a4b1def..b4ed561544 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 34e9520c3c..1dc13295ff 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +84,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index bf96d0989b..b4c3a79387 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index f47b0baba0..14b76a66bc 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 4617740336..f55fe56abb 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 9c445fdadc..52c4d68693 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,7 +86,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 7f384cda97..06981c9861 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 31392e0561..3f87d8aa11 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,7 +89,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index baa65c0dec..975f4b76dc 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_NETCONSOLE
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 8b55dee498..4eb8f39aaf 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -367,7 +367,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 5de39cf740..2230c48d75 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -101,7 +101,6 @@ #endif /* CONFIG_USB_AM35X */
/* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_NAND /* NAND support */
diff --git a/include/configs/aria.h b/include/configs/aria.h index 1564b40832..0a7ef9919e 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -372,7 +372,6 @@ #define CONFIG_LOADS_ECHO 1 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1
-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 084b78c1e3..61989d6bab 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -59,9 +59,6 @@
/* Define which commands should be available at u-boot command prompt */
-#if ENABLE_JFFS -#define CONFIG_CMD_JFFS2 -#endif #define CONFIG_CMD_REGINFO #define CONFIG_CMDLINE_EDITING
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 4c27225d84..bf13d937fb 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -74,7 +74,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 64d7c45aad..a7f5e06c68 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -93,7 +93,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 3c03ed3eb1..c8e9340af2 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -95,7 +95,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2
#define CONFIG_ATMEL_USART #define CONFIG_MACB diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 3a7d826837..3777a0d863 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -21,7 +21,6 @@ /* * Supported commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 6e95064fe1..d2133130bc 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_NAND_PAGE_SIZE NAND_LARGE_BLOCK_PAGE_SIZE #define CONFIG_SYS_NAND_USE_FLASH_BBT
-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND
/* diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5884d5c67c..c892b5faa9 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -91,7 +91,6 @@ /* partition */
/* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
#undef CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 2db31d3c11..3b56fd6739 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -79,7 +79,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index 2fc85983e0..def28f2cf1 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_CLK_FREQ 14745600 /* EP93xx has a 14.7456 clock */
/* Monitor configuration */ -#define CONFIG_CMD_JFFS2
#define CONFIG_SYS_LONGHELP /* Enable "long" help in mon */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O buffer size */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 481051c9c6..e7f7a7cbe6 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -84,7 +84,6 @@ #define CONFIG_AT91_GPIO
/* Command line configuration */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_NAND
diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h index abc4214bc0..83b78907f2 100644 --- a/include/configs/grasshopper.h +++ b/include/configs/grasshopper.h @@ -86,7 +86,6 @@ * Command line configuration. */ /* add useful commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#define CONFIG_AUTO_COMPLETE diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 46374f2c37..bb4eb7be7b 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -87,7 +87,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 5e85cc6d4c..aa3123ad82 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -413,7 +413,6 @@ */ #define CONFIG_CMD_NAND #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_JFFS2 #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index b8a867c7ba..18d8d2fd3d 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -159,7 +159,6 @@ /* * U-Boot commands */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 08ccaa200c..c2b38d8af6 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,7 +13,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS
#undef CONFIG_WATCHDOG /* disable platform specific watchdog */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index c70e68c5b0..bccfb9bcf5 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -80,7 +80,6 @@ #define CONFIG_USB_ETHER_MCS7830
/* commands to include */ -#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
#define CONFIG_CMD_NAND /* NAND support */ #define CONFIG_CMD_UBIFS diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index fcc1c68236..17a97dfc3a 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -273,7 +273,6 @@ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
#define CONFIG_CMD_REGINFO -#define CONFIG_CMD_JFFS2
/* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e8fe2f673c..5ae3af9e38 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -172,7 +172,6 @@ #define CONFIG_CMD_MFSL
#if defined(FLASH) -# define CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS
# if !defined(RAMENV) @@ -186,7 +185,6 @@ # define CONFIG_CMD_SAVES # endif #else -# undef CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBIFS #endif #endif diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 035f1dc5f9..75633f66ef 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
/* @@ -265,13 +264,6 @@ #define LED_ON 0x00000010
/* -<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae -======= - * Temperature sensor - */ - -/* ->>>>>>> Drop digital thermometer and thermostat (DTT) drivers * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 5c9a2d939b..e11a0e628a 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -378,7 +378,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 26472e9474..de6e58a71e 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -12,7 +12,6 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MS7722SE 1
-#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index d000d7617a..13bd6cff3d 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -128,7 +128,6 @@ * File system */ #ifdef CONFIG_SYS_MVFS -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 9ecc28811b..dfa81223c4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -101,7 +101,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_JFFS2_NAND #define CONFIG_JFFS2_LZO #define CONFIG_CMD_UBIFS diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index d8ca6225d6..23f081273f 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -25,8 +25,6 @@ * ---------------------------------------------------------------------------- */
-#define CONFIG_CMD_JFFS2 - #define CONFIG_CMD_NAND
/* ---------------------------------------------------------------------------- diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 406f3e547a..6da17be11c 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -49,7 +49,6 @@ Serial console configuration /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index b220d14dd8..41d5722490 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -226,7 +226,6 @@
#endif
-#define CONFIG_CMD_JFFS2 1 #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND device jffs2 lives on */ diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 22b3c2e2d1..5e58b6b021 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -69,7 +69,6 @@ */ #define CONFIG_CMD_NAND 1
-#define CONFIG_CMD_JFFS2 1 #define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND dev jffs2 lives on */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index e62e21704c..f94e74f0fc 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -77,7 +77,6 @@ /* * File system */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 69073e8a66..2186f21f7a 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -18,7 +18,6 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_JFFS2
#define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 9bce1ac1a0..5d8f079a7a 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -104,8 +104,6 @@ #define CONFIG_CMD_UBIFS /* UBIFS commands */ #define CONFIG_LZO /* LZO is needed for UBIFS */
-#undef CONFIG_CMD_JFFS2 /* JFFS2 Support */ - /* needed for ubi */ #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 8b2f39c910..c5c78bf54c 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -74,7 +74,6 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_SDRAM
#define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/vct.h b/include/configs/vct.h index e4ae9cdb2e..07a5d49f3b 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -234,7 +234,6 @@ int vct_gpio_get(int pin); */ #if defined(CONFIG_VCT_ONENAND) #define CONFIG_SYS_USE_UBI -#define CONFIG_CMD_JFFS2 #define CONFIG_RBTREE #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index efb3038d9a..68ae44bfa1 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -26,7 +26,6 @@ /*Cmd*/ #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS
/*Misc*/ @@ -76,7 +75,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO 1 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_PROTECTION -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 6d9500619e..8294001730 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -176,7 +176,6 @@ extern void out32(unsigned int, unsigned long); * Command configuration */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI
/* diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 4ecceb2a9f..b604019621 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -485,7 +485,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 3e21c96bc2..2645006b37 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 526bff6cff..abbaeaad10 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index ee033ef01d..254fc12cf6 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 083daca785..e02eace1c0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -384,7 +384,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_IRQ -CONFIG_CMD_JFFS2 CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC
On Wed, May 17, 2017 at 03:25:37AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_JFFS2
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
Rather than using CMD_JFFS2 for both the filesystem and its command, we should have a separate option for each. This allows us to enable JFFS2 support without the command, if desired, which reduces U-Boot's size slightly.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
cmd/Kconfig | 1 + cmd/cramfs.c | 4 ++-- doc/README.JFFS2 | 3 +++ fs/Makefile | 2 +- fs/jffs2/Kconfig | 7 +++++++ 5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig index e4cb6c92b0..be6b314c26 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1147,6 +1147,7 @@ config CMD_FS_UUID
config CMD_JFFS2 bool "jffs2 command" + select FS_JFFS2 help Enables commands to support the JFFS2 (Journalling Flash File System version 2) filesystem. This enables fsload, ls and fsinfo which diff --git a/cmd/cramfs.c b/cmd/cramfs.c index 4e75de8f29..49ee36c74a 100644 --- a/cmd/cramfs.c +++ b/cmd/cramfs.c @@ -39,7 +39,7 @@ # define OFFSET_ADJUSTMENT (flash_info[id.num].start[0]) #endif
-#ifndef CONFIG_CMD_JFFS2 +#ifndef CONFIG_FS_JFFS2 #include <linux/stat.h> char *mkmodestr(unsigned long mode, char *str) { @@ -70,7 +70,7 @@ char *mkmodestr(unsigned long mode, char *str) str[10] = '\0'; return str; } -#endif /* CONFIG_CMD_JFFS2 */ +#endif /* CONFIG_FS_JFFS2 */
extern int cramfs_check (struct part_info *info); extern int cramfs_load (char *loadoffset, struct part_info *info, char *filename); diff --git a/doc/README.JFFS2 b/doc/README.JFFS2 index 604e5b9686..0245da0488 100644 --- a/doc/README.JFFS2 +++ b/doc/README.JFFS2 @@ -10,6 +10,9 @@ fsinfo - print information about file systems ls - list files in a directory chpart - change active partition
+If you do now need the commands, you can enable the filesystem separately +with CONFIG_FS_JFFS2 and call the jffs2 functions yourself. + If you boot from a partition which is mounted writable, and you update your boot environment by replacing single files on that partition, you should also define CONFIG_SYS_JFFS2_SORT_FRAGMENTS. Scanning diff --git a/fs/Makefile b/fs/Makefile index 5c90656ba1..5770f41c0b 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -16,7 +16,7 @@ obj-$(CONFIG_FS_CBFS) += cbfs/ obj-$(CONFIG_CMD_CRAMFS) += cramfs/ obj-$(CONFIG_FS_EXT4) += ext4/ obj-y += fat/ -obj-$(CONFIG_CMD_JFFS2) += jffs2/ +obj-$(CONFIG_FS_JFFS2) += jffs2/ obj-$(CONFIG_CMD_REISER) += reiserfs/ obj-$(CONFIG_SANDBOX) += sandbox/ obj-$(CONFIG_CMD_UBIFS) += ubifs/ diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig index e69de29bb2..1b9ecdd8cc 100644 --- a/fs/jffs2/Kconfig +++ b/fs/jffs2/Kconfig @@ -0,0 +1,7 @@ +config FS_JFFS2 + bool "Enable JFFS2 filesystem support" + help + This provides support for reading images from JFFS2 (Journalling + Flash File System version 2). JFFS2 is a log-structured file system + for use with flash memory devices. It supports raw NAND devices, + hard links and compression.
On Wed, May 17, 2017 at 03:25:38AM -0600, Simon Glass wrote:
Rather than using CMD_JFFS2 for both the filesystem and its command, we should have a separate option for each. This allows us to enable JFFS2 support without the command, if desired, which reduces U-Boot's size slightly.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_IRQ
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v3: None Changes in v2: - Add depends on !ARM && !MIPS && !SH - Enable for all PPC boards, and explicitly disable those that don't want it - Enable for microblaze
README | 1 - arch/Kconfig | 3 +++ cmd/Kconfig | 8 ++++++++ configs/TQM823L_LCD_defconfig | 1 + configs/TQM823L_defconfig | 1 + configs/TQM823M_defconfig | 1 + configs/TQM850L_defconfig | 1 + configs/TQM850M_defconfig | 1 + configs/TQM855L_defconfig | 1 + configs/TQM855M_defconfig | 1 + configs/TQM860L_defconfig | 1 + configs/TQM860M_defconfig | 1 + configs/TQM862L_defconfig | 1 + configs/TQM862M_defconfig | 1 + configs/TQM866M_defconfig | 1 + configs/TQM885D_defconfig | 1 + configs/TTTech_defconfig | 1 + configs/ac14xx_defconfig | 1 + configs/aria_defconfig | 1 + configs/mecp5123_defconfig | 1 + configs/mpc5121ads_defconfig | 1 + configs/mpc5121ads_rev2_defconfig | 1 + configs/pdm360ng_defconfig | 1 + configs/wtk_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/MIP405.h | 1 - include/configs/MPC8349ITX.h | 1 - include/configs/MPC8536DS.h | 2 -- include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1022DS.h | 1 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 1 - include/configs/PATI.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 2 -- include/configs/VOM405.h | 1 - include/configs/amcc-common.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cyrus.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 1 - include/configs/dlvision.h | 1 - include/configs/io.h | 1 - include/configs/iocon.h | 1 - include/configs/ipek01.h | 1 - include/configs/lwmon5.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/neo.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/qemu-ppce500.h | 1 - include/configs/t4qds.h | 1 - include/configs/v38b.h | 1 - include/configs/vct.h | 1 - include/configs/x86-common.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - scripts/config_whitelist.txt | 1 - 83 files changed, 32 insertions(+), 62 deletions(-)
diff --git a/README b/README index c493d72fad..8ced3abda2 100644 --- a/README +++ b/README @@ -852,7 +852,6 @@ The following options need to be configured: CONFIG_CMD_IMLS_NAND * List all images found in NAND flash CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env - CONFIG_CMD_IRQ * irqinfo CONFIG_CMD_ITEST Integer/string test of 2 values CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) diff --git a/arch/Kconfig b/arch/Kconfig index 2b194b3049..069f0f5f2c 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -34,6 +34,7 @@ config M68K config MICROBLAZE bool "MicroBlaze architecture" select SUPPORT_OF_CONTROL + imply CMD_IRQ
config MIPS bool "MIPS architecture" @@ -55,6 +56,7 @@ config PPC bool "PowerPC architecture" select HAVE_PRIVATE_LIBGCC select SUPPORT_OF_CONTROL + imply CMD_IRQ
config SANDBOX bool "Sandbox" @@ -91,6 +93,7 @@ config X86 imply CMD_FPGA_LOADMK imply CMD_GETTIME imply CMD_IO + imply CMD_IRQ
config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index be6b314c26..d875f9cf36 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1192,6 +1192,14 @@ config CMD_DIAG available tests and running either all the tests, or specific tests identified by name.
+config CMD_IRQ + bool "irq - Show information about interrupts" + depends on !ARM && !MIPS && !SH + help + This enables two commands: + + interrupts - enable or disable interrupts + irqinfo - print device-specific interrupt information endmenu
config CMD_UBI diff --git a/configs/TQM823L_LCD_defconfig b/configs/TQM823L_LCD_defconfig index ccb68b24c5..5c3fc9b83d 100644 --- a/configs/TQM823L_LCD_defconfig +++ b/configs/TQM823L_LCD_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/TQM823L_defconfig b/configs/TQM823L_defconfig index c588948e11..8c4c28ef54 100644 --- a/configs/TQM823L_defconfig +++ b/configs/TQM823L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM823M_defconfig b/configs/TQM823M_defconfig index 0490828504..d1a3a15c99 100644 --- a/configs/TQM823M_defconfig +++ b/configs/TQM823M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850L_defconfig b/configs/TQM850L_defconfig index 0e42d8c4fe..e3026bd374 100644 --- a/configs/TQM850L_defconfig +++ b/configs/TQM850L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM850M_defconfig b/configs/TQM850M_defconfig index a464fe507a..eda7e69fc9 100644 --- a/configs/TQM850M_defconfig +++ b/configs/TQM850M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855L_defconfig b/configs/TQM855L_defconfig index aa370012f5..203dd7cc27 100644 --- a/configs/TQM855L_defconfig +++ b/configs/TQM855L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM855M_defconfig b/configs/TQM855M_defconfig index faab826a24..f787a2768f 100644 --- a/configs/TQM855M_defconfig +++ b/configs/TQM855M_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860L_defconfig b/configs/TQM860L_defconfig index b18cf31ddd..fffdd08a3b 100644 --- a/configs/TQM860L_defconfig +++ b/configs/TQM860L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM860M_defconfig b/configs/TQM860M_defconfig index fe2fe6d38c..6003b8842a 100644 --- a/configs/TQM860M_defconfig +++ b/configs/TQM860M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862L_defconfig b/configs/TQM862L_defconfig index 6f5f772d32..a2abe6e487 100644 --- a/configs/TQM862L_defconfig +++ b/configs/TQM862L_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM862M_defconfig b/configs/TQM862M_defconfig index 44307760ee..8cdeb0ec85 100644 --- a/configs/TQM862M_defconfig +++ b/configs/TQM862M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM866M_defconfig b/configs/TQM866M_defconfig index d8922900d4..088cc3b33f 100644 --- a/configs/TQM866M_defconfig +++ b/configs/TQM866M_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TQM885D_defconfig b/configs/TQM885D_defconfig index 48421e3cfe..e4d98a3d36 100644 --- a/configs/TQM885D_defconfig +++ b/configs/TQM885D_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y CONFIG_LED_STATUS=y diff --git a/configs/TTTech_defconfig b/configs/TTTech_defconfig index 9d26e94615..caaaa5bcae 100644 --- a/configs/TTTech_defconfig +++ b/configs/TTTech_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/ac14xx_defconfig b/configs/ac14xx_defconfig index 6855331860..092c38ca36 100644 --- a/configs/ac14xx_defconfig +++ b/configs/ac14xx_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/aria_defconfig b/configs/aria_defconfig index 0613dd16fb..39dc563a83 100644 --- a/configs/aria_defconfig +++ b/configs/aria_defconfig @@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mecp5123_defconfig b/configs/mecp5123_defconfig index 3937fe8b44..919c75080b 100644 --- a/configs/mecp5123_defconfig +++ b/configs/mecp5123_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/mpc5121ads_defconfig b/configs/mpc5121ads_defconfig index 5bb78076ad..41bc5a4144 100644 --- a/configs/mpc5121ads_defconfig +++ b/configs/mpc5121ads_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/mpc5121ads_rev2_defconfig b/configs/mpc5121ads_rev2_defconfig index e28fa19227..6af4d46d7c 100644 --- a/configs/mpc5121ads_rev2_defconfig +++ b/configs/mpc5121ads_rev2_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_ISO_PARTITION=y # CONFIG_MMC is not set diff --git a/configs/pdm360ng_defconfig b/configs/pdm360ng_defconfig index 4ef0df1aa8..1ed47d2da8 100644 --- a/configs/pdm360ng_defconfig +++ b/configs/pdm360ng_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +# CONFIG_CMD_IRQ is not set # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y # CONFIG_PCI is not set diff --git a/configs/wtk_defconfig b/configs/wtk_defconfig index 2b81535c29..bea85df807 100644 --- a/configs/wtk_defconfig +++ b/configs/wtk_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_BMP=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_JFFS2=y +# CONFIG_CMD_IRQ is not set CONFIG_MAC_PARTITION=y CONFIG_DOS_PARTITION=y # CONFIG_MMC is not set diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 34f9167cfe..df21c1a483 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_KGDB /* kgdb */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 377b8998a4..6085724a65 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 65d8f126b2..5e81d18e8e 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -293,7 +293,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 59da85d0c9..9254442874 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -520,7 +520,6 @@ combinations. this should be removed later /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index eaa42545fc..f539cde5ba 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -436,7 +436,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 561ff894b3..6d2919ff55 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -46,7 +46,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index c444198778..ab4b060906 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -61,7 +61,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ
#define CONFIG_SUPPORT_VFAT
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index efab6457b3..b13809f88a 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 7cf27fa96d..46f09d6b60 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -478,7 +478,6 @@ boards, we say we have two, but don't display a message if we find only one. */ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_SDRAM
#if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 8375ead394..18b6b4e13e 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -589,8 +589,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c5d581589a..0f96ac0242 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -315,7 +315,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 4509a6d707..029aa572ce 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -342,7 +342,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b186e012d3..9b2f8364d5 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -348,7 +348,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index df50fa3cce..43e05516ab 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -461,7 +461,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 67093dfa31..96a125c323 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -340,7 +340,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 8170b9f17d..8d026addb3 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -354,7 +354,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 0bc71d4ae6..618d5377fc 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -355,7 +355,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 81d2d4f931..eb7db20b7f 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -448,7 +448,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 59f1cc7c8d..79e11bb6f8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -547,7 +547,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9c12c5d21a..0333ff9e08 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -724,7 +724,6 @@ extern unsigned long get_sdram_size(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 2d1564a835..3d12c84ce9 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 8821be3410..719043d5a1 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -241,7 +241,6 @@ extern unsigned long get_clock_freq(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#if defined(CONFIG_PCI) diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 92dcd2c418..17d8b228b4 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -580,7 +580,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 1b2cb3dd22..1f26ac4c2d 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,7 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_IRQ
#define CONFIG_BOOTCOMMAND "" /* autoboot command */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 029de2a1a9..393a02dd78 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -38,7 +38,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_SCSI #define CONFIG_CMD_SDRAM diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index ef20eee201..78ce91d089 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -55,7 +55,6 @@ * Command line configuration. */ #define CONFIG_CMD_PCI -#define CONFIG_CMD_IRQ #define CONFIG_CMD_NAND
#define CONFIG_SUPPORT_VFAT diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 2f05a5a176..a94e790b95 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,7 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI
#undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index d97ec0ef95..5449d2e5d7 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 99537d58e6..21c6dbbbcb 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 977b7b6d63..5ec1e23337 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -658,7 +658,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index fa691b5883..e8338ccfa6 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -771,7 +771,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 1ca13b595d..105e905960 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,7 +744,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index e2f1863bdc..38973cbdf3 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -272,7 +272,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 9cede19d4f..b2feccfd39 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -421,8 +421,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 5255b6d688..a180b381cf 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -53,7 +53,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index eca90cf750..450a2ebc11 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,7 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 40117b9a7f..3d59e98ea2 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -343,7 +343,6 @@
#ifndef CONFIG_TRAILBLAZER
-#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 64ae67e592..e88d09255f 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -593,7 +593,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 9210770d7b..a23da191ab 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -411,7 +411,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
#ifdef CONFIG_PCI diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 7800e81116..6710507a8d 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -85,7 +85,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SAVES diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 5597e27516..aa91bf5513 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ
/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index e5a8b3232d..ac0cd2c0db 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -55,7 +55,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ
/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/io.h b/include/configs/io.h index 767acf2773..98d2fb551d 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ
/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 0d81ac1b2f..e95cd70d71 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ
/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 485b989b4a..c6390dbdbe 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -88,7 +88,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ /* irqinfo */ #define CONFIG_CMD_PCI /* pciinfo */
#define CONFIG_SYS_LOWBOOT 1 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index f36ec3d3f8..8971096a98 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,7 +381,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 5ae3af9e38..9aa4945f49 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -168,7 +168,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL
#if defined(FLASH) diff --git a/include/configs/neo.h b/include/configs/neo.h index 609f7e17ee..345ee0c68a 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -57,7 +57,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_IRQ
/* * SDRAM configuration (please see cpu/ppc/sdram.[ch]) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 24f751c839..71b4f40921 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -813,7 +813,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index a6501520f5..fd644f22da 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -384,7 +384,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO
/* diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index ffd776f6bf..c26810723e 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -127,7 +127,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index f4f9a38b2c..260cdee001 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -241,7 +241,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ
#ifdef CONFIG_PCI #define CONFIG_CMD_PCI diff --git a/include/configs/v38b.h b/include/configs/v38b.h index c5c78bf54c..2bd6cc11ae 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,7 +73,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_SDRAM
#define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 07a5d49f3b..c5b96540ae 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -252,7 +252,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_IRQ #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_STRINGS diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index d8b3f1ad67..b5ef8b5c56 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -70,7 +70,6 @@ /*----------------------------------------------------------------------- * Command line configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI #define CONFIG_SCSI
diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index 68ae44bfa1..e8a0c1c33d 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
/*Cmd*/ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_MTDPARTS
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 8294001730..93afb2062f 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,7 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI
/* diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index b604019621..07f26544fd 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_IRQ #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e02eace1c0..f6bd39fc53 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_IRQ CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC
On Wed, May 17, 2017 at 03:25:39AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_IRQ
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_KGDB
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 1 - cmd/Kconfig | 9 +++++++++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/README b/README index 8ced3abda2..879ae8b33b 100644 --- a/README +++ b/README @@ -853,7 +853,6 @@ The following options need to be configured: CONFIG_CMD_IMPORTENV * import an environment CONFIG_CMD_INI * import data from an ini file into the env CONFIG_CMD_ITEST Integer/string test of 2 values - CONFIG_CMD_KGDB * kgdb CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration (169.254.*.*) diff --git a/cmd/Kconfig b/cmd/Kconfig index d875f9cf36..d691142c82 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1200,6 +1200,15 @@ config CMD_IRQ
interrupts - enable or disable interrupts irqinfo - print device-specific interrupt information + +config CMD_KGDB + bool "kgdb - Allow debugging of U-Boot with gdb" + help + This enables a 'kgdb' command which allows gdb to connect to U-Boot + over a serial link for debugging purposes. This allows + single-stepping, inspecting variables, etc. This is supported only + on PowerPC at present. + endmenu
config CMD_UBI diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index df21c1a483..b1f41abf4f 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */
-#define CONFIG_CMD_KGDB /* kgdb */ #define CONFIG_CMD_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_MTDPARTS /* mtd parts support */ #define CONFIG_CMD_NAND /* NAND support */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f6bd39fc53..1d529bdf2c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_KGDB CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957
On Wed, May 17, 2017 at 03:25:40AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_KGDB
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
include/configs/vct.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/vct.h b/include/configs/vct.h index c5b96540ae..7b04e65d70 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -252,7 +252,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO #undef CONFIG_CMD_STRINGS #undef CONFIG_CMD_TERMINAL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1d529bdf2c..6ea6f73f42 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_LOADY CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957 CONFIG_CMD_MEM
On Wed, May 17, 2017 at 03:25:41AM -0600, Simon Glass wrote:
This is not used in U-Boot. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_LZMA
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
README | 23 ----------------------- arch/Kconfig | 1 + configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/guruplug_defconfig | 1 + configs/ib62x0_defconfig | 1 + configs/iconnect_defconfig | 1 + configs/nsa310s_defconfig | 1 + configs/qemu_mips64_defconfig | 1 + configs/qemu_mips64el_defconfig | 1 + configs/qemu_mips_defconfig | 1 + configs/qemu_mipsel_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/tplink_wdr4300_defconfig | 1 + configs/zipitz2_defconfig | 1 + include/configs/ap121.h | 1 - include/configs/ap143.h | 1 - include/configs/ib62x0.h | 1 - include/configs/iconnect.h | 1 - include/configs/mv-plug-common.h | 1 - include/configs/nsa310s.h | 1 - include/configs/qemu-mips.h | 2 -- include/configs/qemu-mips64.h | 2 -- include/configs/sandbox.h | 1 - include/configs/tplink_wdr4300.h | 1 - include/configs/zipitz2.h | 1 - lib/Kconfig | 8 ++++++++ scripts/config_whitelist.txt | 1 - 28 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/README b/README index 879ae8b33b..3e4ec984b7 100644 --- a/README +++ b/README @@ -1723,29 +1723,6 @@ The following options need to be configured: the malloc area (as defined by CONFIG_SYS_MALLOC_LEN) should be at least 4MB.
- CONFIG_LZMA - - If this option is set, support for lzma compressed - images is included. - - Note: The LZMA algorithm adds between 2 and 4KB of code and it - requires an amount of dynamic memory that is given by the - formula: - - (1846 + 768 << (lc + lp)) * sizeof(uint16) - - Where lc and lp stand for, respectively, Literal context bits - and Literal pos bits. - - This value is upper-bounded by 14MB in the worst case. Anyway, - for a ~4MB large kernel image, we have lc=3 and lp=0 for a - total amount of (1846 + 768 << (3 + 0)) * 2 = ~41KB... that is - a very small buffer. - - Use the lzmainfo tool to determinate the lc and lp values and - then calculate the amount of needed dynamic memory (ensuring - the appropriate CONFIG_SYS_MALLOC_LEN value). - CONFIG_LZO
If this option is set, support for LZO compressed images diff --git a/arch/Kconfig b/arch/Kconfig index 069f0f5f2c..92bb53acf8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -73,6 +73,7 @@ config SANDBOX imply CMD_HASH imply CMD_IO imply CMD_IOTRACE + imply LZMA
config SH bool "SuperH architecture" diff --git a/configs/ap121_defconfig b/configs/ap121_defconfig index 2550aeecb7..40055f04d8 100644 --- a/configs/ap121_defconfig +++ b/configs/ap121_defconfig @@ -50,3 +50,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_AR933X_UART=y CONFIG_DM_SPI=y CONFIG_ATH79_SPI=y +CONFIG_LZMA=y diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index 0753221d7f..05f1699748 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -46,3 +46,4 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_ATH79_SPI=y +CONFIG_LZMA=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 361293af53..570819d3e5 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index a8107e264d..cc9011d05c 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -26,4 +26,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index 32994ec0cb..3e48380bc7 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -21,4 +21,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index 2ba87642b3..ae39818e4b 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -25,4 +25,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/qemu_mips64_defconfig b/configs/qemu_mips64_defconfig index 45513be56f..6835cf1c5c 100644 --- a/configs/qemu_mips64_defconfig +++ b/configs/qemu_mips64_defconfig @@ -15,3 +15,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mips64el_defconfig b/configs/qemu_mips64el_defconfig index 5f6ea3e2e7..60bd6164fc 100644 --- a/configs/qemu_mips64el_defconfig +++ b/configs/qemu_mips64el_defconfig @@ -16,3 +16,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mips_defconfig b/configs/qemu_mips_defconfig index b87b0c571c..c6f08b4efb 100644 --- a/configs/qemu_mips_defconfig +++ b/configs/qemu_mips_defconfig @@ -13,3 +13,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/qemu_mipsel_defconfig b/configs/qemu_mipsel_defconfig index 281cf667da..b8c206971d 100644 --- a/configs/qemu_mipsel_defconfig +++ b/configs/qemu_mipsel_defconfig @@ -14,3 +14,4 @@ CONFIG_CMD_FAT=y # CONFIG_ISO_PARTITION is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_LZMA=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 19acc7de3c..ac7217dcba 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -27,4 +27,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y diff --git a/configs/tplink_wdr4300_defconfig b/configs/tplink_wdr4300_defconfig index 3c7e6ff4ba..65314df133 100644 --- a/configs/tplink_wdr4300_defconfig +++ b/configs/tplink_wdr4300_defconfig @@ -45,3 +45,4 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y +CONFIG_LZMA=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 06e915c1dc..0b38f2b1af 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -19,5 +19,6 @@ CONFIG_PXA_SERIAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_LCD=y +CONFIG_LZMA=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 8ae3c77942..2284b8bc66 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -33,7 +33,6 @@ #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f650000" -#define CONFIG_LZMA
#define MTDIDS_DEFAULT "nor0=spi-flash.0" #define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \ diff --git a/include/configs/ap143.h b/include/configs/ap143.h index a2c31a2fd5..2950783097 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -37,7 +37,6 @@ #define CONFIG_BOOTCOMMAND "sf probe;" \ "mtdparts default;" \ "bootm 0x9f680000" -#define CONFIG_LZMA
#define MTDIDS_DEFAULT "nor0=spi-flash.0" #define MTDPARTS_DEFAULT "mtdparts=spi-flash.0:" \ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 0b92d7b2ca..a5782f3300 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -23,7 +23,6 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA
/* * Commands configuration diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index bb4eb7be7b..63e50606d7 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -25,7 +25,6 @@ * Compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA #define CONFIG_LZO
/* diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 90ad0a654b..a2f68ad70a 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -22,7 +22,6 @@ */ #ifdef CONFIG_SYS_MVFS #define CONFIG_BZIP2 -#define CONFIG_LZMA #endif /* CONFIG_SYS_MVFS */
/* diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 9b99b0e44f..bc67270af7 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -21,7 +21,6 @@
/* compression configuration */ #define CONFIG_BZIP2 -#define CONFIG_LZMA
/* commands configuration */ #define CONFIG_SYS_MVFS diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index aeaf88a686..abdc93c7d2 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -121,6 +121,4 @@
#define MEM_SIZE 128
-#define CONFIG_LZMA - #endif /* __CONFIG_H */ diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index d201c848ff..f1e096fddd 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -121,6 +121,4 @@
#define MEM_SIZE 128
-#define CONFIG_LZMA - #endif /* __CONFIG_H */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index d640949dd9..5a04ce98e7 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -153,7 +153,6 @@ #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2 #define CONFIG_LZO -#define CONFIG_LZMA
#define CONFIG_CMD_LZMADEC
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index d39dd92198..fc99dbd91e 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -36,7 +36,6 @@ "console=ttyS0,115200 root=/dev/mtdblock2 rootfstype=squashfs" #define CONFIG_BOOTCOMMAND \ "dhcp 192.168.1.1:wdr4300.fit && bootm $loadaddr" -#define CONFIG_LZMA
#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x10000 diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 8a745e5097..9b3769b5f1 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -42,7 +42,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SYS_TEXT_BASE 0x0 -#define CONFIG_LZMA /* LZMA compression support */
/* * Serial Console Configuration diff --git a/lib/Kconfig b/lib/Kconfig index db0915153c..09670f031c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -148,6 +148,14 @@ config LZ4 frame format currently (2015) implemented in the Linux kernel (generated by 'lz4 -l'). The two formats are incompatible.
+config LZMA + bool "Enable LZMA decompression support" + help + This enables support for LZMA (Lempel-Ziv-Markov chain algorithm), + a dictionary compression algorithm that provides a high compression + ratio and fairly fast decompression speed. See also + CONFIG_CMD_LZMADEC which provides a decode command. + config LZO bool endmenu diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6ea6f73f42..79e6161d4d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1576,7 +1576,6 @@ CONFIG_LUAN CONFIG_LWMON5 CONFIG_LXT971_NO_SLEEP CONFIG_LYNXKDI -CONFIG_LZMA CONFIG_M41T94_SPI_CS CONFIG_M520x CONFIG_M52277EVB
On Wed, May 17, 2017 at 03:25:42AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_LZMA
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
This converts the following to Kconfig: CONFIG_CMD_LZMADEC
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/Kconfig | 1 + cmd/Kconfig | 11 +++++++++++ cmd/Makefile | 2 -- include/configs/sandbox.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index 92bb53acf8..dfc4659648 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -74,6 +74,7 @@ config SANDBOX imply CMD_IO imply CMD_IOTRACE imply LZMA + imply CMD_LZMADEC
config SH bool "SuperH architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index d691142c82..1e70ac4ecc 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -438,6 +438,17 @@ config CMD_MEMINFO help Display memory information.
+endmenu + +menu "Compression commands" + +config CMD_LZMADEC + bool "lzmadec" + select LZMA + help + Support decompressing an LZMA (Lempel-Ziv-Markov chain algorithm) + image from memory. + config CMD_UNZIP bool "unzip" help diff --git a/cmd/Makefile b/cmd/Makefile index 1293d24e39..9ea56e9977 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -127,9 +127,7 @@ obj-$(CONFIG_CMD_UBI) += ubi.o obj-$(CONFIG_CMD_UBIFS) += ubifs.o obj-$(CONFIG_CMD_UNIVERSE) += universe.o obj-$(CONFIG_CMD_UNZIP) += unzip.o -ifdef CONFIG_LZMA obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o -endif
obj-$(CONFIG_CMD_USB) += usb.o disk.o obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5a04ce98e7..1a7e5a3210 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -154,8 +154,6 @@ #define CONFIG_BZIP2 #define CONFIG_LZO
-#define CONFIG_CMD_LZMADEC - #ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_ATA_IDE0_OFFSET 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 79e6161d4d..8a58bfeecc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,7 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957 CONFIG_CMD_MEM CONFIG_CMD_MFSL
On Wed, May 17, 2017 at 03:25:43AM -0600, Simon Glass wrote:
This converts the following to Kconfig: CONFIG_CMD_LZMADEC
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
Enable this option by default on sandbox to increase build coverage.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: - Add new patch to enable CMD_GETTIME on sandbox
arch/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/Kconfig b/arch/Kconfig index dfc4659648..12fa614e81 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -70,6 +70,7 @@ config SANDBOX select DM_SPI select DM_GPIO select DM_MMC + imply CMD_GETTIME imply CMD_HASH imply CMD_IO imply CMD_IOTRACE
On Wed, May 17, 2017 at 03:25:44AM -0600, Simon Glass wrote:
Enable this option by default on sandbox to increase build coverage.
Signed-off-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (2)
-
Simon Glass -
Tom Rini