Rsync all defconfig files using moveconfig.py

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Add new patch to resync with savedefconfig

configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/Bananapi_M2_Ultra_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +- configs/Itead_Ibox_A20_defconfig | 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 3 --- configs/MPC8544DS_defconfig | 2 +- configs/MPC8610HPCD_defconfig | 2 +- configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/cm_t54_defconfig | 2 +- configs/controlcenterdc_defconfig | 2 +- configs/db-88f6820-gp_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/highbank_defconfig | 2 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 9 +-------- configs/ls1021atwr_nor_defconfig | 9 +-------- configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 9 +-------- configs/ls1021atwr_sdcard_ifc_defconfig | 9 +-------- configs/ls1021atwr_sdcard_qspi_defconfig | 9 +-------- configs/ls1043ardb_SECURE_BOOT_defconfig | 9 +-------- configs/ls1043ardb_defconfig | 9 +-------- configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 9 +-------- configs/ls1043ardb_sdcard_defconfig | 9 +-------- configs/ls1046aqds_SECURE_BOOT_defconfig | 2 +- configs/ls1046aqds_defconfig | 2 +- configs/ls1046aqds_lpuart_defconfig | 2 +- configs/ls1046aqds_nand_defconfig | 2 +- configs/ls1046aqds_qspi_defconfig | 2 +- configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- configs/ls1046aqds_sdcard_qspi_defconfig | 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 10 ++-------- configs/ls1046ardb_qspi_defconfig | 10 ++-------- configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 10 ++-------- configs/ls1046ardb_sdcard_defconfig | 10 ++-------- configs/ls2080ardb_defconfig | 1 - configs/ls2081ardb_defconfig | 2 +- configs/ls2088ardb_qspi_defconfig | 1 - configs/ms7720se_defconfig | 2 +- configs/omap5_uevm_defconfig | 2 +- configs/r8a7795_salvator-x_defconfig | 4 ++-- configs/r8a7796_salvator-x_defconfig | 4 ++-- configs/xilinx_zynqmp_ep_defconfig | 4 ++-- configs/xilinx_zynqmp_zcu102_revA_defconfig | 4 ++-- configs/xilinx_zynqmp_zcu102_revB_defconfig | 4 ++-- 61 files changed, 67 insertions(+), 159 deletions(-)

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 914302276f..d76ddcf811 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -18,8 +18,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_SUN4I_EMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index f7b600be5b..e83ff82984 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -20,13 +20,13 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_SCSI=y CONFIG_DFU_RAM=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index 182a8f5f74..1bc0b7fbb9 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -16,9 +16,9 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index ae98e41685..009c4aa7e2 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -19,9 +19,9 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig index 61fe5e6390..c2fe2d234f 100644 --- a/configs/A20-Olimex-SOM-EVB_defconfig +++ b/configs/A20-Olimex-SOM-EVB_defconfig @@ -20,10 +20,10 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Bananapi_M2_Ultra_defconfig b/configs/Bananapi_M2_Ultra_defconfig index 8c409faab8..a35d4bfd89 100644 --- a/configs/Bananapi_M2_Ultra_defconfig +++ b/configs/Bananapi_M2_Ultra_defconfig @@ -14,6 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set -CONFIG_SCSI=y CONFIG_AXP_DLDO4_VOLT=2500 CONFIG_AXP_ELDO3_VOLT=1200 +CONFIG_SCSI=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 352a18ec8c..4e8e1e1a1f 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -17,8 +17,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_NETCONSOLE=y -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index 4218d5a97a..214c0d85f0 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -19,9 +19,9 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_NETCONSOLE=y -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y CONFIG_AXP_ALDO4_VOLT=2500 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index dc2722a9bf..0a0f95d6fb 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index f83a691a26..a15c831a8a 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -15,6 +15,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_SUN4I_EMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index cbd535c2bc..648eef1e72 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -22,11 +22,11 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_SCSI=y CONFIG_DFU_RAM=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig index bab25b401c..6e6f5b2aaf 100644 --- a/configs/Itead_Ibox_A20_defconfig +++ b/configs/Itead_Ibox_A20_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig index 2ec0847e8a..65ccb6420c 100644 --- a/configs/Lamobo_R1_defconfig +++ b/configs/Lamobo_R1_defconfig @@ -17,8 +17,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig index 1e61cd20ba..c6682b8f79 100644 --- a/configs/Linksprite_pcDuino3_Nano_defconfig +++ b/configs/Linksprite_pcDuino3_Nano_defconfig @@ -17,8 +17,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index f0d382c002..fb81bad00f 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -15,10 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -# CONFIG_SPL_BLK is not set CONFIG_DM_MMC=y -# CONFIG_SPL_DM_MMC is not set -# CONFIG_SPL_DM_MMC_OPS is not set CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y CONFIG_SCSI=y diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig index 8142cf267e..3e75be96b9 100644 --- a/configs/MPC8544DS_defconfig +++ b/configs/MPC8544DS_defconfig @@ -16,12 +16,12 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y # CONFIG_CMD_HASH is not set CONFIG_CMD_EXT2=y -CONFIG_SCSI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_RTL8139=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/MPC8610HPCD_defconfig b/configs/MPC8610HPCD_defconfig index 6aef6d8434..57d8583fd1 100644 --- a/configs/MPC8610HPCD_defconfig +++ b/configs/MPC8610HPCD_defconfig @@ -15,9 +15,9 @@ CONFIG_CMD_PING=y CONFIG_CMD_BMP=y CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y -CONFIG_SCSI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_KEYBOARD=y diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig index 516a16f73e..015b4d5814 100644 --- a/configs/Marsboard_A10_defconfig +++ b/configs/Marsboard_A10_defconfig @@ -11,7 +11,7 @@ CONFIG_SPL=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_SUN4I_EMAC=y CONFIG_SUNXI_NO_PMIC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index 0c9e8d1693..1ca92e0972 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -15,6 +15,6 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_SUN4I_EMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index 400a16505a..d316c75c83 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -16,7 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index ed3e6786c6..5602d3c8e2 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -19,8 +19,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index 56f405ceed..5808d5df1b 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -21,8 +21,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig index 2a2f26d38f..5ee19bca1a 100644 --- a/configs/Wits_Pro_A20_DKT_defconfig +++ b/configs/Wits_Pro_A20_DKT_defconfig @@ -19,8 +19,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_SUN7I_GMAC=y +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig index ff811be04b..4aed572cf6 100644 --- a/configs/cm_t54_defconfig +++ b/configs/cm_t54_defconfig @@ -39,8 +39,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y -CONFIG_SCSI=y CONFIG_MMC_OMAP_HS=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 62c6546c20..af79b6c120 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -35,7 +35,6 @@ CONFIG_CMD_EXT4=y CONFIG_EFI_PARTITION=y CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y -CONFIG_SCSI=y CONFIG_DM_GPIO=y CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y @@ -46,6 +45,7 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SCSI=y CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 5f072c5e67..6c6083d328 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -38,7 +38,6 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y -CONFIG_SCSI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_MV=y @@ -46,6 +45,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PCI=y +CONFIG_SCSI=y CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 6987c35a4e..56effa08d0 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -46,7 +46,6 @@ CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_SPL_OF_TRANSLATE=y -CONFIG_DM_SCSI=y CONFIG_DWC_AHCI=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y @@ -70,6 +69,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_REGULATOR_PALMAS=y CONFIG_DM_REGULATOR_LP873X=y +CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 72c43f8954..5b1d3fb658 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -49,7 +49,6 @@ CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y -CONFIG_DM_SCSI=y CONFIG_DWC_AHCI=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y @@ -73,6 +72,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_REGULATOR_PALMAS=y CONFIG_DM_REGULATOR_LP873X=y +CONFIG_DM_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig index 3ed037ba11..d905b0f32b 100644 --- a/configs/highbank_defconfig +++ b/configs/highbank_defconfig @@ -24,6 +24,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set -CONFIG_SCSI=y # CONFIG_MMC is not set +CONFIG_SCSI=y CONFIG_OF_LIBFDT=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index d7ddd812a3..60000b376b 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_SCSI=y # CONFIG_BLK is not set CONFIG_DM_MMC=y # CONFIG_DM_MMC_OPS is not set @@ -43,6 +42,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig index c8cb2153bf..2d206e1947 100644 --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_LS1021ATWR=y CONFIG_SECURE_BOOT=y CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -12,8 +13,6 @@ CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMINFO=y @@ -22,12 +21,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_MTD_NOR_FLASH=y @@ -46,4 +40,3 @@ CONFIG_VIDEO_FSL_DCU_FB=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_RSA=y CONFIG_SPL_RSA=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 29d6ea19a6..60f0830562 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_TARGET_LS1021ATWR=y CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y @@ -11,8 +12,6 @@ CONFIG_BOOTDELAY=3 CONFIG_SILENT_CONSOLE=y # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMINFO=y @@ -21,12 +20,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y @@ -45,4 +39,3 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_FSL_DCU_FB=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 8689fa7336..4722d36b3d 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y @@ -26,8 +27,6 @@ CONFIG_SPL_HASH_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMINFO=y @@ -35,12 +34,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -61,4 +55,3 @@ CONFIG_VIDEO_FSL_DCU_FB=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_RSA=y CONFIG_SPL_RSA=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig index 8647365276..ba62b12741 100644 --- a/configs/ls1021atwr_sdcard_ifc_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y @@ -24,8 +25,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMINFO=y @@ -33,12 +32,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -57,4 +51,3 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_FSL_DCU_FB=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig index b254f3b909..08bd32a9c2 100644 --- a/configs/ls1021atwr_sdcard_qspi_defconfig +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y @@ -24,8 +25,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_MEMTEST=y @@ -35,12 +34,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_BMP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -64,4 +58,3 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_VIDEO_FSL_DCU_FB=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index c7077fc809..fd37f5909b 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -3,23 +3,17 @@ CONFIG_TARGET_LS1043ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PXE=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_MTD_NOR_FLASH=y @@ -40,4 +34,3 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index a551867ef2..7fe5a13a71 100644 --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@ -2,24 +2,18 @@ CONFIG_ARM=y CONFIG_TARGET_LS1043ARDB=y CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PXE=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y @@ -38,4 +32,3 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index a96cc56832..f939b859af 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" @@ -21,20 +22,13 @@ CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y -CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PXE=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -56,4 +50,3 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index 1b18179d43..0460fddd25 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" @@ -20,20 +21,13 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xf0 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y -CONFIG_HUSH_PARSER=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PXE=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -53,4 +47,3 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046aqds_SECURE_BOOT_defconfig b/configs/ls1046aqds_SECURE_BOOT_defconfig index 08637e236f..8581fb99d0 100644 --- a/configs/ls1046aqds_SECURE_BOOT_defconfig +++ b/configs/ls1046aqds_SECURE_BOOT_defconfig @@ -16,13 +16,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/ls1046aqds_defconfig b/configs/ls1046aqds_defconfig index 94d0ea90ae..eaf35f2543 100644 --- a/configs/ls1046aqds_defconfig +++ b/configs/ls1046aqds_defconfig @@ -16,13 +16,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y diff --git a/configs/ls1046aqds_lpuart_defconfig b/configs/ls1046aqds_lpuart_defconfig index 6fc5d6edb8..7c7975355f 100644 --- a/configs/ls1046aqds_lpuart_defconfig +++ b/configs/ls1046aqds_lpuart_defconfig @@ -17,13 +17,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y diff --git a/configs/ls1046aqds_nand_defconfig b/configs/ls1046aqds_nand_defconfig index 802c69c0ad..7fa956b8bc 100644 --- a/configs/ls1046aqds_nand_defconfig +++ b/configs/ls1046aqds_nand_defconfig @@ -22,13 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y diff --git a/configs/ls1046aqds_qspi_defconfig b/configs/ls1046aqds_qspi_defconfig index c47be08437..4244396f3d 100644 --- a/configs/ls1046aqds_qspi_defconfig +++ b/configs/ls1046aqds_qspi_defconfig @@ -17,13 +17,13 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y diff --git a/configs/ls1046aqds_sdcard_ifc_defconfig b/configs/ls1046aqds_sdcard_ifc_defconfig index f93854ac8f..3c4b6359fd 100644 --- a/configs/ls1046aqds_sdcard_ifc_defconfig +++ b/configs/ls1046aqds_sdcard_ifc_defconfig @@ -22,13 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig index 62a9b2eaaf..8af81c0f85 100644 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@ -22,13 +22,13 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y diff --git a/configs/ls1046ardb_emmc_defconfig b/configs/ls1046ardb_emmc_defconfig index a315ac1b24..29c55733d7 100644 --- a/configs/ls1046ardb_emmc_defconfig +++ b/configs/ls1046ardb_emmc_defconfig @@ -19,13 +19,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y -CONFIG_CMD_USB=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig index 6d40587eee..2ed55547f3 100644 --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@ -4,24 +4,19 @@ CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_SPI_FLASH=y @@ -37,4 +32,3 @@ CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_RSA=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index 1dc74debe7..bb5f3b007e 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -3,25 +3,20 @@ CONFIG_TARGET_LS1046ARDB=y CONFIG_FSL_LS_PPA=y CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_QSPI_BOOT=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTDELAY=10 -CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_FSL_CAAM=y @@ -37,4 +32,3 @@ CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index 9fdc4379cc..419c2289db 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_LS1046ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" @@ -13,20 +14,14 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y -CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -45,4 +40,3 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_RSA=y CONFIG_SPL_RSA=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig index 16cb8f1f00..48b0b43df5 100644 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@ -3,6 +3,7 @@ CONFIG_TARGET_LS1046ARDB=y CONFIG_FSL_LS_PPA=y CONFIG_SPL_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL" @@ -13,20 +14,14 @@ CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 -CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_DM=y @@ -43,4 +38,3 @@ CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index fe4bb27992..da77d60f52 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -40,4 +40,3 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls2081ardb_defconfig b/configs/ls2081ardb_defconfig index 21fce98af7..7fcfdd4b6e 100644 --- a/configs/ls2081ardb_defconfig +++ b/configs/ls2081ardb_defconfig @@ -22,7 +22,6 @@ CONFIG_CMD_CACHE=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_SCSI=y CONFIG_FSL_CAAM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y @@ -31,6 +30,7 @@ CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y diff --git a/configs/ls2088ardb_qspi_defconfig b/configs/ls2088ardb_qspi_defconfig index 4addbaf7df..3a022330e2 100644 --- a/configs/ls2088ardb_qspi_defconfig +++ b/configs/ls2088ardb_qspi_defconfig @@ -40,4 +40,3 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y -CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 7f137fa911..dd95a236bb 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -26,5 +26,5 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y CONFIG_MTD_NOR_FLASH=y -CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_SCIF_CONSOLE=y +CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index d13d11c8b1..635bdf7e13 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -33,10 +33,10 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y -CONFIG_SCSI=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y +CONFIG_SCSI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 1a11099e0c..98eca37710 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -3,9 +3,9 @@ CONFIG_ARCH_RMOBILE=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y -CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x" CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -15,8 +15,8 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_OF_CONTROL=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y CONFIG_SH_SDHI=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 2c8e7ddb99..9e0f9290bf 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -4,9 +4,9 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y -CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x" CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -16,8 +16,8 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_OF_CONTROL=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y CONFIG_SH_SDHI=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index d3ae3ec57a..b696c6272f 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -47,8 +47,6 @@ CONFIG_OF_EMBED=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SATA_CEVA=y CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y @@ -64,6 +62,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=25000000 diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index fc14459d3c..0ef0ba5341 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -40,8 +40,6 @@ CONFIG_OF_EMBED=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SATA_CEVA=y CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y @@ -57,6 +55,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000 diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index bc9b14e2fb..87be093cc2 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -40,8 +40,6 @@ CONFIG_OF_EMBED=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SATA_CEVA=y CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y @@ -57,6 +55,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000

This converts the following to Kconfig: CONFIG_CMD_MAX6957

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

board/work-microwave/work_92105/Kconfig | 7 +++++++ configs/work_92105_defconfig | 1 + include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/board/work-microwave/work_92105/Kconfig b/board/work-microwave/work_92105/Kconfig index 1fde4b29aa..4bc34ed01f 100644 --- a/board/work-microwave/work_92105/Kconfig +++ b/board/work-microwave/work_92105/Kconfig @@ -17,4 +17,11 @@ config CMD_HD44760 help This controls the LCD driver.

+config CMD_MAX6957 + bool "Enable 'max6957aax' PMIC command" + help + DEPRECATED: Needs conversion to driver model. + + This allows PMIC registers to be read and written. + endif diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index ba2474c3a9..1765aa565a 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_CMD_HD44760=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_CMD_MAX6957=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 0ac7b85f4b..5c1af5f2a1 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -131,7 +131,6 @@

#define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 100000 -#define CONFIG_CMD_MAX6957 /* * Environment */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3b5c17a982..9bb398c240 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MAX6957 CONFIG_CMD_MEM CONFIG_CMD_MFSL CONFIG_CMD_MMC_SPI

These are currently not quite in alphabetical order. Before adding more, sort them.

Signed-off-by: Simon Glass sjg@chromium.org Suggested-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: - Add new patch to sort the device-access commands

cmd/Kconfig | 244 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 122 insertions(+), 122 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index f18efc1e88..d9a35b81a7 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -483,6 +483,12 @@ endmenu

menu "Device access commands"

+config CMD_ARMFLASH + #depends on FLASH_CFI_DRIVER + bool "armflash" + help + ARM Ltd reference designs flash partition access + config CMD_CLK bool "clk - Show clock frequencies" help @@ -492,6 +498,25 @@ config CMD_CLK clock values from associated drivers. However currently no command exists for this.

+config CMD_DEMO + bool "demo - Demonstration commands for driver model" + depends on DM + help + Provides a 'demo' command which can be used to play around with + driver model. To use this properly you will need to enable one or + both of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE). + Otherwise you will always get an empty list of devices. The demo + devices are defined in the sandbox device tree, so the easiest + option is to use sandbox and pass the -d point to sandbox's + u-boot.dtb file. + +config CMD_DFU + bool "dfu" + select USB_FUNCTION_DFU + help + Enables the command "dfu" which is used to have U-Boot create a DFU + class device via USB. + config CMD_DM bool "dm - Access to driver model information" depends on DM @@ -503,17 +528,80 @@ config CMD_DM can be useful to see the state of driver model for debugging or interest.

-config CMD_DEMO - bool "demo - Demonstration commands for driver model" - depends on DM +config CMD_FDC + bool "fdcboot - Boot from floppy device" help - Provides a 'demo' command which can be used to play around with - driver model. To use this properly you will need to enable one or - both of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE). - Otherwise you will always get an empty list of devices. The demo - devices are defined in the sandbox device tree, so the easiest - option is to use sandbox and pass the -d point to sandbox's - u-boot.dtb file. + The 'fdtboot' command allows booting an image from a floppy disk. + +config CMD_FLASH + bool "flinfo, erase, protect" + default y + help + NOR flash support. + flinfo - print FLASH memory information + erase - FLASH memory + protect - enable or disable FLASH write protection + +config CMD_FPGA + bool "fpga" + default y + 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 + (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_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_GPIO + bool "gpio" + help + GPIO support. + +config CMD_GPT + bool "GPT (GUID Partition Table) command" + select PARTITION_UUIDS + select EFI_PARTITION + help + Enable the 'gpt' command to ready and write GPT style partition + tables.

config CMD_IDE bool "ide - Support for IDE drivers" @@ -566,6 +654,11 @@ config CMD_IOTRACE might be useful to enhance tracing to only checksum the accesses and not the data read/written.

+config CMD_I2C + bool "i2c" + help + I2C support. + config CMD_LOADB bool "loadb" default y @@ -578,29 +671,6 @@ config CMD_LOADS help Load an S-Record file over serial line

-config CMD_FLASH - bool "flinfo, erase, protect" - default y - help - NOR flash support. - flinfo - print FLASH memory information - erase - FLASH memory - protect - enable or disable FLASH write protection - -config CMD_GPT - bool "GPT (GUID Partition Table) command" - select PARTITION_UUIDS - select EFI_PARTITION - help - Enable the 'gpt' command to ready and write GPT style partition - tables. - -config CMD_ARMFLASH - #depends on FLASH_CFI_DRIVER - bool "armflash" - help - ARM Ltd reference designs flash partition access - config CMD_MMC bool "mmc" help @@ -638,6 +708,25 @@ config CMD_PART Read and display information about the partition table on various media.

+config CMD_REMOTEPROC + bool "remoteproc" + depends on REMOTEPROC + help + Support for Remote Processor control + +config CMD_SATA + bool "sata - Access SATA subsystem" + select SATA + help + SATA (Serial Advanced Technology Attachment) is a serial bus + standard for connecting to hard drives and other storage devices. + This command provides information about attached devices and allows + reading, writing and other operations. + + SATA replaces PATA (originally just ATA), which stands for Parallel AT + Attachment, where AT refers to an IBM AT (Advanced Technology) + computer released in 1984. + config CMD_SF bool "sf" help @@ -648,105 +737,16 @@ config CMD_SPI help SPI utility command.

-config CMD_I2C - bool "i2c" - help - I2C support. - config CMD_USB bool "usb" help USB support.

-config CMD_DFU - bool "dfu" - select USB_FUNCTION_DFU - help - Enables the command "dfu" which is used to have U-Boot create a DFU - class device via USB. - config CMD_USB_MASS_STORAGE bool "UMS usb mass storage" help USB mass storage support

-config CMD_FPGA - bool "fpga" - default y - 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 - (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_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 - help - Support for Remote Processor control - -config CMD_GPIO - bool "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. - -config CMD_SATA - bool "sata - Access SATA subsystem" - select SATA - help - SATA (Serial Advanced Technology Attachment) is a serial bus - standard for connecting to hard drives and other storage devices. - This command provides information about attached devices and allows - reading, writing and other operations. - - SATA replaces PATA (originally just ATA), which stands for Parallel AT - Attachment, where AT refers to an IBM AT (Advanced Technology) - computer released in 1984. - endmenu

This converts the following to Kconfig: CONFIG_CMD_MMC_SPI

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: - Sort Kconfig options in alphabetical order

README | 1 - cmd/Kconfig | 9 +++++++++ configs/UCP1020_SPIFLASH_defconfig | 1 + configs/UCP1020_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/UCP1020.h | 1 - include/configs/am335x_shc.h | 1 - include/configs/microblaze-generic.h | 1 - scripts/config_whitelist.txt | 2 -- 10 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README b/README index ad83a81da9..8d635a1aaf 100644 --- a/README +++ b/README @@ -836,7 +836,6 @@ The following options need to be configured: CONFIG_CMD_TIMER * access to the system tick timer CONFIG_CMD_USB * USB support CONFIG_CMD_CDP * Cisco Discover Protocol support - CONFIG_CMD_MFSL * Microblaze FSL support CONFIG_CMD_XIMG Load part of Multi Image CONFIG_CMD_UUID * Generate random UUID or GUID string

diff --git a/cmd/Kconfig b/cmd/Kconfig index d9a35b81a7..4b63efe80c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -701,6 +701,15 @@ config CMD_NAND_TORTURE

endif # CMD_NAND

+config CMD_MMC_SPI + bool "mmc_spi - Set up MMC SPI device" + help + Provides a way to set up an MMC (Multimedia Card) SPI (Serial + Peripheral Interface) device. The device provides a means of + accessing an MMC device via SPI using a single data line, limited + to 20MHz. It is useful since it reduces the amount of protocol code + required. + config CMD_PART bool "part" select PARTITION_UUIDS diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig index 686137dc98..e871d6fdfc 100644 --- a/configs/UCP1020_SPIFLASH_defconfig +++ b/configs/UCP1020_SPIFLASH_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index be0029673b..13af8626e7 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 3d84cf24aa..f97459e6a8 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MFSL=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index e6ebc2f57d..b3c0d0e71f 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_MFSL /* FSL support for Microblaze */ #define CONFIG_CMD_ONENAND /* OneNAND support */ #define CONFIG_CMD_PCI /* pciinfo */ #define CONFIG_CMD_PCMCIA /* PCMCIA support */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa4712..eea518df21 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -437,7 +437,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_MMC_SPI -#define CONFIG_CMD_MMC_SPI #endif

/* Misc Extra Settings */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f3b7767a97..d21240c23c 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -19,7 +19,6 @@ #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_CMD_EXT4 #undef CONFIG_CMD_EXT4_WRITE -#undef CONFIG_CMD_MMC_SPI #undef CONFIG_CMD_SPI

#define CONFIG_CMD_CACHE diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa007e2819..fb0575fa4d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -163,7 +163,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_MFSL

#if defined(FLASH) # if !defined(RAMENV) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b5662a9fd6..60d13dfbba 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,8 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MFSL -CONFIG_CMD_MMC_SPI CONFIG_CMD_MTDPARTS_SPREAD CONFIG_CMD_ONENAND CONFIG_CMD_PCA953X

This converts the following to Kconfig: CONFIG_CMD_ONENAND

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 8 ++++++++ configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/smdkc100_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 + include/config_cmd_all.h | 1 - include/configs/exynos4-common.h | 2 -- include/configs/nokia_rx51.h | 6 ------ include/configs/omap3_igep00x0.h | 2 -- include/configs/s5p_goni.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/vct.h | 4 ---- scripts/config_whitelist.txt | 1 - 20 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 27b970975e..cbe4744272 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -710,6 +710,14 @@ config CMD_MMC_SPI to 20MHz. It is useful since it reduces the amount of protocol code required.

+config CMD_ONENAND + bool "onenand - access to onenand device" + help + OneNAND is a brand of NAND ('Not AND' gate) flash which provides + various useful features. This command allows reading, writing, + and erasing blocks. It allso provides a way to show and change + bad blocks, and test the device. + config CMD_PART bool "part" select PARTITION_UUIDS diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 8ca5a84ec5..2375f861f1 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 8af6dd53d0..03da20162b 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index dd433309f9..fb8c925113 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 9c66a1826d..0045f5e63e 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Goni # " # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_DFU=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index ef8510d47d..82ba51c00d 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SMDKC100 # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 4c1615c537..4c242e8786 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 20c0863b7b..845833c073 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index dfb8f04ce7..2a726144e9 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index de7b500f80..e2f68eb1ea 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_premium_onenand_defconfig b/configs/vct_premium_onenand_defconfig index ba43e0e00a..39be742c5c 100644 --- a/configs/vct_premium_onenand_defconfig +++ b/configs/vct_premium_onenand_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index cc9998f391..6e3a420a14 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index b3c0d0e71f..c61951bb22 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_ONENAND /* OneNAND support */ #define CONFIG_CMD_PCI /* pciinfo */ #define CONFIG_CMD_PCMCIA /* PCMCIA support */ #define CONFIG_CMD_PORTIO /* Port I/O */ diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index c995f35b73..9f0131a7ee 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -20,8 +20,6 @@ /* SD/MMC configuration */ #define CONFIG_MMC_DEFAULT_DEV 0

-#undef CONFIG_CMD_ONENAND - /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 982651462d..2767f882e4 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -102,12 +102,6 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */

-#ifdef ONENAND_SUPPORT - -#define CONFIG_CMD_ONENAND /* ONENAND support */ - -#endif - #define CONFIG_OMAP3_SPI #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 39f1e54544..35d46dc949 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -52,8 +52,6 @@ #define CONFIG_USBD_MANUFACTURER "Texas Instruments" #define CONFIG_USBD_PRODUCT_NAME "IGEP"

-#define CONFIG_CMD_ONENAND - #ifndef CONFIG_SPL_BUILD

/* Environment */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 9c00138508..eb17580865 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -51,8 +51,6 @@ /* PWM */ #define CONFIG_PWM 1

-#define CONFIG_CMD_ONENAND - /* USB Composite download gadget - g_dnl */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 3e3575438a..58abac5eef 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -59,8 +59,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#define CONFIG_CMD_ONENAND - #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS

diff --git a/include/configs/vct.h b/include/configs/vct.h index 2cb4ab149c..e3c3b0e71f 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -105,10 +105,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ #endif /* CONFIG_CMD_USB */

-#if defined(CONFIG_VCT_ONENAND) -#define CONFIG_CMD_ONENAND -#endif - /* * BOOTP options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b366dc0f39..67ad3b846c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ONENAND CONFIG_CMD_PCA953X CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI

It does not seem worth having an option to enable another sub-command in this legacy driver. Drop this option so that the sub-command is always available.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

README | 1 - drivers/gpio/pca953x.c | 8 -------- include/configs/cl-som-am57x.h | 1 - include/configs/cm_t335.h | 1 - include/configs/ot1200.h | 1 - include/configs/snapper9260.h | 3 --- include/configs/strider.h | 1 - include/configs/xilinx_zynqmp_zcu102.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 - 13 files changed, 22 deletions(-)

diff --git a/README b/README index 5f916c8d8e..addbf306f1 100644 --- a/README +++ b/README @@ -812,7 +812,6 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NET bootp, tftpboot, rarpboot CONFIG_CMD_NFS NFS support - CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 238e02805c..d1c1ae1411 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -143,7 +143,6 @@ int pca953x_get_val(uint8_t chip) }

#ifdef CONFIG_CMD_PCA953X -#ifdef CONFIG_CMD_PCA953X_INFO /* * Display pca953x information */ @@ -193,16 +192,13 @@ static int pca953x_info(uint8_t chip)

return 0; } -#endif /* CONFIG_CMD_PCA953X_INFO */

cmd_tbl_t cmd_pca953x[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(invert, 4, 0, (void *)PCA953X_CMD_INVERT, "", ""), -#ifdef CONFIG_CMD_PCA953X_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""), -#endif };

int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -231,13 +227,11 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ul_arg3 = simple_strtoul(argv[3], NULL, 16) & 0x1;

switch ((long)c->cmd) { -#ifdef CONFIG_CMD_PCA953X_INFO case PCA953X_CMD_INFO: ret = pca953x_info(chip); if (ret) ret = CMD_RET_FAILURE; break; -#endif

case PCA953X_CMD_DEVICE: if (argc == 3) @@ -287,10 +281,8 @@ U_BOOT_CMD( "pca953x gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_PCA953X_INFO "pca953x info\n" " - display info for current chip\n" -#endif "pca953x output pin 0|1\n" " - set pin as output and drive low or high\n" "pca953x invert pin 0|1\n" diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 8f3721cbfc..b9d6454887 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -74,7 +74,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* PCA9555 GPIO expander support */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 7331d4fe1f..bc52aae251 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -163,7 +163,6 @@ * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x26 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 1287282270..8a1a49653c 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -31,7 +31,6 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -#define CONFIG_CMD_PCA953X_INFO

/* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 8ff0fa3412..e7828a5036 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -136,7 +136,4 @@ /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20)

-/* Command line configuration */ -#define CONFIG_CMD_PCA953X_INFO - #endif /* __CONFIG_H */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 507a41462b..aa7f15389c 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -301,7 +301,6 @@ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000

#define CONFIG_PCA953X /* NXP PCA9554 */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x24, 16}, {0x25, 16}, {0x26, 16}, \ {0x3c, 8}, {0x3d, 8}, {0x3e, 8} }

diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 52278f1885..85f78ba43b 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -38,7 +38,6 @@

#define CONFIG_SYS_I2C_ZYNQ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO

#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index c27433787f..fe1c14b7ee 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_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index fa8f1d89f5..8a7cf7f711 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 2a35bf0972..5d59bfe28b 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_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index c31f83d2e1..6bf7dc3e67 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_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8993ee89fb..2f1d669114 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PCI_ENUM CONFIG_CMD_PCMCIA

This driver is not used by any board. Drop it.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

drivers/pcmcia/Makefile | 1 - drivers/pcmcia/ti_pci1410a.c | 623 ------------------------------------------- 2 files changed, 624 deletions(-) delete mode 100644 drivers/pcmcia/ti_pci1410a.c

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b7e6188429..7d8cb5cb4c 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -5,5 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ #

-obj-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o obj-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c deleted file mode 100644 index d83db3f022..0000000000 --- a/drivers/pcmcia/ti_pci1410a.c +++ /dev/null @@ -1,623 +0,0 @@ -/* - * (C) Copyright 2000-2002 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * (C) Copyright 2002 - * Daniel Engström, Omicron Ceti AB - * - * SPDX-License-Identifier: GPL-2.0+ - * - ******************************************************************** - * - * Lots of code copied from: - * - * m8xx_pcmcia.c - Linux PCMCIA socket driver for the mpc8xx series. - * (C) 1999-2000 Magnus Damm damm@bitsmart.com - * - * "The ExCA standard specifies that socket controllers should provide - * two IO and five memory windows per socket, which can be independently - * configured and positioned in the host address space and mapped to - * arbitrary segments of card address space. " - David A Hinds. 1999 - * - * This controller does _not_ meet the ExCA standard. - * - * m8xx pcmcia controller brief info: - * + 8 windows (attrib, mem, i/o) - * + up to two slots (SLOT_A and SLOT_B) - * + inputpins, outputpins, event and mask registers. - * - no offset register. sigh. - * - * Because of the lacking offset register we must map the whole card. - * We assign each memory window PCMCIA_MEM_WIN_SIZE address space. - * Make sure there is (PCMCIA_MEM_WIN_SIZE * PCMCIA_MEM_WIN_NO - * * PCMCIA_SOCKETS_NO) bytes at PCMCIA_MEM_WIN_BASE. - * The i/o windows are dynamically allocated at PCMCIA_IO_WIN_BASE. - * They are maximum 64KByte each... - */ - - -#undef DEBUG /**/ - -/* - * PCMCIA support - */ -#include <common.h> -#include <command.h> -#include <config.h> -#include <pci.h> -#include <asm/io.h> - -#include <pcmcia.h> - -#if defined(CONFIG_CMD_PCMCIA) - -int pcmcia_on(int ide_base_bus); - -static int hardware_disable(int slot); -static int hardware_enable(int slot); -static int voltage_set(int slot, int vcc, int vpp); -static void print_funcid(int func); -static void print_fixed(volatile char *p); -static int identify(volatile char *p); -static int check_ide_device(int slot, int ide_base_bus); - - -/* ------------------------------------------------------------------------- */ - - -const char *indent = "\t "; - -/* ------------------------------------------------------------------------- */ - - -static struct pci_device_id supported[] = { - { PCI_VENDOR_ID_TI, 0xac50 }, /* Ti PCI1410A */ - { PCI_VENDOR_ID_TI, 0xac56 }, /* Ti PCI1510 */ - { } -}; - -static pci_dev_t devbusfn; -static u32 socket_base; -static u32 pcmcia_cis_ptr; - -int pcmcia_on(int ide_base_bus) -{ - u16 dev_id; - u32 socket_status; - int slot = 0; - int cis_len; - u16 io_base; - u16 io_len; - - /* - * Find the CardBus PCI device(s). - */ - if ((devbusfn = pci_find_devices(supported, 0)) < 0) { - printf("Ti CardBus: not found\n"); - return 1; - } - - pci_read_config_word(devbusfn, PCI_DEVICE_ID, &dev_id); - - if (dev_id == 0xac56) { - debug("Enable PCMCIA Ti PCI1510\n"); - } else { - debug("Enable PCMCIA Ti PCI1410A\n"); - } - - pcmcia_cis_ptr = CONFIG_SYS_PCMCIA_CIS_WIN; - cis_len = CONFIG_SYS_PCMCIA_CIS_WIN_SIZE; - - io_base = CONFIG_SYS_PCMCIA_IO_WIN; - io_len = CONFIG_SYS_PCMCIA_IO_WIN_SIZE; - - /* - * Setup the PCI device. - */ - pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &socket_base); - socket_base &= ~0xf; - - socket_status = readl(socket_base+8); - if ((socket_status & 6) == 0) { - printf("Card Present: "); - - switch (socket_status & 0x3c00) { - - case 0x400: - printf("5V "); - break; - case 0x800: - printf("3.3V "); - break; - case 0xc00: - printf("3.3/5V "); - break; - default: - printf("unsupported Vcc "); - break; - } - switch (socket_status & 0x30) { - case 0x10: - printf("16bit PC-Card\n"); - break; - case 0x20: - printf("32bit CardBus Card\n"); - break; - default: - printf("8bit PC-Card\n"); - break; - } - } - - - writeb(0x41, socket_base + 0x806); /* Enable I/O window 0 and memory window 0 */ - writeb(0x0e, socket_base + 0x807); /* Reset I/O window options */ - - /* Careful: the linux yenta driver do not seem to reset the offset - * in the i/o windows, so leaving them non-zero is a problem */ - - writeb(io_base & 0xff, socket_base + 0x808); /* I/O window 0 base address */ - writeb(io_base>>8, socket_base + 0x809); - writeb((io_base + io_len - 1) & 0xff, socket_base + 0x80a); /* I/O window 0 end address */ - writeb((io_base + io_len - 1)>>8, socket_base + 0x80b); - writeb(0x00, socket_base + 0x836); /* I/O window 0 offset address 0x000 */ - writeb(0x00, socket_base + 0x837); - - - writeb((pcmcia_cis_ptr&0x000ff000) >> 12, - socket_base + 0x810); /* Memory window 0 start address bits 19-12 */ - writeb((pcmcia_cis_ptr&0x00f00000) >> 20, - socket_base + 0x811); /* Memory window 0 start address bits 23-20 */ - writeb(((pcmcia_cis_ptr+cis_len-1) & 0x000ff000) >> 12, - socket_base + 0x812); /* Memory window 0 end address bits 19-12*/ - writeb(((pcmcia_cis_ptr+cis_len-1) & 0x00f00000) >> 20, - socket_base + 0x813); /* Memory window 0 end address bits 23-20*/ - writeb(0x00, socket_base + 0x814); /* Memory window 0 offset bits 19-12 */ - writeb(0x40, socket_base + 0x815); /* Memory window 0 offset bits 23-20 and - * options (read/write, attribute access) */ - writeb(0x00, socket_base + 0x816); /* ExCA card-detect and general control */ - writeb(0x00, socket_base + 0x81e); /* ExCA global control (interrupt modes) */ - - writeb((pcmcia_cis_ptr & 0xff000000) >> 24, - socket_base + 0x840); /* Memory window address bits 31-24 */ - - - /* turn off voltage */ - if (voltage_set(slot, 0, 0)) { - return 1; - } - - /* Enable external hardware */ - if (hardware_enable(slot)) { - return 1; - } - - if (check_ide_device(slot, ide_base_bus)) { - return 1; - } - - return 0; -} - -/* ------------------------------------------------------------------------- */ - - -#if defined(CONFIG_CMD_PCMCIA) -int pcmcia_off (void) -{ - int slot = 0; - - writeb(0x00, socket_base + 0x806); /* disable all I/O and memory windows */ - - writeb(0x00, socket_base + 0x808); /* I/O window 0 base address */ - writeb(0x00, socket_base + 0x809); - writeb(0x00, socket_base + 0x80a); /* I/O window 0 end address */ - writeb(0x00, socket_base + 0x80b); - writeb(0x00, socket_base + 0x836); /* I/O window 0 offset address */ - writeb(0x00, socket_base + 0x837); - - writeb(0x00, socket_base + 0x80c); /* I/O window 1 base address */ - writeb(0x00, socket_base + 0x80d); - writeb(0x00, socket_base + 0x80e); /* I/O window 1 end address */ - writeb(0x00, socket_base + 0x80f); - writeb(0x00, socket_base + 0x838); /* I/O window 1 offset address */ - writeb(0x00, socket_base + 0x839); - - writeb(0x00, socket_base + 0x810); /* Memory window 0 start address */ - writeb(0x00, socket_base + 0x811); - writeb(0x00, socket_base + 0x812); /* Memory window 0 end address */ - writeb(0x00, socket_base + 0x813); - writeb(0x00, socket_base + 0x814); /* Memory window 0 offset */ - writeb(0x00, socket_base + 0x815); - - writeb(0xc0, socket_base + 0x840); /* Memory window 0 page address */ - - - /* turn off voltage */ - voltage_set(slot, 0, 0); - - /* disable external hardware */ - printf ("Shutdown and Poweroff Ti PCI1410A\n"); - hardware_disable(slot); - - return 0; -} - -#endif - -/* ------------------------------------------------------------------------- */ - - -#define MAX_TUPEL_SZ 512 -#define MAX_FEATURES 4 -int ide_devices_found; -static int check_ide_device(int slot, int ide_base_bus) -{ - volatile char *ident = NULL; - volatile char *feature_p[MAX_FEATURES]; - volatile char *p, *start; - int n_features = 0; - uchar func_id = ~0; - uchar code, len; - ushort config_base = 0; - int found = 0; - int i; - u32 socket_status; - - debug ("PCMCIA MEM: %08X\n", pcmcia_cis_ptr); - - socket_status = readl(socket_base+8); - - if ((socket_status & 6) != 0 || (socket_status & 0x20) != 0) { - printf("no card or CardBus card\n"); - return 1; - } - - start = p = (volatile char *) pcmcia_cis_ptr; - - while ((p - start) < MAX_TUPEL_SZ) { - - code = *p; p += 2; - - if (code == 0xFF) { /* End of chain */ - break; - } - - len = *p; p += 2; -#if defined(DEBUG) && (DEBUG > 1) - { - volatile uchar *q = p; - printf ("\nTuple code %02x length %d\n\tData:", - code, len); - - for (i = 0; i < len; ++i) { - printf (" %02x", *q); - q+= 2; - } - } -#endif /* DEBUG */ - switch (code) { - case CISTPL_VERS_1: - ident = p + 4; - break; - case CISTPL_FUNCID: - /* Fix for broken SanDisk which may have 0x80 bit set */ - func_id = *p & 0x7F; - break; - case CISTPL_FUNCE: - if (n_features < MAX_FEATURES) - feature_p[n_features++] = p; - break; - case CISTPL_CONFIG: - config_base = (*(p+6) << 8) + (*(p+4)); - debug ("\n## Config_base = %04x ###\n", config_base); - default: - break; - } - p += 2 * len; - } - - found = identify(ident); - - if (func_id != ((uchar)~0)) { - print_funcid (func_id); - - if (func_id == CISTPL_FUNCID_FIXED) - found = 1; - else - return 1; /* no disk drive */ - } - - for (i=0; i<n_features; ++i) { - print_fixed(feature_p[i]); - } - - if (!found) { - printf("unknown card type\n"); - return 1; - } - - /* select config index 1 */ - writeb(1, pcmcia_cis_ptr + config_base); - -#if 0 - printf("Confiuration Option Register: %02x\n", readb(pcmcia_cis_ptr + config_base)); - printf("Card Confiuration and Status Register: %02x\n", readb(pcmcia_cis_ptr + config_base + 2)); - printf("Pin Replacement Register Register: %02x\n", readb(pcmcia_cis_ptr + config_base + 4)); - printf("Socket and Copy Register: %02x\n", readb(pcmcia_cis_ptr + config_base + 6)); -#endif - ide_devices_found |= (1 << (slot+ide_base_bus)); - - return 0; -} - - -static int voltage_set(int slot, int vcc, int vpp) -{ - u32 socket_control; - int reg=0; - - switch (slot) { - case 0: - reg = socket_base + 0x10; - break; - default: - return 1; - } - - socket_control = 0; - - - switch (vcc) { - case 50: - socket_control |= 0x20; - break; - case 33: - socket_control |= 0x30; - break; - case 0: - default: ; - } - - switch (vpp) { - case 120: - socket_control |= 0x1; - break; - case 50: - socket_control |= 0x2; - break; - case 33: - socket_control |= 0x3; - break; - case 0: - default: ; - } - - writel(socket_control, reg); - - debug ("voltage_set: Ti PCI1410A Slot %d, Vcc=%d.%d, Vpp=%d.%d\n", - slot, vcc/10, vcc%10, vpp/10, vpp%10); - - udelay(500); - return 0; -} - - -static int hardware_enable(int slot) -{ - u32 socket_status; - u16 brg_ctrl; - int is_82365sl; - - socket_status = readl(socket_base+8); - - if ((socket_status & 6) == 0) { - - switch (socket_status & 0x3c00) { - - case 0x400: - printf("5V "); - voltage_set(slot, 50, 0); - break; - case 0x800: - voltage_set(slot, 33, 0); - break; - case 0xc00: - voltage_set(slot, 33, 0); - break; - default: - voltage_set(slot, 0, 0); - break; - } - } else { - voltage_set(slot, 0, 0); - } - - pci_read_config_word(devbusfn, PCI_BRIDGE_CONTROL, &brg_ctrl); - brg_ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; - pci_write_config_word(devbusfn, PCI_BRIDGE_CONTROL, brg_ctrl); - is_82365sl = ((readb(socket_base+0x800) & 0x0f) == 2); - writeb(is_82365sl?0x90:0x98, socket_base+0x802); - writeb(0x67, socket_base+0x803); - udelay(100000); -#if 0 - printf("ExCA Id %02x, Card Status %02x, Power config %02x, Interrupt Config %02x, bridge control %04x %d\n", - readb(socket_base+0x800), readb(socket_base+0x801), - readb(socket_base+0x802), readb(socket_base+0x803), brg_ctrl, is_82365sl); -#endif - - return ((readb(socket_base+0x801)&0x6c)==0x6c)?0:1; -} - - -static int hardware_disable(int slot) -{ - voltage_set(slot, 0, 0); - return 0; -} - -static void print_funcid(int func) -{ - puts(indent); - switch (func) { - case CISTPL_FUNCID_MULTI: - puts(" Multi-Function"); - break; - case CISTPL_FUNCID_MEMORY: - puts(" Memory"); - break; - case CISTPL_FUNCID_SERIAL: - puts(" Serial Port"); - break; - case CISTPL_FUNCID_PARALLEL: - puts(" Parallel Port"); - break; - case CISTPL_FUNCID_FIXED: - puts(" Fixed Disk"); - break; - case CISTPL_FUNCID_VIDEO: - puts(" Video Adapter"); - break; - case CISTPL_FUNCID_NETWORK: - puts(" Network Adapter"); - break; - case CISTPL_FUNCID_AIMS: - puts(" AIMS Card"); - break; - case CISTPL_FUNCID_SCSI: - puts(" SCSI Adapter"); - break; - default: - puts(" Unknown"); - break; - } - puts(" Card\n"); -} - -/* ------------------------------------------------------------------------- */ - -static void print_fixed(volatile char *p) -{ - if (p == NULL) - return; - - puts(indent); - - switch (*p) { - case CISTPL_FUNCE_IDE_IFACE: - { uchar iface = *(p+2); - - puts ((iface == CISTPL_IDE_INTERFACE) ? " IDE" : " unknown"); - puts (" interface "); - break; - } - case CISTPL_FUNCE_IDE_MASTER: - case CISTPL_FUNCE_IDE_SLAVE: - { - uchar f1 = *(p+2); - uchar f2 = *(p+4); - - puts((f1 & CISTPL_IDE_SILICON) ? " [silicon]" : " [rotating]"); - - if (f1 & CISTPL_IDE_UNIQUE) { - puts(" [unique]"); - } - - puts((f1 & CISTPL_IDE_DUAL) ? " [dual]" : " [single]"); - - if (f2 & CISTPL_IDE_HAS_SLEEP) { - puts(" [sleep]"); - } - - if (f2 & CISTPL_IDE_HAS_STANDBY) { - puts(" [standby]"); - } - - if (f2 & CISTPL_IDE_HAS_IDLE) { - puts(" [idle]"); - } - - if (f2 & CISTPL_IDE_LOW_POWER) { - puts(" [low power]"); - } - - if (f2 & CISTPL_IDE_REG_INHIBIT) { - puts(" [reg inhibit]"); - } - - if (f2 & CISTPL_IDE_HAS_INDEX) { - puts(" [index]"); - } - - if (f2 & CISTPL_IDE_IOIS16) { - puts(" [IOis16]"); - } - - break; - } - } - putc('\n'); -} - -/* ------------------------------------------------------------------------- */ - -#define MAX_IDENT_CHARS 64 -#define MAX_IDENT_FIELDS 4 - -static char *known_cards[] = { - "ARGOSY PnPIDE D5", - NULL -}; - -static int identify(volatile char *p) -{ - char id_str[MAX_IDENT_CHARS]; - char data; - char *t; - char **card; - int i, done; - - if (p == NULL) - return (0); /* Don't know */ - - t = id_str; - done =0; - - for (i=0; i<=4 && !done; ++i, p+=2) { - while ((data = *p) != '\0') { - if (data == 0xFF) { - done = 1; - break; - } - *t++ = data; - if (t == &id_str[MAX_IDENT_CHARS-1]) { - done = 1; - break; - } - p += 2; - } - if (!done) - *t++ = ' '; - } - *t = '\0'; - while (--t > id_str) { - if (*t == ' ') { - *t = '\0'; - } else { - break; - } - } - puts(id_str); - putc('\n'); - - for (card=known_cards; *card; ++card) { - debug ("## Compare against "%s"\n", *card); - if (strcmp(*card, id_str) == 0) { /* found! */ - debug ("## CARD FOUND ##\n"); - return 1; - } - } - - return 0; /* don't know */ -} - -#endif /* CONFIG_CMD_PCMCIA */

This command is not used by any board. It also looks quite similar to the 'iod' and 'iow' commands which use the correct I/O macros.

Drop it.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Drop mention of this from several other places - Move CMD_PORTIO changes in from the CMD_READ patch

README | 1 - cmd/Makefile | 1 - cmd/portio.c | 145 ------------------------------------------- include/command.h | 9 ++- include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 4 insertions(+), 154 deletions(-) delete mode 100644 cmd/portio.c

diff --git a/README b/README index 186311bd88..06a9b2eca9 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFS NFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_PORTIO * Port I/O CONFIG_CMD_READ * Read raw data from partition CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUN run command in env variable diff --git a/cmd/Makefile b/cmd/Makefile index bd231f24d8..eff6bd678f 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -97,7 +97,6 @@ ifdef CONFIG_PCI obj-$(CONFIG_CMD_PCI) += pci.o endif obj-y += pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += portio.o obj-$(CONFIG_CMD_PXE) += pxe.o obj-$(CONFIG_CMD_QFW) += qfw.o obj-$(CONFIG_CMD_READ) += read.o diff --git a/cmd/portio.c b/cmd/portio.c deleted file mode 100644 index bf3a99791c..0000000000 --- a/cmd/portio.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * (C) Copyright 2003 - * Marc Singer, elf@buici.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Port I/O Functions - * - * Copied from FADS ROM, Dan Malek (dmalek@jlc.net) - */ - -#include <common.h> -#include <command.h> - -/* Display values from last command. - * Memory modify remembered values are different from display memory. - */ -static uint in_last_addr, in_last_size; -static uint out_last_addr, out_last_size, out_last_value; - - -int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) -{ - uint addr = out_last_addr; - uint size = out_last_size; - uint value = out_last_value; - - if (argc != 3) - return CMD_RET_USAGE; - - if ((flag & CMD_FLAG_REPEAT) == 0) { - /* - * New command specified. Check for a size specification. - * Defaults to long if no or incorrect specification. - */ - size = cmd_get_data_size (argv[0], 1); - addr = simple_strtoul (argv[1], NULL, 16); - value = simple_strtoul (argv[2], NULL, 16); - } -#if defined (CONFIG_X86) - - { - unsigned short port = addr; - - switch (size) { - default: - case 1: - { - unsigned char ch = value; - __asm__ volatile ("out %0, %%dx"::"a" (ch), "d" (port)); - } - break; - case 2: - { - unsigned short w = value; - __asm__ volatile ("out %0, %%dx"::"a" (w), "d" (port)); - } - break; - case 4: - __asm__ volatile ("out %0, %%dx"::"a" (value), "d" (port)); - - break; - } - } - -#endif /* CONFIG_X86 */ - - out_last_addr = addr; - out_last_size = size; - out_last_value = value; - - return 0; -} - -U_BOOT_CMD( - out, 3, 1, do_portio_out, - "write datum to IO port", - "[.b, .w, .l] port value\n - output to IO port" -); - -int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) -{ - uint addr = in_last_addr; - uint size = in_last_size; - - if (argc != 2) - return CMD_RET_USAGE; - - if ((flag & CMD_FLAG_REPEAT) == 0) { - /* - * New command specified. Check for a size specification. - * Defaults to long if no or incorrect specification. - */ - size = cmd_get_data_size (argv[0], 1); - addr = simple_strtoul (argv[1], NULL, 16); - } -#if defined (CONFIG_X86) - - { - unsigned short port = addr; - - switch (size) { - default: - case 1: - { - unsigned char ch; - __asm__ volatile ("in %%dx, %0":"=a" (ch):"d" (port)); - - printf (" %02x\n", ch); - } - break; - case 2: - { - unsigned short w; - __asm__ volatile ("in %%dx, %0":"=a" (w):"d" (port)); - - printf (" %04x\n", w); - } - break; - case 4: - { - unsigned long l; - __asm__ volatile ("in %%dx, %0":"=a" (l):"d" (port)); - - printf (" %08lx\n", l); - } - break; - } - } -#endif /* CONFIG_X86 */ - - in_last_addr = addr; - in_last_size = size; - - return 0; -} - -U_BOOT_CMD( - in, 2, 1, do_portio_in, - "read data from an IO port", - "[.b, .w, .l] port\n" - " - read datum from IO port" -); diff --git a/include/command.h b/include/command.h index 08f04867dd..767cabb3df 100644 --- a/include/command.h +++ b/include/command.h @@ -80,11 +80,10 @@ int cmd_process_error(cmd_tbl_t *cmdtp, int err); * void function (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); */

-#if defined(CONFIG_CMD_MEMORY) \ - || defined(CONFIG_CMD_I2C) \ - || defined(CONFIG_CMD_ITEST) \ - || defined(CONFIG_CMD_PCI) \ - || defined(CONFIG_CMD_PORTIO) +#if defined(CONFIG_CMD_MEMORY) || \ + defined(CONFIG_CMD_I2C) || \ + defined(CONFIG_CMD_ITEST) || \ + defined(CONFIG_CMD_PCI) #define CMD_DATA_SIZE extern int cmd_get_data_size(char* arg, int default_size); #endif diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index a008bacdd9..35a6a529eb 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_PORTIO /* Port I/O */ #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_READ /* Read data from partition */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6b7056d6ea..899fd501ad 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PORTIO CONFIG_CMD_READ CONFIG_CMD_REGINFO CONFIG_CMD_REISER

Convert this option and enable it in sandbox. Also correct a bug which was introduced with the block-device driver model conversion.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Move CMD_PORTIO changes to previous patch - Sort Kconfig options in alphabetical order

README | 1 - cmd/Kconfig | 5 +++++ cmd/read.c | 2 +- configs/sandbox_defconfig | 3 +++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README b/README index 06a9b2eca9..2e813b7bcb 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFS NFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_READ * Read raw data from partition CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUN run command in env variable CONFIG_CMD_SANDBOX * sb command to access sandbox features diff --git a/cmd/Kconfig b/cmd/Kconfig index 7892b0b03f..15dcfbf1e9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -741,6 +741,11 @@ config CMD_PCMCIA about 1990. These devices are typically removable memory or network cards using a standard 68-pin connector.

+config CMD_READ + bool "read - Read binary data from a partition" + help + Provides low-level access to the data in a partition. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/cmd/read.c b/cmd/read.c index 61d8ce73e4..ecf925426f 100644 --- a/cmd/read.c +++ b/cmd/read.c @@ -66,7 +66,7 @@ int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; }

- if (blk_read(dev_desc, offset + blk, cnt, addr) < 0) { + if (blk_dread(dev_desc, offset + blk, cnt, addr) < 0) { printf("Error reading blocks\n"); return 1; } diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 3fe2702d30..a1844d30a2 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -193,3 +193,6 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_MTDPARTS_SPREAD=y +CONFIG_CMD_READ=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 35a6a529eb..edfc91ff9b 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -15,7 +15,6 @@

#define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ -#define CONFIG_CMD_READ /* Read data from partition */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 899fd501ad..33a408891e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_READ CONFIG_CMD_REGINFO CONFIG_CMD_REISER CONFIG_CMD_SANDBOX

From: Christophe Leroy christophe.leroy@c-s.fr

This patch converts CONFIG_CMD_REGINFO to Kconfig

Signed-off-by: Christophe Leroy christophe.leroy@c-s.fr Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Fixed lots of merge conflicts with my series - Pull in this patch from http://patchwork.ozlabs.org/patch/787724/ instead

README | 1 - arch/powerpc/Kconfig | 3 +++ cmd/Kconfig | 5 +++++ include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 5 ----- include/configs/BSC9131RDB.h | 5 ----- include/configs/BSC9132QDS.h | 5 ----- include/configs/C29XPCIE.h | 5 ----- include/configs/MCR3000.h | 3 --- include/configs/MPC8536DS.h | 5 ----- include/configs/MPC8541CDS.h | 5 ----- include/configs/MPC8544DS.h | 5 ----- include/configs/MPC8548CDS.h | 5 ----- include/configs/MPC8555CDS.h | 5 ----- include/configs/MPC8560ADS.h | 8 -------- include/configs/MPC8568MDS.h | 5 ----- include/configs/MPC8569MDS.h | 5 ----- include/configs/MPC8572DS.h | 5 ----- include/configs/MPC8610HPCD.h | 2 -- include/configs/MPC8641HPCN.h | 5 ----- include/configs/P1010RDB.h | 5 ----- include/configs/P1022DS.h | 5 ----- include/configs/P1023RDB.h | 5 ----- include/configs/T102xQDS.h | 5 ----- include/configs/T102xRDB.h | 5 ----- include/configs/T1040QDS.h | 5 ----- include/configs/T104xRDB.h | 5 ----- include/configs/T208xQDS.h | 5 ----- include/configs/T208xRDB.h | 5 ----- include/configs/T4240RDB.h | 2 -- include/configs/TQM834x.h | 5 ----- include/configs/UCP1020.h | 5 ----- include/configs/controlcenterd.h | 3 --- include/configs/corenet_ds.h | 5 ----- include/configs/cyrus.h | 5 ----- include/configs/p1_p2_rdb_pc.h | 5 ----- include/configs/p1_twr.h | 5 ----- include/configs/qemu-ppce500.h | 2 -- include/configs/sbc8548.h | 5 ----- include/configs/sbc8641d.h | 2 -- include/configs/smdkc100.h | 3 --- include/configs/socrates.h | 1 - include/configs/t4qds.h | 2 -- include/configs/xpedite517x.h | 5 ----- include/configs/xpedite520x.h | 5 ----- include/configs/xpedite537x.h | 5 ----- include/configs/xpedite550x.h | 5 ----- scripts/config_whitelist.txt | 1 - 48 files changed, 8 insertions(+), 196 deletions(-)

diff --git a/README b/README index 2e813b7bcb..9b64ef06f4 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFS NFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUN run command in env variable CONFIG_CMD_SANDBOX * sb command to access sandbox features CONFIG_CMD_SAVES * save S record dump diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8094416e4a..c79b247651 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -23,15 +23,18 @@ config MPC85xx imply USB_EHCI_HCD if USB imply CMD_HASH imply CMD_IRQ + imply CMD_REGINFO

config MPC86xx bool "MPC86xx" select SYS_FSL_DDR select SYS_FSL_DDR_BE imply ENV_IS_IN_FLASH + imply CMD_REGINFO

config 8xx bool "MPC8xx" + imply CMD_REGINFO

endchoice

diff --git a/cmd/Kconfig b/cmd/Kconfig index 15dcfbf1e9..070536ac23 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -158,6 +158,11 @@ config CMD_LICENSE help Print GPL license text

+config CMD_REGINFO + bool "reginfo" + help + Register dump + endmenu

menu "Boot commands" diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index edfc91ff9b..cb0ab6d61a 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_REGINFO /* Register dump */ #define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 984803d440..ce9be95e7e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -690,11 +690,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index a7c97a3b79..38407af3c7 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -286,11 +286,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index b385cf4a97..8f2bccddb5 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -509,11 +509,6 @@ combinations. this should be removed later #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index a00d3872e3..c88715f601 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -427,11 +427,6 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index 17090da796..aabbab6e05 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -151,7 +151,4 @@ #define BOOTFLAG_COLD 0x01 #define BOOTFLAG_WARM 0x02

-/* Misc Settings */ -#define CONFIG_CMD_REGINFO - #endif /* __CONFIG_H */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 277c9d00a7..11a7950e4d 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -580,11 +580,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

#ifdef CONFIG_MMC diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 3867b31e23..aa450fcaa4 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -338,11 +338,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index cea37f8ae4..1c8e031a7e 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -344,11 +344,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 7c98bcb035..58cd674a5f 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -457,11 +457,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 3dc24bd74e..b580c33070 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -336,11 +336,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 8b8be2da0e..672ae5007c 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -349,14 +349,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - -#if defined(CONFIG_ETHER_ON_FCC) -#endif - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index e6b1ea982f..29f3d09cfd 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -351,11 +351,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 6f2fa4939a..a0d48af908 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -443,11 +443,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

#ifdef CONFIG_MMC diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index a75d30851b..2d905e4732 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -542,11 +542,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 807624e2ce..e13fff0375 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -262,8 +262,6 @@

#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */

-#define CONFIG_CMD_REGINFO - #define CONFIG_ULI526X #ifdef CONFIG_ULI526X #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index b74ef38513..607e8bd114 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -582,11 +582,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9f52a6fc48..a61c59f7fa 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -711,11 +711,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 152f0d89f0..fe7c677946 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -582,11 +582,6 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 45dcb6b04b..3522c32a72 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -236,11 +236,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 1adbf1ae90..e4f8e7d980 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -768,11 +768,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 7a33b8a19e..7c81dc428e 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -779,11 +779,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 0f0e149572..de60b21e35 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -647,11 +647,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 34578cc819..84bcecbb05 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -762,11 +762,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b45e634ddb..28e4bb01fb 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -733,11 +733,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index b5b7a4a8fb..a91d39e4eb 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -679,11 +679,6 @@ unsigned long get_board_ddr_clk(void); * Environment */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 1b56020c10..0717ae5a1e 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -56,8 +56,6 @@

#define CONFIG_DDR_ECC

-#define CONFIG_CMD_REGINFO - /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index aab8b5d9f2..b9923c316b 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -213,11 +213,6 @@

#endif /* CONFIG_TSEC_ENET */

-/* - * General PCI - * Addresses are mapped 1-1. - */ - #if defined(CONFIG_PCI)

#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6573301493..53d4bfa2f0 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -410,11 +410,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 55d705c2fc..3b0290ccc4 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -335,9 +335,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

#ifndef CONFIG_TRAILBLAZER - -#define CONFIG_CMD_REGINFO - /* * Board initialisation callbacks */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 19f3a55e9a..08c51e3434 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -580,11 +580,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 5ba393a7db..aaa7a619ca 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -406,11 +406,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d9829d6125..0a2c8611a1 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -798,11 +798,6 @@ #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 795d238b6d..a992763d05 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -374,11 +374,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 2c9a3466f7..e0cc873e06 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -10,8 +10,6 @@ #ifndef __QEMU_PPCE500_H #define __QEMU_PPCE500_H

-#define CONFIG_CMD_REGINFO - #undef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index c2f533b0a1..28e53b1c2c 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -507,11 +507,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index de123fdd9c..dcce2ba193 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -450,8 +450,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

-#define CONFIG_CMD_REGINFO - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 58abac5eef..f5d541d20b 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -56,9 +56,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE

-/*********************************************************** - * Command definition - ***********************************************************/ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS

diff --git a/include/configs/socrates.h b/include/configs/socrates.h index b6ea44e3c0..cce7f901af 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -278,7 +278,6 @@ * Command line configuration. */ #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_REGINFO

#undef CONFIG_WATCHDOG /* watchdog disabled */

diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 23b6bf0361..ce138f843f 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -10,8 +10,6 @@ #ifndef __T4QDS_H #define __T4QDS_H

-#define CONFIG_CMD_REGINFO - /* High Level Configuration Options */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 57fc16812e..3753871343 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -481,11 +481,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); BATL_CACHEINHIBIT) #define CONFIG_SYS_IBAT7U CONFIG_SYS_DBAT7U

-/* - * Command configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 628de82767..7a37b5cf7e 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -284,11 +284,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_GATEWAY

-/* - * Command configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index c599b22bc8..47affb5e74 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -334,11 +334,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define TSEC2_PHYIDX 0 #define CONFIG_HAS_ETH1

-/* - * Command configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index c387d951c1..60b9c00e26 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -333,11 +333,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

-/* - * Command configuration. - */ -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 33a408891e..01087839ee 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_REGINFO CONFIG_CMD_REISER CONFIG_CMD_SANDBOX CONFIG_CMD_SAVES

This converts the following to Kconfig: CONFIG_CMD_REISER

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 9 +++++++++ configs/ethernut5_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/ethernut5.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 070536ac23..6a39e26256 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1266,6 +1266,15 @@ config CMD_MTDPARTS_SPREAD at least as large as the size specified in the mtdparts variable and 2) each partition starts on a good block.

+config CMD_REISER + bool "reiser - Access to reiserfs filesystems" + help + This provides two commands which operate on a resierfs filesystem, + commonly used some years ago: + + reiserls - list files + reiserload - load a file + endmenu

menu "Debug commands" diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 65a21732e7..6a34363f1e 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +CONFIG_CMD_REISER=y CONFIG_CMD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index cb0ab6d61a..00bc6fc88a 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_REISER /* Reiserfs support */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 8bec154f43..cdad2e6d49 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -83,7 +83,6 @@ #define CONFIG_AT91_GPIO

#ifndef MINIMAL_LOADER -#define CONFIG_CMD_REISER #define CONFIG_CMD_SAVES #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 01087839ee..64f18f0af1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_REISER CONFIG_CMD_SANDBOX CONFIG_CMD_SAVES CONFIG_CMD_SCSI

This converts the following to Kconfig: CONFIG_CMD_SAVES

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Put Kconfig change in alphabetical order - Remove some now-superfluous /* commands */ comments in header files

README | 1 - arch/arm/Kconfig | 6 ++++++ cmd/Kconfig | 6 ++++++ configs/ethernut5_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/x600_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/calimain.h | 8 -------- include/configs/da850evm.h | 5 ----- include/configs/ea20.h | 5 ----- include/configs/ethernut5.h | 1 - include/configs/ipam390.h | 5 ----- include/configs/legoev3.h | 5 ----- include/configs/microblaze-generic.h | 18 ------------------ include/configs/omapl138_lcdk.h | 4 ---- include/configs/spear-common.h | 5 ----- include/configs/ti_armv7_keystone2.h | 3 --- include/configs/x600.h | 5 ----- include/configs/xtfpga.h | 6 ------ scripts/config_whitelist.txt | 1 - 21 files changed, 16 insertions(+), 73 deletions(-)

diff --git a/README b/README index 3a4e3a8f45..318a4aa25d 100644 --- a/README +++ b/README @@ -815,7 +815,6 @@ The following options need to be configured: CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_RUN run command in env variable - CONFIG_CMD_SAVES * save S record dump CONFIG_CMD_SDRAM * print SDRAM configuration information (requires CONFIG_CMD_I2C) CONFIG_CMD_SF * Read/write/erase SPI NOR flash diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7f6ab4ac7e..5e42e7b030 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -308,6 +308,7 @@ config TARGET_GPLUGD config ARCH_DAVINCI bool "TI DaVinci" select CPU_ARM926EJS + imply CMD_SAVES help Support for TI's DaVinci platform.

@@ -409,21 +410,25 @@ config TARGET_SPEAR300 bool "Support spear300" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES

config TARGET_SPEAR310 bool "Support spear310" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES

config TARGET_SPEAR320 bool "Support spear320" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES

config TARGET_SPEAR600 bool "Support spear600" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES

config TARGET_STV0991 bool "Support stv0991" @@ -572,6 +577,7 @@ config ARCH_KEYSTONE select CMD_POWEROFF imply CMD_MTDPARTS imply FIT + imply CMD_SAVES

config ARCH_OMAP2PLUS bool "TI OMAP2+" diff --git a/cmd/Kconfig b/cmd/Kconfig index 6a39e26256..f90673f95b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -770,6 +770,12 @@ config CMD_SATA Attachment, where AT refers to an IBM AT (Advanced Technology) computer released in 1984.

+config CMD_SAVES + bool "saves - Save a file over serial in S-Record format" + help + Provides a way to save a binary file using the Motorola S-Record + format over the serial line. + config CMD_SF bool "sf" help diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 6a34363f1e..033e214a04 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SAVES=y CONFIG_CMD_RARP=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index f97459e6a8..789488e735 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -24,6 +24,7 @@ CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MFSL=y +CONFIG_CMD_SAVES=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index d46289179f..cfc537a523 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SAVES=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index e52e62b201..f28c05f156 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -10,6 +10,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n" CONFIG_AUTOBOOT_STOP_STR=" " CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y +CONFIG_CMD_SAVES=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_DIAG=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 87fba76cc9..c72b24284b 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_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index b6c8035fb5..044aa69baf 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -294,14 +294,6 @@ "echo Product: $product; " \ "gpio c 1; gpio c 2;"

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES - -#ifndef CONFIG_DRIVER_TI_EMAC -#endif - /* additions for new relocation code, must added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0xc0000000 /* initial stack pointer in internal SRAM */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 695f3f6874..675e7a649e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -263,11 +263,6 @@ "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" #define CONFIG_EXTRA_ENV_SETTINGS "hwconfig=dsp:wake=yes"

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES - #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif diff --git a/include/configs/ea20.h b/include/configs/ea20.h index b1c4e3a750..158eea6018 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -121,11 +121,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES - #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index cdad2e6d49..c1f04a92ff 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -83,7 +83,6 @@ #define CONFIG_AT91_GPIO

#ifndef MINIMAL_LOADER -#define CONFIG_CMD_SAVES #endif

/* NAND flash */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index a21261f4d5..083ccd8ef6 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -236,11 +236,6 @@ "nand write c0000100 180000 20000\0" \ "\0"

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES - #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 4ea61af920..2e6147d822 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -197,11 +197,6 @@ "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \ "bootscript=source ${bootscraddr}\0" \

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES - #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index fb0575fa4d..8ddbf599e1 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -160,24 +160,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ - -#if defined(FLASH) -# if !defined(RAMENV) -# define CONFIG_CMD_SAVES -# endif - -#else -#if defined(SPIFLASH) - -# if !defined(RAMENV) -# define CONFIG_CMD_SAVES -# endif -#endif -#endif - #if defined(CONFIG_CMD_JFFS2) # define CONFIG_MTD_PARTITIONS #endif diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 08e7deb30f..6ea2b5e7f3 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -274,10 +274,6 @@ "boot_fit=0\0" \ "console=ttyS2,115200n8\0"

-/* - * U-Boot commands - */ -#define CONFIG_CMD_SAVES #ifdef CONFIG_CMD_BDI #define CONFIG_CLOCKS #endif diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 83060e71a6..90ffa19b4b 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -93,11 +93,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION

-/* - * Command support defines - */ -#define CONFIG_CMD_SAVES - /* * Default Environment Varible definitions */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 26290ef1b2..78c6726637 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -198,9 +198,6 @@ #define CONFIG_DEV_USB_PHY_BASE KS2_DEV_USB_PHY_BASE #define CONFIG_USB_PHY_CFG_BASE KS2_USB_PHY_CFG_BASE

-/* U-Boot command configuration */ -#define CONFIG_CMD_SAVES - /* U-Boot general configuration */ #define CONFIG_MISC_INIT_R #define CONFIG_MX_CYCLIC diff --git a/include/configs/x600.h b/include/configs/x600.h index a8435d8b01..7f19aec3ec 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -100,11 +100,6 @@ #define CONFIG_USB_EHCI_SPEAR #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

-/* - * Command support defines - */ -#define CONFIG_CMD_SAVES - /* Filesystem support (for USB key) */ #define CONFIG_SUPPORT_VFAT

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 206ec344d9..df983d9f1e 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -123,12 +123,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

-/*=================*/ -/* U-Boot commands */ -/*=================*/ - -#define CONFIG_CMD_SAVES - /*==============================*/ /* U-Boot autoboot configuration */ /*==============================*/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fd093f797d..30b3451447 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SAVES CONFIG_CMD_SCSI CONFIG_CMD_SDRAM CONFIG_CMD_SF_TEST

This converts the following to Kconfig: CONFIG_CMD_SCSI

Also update the Makefile to use CONFIG_CMD_SCSI instead of CONFIG_SCSI to enable the command, fixing an earlier error.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Update commit message to explain Makefile change

arch/arm/Kconfig | 3 +++ cmd/Kconfig | 9 +++++++++ cmd/Makefile | 2 +- configs/cl-som-am57x_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + include/configs/cl-som-am57x.h | 1 - include/configs/controlcenterdc.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1043ardb.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e42e7b030..477e76be29 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,6 +879,7 @@ config TARGET_LS1012ARDB select ARM64 select BOARD_LATE_INIT imply SCSI + imply CMD_SCSI help Support for Freescale LS1012ARDB platform. The LS1012A Reference design board (RDB) is a high-performance @@ -932,6 +933,7 @@ config TARGET_LS1021AIOT select ARCH_LS1021A select ARCH_SUPPORT_PSCI imply SCSI + imply CMD_SCSI help Support for Freescale LS1021AIOT platform. The LS1021A Freescale board (IOT) is a high-performance @@ -959,6 +961,7 @@ config TARGET_LS1043ARDB select SUPPORT_SPL select BOARD_EARLY_INIT_F imply SCSI + imply CMD_SCSI help Support for Freescale LS1043ARDB platform.

diff --git a/cmd/Kconfig b/cmd/Kconfig index f90673f95b..c74acd535b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1281,6 +1281,15 @@ config CMD_REISER reiserls - list files reiserload - load a file

+config CMD_SCSI + bool "scsi - Access to SCSI devices" + select SCSI + help + This provides a 'scsi' command which provides access to SCSI (Small + Computer System Interface) devices. The command provides a way to + scan the bus, reset the bus, read and write data and get information + about devices. + endmenu

menu "Debug commands" diff --git a/cmd/Makefile b/cmd/Makefile index eff6bd678f..a85fe25dda 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -106,7 +106,7 @@ obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o obj-$(CONFIG_SANDBOX) += host.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_SCSI) += scsi.o disk.o +obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SPI) += spi.o diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index e0b7565ac0..71ce02d616 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_SCSI=y CONFIG_ISO_PARTITION=y CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index bb9c1b5d4f..4affd31ebd 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y +CONFIG_CMD_SCSI=y CONFIG_EFI_PARTITION=y CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 383fc1a95f..dfc378677d 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_SCSI=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index b9d6454887..afab46caae 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -64,7 +64,6 @@

#ifndef CONFIG_SPL_BUILD /* SATA */ -#define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 979bb98850..715e9ed9c9 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -33,7 +33,6 @@ * Commands configuration */ #define CONFIG_CMD_I2C -#define CONFIG_CMD_SCSI #define CONFIG_CMD_SPI

/* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 99f5dd4119..b3121d2c21 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -136,7 +136,6 @@ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_CMD_SCSI

#define CONFIG_SYS_SATA AHCI_BASE_ADDR

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index f4ed0302a9..e9edcd2bc9 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -52,7 +52,6 @@ #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_CMD_SCSI

#define CONFIG_SYS_SATA AHCI_BASE_ADDR

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 9896b0f04b..0c4e98d28f 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -142,7 +142,6 @@ #define CONFIG_FSL_ESDHC

/* SATA */ -#define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 937fd930ee..b95c2d87c0 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -294,7 +294,6 @@ #ifndef SPL_NO_SATA #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI -#define CONFIG_CMD_SCSI #ifndef CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 30b3451447..1ae87eb0b5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SCSI CONFIG_CMD_SDRAM CONFIG_CMD_SF_TEST CONFIG_CMD_SH_ZIMAGEBOOT

This converts the following to Kconfig: CONFIG_CMD_SDRAM

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Put Kconfig change in alphabetical order - Remove some now-superfluous /* commands */ comments in header files

README | 2 -- cmd/Kconfig | 7 +++++++ configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MigoR_defconfig | 1 + configs/alt_defconfig | 1 + configs/ap325rxa_defconfig | 1 + configs/ap_sh4a_4a_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/blanche_defconfig | 1 + configs/ecovec_defconfig | 1 + configs/espt_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/ms7720se_defconfig | 1 + configs/ms7722se_defconfig | 1 + configs/porter_defconfig | 1 + configs/r0p7734_defconfig | 1 + configs/r7780mp_defconfig | 1 + configs/r8a7795_salvator-x_defconfig | 1 + configs/r8a7796_salvator-x_defconfig | 1 + configs/rsk7203_defconfig | 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/sh7763rdp_defconfig | 1 + configs/sh7785lcr_32bit_defconfig | 1 + configs/sh7785lcr_defconfig | 1 + configs/shmin_defconfig | 1 + configs/silk_defconfig | 1 + configs/socrates_defconfig | 1 + configs/stout_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/MPC8349ITX.h | 5 ----- include/configs/MigoR.h | 2 -- include/configs/ap325rxa.h | 2 -- include/configs/ap_sh4a_4a.h | 2 -- include/configs/armadillo-800eva.h | 2 -- include/configs/ecovec.h | 2 -- include/configs/espt.h | 5 ----- include/configs/ms7720se.h | 2 -- include/configs/ms7722se.h | 2 -- include/configs/r0p7734.h | 2 -- include/configs/r7780mp.h | 5 ----- include/configs/rcar-gen2-common.h | 2 -- include/configs/rcar-gen3-common.h | 1 - include/configs/rsk7203.h | 2 -- include/configs/sh7752evb.h | 2 -- include/configs/sh7753evb.h | 2 -- include/configs/sh7757lcr.h | 2 -- include/configs/sh7763rdp.h | 5 ----- include/configs/sh7785lcr.h | 1 - include/configs/shmin.h | 2 -- include/configs/socrates.h | 5 ----- scripts/config_whitelist.txt | 1 - 57 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/README b/README index 318a4aa25d..2371304279 100644 --- a/README +++ b/README @@ -815,8 +815,6 @@ The following options need to be configured: CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_RUN run command in env variable - CONFIG_CMD_SDRAM * print SDRAM configuration information - (requires CONFIG_CMD_I2C) CONFIG_CMD_SF * Read/write/erase SPI NOR flash CONFIG_CMD_SOFTSWITCH * Soft switch setting command for BF60x CONFIG_CMD_SOURCE "source" command Support diff --git a/cmd/Kconfig b/cmd/Kconfig index c74acd535b..6431d7c70f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -776,6 +776,13 @@ config CMD_SAVES Provides a way to save a binary file using the Motorola S-Record format over the serial line.

+config CMD_SDRAM + bool "sdram - Print SDRAM configuration information" + help + Provides information about attached SDRAM. This assumed that the + SDRAM has an EEPROM with information that can be read using the + I2C bus. This is only available on some boards. + config CMD_SF bool "sf" help diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig index 09af09d4c3..f1cfd3705c 100644 --- a/configs/MPC8349ITXGP_defconfig +++ b/configs/MPC8349ITXGP_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> " CONFIG_CMD_I2C=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index 0650c7979a..4974dd1a9c 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_SATA=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y diff --git a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig index 3763f49ba6..22805ae63e 100644 --- a/configs/MPC8349ITX_defconfig +++ b/configs/MPC8349ITX_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_SATA=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig index b8e2da2678..a62d3172d0 100644 --- a/configs/MigoR_defconfig +++ b/configs/MigoR_defconfig @@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 109b1abfe7..4dc13d681c 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig index 8c1aaf2c3c..fedaad9677 100644 --- a/configs/ap325rxa_defconfig +++ b/configs/ap325rxa_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_ENV_EXISTS is not set CONFIG_CMD_IDE=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index 400cfd10a7..c229cf725e 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 8b2448b1fc..53d8ec1016 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index c2a4c8092f..a4f02fe882 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_MMC=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index 532b22d3be..4a5bed30c3 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -17,6 +17,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/espt_defconfig b/configs/espt_defconfig index a41704ec96..a87edf1daf 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 12b768ca39..885d3ca05b 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index e6eef3f731..a95f372f27 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index ca4f73d04f..7afd59f138 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index be5e82aeae..1f436589dd 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_IDE=y # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set CONFIG_CMD_PCMCIA=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/ms7722se_defconfig b/configs/ms7722se_defconfig index 37cf8776c2..d3561da2f0 100644 --- a/configs/ms7722se_defconfig +++ b/configs/ms7722se_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/porter_defconfig b/configs/porter_defconfig index e90fbf1137..21f401aac6 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index 91b36058bc..994c156a73 100644 --- a/configs/r0p7734_defconfig +++ b/configs/r0p7734_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig index 58decc5b52..b2596a4a7a 100644 --- a/configs/r7780mp_defconfig +++ b/configs/r7780mp_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_IDE=y # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 98eca37710..4203b9cd69 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 9e0f9290bf..3c53e47bf1 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/rsk7203_defconfig b/configs/rsk7203_defconfig index f7b99f4842..8f642bf62f 100644 --- a/configs/rsk7203_defconfig +++ b/configs/rsk7203_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index 124757353b..d6ddbfed54 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_MD5SUM=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 68e0c5cdfb..023d2ee97d 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_MD5SUM=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index d43c0184e4..ee9cbc1074 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_MD5SUM=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7763rdp_defconfig b/configs/sh7763rdp_defconfig index 32cc565b5e..858d9e250e 100644 --- a/configs/sh7763rdp_defconfig +++ b/configs/sh7763rdp_defconfig @@ -15,6 +15,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig index d4ebd4b99d..bd5db3edf1 100644 --- a/configs/sh7785lcr_32bit_defconfig +++ b/configs/sh7785lcr_32bit_defconfig @@ -17,6 +17,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig index 5aaca3f574..7547ae475b 100644 --- a/configs/sh7785lcr_defconfig +++ b/configs/sh7785lcr_defconfig @@ -16,6 +16,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/shmin_defconfig b/configs/shmin_defconfig index 249582f495..8570bbc46a 100644 --- a/configs/shmin_defconfig +++ b/configs/shmin_defconfig @@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SDRAM=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/configs/silk_defconfig b/configs/silk_defconfig index d2d20b9b96..bd2832843d 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index f0c1d72f5f..1ab178a175 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set diff --git a/configs/stout_defconfig b/configs/stout_defconfig index bee7401d79..b1467764f7 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y +CONFIG_CMD_SDRAM=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index c72b24284b..25dd3c7355 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_SDRAM /* SDRAM DIMM SPD info printout */ #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */ #define CONFIG_CMD_ZFS /* ZFS Support */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 7d8074b462..212c2e84cb 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -473,11 +473,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SDRAM - #if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \ || defined(CONFIG_USB_STORAGE) #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 73b0e6e05a..a311427435 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MIGO_R 1

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 448c9279a9..0e0e5f9b43 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -13,8 +13,6 @@ #define CONFIG_CPU_SH7723 1 #define CONFIG_AP325RXA 1

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC2,38400"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index adc7d1feba..2f2e4e83f7 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -16,8 +16,6 @@

#define CONFIG_SYS_TEXT_BASE 0x8BFC0000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC4,115200"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 643b26b488..74eebd3aaf 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -16,8 +16,6 @@

#include <asm/arch/rmobile.h>

-#define CONFIG_CMD_SDRAM - #define BOARD_LATE_INIT

#define CONFIG_BOOTARGS "" diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 2471277c68..7b67d992c0 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -28,8 +28,6 @@ #define CONFIG_ECOVEC_ROMIMAGE_ADDR 0xA0040000 #define CONFIG_SYS_TEXT_BASE 0x8FFC0000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/espt.h b/include/configs/espt.h index 07f327532b..438580b51f 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -14,11 +14,6 @@ #define CONFIG_ESPT 1 #define __LITTLE_ENDIAN 1

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1

diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 112145ce77..77e67aa183 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7720 1 #define CONFIG_MS7720SE 1

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 49eadd10e9..af7453e71d 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7722 1 #define CONFIG_MS7722SE 1

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index d79aa21c9e..7c2badc3d5 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -16,8 +16,6 @@

#define CONFIG_SYS_TEXT_BASE 0x8FFC0000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC3,115200"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 21364ddd4a..271ed53b81 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -17,11 +17,6 @@

#define CONFIG_DISPLAY_BOARDINFO

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SDRAM - #define CONFIG_CONS_SCIF0 1

#define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 16f45f2bea..440984ce86 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -11,8 +11,6 @@

#include <asm/arch/rmobile.h>

-#define CONFIG_CMD_SDRAM - /* Support File sytems */ #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_EXT4 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 6c23249861..a79d0e60d0 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -12,7 +12,6 @@

#include <asm/arch/rmobile.h>

-#define CONFIG_CMD_SDRAM #define CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 58aadbef01..ef054dad39 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -13,8 +13,6 @@ #define CONFIG_CPU_SH7203 1 #define CONFIG_RSK7203 1

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_LOADADDR 0x0C100000 /* RSK7203_SDRAM_BASE + 1MB */

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 39e8244b25..a7a2750c15 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -14,8 +14,6 @@

#define CONFIG_SYS_TEXT_BASE 0x5ff80000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 24ec0768af..6feed0f7f1 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -14,8 +14,6 @@

#define CONFIG_SYS_TEXT_BASE 0x5ff80000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index e5084adfcc..11992f5239 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -15,8 +15,6 @@

#define CONFIG_SYS_TEXT_BASE 0x8ef80000

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp"

#define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 74bd9fc29a..327bedb96a 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -14,11 +14,6 @@ #define CONFIG_SH7763RDP 1 #define __LITTLE_ENDIAN 1

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index f249f4298d..d4477c2794 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -12,7 +12,6 @@ #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1

-#define CONFIG_CMD_SDRAM #define CONFIG_CMD_SH_ZIMAGEBOOT

#define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/shmin.h b/include/configs/shmin.h index d31dc558b1..295607808a 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -15,8 +15,6 @@ /* T-SH7706LSR*/ /* #define CONFIG_T_SH7706LSR 1 */

-#define CONFIG_CMD_SDRAM - #define CONFIG_BOOTARGS "console=ttySC0,115200"

/* diff --git a/include/configs/socrates.h b/include/configs/socrates.h index cce7f901af..27e33a7a78 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -274,11 +274,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SDRAM - #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1ae87eb0b5..1d7244c5ee 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SDRAM CONFIG_CMD_SF_TEST CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL

This converts the following to Kconfig: CONFIG_CMD_SF_TEST

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Fix typos in help - Make X86 imply CMD_SF_TEST (except for efi-x86 which fails) - Put Kconfig change in alphabetical order

README | 6 ------ arch/Kconfig | 2 ++ cmd/Kconfig | 11 +++++++++++ configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/efi-x86_defconfig | 1 + configs/sandbox_defconfig | 4 +--- include/configs/efi-x86.h | 2 -- include/configs/sandbox.h | 1 - include/configs/veyron.h | 2 -- include/configs/x86-common.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README b/README index 2371304279..d5684ce5b5 100644 --- a/README +++ b/README @@ -2500,12 +2500,6 @@ The following options need to be configured: CONFIG_SF_DEFAULT_MODE (see include/spi.h) CONFIG_SF_DEFAULT_SPEED in Hz

- CONFIG_CMD_SF_TEST - - Define this option to include a destructive SPI flash - test ('sf test'). - -- SystemACE Support: CONFIG_SYSTEMACE

Adding this option adds support for Xilinx SystemACE diff --git a/arch/Kconfig b/arch/Kconfig index e063ee0d23..08f6e7f47d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -78,6 +78,7 @@ config SANDBOX imply LZMA imply SCSI imply CMD_SATA + imply CMD_SF_TEST

config SH bool "SuperH architecture" @@ -111,6 +112,7 @@ config X86 imply CMD_GETTIME imply CMD_IO imply CMD_IRQ + imply CMD_SF_TEST

config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 6431d7c70f..2a9c55f608 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -788,6 +788,17 @@ config CMD_SF help SPI Flash support

+config CMD_SF_TEST + bool "sf test - Allow testing of SPI flash" + help + Provides a way to test that SPI flash is working correctly. The + test is destructive, in that an area of SPI flash must be provided + for the test to use. Performance information is also provided, + measuring the performance of reading, writing and erasing in + Mbps (Million Bits Per Second). This value should approximately + equal the SPI bus speed for a single-bit-wide SPI bus, assuming + everything is working properly. + config CMD_SPI bool "sspi" help diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 01032e7330..b4e727009c 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index b9d4fc9c12..8e91db4014 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index fb955e46c6..e512ce1ef8 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 789c5ce5bf..a23d402dee 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y +# CONFIG_CMD_SF_TEST is not set CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a1844d30a2..349d3c7270 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_GPIO=y CONFIG_CMD_PCI=y +CONFIG_CMD_READ=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y @@ -193,6 +194,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_MTDPARTS=y -CONFIG_CMD_MTDPARTS_SPREAD=y -CONFIG_CMD_READ=y diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 4a6b66507f..fa263632a2 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -9,8 +9,6 @@

#include <configs/x86-common.h>

-#undef CONFIG_CMD_SF_TEST - #undef CONFIG_TPM_TIS_BASE_ADDRESS

#undef CONFIG_SCSI_AHCI diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index beb5a124a2..13777abb4c 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -52,7 +52,6 @@ #define CONFIG_ENV_SIZE 8192

/* SPI - enable all SPI flash types for testing purposes */ -#define CONFIG_CMD_SF_TEST

#define CONFIG_I2C_EDID

diff --git a/include/configs/veyron.h b/include/configs/veyron.h index 3f236aa13c..3a5fc065d8 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -17,8 +17,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPI_FLASH_GIGADEVICE

-#define CONFIG_CMD_SF_TEST - #define CONFIG_KEYBOARD

#endif diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f5f7a92b8b..43af193344 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -107,7 +107,6 @@ /*----------------------------------------------------------------------- * FLASH configuration */ -#define CONFIG_CMD_SF_TEST #define CONFIG_SPI

/*----------------------------------------------------------------------- diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1d7244c5ee..3a81c7e3ad 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SF_TEST CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS

This converts the following to Kconfig: CONFIG_CMD_SH_ZIMAGEBOOT

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Make this 'default y' and drop defconfig file changes - Remove some now-superfluous /* commands */ comments in header files - Rename the option to include 'zimageboot'

arch/sh/Kconfig | 2 ++ arch/sh/lib/Kconfig | 6 ++++++ include/configs/r2dplus.h | 5 ----- include/configs/sh7785lcr.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 arch/sh/lib/Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1d40fe6845..fa32df02fc 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -128,6 +128,8 @@ config SYS_CPU default "sh3" if CPU_SH3 default "sh4" if CPU_SH4

+source "arch/sh/lib/Kconfig" + source "board/alphaproject/ap_sh4a_4a/Kconfig" source "board/espt/Kconfig" source "board/mpr2/Kconfig" diff --git a/arch/sh/lib/Kconfig b/arch/sh/lib/Kconfig new file mode 100644 index 0000000000..cec8d09cc3 --- /dev/null +++ b/arch/sh/lib/Kconfig @@ -0,0 +1,6 @@ +config CMD_SH_ZIMAGEBOOT + bool "zimageboot - Boot a zImage on SH" + default y + help + This is special SH-specific command to boot a zImage (compressed + Linux image) on SH-architecture boards. diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index a604848073..4feaa0509a 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -8,11 +8,6 @@

#define CONFIG_DISPLAY_BOARDINFO

-/* - * Command line configuration. - */ -#define CONFIG_CMD_SH_ZIMAGEBOOT - /* SCIF */ #define CONFIG_CONS_SCIF1 1

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index d4477c2794..da827aca87 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1

-#define CONFIG_CMD_SH_ZIMAGEBOOT - #define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp"

#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3a81c7e3ad..08351b57e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE

This converts the following to Kconfig: CONFIG_CMD_SPL

Note that trats does not actually use SPL, so this option can no-longer be set.

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Fix up microblaze-generic, gw_ventana, ipam390 - Remove some now-superfluous /* commands */ comments in header files

arch/arm/Kconfig | 1 + arch/arm/mach-imx/mx6/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 1 + cmd/Kconfig | 9 +++++++++ configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_evm_nodt_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/mx6sabreauto.h | 1 - include/configs/mx6sabresd.h | 1 - include/configs/ti_armv7_common.h | 4 ---- include/configs/trats.h | 1 - include/configs/twister.h | 1 - include/configs/zynq-common.h | 1 - scripts/config_whitelist.txt | 1 - 43 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 477e76be29..c0f1c2802e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -729,6 +729,7 @@ config ARCH_ZYNQ select CLK_ZYNQ imply CMD_CLK imply FAT_WRITE + imply CMD_SPL

config ARCH_ZYNQMP bool "Support Xilinx ZynqMP Platform" diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index bb2ce33132..9bae748c67 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -145,6 +145,7 @@ config TARGET_GW_VENTANA bool "gw_ventana" select SUPPORT_SPL imply CMD_SATA + imply CMD_SPL

config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index d8abba992a..7260d27877 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -81,6 +81,7 @@ config TARGET_AM335X_SHC select DM select DM_SERIAL select DM_GPIO + imply CMD_SPL

config TARGET_AM335X_SL50 bool "Support am335x_sl50" diff --git a/cmd/Kconfig b/cmd/Kconfig index 2a9c55f608..9157900a18 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -275,6 +275,15 @@ config CMD_POWEROFF help Poweroff/Shutdown the system

+config CMD_SPL + bool "spl export - Export boot information for Falcon boot" + depends on SPL + help + Falcon mode allows booting directly from SPL into an Operating + System such as Linux, thus skipping U-Boot proper. See + doc/README.falcon for full information about how to use this + command. + endmenu

menu "Environment commands" diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index ae2adb792a..0e30575287 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -24,6 +24,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_DFU_TFTP=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 3ff6220dfc..2ea57ced8d 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -27,6 +27,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index b68857d7b7..07d70db9f2 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -20,6 +20,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index ebf155bfca..eb5a0d6abb 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -19,6 +19,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MTDPARTS=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index efc34ff2e8..7c7a5bd150 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -22,6 +22,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index 2c628870e0..480d94e38c 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig index 5d5c68e0fa..6757473c90 100644 --- a/configs/am335x_sl50_defconfig +++ b/configs/am335x_sl50_defconfig @@ -29,6 +29,7 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" CONFIG_AUTOBOOT_DELAY_STR="d" CONFIG_AUTOBOOT_STOP_STR=" " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index e99ee80cef..9cb1a6b2a3 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 7a561fd746..75dbb38ebc 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 90c0c85988..b073b4fe55 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_USB_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 9cae0cb9f7..ac6f8f43b6 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -33,6 +33,7 @@ CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_PMIC is not set diff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig index 0a898ded4b..c8d773ea10 100644 --- a/configs/am57xx_evm_nodt_defconfig +++ b/configs/am57xx_evm_nodt_defconfig @@ -24,6 +24,7 @@ CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index c5d15c6296..b5d2518cd5 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index 31e077c395..b1cc9784a8 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 4c881d207e..f4ad7267f8 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="Cairo # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index cd790fc675..8c0d1eed20 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 56effa08d0..77f9bc3e34 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -32,6 +32,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x2f000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_ISO_PARTITION=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 0337afa380..c97256d0ff 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -17,6 +17,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 789488e735..7c2d7f8362 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SYS_OS_BASE=0x2c060000 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MFSL=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 03bd57351b..6c37df135e 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index b876be5831..f824f7c547 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 1eb1ff8f12..d1eb9419fb 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="OMAP Logic # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 1a1dfcfafb..12dab49318 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="Overo # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index b9503440d4..3e39e2f0df 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL=y # CONFIG_SPL_I2C_SUPPORT is not set CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 635bdf7e13..c613433d12 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 6571876f24..103391520b 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index a622359f24..4add43836b 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -28,6 +28,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 27b3b0b307..8354eba25a 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -29,6 +29,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index b9e8cf9155..f99f781baf 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_SPL=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 18d1e7b1f5..0c395e5480 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS (14 * SZ_1M)

/* Falcon Mode */ -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 083ccd8ef6..4824941dc3 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -274,7 +274,6 @@ GENERATED_GBL_DATA_SIZE)

/* add FALCON boot mode */ -#define CONFIG_CMD_SPL #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR #define CONFIG_CMD_SPL_NAND_OFS 0x00180000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 8ddbf599e1..3c8b640f1d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -236,7 +236,6 @@ #endif

/* SPL part */ -#define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK

#define CONFIG_SPL_LDSCRIPT "arch/microblaze/cpu/u-boot-spl.lds" diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index bd178a4a87..daebf5cba5 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -34,7 +34,6 @@ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 0fa442985a..9622394c8f 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -24,7 +24,6 @@ /* Falcon Mode */ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index ccd7cd72d2..ac3eb5d729 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -201,10 +201,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1700 /* address 0x2E0000 */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x1500 /* address 0x2A0000 */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x200 /* 256KiB */ - - -/* spl export command */ -#define CONFIG_CMD_SPL #endif

/* General parts of the framework, required. */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3059d89ac9..861eb26305 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -166,7 +166,6 @@ "fdtaddr=40800000\0" \

/* Falcon mode definitions */ -#define CONFIG_CMD_SPL #define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100

/* GPT */ diff --git a/include/configs/twister.h b/include/configs/twister.h index 94dde90e60..c45ae87a41 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -36,7 +36,6 @@ "bootcmd=run nandboot\0"

/* SPL OS boot options */ -#define CONFIG_CMD_SPL #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 056eef7ce8..35e5c1e64f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -318,7 +318,6 @@ /* Commands */

/* SPL part */ -#define CONFIG_CMD_SPL #define CONFIG_SPL_FRAMEWORK

#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 08351b57e1..2bac9cf7a2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_STRINGS

This converts the following to Kconfig: CONFIG_CMD_SPL_NAND_OFS

Signed-off-by: Simon Glass sjg@chromium.org ---

Changes in v2: - Drop unwanted 'CONFIG_CMD_SPL_NAND_OFS=0x0' lines in defconfig

cmd/Kconfig | 10 ++++++++++ configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 2 -- scripts/config_whitelist.txt | 1 - 39 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 9157900a18..065664db06 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -284,6 +284,16 @@ config CMD_SPL doc/README.falcon for full information about how to use this command.

+config CMD_SPL_NAND_OFS + hex "Offset of OS command line args for Falcon-mode NAND boot" + depends on CMD_SPL + default 0 + help + This provides the offset of the command line arguments for Linux + when booting from NAND in Falcon mode. See doc/README.falcon + for full information about how to use this option (and also see + board/gateworks/gw_ventana/README for an example). + endmenu

menu "Environment commands" diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 07d70db9f2..8ffb1d61a4 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index eb5a0d6abb..5aac38f3c6 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_NAND=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MTDPARTS=y CONFIG_DFU_MMC=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 7c7a5bd150..83d6aba8e5 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -23,6 +23,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x81000000 CONFIG_FASTBOOT_BUF_SIZE=0x07000000 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00080000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 9cb1a6b2a3..29f0be28e3 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 75dbb38ebc..b5a2863328 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index b073b4fe55..28302a4979 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index f4ad7267f8..da2cf4cfe4 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -14,6 +14,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 8c0d1eed20..dadc8b6ab3 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -10,6 +10,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x680000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 316df3e97f..3318faee0f 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index d04a92b83a..7830d90ca2 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 02b4d2bec3..3b0f42d377 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL_NAND_OFS=0x1100000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 2375f861f1..576674cc33 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 03da20162b..b80db9a876 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index fb8c925113..237bc43f5d 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_ONENAND_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index c97256d0ff..702b311568 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00180000 CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index f824f7c547..98e2be62db 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index d1eb9419fb..27c9e21bd5 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -20,6 +20,7 @@ CONFIG_SYS_PROMPT="OMAP Logic # " # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 # CONFIG_CMD_EEPROM is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 12dab49318..18bb6a124d 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 8354eba25a..b4562b599c 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -30,6 +30,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index f99f781baf..261d946f2b 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="twister => " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x00800000 CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2a2e2ba0a9..1d8a07efff 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -238,7 +238,6 @@ #define CONFIG_SPL_NAND_AM33XX_BCH #endif #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 44691676da..0d84a437d5 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -309,7 +309,6 @@ #endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00100000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif diff --git a/include/configs/baltos.h b/include/configs/baltos.h index aba7208c5a..1b932e24c7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -45,7 +45,6 @@ #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index fafab8ea97..90188ea178 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SPL_NAND_AM33XX_BCH #endif #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 9688c4a776..3dbbf67b5c 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -66,7 +66,6 @@

/* NAND */ #ifdef CONFIG_NAND -#define CONFIG_CMD_SPL_NAND_OFS 0x080000 /* end of u-boot */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x140000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif /* CONFIG_NAND */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index bc52aae251..a3c2942f79 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -139,7 +139,6 @@ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x400000 /* un-assigned: (using dtb) */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x500000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index fb9e4c6428..b4f46697e3 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -212,8 +212,6 @@

/* SPL OS boot options */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ -#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ - 0x400000) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000

#undef CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index b5091513f7..79a4488818 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -211,7 +211,6 @@ #endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os-boot params*/ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 0c395e5480..d389058573 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -16,7 +16,6 @@ #define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

/* Falcon Mode - NAND support: args@17MB kernel@18MB */ -#define CONFIG_CMD_SPL_NAND_OFS (17 * SZ_1M) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS (18 * SZ_1M)

/* Falcon Mode - MMC support: args@1MB kernel@2MB */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 4824941dc3..6adbb8e778 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -276,7 +276,6 @@ /* add FALCON boot mode */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR -#define CONFIG_CMD_SPL_NAND_OFS 0x00180000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x400

/* GPIO support */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a87a75e3cc..c6839013f2 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -276,7 +276,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 4f8ce54144..5f9f8156fd 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -200,7 +200,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 2ab74cb0e9..9143072814 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -264,7 +264,6 @@

/* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 133069abbc..b123e62756 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -218,7 +218,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index b86292400a..81f8b799a0 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -57,7 +57,6 @@ #if defined(CONFIG_CMD_NAND) /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index dbe0ddd785..1d962b100a 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -163,7 +163,6 @@ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 /* un-assigned */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 #define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif diff --git a/include/configs/twister.h b/include/configs/twister.h index c45ae87a41..80d480b103 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -38,8 +38,6 @@ /* SPL OS boot options */ #define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 -#define CONFIG_CMD_SPL_NAND_OFS (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\ - 0x600000)

#define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2bac9cf7a2..d12eeec5cb 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_STRINGS CONFIG_CMD_SX151X

This converts the following to Kconfig: CONFIG_CMD_SPL_WRITE_SIZE

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 9 +++++++++ configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/mx6sabreauto.h | 1 - include/configs/mx6sabresd.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 1 - scripts/config_whitelist.txt | 1 - 31 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 065664db06..df16508e47 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -294,6 +294,15 @@ config CMD_SPL_NAND_OFS for full information about how to use this option (and also see board/gateworks/gw_ventana/README for an example).

+config CMD_SPL_WRITE_SIZE + hex "Size of argument area" + depends on CMD_SPL + default 0x2000 + help + This provides the size of the command-line argument area in NAND + flash used by Falcon-mode boot. See the documentation until CMD_SPL + for detail. + endmenu

menu "Environment commands" diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 29f0be28e3..0c8b784cd6 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x40000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index b5a2863328..f6a51a24a7 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x40000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 28302a4979..08686d8d9d 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x40000 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index dadc8b6ab3..b3a602314a 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x680000 +CONFIG_CMD_SPL_WRITE_SIZE=0x400 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 3318faee0f..944c0125e8 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL_NAND_OFS=0x1100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 7830d90ca2..5b2672c2bf 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL_NAND_OFS=0x1100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 3b0f42d377..ecbe4e60a6 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -34,6 +34,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL_NAND_OFS=0x1100000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 702b311568..80d9f47a65 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -19,6 +19,7 @@ CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00180000 +CONFIG_CMD_SPL_WRITE_SIZE=0x400 CONFIG_CMD_ASKENV=y CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FLASH is not set diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 6c37df135e..99da859303 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 261d946f2b..82bcc8a2d8 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="twister => " # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00800000 +CONFIG_CMD_SPL_WRITE_SIZE=0x400 CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1d8a07efff..1c6189311c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -239,7 +239,6 @@ #endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #endif /* !CONFIG_NAND */

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 0d84a437d5..d5d15e08fa 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -310,7 +310,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00300000 /* kernel offset */ -#define CONFIG_CMD_SPL_WRITE_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #endif #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 1b932e24c7..4e352b0e29 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -46,7 +46,6 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 90188ea178..0c93a2b1b6 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -396,7 +396,6 @@ DEFAULT_LINUX_BOOT_ENV \ #endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #endif /* !CONFIG_NAND */

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 3dbbf67b5c..f965fc9a1d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -67,7 +67,6 @@ /* NAND */ #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x140000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif /* CONFIG_NAND */ #endif /* CONFIG_SPL_OS_BOOT */

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index a3c2942f79..99bc4e08df 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x500000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

/* GPIO pin + bank to pin ID mapping */ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index b4f46697e3..f935334388 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -211,7 +211,6 @@ #define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000

/* SPL OS boot options */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000

#undef CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 79a4488818..fce67b7cef 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -212,7 +212,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #endif /* !CONFIG_NAND */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index d389058573..aeacd46f33 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -13,7 +13,6 @@

/* Falcon Mode */ #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

/* Falcon Mode - NAND support: args@17MB kernel@18MB */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS (18 * SZ_1M) diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 6adbb8e778..be91dc27cd 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -276,7 +276,6 @@ /* add FALCON boot mode */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 #define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR -#define CONFIG_CMD_SPL_WRITE_SIZE 0x400

/* GPIO support */ #define CONFIG_DA8XX_GPIO diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index daebf5cba5..03ab812a32 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -35,7 +35,6 @@ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

/* Falcon Mode - MMC support: args@1MB kernel@2MB */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 9622394c8f..5410881fa1 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -25,7 +25,6 @@ #define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" #define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 -#define CONFIG_CMD_SPL_WRITE_SIZE (128 * SZ_1K)

/* Falcon Mode - MMC support: args@1MB kernel@2MB */ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c6839013f2..fe83e71b61 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -277,7 +277,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

#endif /* __CONFIG_H */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 5f9f8156fd..162fe0f2d3 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -201,7 +201,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

/* env defaults */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 9143072814..e4527471f4 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -265,7 +265,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

#endif /* __CONFIG_H */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index b123e62756..d6c469b402 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -219,7 +219,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

#endif /* __CONFIG_H */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 81f8b799a0..f58d621e2c 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -58,7 +58,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #endif

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 1d962b100a..55ce849081 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -164,7 +164,6 @@ /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif

/* diff --git a/include/configs/twister.h b/include/configs/twister.h index 80d480b103..bec402ea9c 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -36,7 +36,6 @@ "bootcmd=run nandboot\0"

/* SPL OS boot options */ -#define CONFIG_CMD_SPL_WRITE_SIZE 0x400 /* 1024 byte */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000

#define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d12eeec5cb..d2f839a7a2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SPL_WRITE_SIZE CONFIG_CMD_STRINGS CONFIG_CMD_SX151X CONFIG_CMD_TCA642X

This driver is not used in U-Boot. Drop it and its associated CONFIG options.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: - Drop include/sx151x.h also

drivers/gpio/Makefile | 1 - drivers/gpio/sx151x.c | 242 ------------------------------------------- include/sx151x.h | 17 --- scripts/config_whitelist.txt | 3 - 4 files changed, 263 deletions(-) delete mode 100644 drivers/gpio/sx151x.c delete mode 100644 include/sx151x.h

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 8937e99b47..1396467ab6 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_BCM2835_GPIO) += bcm2835_gpio.o obj-$(CONFIG_XILINX_GPIO) += xilinx_gpio.o obj-$(CONFIG_ADI_GPIO2) += adi_gpio2.o obj-$(CONFIG_TCA642X) += tca642x.o -oby-$(CONFIG_SX151X) += sx151x.o obj-$(CONFIG_SUNXI_GPIO) += sunxi_gpio.o obj-$(CONFIG_LPC32XX_GPIO) += lpc32xx_gpio.o obj-$(CONFIG_STM32_GPIO) += stm32_gpio.o diff --git a/drivers/gpio/sx151x.c b/drivers/gpio/sx151x.c deleted file mode 100644 index 167cf40c71..0000000000 --- a/drivers/gpio/sx151x.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * (C) Copyright 2013 - * Viktar Palstsiuk, Promwad, viktar.palstsiuk@promwad.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -/* - * Driver for Semtech SX151x SPI GPIO Expanders - */ - -#include <common.h> -#include <spi.h> -#include <sx151x.h> - -#ifndef CONFIG_SX151X_SPI_BUS -#define CONFIG_SX151X_SPI_BUS 0 -#endif - -/* - * The SX151x registers - */ - -#ifdef CONFIG_SX151X_GPIO_COUNT_8 -/* 8bit: SX1511 */ -#define SX151X_REG_DIR 0x07 -#define SX151X_REG_DATA 0x08 -#else -/* 16bit: SX1512 */ -#define SX151X_REG_DIR 0x0F -#define SX151X_REG_DATA 0x11 -#endif -#define SX151X_REG_RESET 0x7D - -static int sx151x_spi_write(int chip, unsigned char reg, unsigned char val) -{ - struct spi_slave *slave; - unsigned char buf[2]; - int ret; - - slave = spi_setup_slave(CONFIG_SX151X_SPI_BUS, chip, 1000000, - SPI_MODE_0); - if (!slave) - return 0; - - spi_claim_bus(slave); - - buf[0] = reg; - buf[1] = val; - - ret = spi_xfer(slave, 16, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END); - if (ret < 0) - printf("spi%d.%d write fail: can't write %02x to %02x: %d\n", - CONFIG_SX151X_SPI_BUS, chip, val, reg, ret); - else - printf("spi%d.%d write 0x%02x to register 0x%02x\n", - CONFIG_SX151X_SPI_BUS, chip, val, reg); - spi_release_bus(slave); - spi_free_slave(slave); - - return ret; -} - -static int sx151x_spi_read(int chip, unsigned char reg) -{ - struct spi_slave *slave; - int ret; - - slave = spi_setup_slave(CONFIG_SX151X_SPI_BUS, chip, 1000000, - SPI_MODE_0); - if (!slave) - return 0; - - spi_claim_bus(slave); - - ret = spi_w8r8(slave, reg | 0x80); - if (ret < 0) - printf("spi%d.%d read fail: can't read %02x: %d\n", - CONFIG_SX151X_SPI_BUS, chip, reg, ret); - else - printf("spi%d.%d read register 0x%02x: 0x%02x\n", - CONFIG_SX151X_SPI_BUS, chip, reg, ret); - - spi_release_bus(slave); - spi_free_slave(slave); - - return ret; -} - -static inline void sx151x_find_cfg(int gpio, unsigned char *reg, unsigned char *mask) -{ - *reg -= gpio / 8; - *mask = 1 << (gpio % 8); -} - -static int sx151x_write_cfg(int chip, unsigned char gpio, unsigned char reg, int val) -{ - unsigned char mask; - unsigned char data; - int ret; - - sx151x_find_cfg(gpio, &reg, &mask); - ret = sx151x_spi_read(chip, reg); - if (ret < 0) - return ret; - else - data = ret; - data &= ~mask; - data |= (val << (gpio % 8)) & mask; - return sx151x_spi_write(chip, reg, data); -} - -int sx151x_get_value(int chip, int gpio) -{ - unsigned char reg = SX151X_REG_DATA; - unsigned char mask; - int ret; - - sx151x_find_cfg(gpio, &reg, &mask); - ret = sx151x_spi_read(chip, reg); - if (ret >= 0) - ret = (ret & mask) != 0 ? 1 : 0; - - return ret; -} - -int sx151x_set_value(int chip, int gpio, int val) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DATA, (val ? 1 : 0)); -} - -int sx151x_direction_input(int chip, int gpio) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DIR, 1); -} - -int sx151x_direction_output(int chip, int gpio) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DIR, 0); -} - -int sx151x_reset(int chip) -{ - int err; - - err = sx151x_spi_write(chip, SX151X_REG_RESET, 0x12); - if (err < 0) - return err; - - err = sx151x_spi_write(chip, SX151X_REG_RESET, 0x34); - return err; -} - -#ifdef CONFIG_CMD_SX151X - -int do_sx151x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - int ret = CMD_RET_USAGE, chip = 0, gpio = 0, val = 0; - - if (argc < 3) - return CMD_RET_USAGE; - - /* arg2 used as chip number */ - chip = simple_strtoul(argv[2], NULL, 10); - - if (strcmp(argv[1], "reset") == 0) { - ret = sx151x_reset(chip); - if (!ret) { - printf("Device at spi%d.%d was reset\n", - CONFIG_SX151X_SPI_BUS, chip); - } - return ret; - } - - if (argc < 4) - return CMD_RET_USAGE; - - /* arg3 used as gpio number */ - gpio = simple_strtoul(argv[3], NULL, 10); - - if (strcmp(argv[1], "get") == 0) { - ret = sx151x_get_value(chip, gpio); - if (ret < 0) - printf("Failed to get value at spi%d.%d gpio %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio); - else { - printf("Value at spi%d.%d gpio %d is %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio, ret); - ret = 0; - } - return ret; - } - - if (argc < 5) - return CMD_RET_USAGE; - - /* arg4 used as value or direction */ - val = simple_strtoul(argv[4], NULL, 10); - - if (strcmp(argv[1], "set") == 0) { - ret = sx151x_set_value(chip, gpio, val); - if (ret < 0) - printf("Failed to set value at spi%d.%d gpio %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio); - else - printf("New value at spi%d.%d gpio %d is %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio, val); - return ret; - } else if (strcmp(argv[1], "dir") == 0) { - if (val == 0) - ret = sx151x_direction_output(chip, gpio); - else - ret = sx151x_direction_input(chip, gpio); - - if (ret < 0) - printf("Failed to set direction of spi%d.%d gpio %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio); - else - printf("New direction of spi%d.%d gpio %d is %d\n", - CONFIG_SX151X_SPI_BUS, chip, gpio, val); - return ret; - } - - printf("Please see usage\n"); - - return ret; -} - -U_BOOT_CMD( - sx151x, 5, 1, do_sx151x, - "sx151x gpio access", - "dir chip gpio 0|1\n" - " - set gpio direction (0 for output, 1 for input)\n" - "sx151x get chip gpio\n" - " - get gpio value\n" - "sx151x set chip gpio 0|1\n" - " - set gpio value\n" - "sx151x reset chip\n" - " - reset chip" -); - -#endif /* CONFIG_CMD_SX151X */ diff --git a/include/sx151x.h b/include/sx151x.h deleted file mode 100644 index be42b0681b..0000000000 --- a/include/sx151x.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2013 - * Viktar Palstsiuk, Promwad, viktar.palstsiuk@promwad.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __SX151X_H_ -#define __SX151X_H_ - -int sx151x_get_value(int chip, int gpio); -int sx151x_set_value(int chip, int gpio, int val); -int sx151x_direction_input(int chip, int gpio); -int sx151x_direction_output(int chip, int gpio); -int sx151x_reset(int chip); - -#endif /* __SX151X_H_ */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e89099472c..f5ec487668 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SX151X CONFIG_CMD_TCA642X CONFIG_CMD_TERMINAL CONFIG_CMD_TFTP @@ -2338,8 +2337,6 @@ CONFIG_SUPPORT_EMMC_RPMB CONFIG_SUPPORT_RAW_INITRD CONFIG_SUPPORT_VFAT CONFIG_SUVD3 -CONFIG_SX151X_GPIO_COUNT_8 -CONFIG_SX151X_SPI_BUS CONFIG_SXNI855T CONFIG_SYSCOUNTER_TIMER CONFIG_SYSFLAGS_ADDR

This converts the following to Kconfig: CONFIG_CMD_TERMINAL

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 8 ++++++++ include/config_cmd_all.h | 1 - include/configs/vct.h | 2 -- scripts/config_whitelist.txt | 1 - 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 4c1cbe736f..a4c719d424 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1085,6 +1085,14 @@ config CMD_QFW

source "cmd/mvebu/Kconfig"

+config CMD_TERMINAL + bool "terminal - provides a way to attach a serial terminal" + help + Provides a 'cu'-like serial terminal command. This can be used to + access other serial ports from the system console. The terminal + is very simple with no special processing of characters. As with + cu, you can press ~. (tilde followed by period) to exit. + endmenu

config CMD_BOOTSTAGE diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 25dd3c7355..f93d5508bb 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_TERMINAL /* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */ #define CONFIG_CMD_ZFS /* ZFS Support */

diff --git a/include/configs/vct.h b/include/configs/vct.h index a98dae8e24..e7c3d4b589 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -239,8 +239,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_TERMINAL - #undef CONFIG_SMC911X #undef CONFIG_SYS_I2C_SOFT #undef CONFIG_SOURCE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4ce1273bed..1753f4572f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TERMINAL CONFIG_CMD_TFTP CONFIG_CMD_THOR_DOWNLOAD CONFIG_CMD_TRACE

This converts the following to Kconfig: CONFIG_CMD_THOR_DOWNLOAD

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 8 ++++++++ configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/topic_miami_defconfig | 1 + configs/topic_miamilite_defconfig | 1 + configs/topic_miamiplus_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + include/configs/exynos4-common.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/smdkv310.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index a4c719d424..6a895bbac5 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -303,6 +303,14 @@ config CMD_SPL_WRITE_SIZE flash used by Falcon-mode boot. See the documentation until CMD_SPL for detail.

+config CMD_THOR_DOWNLOAD + bool "thor - TIZEN 'thor' download" + help + Implements the 'thor' download protocol. This is a way of + downloading a software update over USB from an attached host. + There is no documentation about this within the U-Boot source code + but you should be able to find something on the interwebs. + endmenu

menu "Environment commands" diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index ffcecd5fd2..2354a00ad4 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -12,6 +12,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_PROMPT="ODROID-XU3 # " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 22e86e28c3..c9e55406eb 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="Odroid # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 573c9e29a7..0a27833f46 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="ORIGEN # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 0045f5e63e..8bfab751cb 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="Goni # " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 021e6c5102..cdbf12ceff 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Universal # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 1873791e79..1bc9e3849e 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index db859a7b0b..df36b68ba7 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index 93e0292bd5..18df89ddd0 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 16ac27fb95..f91ec1d3c3 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="Trats2 # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 0f2445bdf4..3a8f075d7b 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Trats # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index b696c6272f..f9b2d6e101 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -21,6 +21,7 @@ CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_EDITENV is not set # CONFIG_CMD_ENV_EXISTS is not set CONFIG_CMD_UNZIP=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index 8c4931f20d..8d648262cf 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index c4d8c97075..34d2843926 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y # CONFIG_CMD_FLASH is not set diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index b58460ae3a..112780b8d0 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 0e1c841ea5..7ca92053d4 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -20,6 +20,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_UNZIP=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index ec8eafb4db..1eb6575693 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_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_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index f5155b2678..ad6bc0b5bc 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index b850af923b..d6a32f93d7 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 35722e9952..5616549bc0 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 762d475de6..9ebcd4131f 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_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_THOR_DOWNLOAD=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 439236139e..31499a1e92 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 9f0131a7ee..94fd3b36f6 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -21,7 +21,6 @@ #define CONFIG_MMC_DEFAULT_DEV 0

/* TIZEN THOR downloader support */ -#define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR

#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 697f8d2582..8bc7fbde9e 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -48,7 +48,6 @@ #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_USB_FUNCTION_THOR -#define CONFIG_CMD_THOR_DOWNLOAD

/* UMS */ #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index eb17580865..01655ee1ed 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -56,7 +56,6 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300

/* TIZEN THOR downloader support */ -#define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR

/* USB Samsung's IDs */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 9986a3b707..96048f5d40 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -15,7 +15,6 @@ #undef CONFIG_USB_GADGET_DWC2_OTG #undef CONFIG_USB_GADGET_DWC2_OTG_PHY #undef CONFIG_REVISION_TAG -#undef CONFIG_CMD_THOR_DOWNLOAD

/* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 363c2924f0..55bd2836e6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -89,7 +89,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_USB_CABLE_CHECK -#define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR #define CONFIG_THOR_RESET_OFF #define DFU_ALT_INFO_RAM \ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 35e5c1e64f..66bc508b9d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -91,7 +91,6 @@ # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300 # define CONFIG_USB_CABLE_CHECK -# define CONFIG_CMD_THOR_DOWNLOAD # define CONFIG_THOR_RESET_OFF # define CONFIG_USB_FUNCTION_THOR # define DFU_ALT_INFO_RAM \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cd87bafbed..515ea8861d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_THOR_DOWNLOAD CONFIG_CMD_TRACE CONFIG_CMD_TSI148 CONFIG_CMD_UNIVERSE

This converts the following to Kconfig: CONFIG_CMD_TRACE

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 9 +++++++++ include/configs/exynos5-common.h | 1 - include/configs/sandbox.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index f8017f885a..425d1d1351 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1407,6 +1407,15 @@ config CMD_KGDB single-stepping, inspecting variables, etc. This is supported only on PowerPC at present.

+config CMD_TRACE + bool "trace - Support tracing of function calls and timing" + help + Enables a command to control using of function tracing within + U-Boot. This allows recording of call traces including timing + information. The command can write data to memory for exporting + for analsys (e.g. using bootchart). See doc/README.trace for full + details. + endmenu

config CMD_UBI diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 3b73bbc525..9c9681e8ac 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -17,7 +17,6 @@

#ifdef FTRACE #define CONFIG_TRACE -#define CONFIG_CMD_TRACE #define CONFIG_TRACE_BUFFER_SIZE (16 << 20) #define CONFIG_TRACE_EARLY_SIZE (8 << 20) #define CONFIG_TRACE_EARLY diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 13777abb4c..7567ccd905 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -8,7 +8,6 @@

#ifdef FTRACE #define CONFIG_TRACE -#define CONFIG_CMD_TRACE #define CONFIG_TRACE_BUFFER_SIZE (16 << 20) #define CONFIG_TRACE_EARLY_SIZE (8 << 20) #define CONFIG_TRACE_EARLY diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 515ea8861d..58f8bc4e87 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TRACE CONFIG_CMD_TSI148 CONFIG_CMD_UNIVERSE CONFIG_CMD_UUID

This converts the following to Kconfig: CONFIG_CMD_UNIVERSE

Since no board uses this, perhaps we should drop this command?

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: - Add a note about dropping CMD_UNIVERSE - Sort Kconfig options in alphabetical order

cmd/Kconfig | 6 ++++++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index 7934753232..4524370d23 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -854,6 +854,12 @@ config CMD_TSI148 This provides various sub-commands to initialise and configure the Turndra tsi148 device. See the command help for full details.

+config CMD_UNIVERSE + bool "universe - Command to set up the Turndra Universe controller" + help + This allows setting up the VMEbus provided by this controller. + See the command help for full details. + config CMD_USB bool "usb" help diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index f93d5508bb..faddca88cd 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_UNIVERSE /* Tundra Universe Support */ #define CONFIG_CMD_ZFS /* ZFS Support */

#endif /* _CONFIG_CMD_ALL_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 42eb367aa3..31aee890d7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_UNIVERSE CONFIG_CMD_UUID CONFIG_CMD_ZBOOT CONFIG_CMD_ZFS

This converts the following to Kconfig: CONFIG_CMD_UUID

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

README | 1 - cmd/Kconfig | 11 +++++++++++ scripts/config_whitelist.txt | 1 - 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/README b/README index d5684ce5b5..1def10f235 100644 --- a/README +++ b/README @@ -826,7 +826,6 @@ The following options need to be configured: CONFIG_CMD_USB * USB support CONFIG_CMD_CDP * Cisco Discover Protocol support CONFIG_CMD_XIMG Load part of Multi Image - CONFIG_CMD_UUID * Generate random UUID or GUID string

EXAMPLE: If you want all functions except of network support you can write: diff --git a/cmd/Kconfig b/cmd/Kconfig index 4524370d23..de66c54ebc 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1113,6 +1113,17 @@ config CMD_TERMINAL is very simple with no special processing of characters. As with cu, you can press ~. (tilde followed by period) to exit.

+config CMD_UUID + bool "uuid, guid - generation of unique IDs" + help + This enables two commands: + + uuid - generate random Universally Unique Identifier + guid - generate Globally Unique Identifier based on random UUID + + The two commands are very similar except for the endianness of the + output. + endmenu

config CMD_BOOTSTAGE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31aee890d7..b2160567d6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_UUID CONFIG_CMD_ZBOOT CONFIG_CMD_ZFS CONFIG_CM_INIT

This converts the following to Kconfig: CONFIG_CMD_ZFS

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: None

cmd/Kconfig | 11 +++++++++++ include/config_cmd_all.h | 2 -- scripts/config_whitelist.txt | 1 - 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index c00353fff3..2c2669cdc3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1406,6 +1406,17 @@ config CMD_YAFFS2 that device writes are sequential regardless of filesystem activity.

+config CMD_ZFS + bool "zfs - Access of ZFS filesystem" + help + This provides commands to accessing a ZFS filesystem, commonly used + on Solaris systems. Two sub-commands are provided: + + zfsls - list files in a directory + zfsload - load a file + + See doc/README.zfs for more details. + endmenu

menu "Debug commands" diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index faddca88cd..df88df42e1 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,6 +13,4 @@ * Alphabetical list of all possible commands. */

-#define CONFIG_CMD_ZFS /* ZFS Support */ - #endif /* _CONFIG_CMD_ALL_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c3d3e46f9..0b70937810 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ZFS CONFIG_CM_INIT CONFIG_CM_MULTIPLE_SSRAM CONFIG_CM_REMAP

Most of this is duplicated in Kconfig help. Add some of that which is not, and remove the help from the README.

Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---

Changes in v2: - Drop patch to convert CONFIG_CMD_MTDPARTS to Kconfig (already done)

README | 116 +-------------------------------------------------- cmd/Kconfig | 4 +- cmd/fastboot/Kconfig | 2 + 3 files changed, 6 insertions(+), 116 deletions(-)

diff --git a/README b/README index 21639fdd3b..99a0a41c47 100644 --- a/README +++ b/README @@ -756,93 +756,6 @@ The following options need to be configured: Select one of the baudrates listed in CONFIG_SYS_BAUDRATE_TABLE, see below.

-- Monitor Functions: - The default command configuration includes all commands - except those marked below with a "*". - - CONFIG_CMD_AES AES 128 CBC encrypt/decrypt - CONFIG_CMD_ASKENV * ask for env variable - CONFIG_CMD_BDI bdinfo - CONFIG_CMD_BOOTD bootd - CONFIG_CMD_BOOTI * ARM64 Linux kernel Image support - CONFIG_CMD_CACHE * icache, dcache - CONFIG_CMD_CONSOLE coninfo - CONFIG_CMD_DHCP * DHCP support - CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_ECHO echo arguments - CONFIG_CMD_EDITENV edit env variable - CONFIG_CMD_ELF * bootelf, bootvx - CONFIG_CMD_ENV_EXISTS * check existence of env variable - CONFIG_CMD_EXPORTENV * export the environment - CONFIG_CMD_EXT2 * ext2 command support - CONFIG_CMD_EXT4 * ext4 command support - CONFIG_CMD_FS_GENERIC * filesystem commands (e.g. load, ls) - that work for multiple fs types - CONFIG_CMD_FS_UUID * Look up a filesystem UUID - CONFIG_CMD_SAVEENV saveenv - CONFIG_CMD_FLASH flinfo, erase, protect - CONFIG_CMD_FPGA FPGA device initialization support - CONFIG_CMD_GO * the 'go' command (exec code) - CONFIG_CMD_GREPENV * search environment - CONFIG_CMD_I2C * I2C serial bus 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 - 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_LDRINFO * ldrinfo (display Blackfin loader) - CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration - (169.254.*.*) - CONFIG_CMD_LOADB loadb - CONFIG_CMD_LOADS loads - CONFIG_CMD_MD5SUM * print md5 message digest - (requires CONFIG_CMD_MEMORY and CONFIG_MD5) - CONFIG_CMD_MEMINFO * Display detailed memory information - CONFIG_CMD_MEMORY md, mm, nm, mw, cp, cmp, crc, base, - loop, loopw - CONFIG_CMD_MEMTEST * mtest - CONFIG_CMD_MISC Misc functions like sleep etc - CONFIG_CMD_MMC * MMC memory mapped support - CONFIG_CMD_MII * MII utility commands - CONFIG_CMD_NET bootp, tftpboot, rarpboot - CONFIG_CMD_NFS NFS support - CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network - host - CONFIG_CMD_RUN run command in env variable - CONFIG_CMD_SF * Read/write/erase SPI NOR flash - CONFIG_CMD_SOFTSWITCH * Soft switch setting command for BF60x - CONFIG_CMD_SOURCE "source" command Support - CONFIG_CMD_SPI * SPI serial bus support - CONFIG_CMD_TFTPSRV * TFTP transfer in server mode - CONFIG_CMD_TFTPPUT * TFTP put command (upload) - CONFIG_CMD_TIME * run command and report execution time (ARM specific) - CONFIG_CMD_TIMER * access to the system tick timer - CONFIG_CMD_USB * USB support - CONFIG_CMD_CDP * Cisco Discover Protocol support - CONFIG_CMD_XIMG Load part of Multi Image - - EXAMPLE: If you want all functions except of network - support you can write: - - #include "config_cmd_all.h" - #undef CONFIG_CMD_NET - - Other Commands: - fdt (flattened device tree) command: CONFIG_OF_LIBFDT - - Note: Don't enable the "icache" and "dcache" commands - (configuration option CONFIG_CMD_CACHE) unless you know - what you (and your U-Boot users) are doing. Data - cache cannot be enabled on systems like the - 8xx (where accesses to the IMMR region must be - uncached), and it cannot be disabled on all other - systems where we (mis-) use the data cache to hold an - initial stack and some data. - - - XXX - this list needs to get updated! - - Removal of commands If no commands are needed to boot, you can disable CONFIG_CMDLINE to remove them. In this case, the command line @@ -1044,10 +957,6 @@ The following options need to be configured: Allow generic access to the SPI bus on the Intel 8257x, for example with the "sspi" command.

- CONFIG_CMD_E1000 - Management command for E1000 devices. When used on devices - with SPI support you can reprogram the EEPROM from U-Boot. - CONFIG_EEPRO100 Support for Intel 82557/82559/82559ER chips. Optional CONFIG_EEPRO100_SROM_WRITE enables EEPROM @@ -1182,11 +1091,6 @@ The following options need to be configured: to. Contemporary x86 systems usually map it at 0xfed40000.

- CONFIG_CMD_TPM - Add tpm monitor functions. - Requires CONFIG_TPM. If CONFIG_TPM_AUTH_SESSIONS is set, also - provides monitor access to authorized functions. - CONFIG_TPM Define this to enable the TPM support library which provides functional interfaces to some TPM commands. @@ -1314,12 +1218,6 @@ The following options need to be configured: CONFIG_USB_FUNCTION_DFU This enables the USB portion of the DFU USB class

- CONFIG_CMD_DFU - This enables the command "dfu" which is used to have - U-Boot create a DFU class device via USB. This command - requires that the "dfu_alt_info" environment variable be - set and define the alt settings to expose to the host. - CONFIG_DFU_MMC This enables support for exposing (e)MMC devices via DFU.

@@ -1359,13 +1257,6 @@ The following options need to be configured: CONFIG_USB_FUNCTION_FASTBOOT This enables the USB part of the fastboot gadget

- CONFIG_CMD_FASTBOOT - This enables the command "fastboot" which enables the Android - fastboot mode for the platform's USB device. Fastboot is a USB - protocol for downloading images, flashing and device control - used on Android devices. - See doc/README.android-fastboot for more information. - CONFIG_ANDROID_BOOT_IMAGE This enables support for booting images which use the Android image format header. @@ -2476,12 +2367,7 @@ The following options need to be configured: commands cp, md...

- Serial Flash support - CONFIG_CMD_SF - - Defining this option enables SPI flash commands - 'sf probe/read/write/erase/update'. - - Usage requires an initial 'probe' to define the serial + Usage requires an initial 'sf probe' to define the serial flash parameters, followed by read/write/erase/update commands.

diff --git a/cmd/Kconfig b/cmd/Kconfig index 2c2669cdc3..c38a6b81f1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -576,7 +576,9 @@ config CMD_DFU select USB_FUNCTION_DFU help Enables the command "dfu" which is used to have U-Boot create a DFU - class device via USB. + class device via USB. This command requires that the "dfu_alt_info" + environment variable be set and define the alt settings to expose to + the host.

config CMD_DM bool "dm - Access to driver model information" diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig index 89b9e73440..b84529a374 100644 --- a/cmd/fastboot/Kconfig +++ b/cmd/fastboot/Kconfig @@ -18,6 +18,8 @@ config CMD_FASTBOOT protocol for downloading images, flashing and device control used on Android devices.

+ See doc/README.android-fastboot for more information. + config ANDROID_BOOT_IMAGE bool "Enable support for Android Boot Images" help