[U-Boot] [PATCH 0/2] Move commands into their own directory
This series makes a start at cleaning up the common directory. At present it includes any code that is not board-specific, a library or a driver. This means there are a lot of files, including all the commands.
Moving the command files into their own directory makes them easier to find and is more logical than having them all in common/.
Simon Glass (2): Move all command code into its own directory Remove the cmd_ prefix from command files
Kconfig | 2 + Makefile | 1 + cmd/Kconfig | 585 ++++++++++++++++++++ cmd/Makefile | 166 ++++++ common/cmd_aes.c => cmd/aes.c | 0 common/cmd_ambapp.c => cmd/ambapp.c | 0 common/cmd_armflash.c => cmd/armflash.c | 0 common/cmd_bdinfo.c => cmd/bdinfo.c | 0 common/cmd_bedbug.c => cmd/bedbug.c | 0 common/cmd_blob.c => cmd/blob.c | 0 common/cmd_bmp.c => cmd/bmp.c | 0 common/cmd_boot.c => cmd/boot.c | 0 common/cmd_bootldr.c => cmd/bootldr.c | 0 common/cmd_bootm.c => cmd/bootm.c | 0 common/cmd_bootmenu.c => cmd/bootmenu.c | 0 common/cmd_bootstage.c => cmd/bootstage.c | 0 common/cmd_cache.c => cmd/cache.c | 0 common/cmd_cbfs.c => cmd/cbfs.c | 0 common/cmd_clk.c => cmd/clk.c | 0 common/cmd_console.c => cmd/console.c | 0 common/cmd_cplbinfo.c => cmd/cplbinfo.c | 0 common/cmd_cpu.c => cmd/cpu.c | 0 common/cmd_cramfs.c => cmd/cramfs.c | 0 .../dataflash_mmc_mux.c | 0 common/cmd_date.c => cmd/date.c | 0 common/cmd_dcr.c => cmd/dcr.c | 0 common/cmd_demo.c => cmd/demo.c | 0 common/cmd_dfu.c => cmd/dfu.c | 0 common/cmd_diag.c => cmd/diag.c | 0 common/cmd_disk.c => cmd/disk.c | 0 common/cmd_display.c => cmd/display.c | 0 common/cmd_dtt.c => cmd/dtt.c | 0 common/cmd_echo.c => cmd/echo.c | 0 common/cmd_eeprom.c => cmd/eeprom.c | 0 common/cmd_efi.c => cmd/efi.c | 0 common/cmd_elf.c => cmd/elf.c | 0 common/cmd_ethsw.c => cmd/ethsw.c | 0 common/cmd_exit.c => cmd/exit.c | 0 common/cmd_ext2.c => cmd/ext2.c | 0 common/cmd_ext4.c => cmd/ext4.c | 0 common/cmd_fastboot.c => cmd/fastboot.c | 0 common/cmd_fat.c => cmd/fat.c | 0 common/cmd_fdc.c => cmd/fdc.c | 0 common/cmd_fdt.c => cmd/fdt.c | 0 common/cmd_fitupd.c => cmd/fitupd.c | 0 common/cmd_flash.c => cmd/flash.c | 0 common/cmd_fpga.c => cmd/fpga.c | 0 common/cmd_fpgad.c => cmd/fpgad.c | 0 common/cmd_fs.c => cmd/fs.c | 0 common/cmd_fs_uuid.c => cmd/fs_uuid.c | 0 common/cmd_fuse.c => cmd/fuse.c | 0 common/cmd_gettime.c => cmd/gettime.c | 0 common/cmd_gpio.c => cmd/gpio.c | 0 common/cmd_gpt.c => cmd/gpt.c | 0 common/cmd_hash.c => cmd/hash.c | 0 common/cmd_help.c => cmd/help.c | 0 common/cmd_host.c => cmd/host.c | 0 common/cmd_i2c.c => cmd/i2c.c | 0 common/cmd_ide.c => cmd/ide.c | 0 common/cmd_immap.c => cmd/immap.c | 0 common/cmd_ini.c => cmd/ini.c | 0 common/cmd_io.c => cmd/io.c | 0 common/cmd_iotrace.c => cmd/iotrace.c | 0 common/cmd_irq.c => cmd/irq.c | 0 common/cmd_itest.c => cmd/itest.c | 0 common/cmd_jffs2.c => cmd/jffs2.c | 0 common/cmd_ldrinfo.c => cmd/ldrinfo.c | 0 common/cmd_led.c => cmd/led.c | 0 common/cmd_license.c => cmd/license.c | 0 common/cmd_load.c => cmd/load.c | 0 common/cmd_log.c => cmd/log.c | 0 common/cmd_lzmadec.c => cmd/lzmadec.c | 0 common/cmd_mac.c => cmd/mac.c | 0 common/cmd_md5sum.c => cmd/md5sum.c | 0 common/cmd_mdio.c => cmd/mdio.c | 0 common/cmd_mem.c => cmd/mem.c | 0 common/cmd_mfsl.c => cmd/mfsl.c | 0 common/cmd_mii.c => cmd/mii.c | 0 common/cmd_misc.c => cmd/misc.c | 0 common/cmd_mmc.c => cmd/mmc.c | 0 common/cmd_mmc_spi.c => cmd/mmc_spi.c | 0 common/cmd_mp.c => cmd/mp.c | 0 common/cmd_mtdparts.c => cmd/mtdparts.c | 0 common/cmd_nand.c => cmd/nand.c | 0 common/cmd_net.c => cmd/net.c | 0 common/cmd_nvedit.c => cmd/nvedit.c | 0 common/cmd_onenand.c => cmd/onenand.c | 0 common/cmd_otp.c => cmd/otp.c | 0 common/cmd_part.c => cmd/part.c | 0 common/cmd_pci.c => cmd/pci.c | 0 common/cmd_pcmcia.c => cmd/pcmcia.c | 0 common/cmd_pmic.c => cmd/pmic.c | 0 common/cmd_portio.c => cmd/portio.c | 0 common/cmd_pxe.c => cmd/pxe.c | 0 common/cmd_read.c => cmd/read.c | 0 common/cmd_reginfo.c => cmd/reginfo.c | 0 common/cmd_regulator.c => cmd/regulator.c | 0 common/cmd_reiser.c => cmd/reiser.c | 0 common/cmd_remoteproc.c => cmd/remoteproc.c | 0 common/cmd_sata.c => cmd/sata.c | 0 common/cmd_scsi.c => cmd/scsi.c | 0 common/cmd_setexpr.c => cmd/setexpr.c | 0 common/cmd_sf.c => cmd/sf.c | 0 common/cmd_sha1sum.c => cmd/sha1sum.c | 0 common/cmd_softswitch.c => cmd/softswitch.c | 0 common/cmd_sound.c => cmd/sound.c | 0 common/cmd_source.c => cmd/source.c | 0 common/cmd_spi.c => cmd/spi.c | 0 common/cmd_spibootldr.c => cmd/spibootldr.c | 0 common/cmd_spl.c => cmd/spl.c | 0 common/cmd_strings.c => cmd/strings.c | 0 common/cmd_terminal.c => cmd/terminal.c | 0 common/cmd_test.c => cmd/test.c | 0 common/cmd_thordown.c => cmd/thordown.c | 0 common/cmd_time.c => cmd/time.c | 0 common/cmd_tpm.c => cmd/tpm.c | 0 common/cmd_tpm_test.c => cmd/tpm_test.c | 0 common/cmd_trace.c => cmd/trace.c | 0 common/cmd_tsi148.c => cmd/tsi148.c | 0 common/cmd_ubi.c => cmd/ubi.c | 0 common/cmd_ubifs.c => cmd/ubifs.c | 0 common/cmd_universe.c => cmd/universe.c | 0 common/cmd_unzip.c => cmd/unzip.c | 0 common/cmd_usb.c => cmd/usb.c | 0 .../usb_mass_storage.c | 0 common/cmd_version.c => cmd/version.c | 0 common/cmd_ximg.c => cmd/ximg.c | 0 common/cmd_yaffs2.c => cmd/yaffs2.c | 0 common/cmd_zfs.c => cmd/zfs.c | 0 common/cmd_zip.c => cmd/zip.c | 0 common/Kconfig | 586 --------------------- common/Makefile | 156 +----- scripts/Makefile.spl | 2 +- 133 files changed, 761 insertions(+), 737 deletions(-) create mode 100644 cmd/Kconfig create mode 100644 cmd/Makefile rename common/cmd_aes.c => cmd/aes.c (100%) rename common/cmd_ambapp.c => cmd/ambapp.c (100%) rename common/cmd_armflash.c => cmd/armflash.c (100%) rename common/cmd_bdinfo.c => cmd/bdinfo.c (100%) rename common/cmd_bedbug.c => cmd/bedbug.c (100%) rename common/cmd_blob.c => cmd/blob.c (100%) rename common/cmd_bmp.c => cmd/bmp.c (100%) rename common/cmd_boot.c => cmd/boot.c (100%) rename common/cmd_bootldr.c => cmd/bootldr.c (100%) rename common/cmd_bootm.c => cmd/bootm.c (100%) rename common/cmd_bootmenu.c => cmd/bootmenu.c (100%) rename common/cmd_bootstage.c => cmd/bootstage.c (100%) rename common/cmd_cache.c => cmd/cache.c (100%) rename common/cmd_cbfs.c => cmd/cbfs.c (100%) rename common/cmd_clk.c => cmd/clk.c (100%) rename common/cmd_console.c => cmd/console.c (100%) rename common/cmd_cplbinfo.c => cmd/cplbinfo.c (100%) rename common/cmd_cpu.c => cmd/cpu.c (100%) rename common/cmd_cramfs.c => cmd/cramfs.c (100%) rename common/cmd_dataflash_mmc_mux.c => cmd/dataflash_mmc_mux.c (100%) rename common/cmd_date.c => cmd/date.c (100%) rename common/cmd_dcr.c => cmd/dcr.c (100%) rename common/cmd_demo.c => cmd/demo.c (100%) rename common/cmd_dfu.c => cmd/dfu.c (100%) rename common/cmd_diag.c => cmd/diag.c (100%) rename common/cmd_disk.c => cmd/disk.c (100%) rename common/cmd_display.c => cmd/display.c (100%) rename common/cmd_dtt.c => cmd/dtt.c (100%) rename common/cmd_echo.c => cmd/echo.c (100%) rename common/cmd_eeprom.c => cmd/eeprom.c (100%) rename common/cmd_efi.c => cmd/efi.c (100%) rename common/cmd_elf.c => cmd/elf.c (100%) rename common/cmd_ethsw.c => cmd/ethsw.c (100%) rename common/cmd_exit.c => cmd/exit.c (100%) rename common/cmd_ext2.c => cmd/ext2.c (100%) rename common/cmd_ext4.c => cmd/ext4.c (100%) rename common/cmd_fastboot.c => cmd/fastboot.c (100%) rename common/cmd_fat.c => cmd/fat.c (100%) rename common/cmd_fdc.c => cmd/fdc.c (100%) rename common/cmd_fdt.c => cmd/fdt.c (100%) rename common/cmd_fitupd.c => cmd/fitupd.c (100%) rename common/cmd_flash.c => cmd/flash.c (100%) rename common/cmd_fpga.c => cmd/fpga.c (100%) rename common/cmd_fpgad.c => cmd/fpgad.c (100%) rename common/cmd_fs.c => cmd/fs.c (100%) rename common/cmd_fs_uuid.c => cmd/fs_uuid.c (100%) rename common/cmd_fuse.c => cmd/fuse.c (100%) rename common/cmd_gettime.c => cmd/gettime.c (100%) rename common/cmd_gpio.c => cmd/gpio.c (100%) rename common/cmd_gpt.c => cmd/gpt.c (100%) rename common/cmd_hash.c => cmd/hash.c (100%) rename common/cmd_help.c => cmd/help.c (100%) rename common/cmd_host.c => cmd/host.c (100%) rename common/cmd_i2c.c => cmd/i2c.c (100%) rename common/cmd_ide.c => cmd/ide.c (100%) rename common/cmd_immap.c => cmd/immap.c (100%) rename common/cmd_ini.c => cmd/ini.c (100%) rename common/cmd_io.c => cmd/io.c (100%) rename common/cmd_iotrace.c => cmd/iotrace.c (100%) rename common/cmd_irq.c => cmd/irq.c (100%) rename common/cmd_itest.c => cmd/itest.c (100%) rename common/cmd_jffs2.c => cmd/jffs2.c (100%) rename common/cmd_ldrinfo.c => cmd/ldrinfo.c (100%) rename common/cmd_led.c => cmd/led.c (100%) rename common/cmd_license.c => cmd/license.c (100%) rename common/cmd_load.c => cmd/load.c (100%) rename common/cmd_log.c => cmd/log.c (100%) rename common/cmd_lzmadec.c => cmd/lzmadec.c (100%) rename common/cmd_mac.c => cmd/mac.c (100%) rename common/cmd_md5sum.c => cmd/md5sum.c (100%) rename common/cmd_mdio.c => cmd/mdio.c (100%) rename common/cmd_mem.c => cmd/mem.c (100%) rename common/cmd_mfsl.c => cmd/mfsl.c (100%) rename common/cmd_mii.c => cmd/mii.c (100%) rename common/cmd_misc.c => cmd/misc.c (100%) rename common/cmd_mmc.c => cmd/mmc.c (100%) rename common/cmd_mmc_spi.c => cmd/mmc_spi.c (100%) rename common/cmd_mp.c => cmd/mp.c (100%) rename common/cmd_mtdparts.c => cmd/mtdparts.c (100%) rename common/cmd_nand.c => cmd/nand.c (100%) rename common/cmd_net.c => cmd/net.c (100%) rename common/cmd_nvedit.c => cmd/nvedit.c (100%) rename common/cmd_onenand.c => cmd/onenand.c (100%) rename common/cmd_otp.c => cmd/otp.c (100%) rename common/cmd_part.c => cmd/part.c (100%) rename common/cmd_pci.c => cmd/pci.c (100%) rename common/cmd_pcmcia.c => cmd/pcmcia.c (100%) rename common/cmd_pmic.c => cmd/pmic.c (100%) rename common/cmd_portio.c => cmd/portio.c (100%) rename common/cmd_pxe.c => cmd/pxe.c (100%) rename common/cmd_read.c => cmd/read.c (100%) rename common/cmd_reginfo.c => cmd/reginfo.c (100%) rename common/cmd_regulator.c => cmd/regulator.c (100%) rename common/cmd_reiser.c => cmd/reiser.c (100%) rename common/cmd_remoteproc.c => cmd/remoteproc.c (100%) rename common/cmd_sata.c => cmd/sata.c (100%) rename common/cmd_scsi.c => cmd/scsi.c (100%) rename common/cmd_setexpr.c => cmd/setexpr.c (100%) rename common/cmd_sf.c => cmd/sf.c (100%) rename common/cmd_sha1sum.c => cmd/sha1sum.c (100%) rename common/cmd_softswitch.c => cmd/softswitch.c (100%) rename common/cmd_sound.c => cmd/sound.c (100%) rename common/cmd_source.c => cmd/source.c (100%) rename common/cmd_spi.c => cmd/spi.c (100%) rename common/cmd_spibootldr.c => cmd/spibootldr.c (100%) rename common/cmd_spl.c => cmd/spl.c (100%) rename common/cmd_strings.c => cmd/strings.c (100%) rename common/cmd_terminal.c => cmd/terminal.c (100%) rename common/cmd_test.c => cmd/test.c (100%) rename common/cmd_thordown.c => cmd/thordown.c (100%) rename common/cmd_time.c => cmd/time.c (100%) rename common/cmd_tpm.c => cmd/tpm.c (100%) rename common/cmd_tpm_test.c => cmd/tpm_test.c (100%) rename common/cmd_trace.c => cmd/trace.c (100%) rename common/cmd_tsi148.c => cmd/tsi148.c (100%) rename common/cmd_ubi.c => cmd/ubi.c (100%) rename common/cmd_ubifs.c => cmd/ubifs.c (100%) rename common/cmd_universe.c => cmd/universe.c (100%) rename common/cmd_unzip.c => cmd/unzip.c (100%) rename common/cmd_usb.c => cmd/usb.c (100%) rename common/cmd_usb_mass_storage.c => cmd/usb_mass_storage.c (100%) rename common/cmd_version.c => cmd/version.c (100%) rename common/cmd_ximg.c => cmd/ximg.c (100%) rename common/cmd_yaffs2.c => cmd/yaffs2.c (100%) rename common/cmd_zfs.c => cmd/zfs.c (100%) rename common/cmd_zip.c => cmd/zip.c (100%)
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org ---
Kconfig | 2 + Makefile | 1 + cmd/Kconfig | 585 +++++++++++++++++++++++++++++++ cmd/Makefile | 166 +++++++++ {common => cmd}/cmd_aes.c | 0 {common => cmd}/cmd_ambapp.c | 0 {common => cmd}/cmd_armflash.c | 0 {common => cmd}/cmd_bdinfo.c | 0 {common => cmd}/cmd_bedbug.c | 0 {common => cmd}/cmd_blob.c | 0 {common => cmd}/cmd_bmp.c | 0 {common => cmd}/cmd_boot.c | 0 {common => cmd}/cmd_bootldr.c | 0 {common => cmd}/cmd_bootm.c | 0 {common => cmd}/cmd_bootmenu.c | 0 {common => cmd}/cmd_bootstage.c | 0 {common => cmd}/cmd_cache.c | 0 {common => cmd}/cmd_cbfs.c | 0 {common => cmd}/cmd_clk.c | 0 {common => cmd}/cmd_console.c | 0 {common => cmd}/cmd_cplbinfo.c | 0 {common => cmd}/cmd_cpu.c | 0 {common => cmd}/cmd_cramfs.c | 0 {common => cmd}/cmd_dataflash_mmc_mux.c | 0 {common => cmd}/cmd_date.c | 0 {common => cmd}/cmd_dcr.c | 0 {common => cmd}/cmd_demo.c | 0 {common => cmd}/cmd_dfu.c | 0 {common => cmd}/cmd_diag.c | 0 {common => cmd}/cmd_disk.c | 0 {common => cmd}/cmd_display.c | 0 {common => cmd}/cmd_dtt.c | 0 {common => cmd}/cmd_echo.c | 0 {common => cmd}/cmd_eeprom.c | 0 {common => cmd}/cmd_efi.c | 0 {common => cmd}/cmd_elf.c | 0 {common => cmd}/cmd_ethsw.c | 0 {common => cmd}/cmd_exit.c | 0 {common => cmd}/cmd_ext2.c | 0 {common => cmd}/cmd_ext4.c | 0 {common => cmd}/cmd_fastboot.c | 0 {common => cmd}/cmd_fat.c | 0 {common => cmd}/cmd_fdc.c | 0 {common => cmd}/cmd_fdt.c | 0 {common => cmd}/cmd_fitupd.c | 0 {common => cmd}/cmd_flash.c | 0 {common => cmd}/cmd_fpga.c | 0 {common => cmd}/cmd_fpgad.c | 0 {common => cmd}/cmd_fs.c | 0 {common => cmd}/cmd_fs_uuid.c | 0 {common => cmd}/cmd_fuse.c | 0 {common => cmd}/cmd_gettime.c | 0 {common => cmd}/cmd_gpio.c | 0 {common => cmd}/cmd_gpt.c | 0 {common => cmd}/cmd_hash.c | 0 {common => cmd}/cmd_help.c | 0 {common => cmd}/cmd_host.c | 0 {common => cmd}/cmd_i2c.c | 0 {common => cmd}/cmd_ide.c | 0 {common => cmd}/cmd_immap.c | 0 {common => cmd}/cmd_ini.c | 0 {common => cmd}/cmd_io.c | 0 {common => cmd}/cmd_iotrace.c | 0 {common => cmd}/cmd_irq.c | 0 {common => cmd}/cmd_itest.c | 0 {common => cmd}/cmd_jffs2.c | 0 {common => cmd}/cmd_ldrinfo.c | 0 {common => cmd}/cmd_led.c | 0 {common => cmd}/cmd_license.c | 0 {common => cmd}/cmd_load.c | 0 {common => cmd}/cmd_log.c | 0 {common => cmd}/cmd_lzmadec.c | 0 {common => cmd}/cmd_mac.c | 0 {common => cmd}/cmd_md5sum.c | 0 {common => cmd}/cmd_mdio.c | 0 {common => cmd}/cmd_mem.c | 0 {common => cmd}/cmd_mfsl.c | 0 {common => cmd}/cmd_mii.c | 0 {common => cmd}/cmd_misc.c | 0 {common => cmd}/cmd_mmc.c | 0 {common => cmd}/cmd_mmc_spi.c | 0 {common => cmd}/cmd_mp.c | 0 {common => cmd}/cmd_mtdparts.c | 0 {common => cmd}/cmd_nand.c | 0 {common => cmd}/cmd_net.c | 0 {common => cmd}/cmd_nvedit.c | 0 {common => cmd}/cmd_onenand.c | 0 {common => cmd}/cmd_otp.c | 0 {common => cmd}/cmd_part.c | 0 {common => cmd}/cmd_pci.c | 0 {common => cmd}/cmd_pcmcia.c | 0 {common => cmd}/cmd_pmic.c | 0 {common => cmd}/cmd_portio.c | 0 {common => cmd}/cmd_pxe.c | 0 {common => cmd}/cmd_read.c | 0 {common => cmd}/cmd_reginfo.c | 0 {common => cmd}/cmd_regulator.c | 0 {common => cmd}/cmd_reiser.c | 0 {common => cmd}/cmd_remoteproc.c | 0 {common => cmd}/cmd_sata.c | 0 {common => cmd}/cmd_scsi.c | 0 {common => cmd}/cmd_setexpr.c | 0 {common => cmd}/cmd_sf.c | 0 {common => cmd}/cmd_sha1sum.c | 0 {common => cmd}/cmd_softswitch.c | 0 {common => cmd}/cmd_sound.c | 0 {common => cmd}/cmd_source.c | 0 {common => cmd}/cmd_spi.c | 0 {common => cmd}/cmd_spibootldr.c | 0 {common => cmd}/cmd_spl.c | 0 {common => cmd}/cmd_strings.c | 0 {common => cmd}/cmd_terminal.c | 0 {common => cmd}/cmd_test.c | 0 {common => cmd}/cmd_thordown.c | 0 {common => cmd}/cmd_time.c | 0 {common => cmd}/cmd_tpm.c | 0 {common => cmd}/cmd_tpm_test.c | 0 {common => cmd}/cmd_trace.c | 0 {common => cmd}/cmd_tsi148.c | 0 {common => cmd}/cmd_ubi.c | 0 {common => cmd}/cmd_ubifs.c | 0 {common => cmd}/cmd_universe.c | 0 {common => cmd}/cmd_unzip.c | 0 {common => cmd}/cmd_usb.c | 0 {common => cmd}/cmd_usb_mass_storage.c | 0 {common => cmd}/cmd_version.c | 0 {common => cmd}/cmd_ximg.c | 0 {common => cmd}/cmd_yaffs2.c | 0 {common => cmd}/cmd_zfs.c | 0 {common => cmd}/cmd_zip.c | 0 common/Kconfig | 586 -------------------------------- common/Makefile | 156 +-------- scripts/Makefile.spl | 2 +- 133 files changed, 761 insertions(+), 737 deletions(-) create mode 100644 cmd/Kconfig create mode 100644 cmd/Makefile rename {common => cmd}/cmd_aes.c (100%) rename {common => cmd}/cmd_ambapp.c (100%) rename {common => cmd}/cmd_armflash.c (100%) rename {common => cmd}/cmd_bdinfo.c (100%) rename {common => cmd}/cmd_bedbug.c (100%) rename {common => cmd}/cmd_blob.c (100%) rename {common => cmd}/cmd_bmp.c (100%) rename {common => cmd}/cmd_boot.c (100%) rename {common => cmd}/cmd_bootldr.c (100%) rename {common => cmd}/cmd_bootm.c (100%) rename {common => cmd}/cmd_bootmenu.c (100%) rename {common => cmd}/cmd_bootstage.c (100%) rename {common => cmd}/cmd_cache.c (100%) rename {common => cmd}/cmd_cbfs.c (100%) rename {common => cmd}/cmd_clk.c (100%) rename {common => cmd}/cmd_console.c (100%) rename {common => cmd}/cmd_cplbinfo.c (100%) rename {common => cmd}/cmd_cpu.c (100%) rename {common => cmd}/cmd_cramfs.c (100%) rename {common => cmd}/cmd_dataflash_mmc_mux.c (100%) rename {common => cmd}/cmd_date.c (100%) rename {common => cmd}/cmd_dcr.c (100%) rename {common => cmd}/cmd_demo.c (100%) rename {common => cmd}/cmd_dfu.c (100%) rename {common => cmd}/cmd_diag.c (100%) rename {common => cmd}/cmd_disk.c (100%) rename {common => cmd}/cmd_display.c (100%) rename {common => cmd}/cmd_dtt.c (100%) rename {common => cmd}/cmd_echo.c (100%) rename {common => cmd}/cmd_eeprom.c (100%) rename {common => cmd}/cmd_efi.c (100%) rename {common => cmd}/cmd_elf.c (100%) rename {common => cmd}/cmd_ethsw.c (100%) rename {common => cmd}/cmd_exit.c (100%) rename {common => cmd}/cmd_ext2.c (100%) rename {common => cmd}/cmd_ext4.c (100%) rename {common => cmd}/cmd_fastboot.c (100%) rename {common => cmd}/cmd_fat.c (100%) rename {common => cmd}/cmd_fdc.c (100%) rename {common => cmd}/cmd_fdt.c (100%) rename {common => cmd}/cmd_fitupd.c (100%) rename {common => cmd}/cmd_flash.c (100%) rename {common => cmd}/cmd_fpga.c (100%) rename {common => cmd}/cmd_fpgad.c (100%) rename {common => cmd}/cmd_fs.c (100%) rename {common => cmd}/cmd_fs_uuid.c (100%) rename {common => cmd}/cmd_fuse.c (100%) rename {common => cmd}/cmd_gettime.c (100%) rename {common => cmd}/cmd_gpio.c (100%) rename {common => cmd}/cmd_gpt.c (100%) rename {common => cmd}/cmd_hash.c (100%) rename {common => cmd}/cmd_help.c (100%) rename {common => cmd}/cmd_host.c (100%) rename {common => cmd}/cmd_i2c.c (100%) rename {common => cmd}/cmd_ide.c (100%) rename {common => cmd}/cmd_immap.c (100%) rename {common => cmd}/cmd_ini.c (100%) rename {common => cmd}/cmd_io.c (100%) rename {common => cmd}/cmd_iotrace.c (100%) rename {common => cmd}/cmd_irq.c (100%) rename {common => cmd}/cmd_itest.c (100%) rename {common => cmd}/cmd_jffs2.c (100%) rename {common => cmd}/cmd_ldrinfo.c (100%) rename {common => cmd}/cmd_led.c (100%) rename {common => cmd}/cmd_license.c (100%) rename {common => cmd}/cmd_load.c (100%) rename {common => cmd}/cmd_log.c (100%) rename {common => cmd}/cmd_lzmadec.c (100%) rename {common => cmd}/cmd_mac.c (100%) rename {common => cmd}/cmd_md5sum.c (100%) rename {common => cmd}/cmd_mdio.c (100%) rename {common => cmd}/cmd_mem.c (100%) rename {common => cmd}/cmd_mfsl.c (100%) rename {common => cmd}/cmd_mii.c (100%) rename {common => cmd}/cmd_misc.c (100%) rename {common => cmd}/cmd_mmc.c (100%) rename {common => cmd}/cmd_mmc_spi.c (100%) rename {common => cmd}/cmd_mp.c (100%) rename {common => cmd}/cmd_mtdparts.c (100%) rename {common => cmd}/cmd_nand.c (100%) rename {common => cmd}/cmd_net.c (100%) rename {common => cmd}/cmd_nvedit.c (100%) rename {common => cmd}/cmd_onenand.c (100%) rename {common => cmd}/cmd_otp.c (100%) rename {common => cmd}/cmd_part.c (100%) rename {common => cmd}/cmd_pci.c (100%) rename {common => cmd}/cmd_pcmcia.c (100%) rename {common => cmd}/cmd_pmic.c (100%) rename {common => cmd}/cmd_portio.c (100%) rename {common => cmd}/cmd_pxe.c (100%) rename {common => cmd}/cmd_read.c (100%) rename {common => cmd}/cmd_reginfo.c (100%) rename {common => cmd}/cmd_regulator.c (100%) rename {common => cmd}/cmd_reiser.c (100%) rename {common => cmd}/cmd_remoteproc.c (100%) rename {common => cmd}/cmd_sata.c (100%) rename {common => cmd}/cmd_scsi.c (100%) rename {common => cmd}/cmd_setexpr.c (100%) rename {common => cmd}/cmd_sf.c (100%) rename {common => cmd}/cmd_sha1sum.c (100%) rename {common => cmd}/cmd_softswitch.c (100%) rename {common => cmd}/cmd_sound.c (100%) rename {common => cmd}/cmd_source.c (100%) rename {common => cmd}/cmd_spi.c (100%) rename {common => cmd}/cmd_spibootldr.c (100%) rename {common => cmd}/cmd_spl.c (100%) rename {common => cmd}/cmd_strings.c (100%) rename {common => cmd}/cmd_terminal.c (100%) rename {common => cmd}/cmd_test.c (100%) rename {common => cmd}/cmd_thordown.c (100%) rename {common => cmd}/cmd_time.c (100%) rename {common => cmd}/cmd_tpm.c (100%) rename {common => cmd}/cmd_tpm_test.c (100%) rename {common => cmd}/cmd_trace.c (100%) rename {common => cmd}/cmd_tsi148.c (100%) rename {common => cmd}/cmd_ubi.c (100%) rename {common => cmd}/cmd_ubifs.c (100%) rename {common => cmd}/cmd_universe.c (100%) rename {common => cmd}/cmd_unzip.c (100%) rename {common => cmd}/cmd_usb.c (100%) rename {common => cmd}/cmd_usb_mass_storage.c (100%) rename {common => cmd}/cmd_version.c (100%) rename {common => cmd}/cmd_ximg.c (100%) rename {common => cmd}/cmd_yaffs2.c (100%) rename {common => cmd}/cmd_zfs.c (100%) rename {common => cmd}/cmd_zip.c (100%)
diff --git a/Kconfig b/Kconfig index 821b464..d5e503a 100644 --- a/Kconfig +++ b/Kconfig @@ -224,6 +224,8 @@ endmenu # Boot images
source "common/Kconfig"
+source "cmd/Kconfig" + source "dts/Kconfig"
source "net/Kconfig" diff --git a/Makefile b/Makefile index 5882c30..6a67efb 100644 --- a/Makefile +++ b/Makefile @@ -667,6 +667,7 @@ libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/phy/ libs-y += drivers/usb/ulpi/ +libs-y += cmd/ libs-y += common/ libs-$(CONFIG_API) += api/ libs-$(CONFIG_HAS_POST) += post/ diff --git a/cmd/Kconfig b/cmd/Kconfig new file mode 100644 index 0000000..2ed0263 --- /dev/null +++ b/cmd/Kconfig @@ -0,0 +1,585 @@ +menu "Command line interface" + +config HUSH_PARSER + bool "Use hush shell" + select SYS_HUSH_PARSER + help + This option enables the "hush" shell (from Busybox) as command line + interpreter, thus enabling powerful command line syntax like + if...then...else...fi conditionals or `&&' and '||' + constructs ("shell scripts"). + + If disabled, you get the old, much simpler behaviour with a somewhat + smaller memory footprint. + +config SYS_HUSH_PARSER + bool + help + Backward compatibility. + +config SYS_PROMPT + string "Shell prompt" + default "=> " + help + This string is displayed in the command line to the left of the + cursor. + +menu "Autoboot options" + +config AUTOBOOT_KEYED + bool "Stop autobooting via specific input key / string" + default n + help + This option enables stopping (aborting) of the automatic + boot feature only by issuing a specific input key or + string. If not enabled, any input key will abort the + U-Boot automatic booting process and bring the device + to the U-Boot prompt for user input. + +config AUTOBOOT_PROMPT + string "Autoboot stop prompt" + depends on AUTOBOOT_KEYED + default "Autoboot in %d seconds\n" + help + This string is displayed before the boot delay selected by + CONFIG_BOOTDELAY starts. If it is not defined there is no + output indicating that autoboot is in progress. + + Note that this define is used as the (only) argument to a + printf() call, so it may contain '%' format specifications, + provided that it also includes, sepearated by commas exactly + like in a printf statement, the required arguments. It is + the responsibility of the user to select only such arguments + that are valid in the given context. + +config AUTOBOOT_ENCRYPTION + bool "Enable encryption in autoboot stopping" + depends on AUTOBOOT_KEYED + default n + +config AUTOBOOT_DELAY_STR + string "Delay autobooting via specific input key / string" + depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION + help + This option delays the automatic boot feature by issuing + a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR + or the environment variable "bootdelaykey" is specified + and this string is received from console input before + autoboot starts booting, U-Boot gives a command prompt. The + U-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME is + used, otherwise it never times out. + +config AUTOBOOT_STOP_STR + string "Stop autobooting via specific input key / string" + depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION + help + This option enables stopping (aborting) of the automatic + boot feature only by issuing a specific input key or + string. If CONFIG_AUTOBOOT_STOP_STR or the environment + variable "bootstopkey" is specified and this string is + received from console input before autoboot starts booting, + U-Boot gives a command prompt. The U-Boot prompt never + times out, even if CONFIG_BOOT_RETRY_TIME is used. + +config AUTOBOOT_KEYED_CTRLC + bool "Enable Ctrl-C autoboot interruption" + depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION + default n + help + This option allows for the boot sequence to be interrupted + by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey". + Setting this variable provides an escape sequence from the + limited "password" strings. + +config AUTOBOOT_STOP_STR_SHA256 + string "Stop autobooting via SHA256 encrypted password" + depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION + help + This option adds the feature to only stop the autobooting, + and therefore boot into the U-Boot prompt, when the input + string / password matches a values that is encypted via + a SHA256 hash and saved in the environment. + +endmenu + +comment "Commands" + +menu "Info commands" + +config CMD_BDI + bool "bdinfo" + default y + help + Print board info + +config CMD_CONSOLE + bool "coninfo" + default y + help + Print console devices and information. + +config CMD_CPU + bool "cpu" + help + Print information about available CPUs. This normally shows the + number of CPUs, type (e.g. manufacturer, architecture, product or + internal name) and clock frequency. Other information may be + available depending on the CPU driver. + +config CMD_LICENSE + bool "license" + help + Print GPL license text + +endmenu + +menu "Boot commands" + +config CMD_BOOTD + bool "bootd" + default y + help + Run the command stored in the environment "bootcmd", i.e. + "bootd" does the same thing as "run bootcmd". + +config CMD_BOOTM + bool "bootm" + default y + help + Boot an application image from the memory. + +config CMD_ELF + bool "bootelf, bootvx" + default y + help + Boot an ELF/vxWorks image from the memory. + +config CMD_GO + bool "go" + default y + help + Start an application at a given address. + +config CMD_RUN + bool "run" + default y + help + Run the command in the given environment variable. + +config CMD_IMI + bool "iminfo" + default y + help + Print header information for application image. + +config CMD_IMLS + bool "imls" + default y + help + List all images found in flash + +config CMD_XIMG + bool "imxtract" + default y + help + Extract a part of a multi-image. + +config CMD_POWEROFF + bool + +endmenu + +menu "Environment commands" + +config CMD_EXPORTENV + bool "env export" + default y + help + Export environments. + +config CMD_IMPORTENV + bool "env import" + default y + help + Import environments. + +config CMD_EDITENV + bool "editenv" + default y + help + Edit environment variable. + +config CMD_SAVEENV + bool "saveenv" + default y + help + Save all environment variables into the compiled-in persistent + storage. + +config CMD_ENV_EXISTS + bool "env exists" + default y + help + Check if a variable is defined in the environment for use in + shell scripting. + +endmenu + +menu "Memory commands" + +config CMD_MEMORY + bool "md, mm, nm, mw, cp, cmp, base, loop" + default y + help + Memeory commands. + md - memory display + mm - memory modify (auto-incrementing address) + nm - memory modify (constant address) + mw - memory write (fill) + cp - memory copy + cmp - memory compare + base - print or set address offset + loop - initinite loop on address range + +config CMD_CRC32 + bool "crc32" + default y + help + Compute CRC32. + +config LOOPW + bool "loopw" + help + Infinite write loop on address range + +config CMD_MEMTEST + bool "memtest" + help + Simple RAM read/write test. + +config CMD_MX_CYCLIC + bool "mdc, mwc" + help + mdc - memory display cyclic + mwc - memory write cyclic + +config CMD_MEMINFO + bool "meminfo" + help + Display memory information. + +endmenu + +menu "Device access commands" + +config CMD_DM + bool "dm - Access to driver model information" + depends on DM + default y + help + Provides access to driver model data structures and information, + such as a list of devices, list of uclasses and the state of each + device (e.g. activated). This is not required for operation, but + 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 + 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_LOADB + bool "loadb" + default y + help + Load a binary file over serial line. + +config CMD_LOADS + bool "loads" + default y + 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_ARMFLASH + depends on FLASH_CFI_DRIVER + bool "armflash" + help + ARM Ltd reference designs flash partition access + +config CMD_NAND + bool "nand" + help + NAND support. + +config CMD_SF + bool "sf" + help + SPI Flash support + +config CMD_SPI + bool "sspi" + help + SPI utility command. + +config CMD_I2C + bool "i2c" + help + I2C support. + +config CMD_USB + bool "usb" + help + USB support. + +config CMD_FPGA + bool "fpga" + default y + help + FPGA support. + +config CMD_REMOTEPROC + bool "remoteproc" + depends on REMOTEPROC + help + Support for Remote Processor control + +config CMD_GPIO + bool "gpio" + help + GPIO support. + +endmenu + + +menu "Shell scripting commands" + +config CMD_ECHO + bool "echo" + default y + help + Echo args to console + +config CMD_ITEST + bool "itest" + default y + help + Return true/false on integer compare. + +config CMD_SOURCE + bool "source" + default y + help + Run script from memory + +config CMD_SETEXPR + bool "setexpr" + default y + help + Evaluate boolean and math expressions and store the result in an env + variable. + Also supports loading the value at a memory location into a variable. + If CONFIG_REGEX is enabled, setexpr also supports a gsub function. + +endmenu + +menu "Network commands" + +config CMD_NET + bool "bootp, tftpboot" + select NET + default y + help + Network commands. + bootp - boot image via network using BOOTP/TFTP protocol + tftpboot - boot image via network using TFTP protocol + +config CMD_TFTPPUT + bool "tftp put" + help + TFTP put command, for uploading files to a server + +config CMD_TFTPSRV + bool "tftpsrv" + help + Act as a TFTP server and boot the first received file + +config CMD_RARP + bool "rarpboot" + help + Boot image via network using RARP/TFTP protocol + +config CMD_DHCP + bool "dhcp" + help + Boot image via network using DHCP/TFTP protocol + +config CMD_NFS + bool "nfs" + default y + help + Boot image via network using NFS protocol. + +config CMD_PING + bool "ping" + help + Send ICMP ECHO_REQUEST to network host + +config CMD_CDP + bool "cdp" + help + Perform CDP network configuration + +config CMD_SNTP + bool "sntp" + help + Synchronize RTC via network + +config CMD_DNS + bool "dns" + help + Lookup the IP of a hostname + +config CMD_LINK_LOCAL + bool "linklocal" + help + Acquire a network IP address using the link-local protocol + +endmenu + +menu "Misc commands" + +config CMD_AMBAPP + bool "ambapp" + depends on LEON3 + default y + help + Lists AMBA Plug-n-Play information. + +config SYS_AMBAPP_PRINT_ON_STARTUP + bool "Show AMBA PnP info on startup" + depends on CMD_AMBAPP + default n + help + Show AMBA Plug-n-Play information on startup. + +config CMD_TIME + bool "time" + help + Run commands and summarize execution time. + +# TODO: rename to CMD_SLEEP +config CMD_MISC + bool "sleep" + default y + help + Delay execution for some time + +config CMD_TIMER + bool "timer" + help + Access the system timer. + +config CMD_SETGETDCR + bool "getdcr, setdcr, getidcr, setidcr" + depends on 4xx + default y + help + getdcr - Get an AMCC PPC 4xx DCR's value + setdcr - Set an AMCC PPC 4xx DCR's value + getidcr - Get a register value via indirect DCR addressing + setidcr - Set a register value via indirect DCR addressing + +config CMD_SOUND + bool "sound" + depends on SOUND + help + This provides basic access to the U-Boot's sound support. The main + feature is to play a beep. + + sound init - set up sound system + sound play - play a sound + +endmenu + +config CMD_BOOTSTAGE + bool "Enable the 'bootstage' command" + depends on BOOTSTAGE + help + Add a 'bootstage' command which supports printing a report + and un/stashing of bootstage data. + +menu "Power commands" +config CMD_PMIC + bool "Enable Driver Model PMIC command" + depends on DM_PMIC + help + This is the pmic command, based on a driver model pmic's API. + Command features are unchanged: + - list - list pmic devices + - pmic dev <id> - show or [set] operating pmic device (NEW) + - pmic dump - dump registers + - pmic read address - read byte of register at address + - pmic write address - write byte to register at address + The only one change for this command is 'dev' subcommand. + +config CMD_REGULATOR + bool "Enable Driver Model REGULATOR command" + depends on DM_REGULATOR + help + This command is based on driver model regulator's API. + User interface features: + - list - list regulator devices + - regulator dev <id> - show or [set] operating regulator device + - regulator info - print constraints info + - regulator status - print operating status + - regulator value <val] <-f> - print/[set] voltage value [uV] + - regulator current <val> - print/[set] current value [uA] + - regulator mode <id> - print/[set] operating mode id + - regulator enable - enable the regulator output + - regulator disable - disable the regulator output + + The '-f' (force) option can be used for set the value which exceeds + the limits, which are found in device-tree and are kept in regulator's + uclass platdata structure. + +endmenu + +menu "Security commands" +config CMD_TPM + bool "Enable the 'tpm' command" + depends on TPM + help + This provides a means to talk to a TPM from the command line. A wide + range of commands if provided - see 'tpm help' for details. The + command requires a suitable TPM on your board and the correct driver + must be enabled. + +config CMD_TPM_TEST + bool "Enable the 'tpm test' command" + depends on CMD_TPM + help + This provides a a series of tests to confirm that the TPM is working + correctly. The tests cover initialisation, non-volatile RAM, extend, + global lock and checking that timing is within expectations. The + tests pass correctly on Infineon TPMs but may need to be adjusted + for other devices. + +endmenu + +endmenu diff --git a/cmd/Makefile b/cmd/Makefile new file mode 100644 index 0000000..880a886 --- /dev/null +++ b/cmd/Makefile @@ -0,0 +1,166 @@ +# +# (C) Copyright 2004-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +ifndef CONFIG_SPL_BUILD +# core command +obj-y += cmd_boot.o +obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o +obj-y += cmd_help.o +obj-y += cmd_version.o + +# command +obj-$(CONFIG_CMD_AES) += cmd_aes.o +obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o +obj-$(CONFIG_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o +obj-$(CONFIG_CMD_BMP) += cmd_bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o +obj-$(CONFIG_CMD_CACHE) += cmd_cache.o +obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o +obj-$(CONFIG_CMD_CLK) += cmd_clk.o +obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o +obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cmd_cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += cmd_date.o +obj-$(CONFIG_CMD_DEMO) += cmd_demo.o +obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +ifdef CONFIG_4xx +obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +endif +ifdef CONFIG_POST +obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +endif +obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o +obj-$(CONFIG_CMD_DTT) += cmd_dtt.o +obj-$(CONFIG_CMD_ECHO) += cmd_echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_EFI_STUB) += cmd_efi.o +obj-$(CONFIG_CMD_ELF) += cmd_elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o +obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o +obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o +obj-$(CONFIG_CMD_FAT) += cmd_fat.o +obj-$(CONFIG_CMD_FDC) += cmd_fdc.o +obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o +obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o +obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +ifdef CONFIG_FPGA +obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +endif +obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o +obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o +obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o +obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o +obj-$(CONFIG_CMD_I2C) += cmd_i2c.o +obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o +obj-$(CONFIG_CMD_HASH) += cmd_hash.o +obj-$(CONFIG_CMD_IDE) += cmd_ide.o +obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o +obj-$(CONFIG_CMD_INI) += cmd_ini.o +obj-$(CONFIG_CMD_IRQ) += cmd_irq.o +obj-$(CONFIG_CMD_ITEST) += cmd_itest.o +obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o +obj-$(CONFIG_CMD_LED) += cmd_led.o +obj-$(CONFIG_CMD_LICENSE) += cmd_license.o +obj-y += cmd_load.o +obj-$(CONFIG_LOGBUFFER) += cmd_log.o +obj-$(CONFIG_ID_EEPROM) += cmd_mac.o +obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o +obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o +obj-$(CONFIG_CMD_IO) += cmd_io.o +obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_MII) += cmd_mii.o +ifdef CONFIG_PHYLIB +obj-$(CONFIG_CMD_MII) += cmd_mdio.o +endif +obj-$(CONFIG_CMD_MISC) += cmd_misc.o +obj-$(CONFIG_CMD_MMC) += cmd_mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o +obj-$(CONFIG_MP) += cmd_mp.o +obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o +obj-$(CONFIG_CMD_NAND) += cmd_nand.o +obj-$(CONFIG_CMD_NET) += cmd_net.o +obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o +obj-$(CONFIG_CMD_OTP) += cmd_otp.o +obj-$(CONFIG_CMD_PART) += cmd_part.o +ifdef CONFIG_PCI +obj-$(CONFIG_CMD_PCI) += cmd_pci.o +endif +obj-y += cmd_pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o +obj-$(CONFIG_CMD_PXE) += cmd_pxe.o +obj-$(CONFIG_CMD_READ) += cmd_read.o +obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o +obj-$(CONFIG_CMD_REISER) += cmd_reiser.o +obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o +obj-$(CONFIG_SANDBOX) += cmd_host.o +obj-$(CONFIG_CMD_SATA) += cmd_sata.o +obj-$(CONFIG_CMD_SF) += cmd_sf.o +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o +obj-$(CONFIG_CMD_SPI) += cmd_spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o +obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o +obj-$(CONFIG_CMD_TIME) += cmd_time.o +obj-$(CONFIG_CMD_TRACE) += cmd_trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o +obj-$(CONFIG_CMD_TPM) += cmd_tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o +obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o +obj-$(CONFIG_CMD_UBI) += cmd_ubi.o +obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o +obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +ifdef CONFIG_LZMA +obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +endif + +obj-$(CONFIG_CMD_USB) += cmd_usb.o +obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o + +obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o +obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o +obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o +obj-$(CONFIG_CMD_SPL) += cmd_spl.o +obj-$(CONFIG_CMD_ZIP) += cmd_zip.o +obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o + +obj-$(CONFIG_CMD_DFU) += cmd_dfu.o +obj-$(CONFIG_CMD_GPT) += cmd_gpt.o +obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o + +# Power +obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o +obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +endif # !CONFIG_SPL_BUILD + +ifdef CONFIG_SPL_BUILD +ifdef CONFIG_SPL_SATA_SUPPORT +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +endif +endif # CONFIG_SPL_BUILD + +obj-$(CONFIG_CMD_BLOB) += cmd_blob.o + +# core command +obj-y += cmd_nvedit.o +obj-y += cmd_disk.o diff --git a/common/cmd_aes.c b/cmd/cmd_aes.c similarity index 100% rename from common/cmd_aes.c rename to cmd/cmd_aes.c diff --git a/common/cmd_ambapp.c b/cmd/cmd_ambapp.c similarity index 100% rename from common/cmd_ambapp.c rename to cmd/cmd_ambapp.c diff --git a/common/cmd_armflash.c b/cmd/cmd_armflash.c similarity index 100% rename from common/cmd_armflash.c rename to cmd/cmd_armflash.c diff --git a/common/cmd_bdinfo.c b/cmd/cmd_bdinfo.c similarity index 100% rename from common/cmd_bdinfo.c rename to cmd/cmd_bdinfo.c diff --git a/common/cmd_bedbug.c b/cmd/cmd_bedbug.c similarity index 100% rename from common/cmd_bedbug.c rename to cmd/cmd_bedbug.c diff --git a/common/cmd_blob.c b/cmd/cmd_blob.c similarity index 100% rename from common/cmd_blob.c rename to cmd/cmd_blob.c diff --git a/common/cmd_bmp.c b/cmd/cmd_bmp.c similarity index 100% rename from common/cmd_bmp.c rename to cmd/cmd_bmp.c diff --git a/common/cmd_boot.c b/cmd/cmd_boot.c similarity index 100% rename from common/cmd_boot.c rename to cmd/cmd_boot.c diff --git a/common/cmd_bootldr.c b/cmd/cmd_bootldr.c similarity index 100% rename from common/cmd_bootldr.c rename to cmd/cmd_bootldr.c diff --git a/common/cmd_bootm.c b/cmd/cmd_bootm.c similarity index 100% rename from common/cmd_bootm.c rename to cmd/cmd_bootm.c diff --git a/common/cmd_bootmenu.c b/cmd/cmd_bootmenu.c similarity index 100% rename from common/cmd_bootmenu.c rename to cmd/cmd_bootmenu.c diff --git a/common/cmd_bootstage.c b/cmd/cmd_bootstage.c similarity index 100% rename from common/cmd_bootstage.c rename to cmd/cmd_bootstage.c diff --git a/common/cmd_cache.c b/cmd/cmd_cache.c similarity index 100% rename from common/cmd_cache.c rename to cmd/cmd_cache.c diff --git a/common/cmd_cbfs.c b/cmd/cmd_cbfs.c similarity index 100% rename from common/cmd_cbfs.c rename to cmd/cmd_cbfs.c diff --git a/common/cmd_clk.c b/cmd/cmd_clk.c similarity index 100% rename from common/cmd_clk.c rename to cmd/cmd_clk.c diff --git a/common/cmd_console.c b/cmd/cmd_console.c similarity index 100% rename from common/cmd_console.c rename to cmd/cmd_console.c diff --git a/common/cmd_cplbinfo.c b/cmd/cmd_cplbinfo.c similarity index 100% rename from common/cmd_cplbinfo.c rename to cmd/cmd_cplbinfo.c diff --git a/common/cmd_cpu.c b/cmd/cmd_cpu.c similarity index 100% rename from common/cmd_cpu.c rename to cmd/cmd_cpu.c diff --git a/common/cmd_cramfs.c b/cmd/cmd_cramfs.c similarity index 100% rename from common/cmd_cramfs.c rename to cmd/cmd_cramfs.c diff --git a/common/cmd_dataflash_mmc_mux.c b/cmd/cmd_dataflash_mmc_mux.c similarity index 100% rename from common/cmd_dataflash_mmc_mux.c rename to cmd/cmd_dataflash_mmc_mux.c diff --git a/common/cmd_date.c b/cmd/cmd_date.c similarity index 100% rename from common/cmd_date.c rename to cmd/cmd_date.c diff --git a/common/cmd_dcr.c b/cmd/cmd_dcr.c similarity index 100% rename from common/cmd_dcr.c rename to cmd/cmd_dcr.c diff --git a/common/cmd_demo.c b/cmd/cmd_demo.c similarity index 100% rename from common/cmd_demo.c rename to cmd/cmd_demo.c diff --git a/common/cmd_dfu.c b/cmd/cmd_dfu.c similarity index 100% rename from common/cmd_dfu.c rename to cmd/cmd_dfu.c diff --git a/common/cmd_diag.c b/cmd/cmd_diag.c similarity index 100% rename from common/cmd_diag.c rename to cmd/cmd_diag.c diff --git a/common/cmd_disk.c b/cmd/cmd_disk.c similarity index 100% rename from common/cmd_disk.c rename to cmd/cmd_disk.c diff --git a/common/cmd_display.c b/cmd/cmd_display.c similarity index 100% rename from common/cmd_display.c rename to cmd/cmd_display.c diff --git a/common/cmd_dtt.c b/cmd/cmd_dtt.c similarity index 100% rename from common/cmd_dtt.c rename to cmd/cmd_dtt.c diff --git a/common/cmd_echo.c b/cmd/cmd_echo.c similarity index 100% rename from common/cmd_echo.c rename to cmd/cmd_echo.c diff --git a/common/cmd_eeprom.c b/cmd/cmd_eeprom.c similarity index 100% rename from common/cmd_eeprom.c rename to cmd/cmd_eeprom.c diff --git a/common/cmd_efi.c b/cmd/cmd_efi.c similarity index 100% rename from common/cmd_efi.c rename to cmd/cmd_efi.c diff --git a/common/cmd_elf.c b/cmd/cmd_elf.c similarity index 100% rename from common/cmd_elf.c rename to cmd/cmd_elf.c diff --git a/common/cmd_ethsw.c b/cmd/cmd_ethsw.c similarity index 100% rename from common/cmd_ethsw.c rename to cmd/cmd_ethsw.c diff --git a/common/cmd_exit.c b/cmd/cmd_exit.c similarity index 100% rename from common/cmd_exit.c rename to cmd/cmd_exit.c diff --git a/common/cmd_ext2.c b/cmd/cmd_ext2.c similarity index 100% rename from common/cmd_ext2.c rename to cmd/cmd_ext2.c diff --git a/common/cmd_ext4.c b/cmd/cmd_ext4.c similarity index 100% rename from common/cmd_ext4.c rename to cmd/cmd_ext4.c diff --git a/common/cmd_fastboot.c b/cmd/cmd_fastboot.c similarity index 100% rename from common/cmd_fastboot.c rename to cmd/cmd_fastboot.c diff --git a/common/cmd_fat.c b/cmd/cmd_fat.c similarity index 100% rename from common/cmd_fat.c rename to cmd/cmd_fat.c diff --git a/common/cmd_fdc.c b/cmd/cmd_fdc.c similarity index 100% rename from common/cmd_fdc.c rename to cmd/cmd_fdc.c diff --git a/common/cmd_fdt.c b/cmd/cmd_fdt.c similarity index 100% rename from common/cmd_fdt.c rename to cmd/cmd_fdt.c diff --git a/common/cmd_fitupd.c b/cmd/cmd_fitupd.c similarity index 100% rename from common/cmd_fitupd.c rename to cmd/cmd_fitupd.c diff --git a/common/cmd_flash.c b/cmd/cmd_flash.c similarity index 100% rename from common/cmd_flash.c rename to cmd/cmd_flash.c diff --git a/common/cmd_fpga.c b/cmd/cmd_fpga.c similarity index 100% rename from common/cmd_fpga.c rename to cmd/cmd_fpga.c diff --git a/common/cmd_fpgad.c b/cmd/cmd_fpgad.c similarity index 100% rename from common/cmd_fpgad.c rename to cmd/cmd_fpgad.c diff --git a/common/cmd_fs.c b/cmd/cmd_fs.c similarity index 100% rename from common/cmd_fs.c rename to cmd/cmd_fs.c diff --git a/common/cmd_fs_uuid.c b/cmd/cmd_fs_uuid.c similarity index 100% rename from common/cmd_fs_uuid.c rename to cmd/cmd_fs_uuid.c diff --git a/common/cmd_fuse.c b/cmd/cmd_fuse.c similarity index 100% rename from common/cmd_fuse.c rename to cmd/cmd_fuse.c diff --git a/common/cmd_gettime.c b/cmd/cmd_gettime.c similarity index 100% rename from common/cmd_gettime.c rename to cmd/cmd_gettime.c diff --git a/common/cmd_gpio.c b/cmd/cmd_gpio.c similarity index 100% rename from common/cmd_gpio.c rename to cmd/cmd_gpio.c diff --git a/common/cmd_gpt.c b/cmd/cmd_gpt.c similarity index 100% rename from common/cmd_gpt.c rename to cmd/cmd_gpt.c diff --git a/common/cmd_hash.c b/cmd/cmd_hash.c similarity index 100% rename from common/cmd_hash.c rename to cmd/cmd_hash.c diff --git a/common/cmd_help.c b/cmd/cmd_help.c similarity index 100% rename from common/cmd_help.c rename to cmd/cmd_help.c diff --git a/common/cmd_host.c b/cmd/cmd_host.c similarity index 100% rename from common/cmd_host.c rename to cmd/cmd_host.c diff --git a/common/cmd_i2c.c b/cmd/cmd_i2c.c similarity index 100% rename from common/cmd_i2c.c rename to cmd/cmd_i2c.c diff --git a/common/cmd_ide.c b/cmd/cmd_ide.c similarity index 100% rename from common/cmd_ide.c rename to cmd/cmd_ide.c diff --git a/common/cmd_immap.c b/cmd/cmd_immap.c similarity index 100% rename from common/cmd_immap.c rename to cmd/cmd_immap.c diff --git a/common/cmd_ini.c b/cmd/cmd_ini.c similarity index 100% rename from common/cmd_ini.c rename to cmd/cmd_ini.c diff --git a/common/cmd_io.c b/cmd/cmd_io.c similarity index 100% rename from common/cmd_io.c rename to cmd/cmd_io.c diff --git a/common/cmd_iotrace.c b/cmd/cmd_iotrace.c similarity index 100% rename from common/cmd_iotrace.c rename to cmd/cmd_iotrace.c diff --git a/common/cmd_irq.c b/cmd/cmd_irq.c similarity index 100% rename from common/cmd_irq.c rename to cmd/cmd_irq.c diff --git a/common/cmd_itest.c b/cmd/cmd_itest.c similarity index 100% rename from common/cmd_itest.c rename to cmd/cmd_itest.c diff --git a/common/cmd_jffs2.c b/cmd/cmd_jffs2.c similarity index 100% rename from common/cmd_jffs2.c rename to cmd/cmd_jffs2.c diff --git a/common/cmd_ldrinfo.c b/cmd/cmd_ldrinfo.c similarity index 100% rename from common/cmd_ldrinfo.c rename to cmd/cmd_ldrinfo.c diff --git a/common/cmd_led.c b/cmd/cmd_led.c similarity index 100% rename from common/cmd_led.c rename to cmd/cmd_led.c diff --git a/common/cmd_license.c b/cmd/cmd_license.c similarity index 100% rename from common/cmd_license.c rename to cmd/cmd_license.c diff --git a/common/cmd_load.c b/cmd/cmd_load.c similarity index 100% rename from common/cmd_load.c rename to cmd/cmd_load.c diff --git a/common/cmd_log.c b/cmd/cmd_log.c similarity index 100% rename from common/cmd_log.c rename to cmd/cmd_log.c diff --git a/common/cmd_lzmadec.c b/cmd/cmd_lzmadec.c similarity index 100% rename from common/cmd_lzmadec.c rename to cmd/cmd_lzmadec.c diff --git a/common/cmd_mac.c b/cmd/cmd_mac.c similarity index 100% rename from common/cmd_mac.c rename to cmd/cmd_mac.c diff --git a/common/cmd_md5sum.c b/cmd/cmd_md5sum.c similarity index 100% rename from common/cmd_md5sum.c rename to cmd/cmd_md5sum.c diff --git a/common/cmd_mdio.c b/cmd/cmd_mdio.c similarity index 100% rename from common/cmd_mdio.c rename to cmd/cmd_mdio.c diff --git a/common/cmd_mem.c b/cmd/cmd_mem.c similarity index 100% rename from common/cmd_mem.c rename to cmd/cmd_mem.c diff --git a/common/cmd_mfsl.c b/cmd/cmd_mfsl.c similarity index 100% rename from common/cmd_mfsl.c rename to cmd/cmd_mfsl.c diff --git a/common/cmd_mii.c b/cmd/cmd_mii.c similarity index 100% rename from common/cmd_mii.c rename to cmd/cmd_mii.c diff --git a/common/cmd_misc.c b/cmd/cmd_misc.c similarity index 100% rename from common/cmd_misc.c rename to cmd/cmd_misc.c diff --git a/common/cmd_mmc.c b/cmd/cmd_mmc.c similarity index 100% rename from common/cmd_mmc.c rename to cmd/cmd_mmc.c diff --git a/common/cmd_mmc_spi.c b/cmd/cmd_mmc_spi.c similarity index 100% rename from common/cmd_mmc_spi.c rename to cmd/cmd_mmc_spi.c diff --git a/common/cmd_mp.c b/cmd/cmd_mp.c similarity index 100% rename from common/cmd_mp.c rename to cmd/cmd_mp.c diff --git a/common/cmd_mtdparts.c b/cmd/cmd_mtdparts.c similarity index 100% rename from common/cmd_mtdparts.c rename to cmd/cmd_mtdparts.c diff --git a/common/cmd_nand.c b/cmd/cmd_nand.c similarity index 100% rename from common/cmd_nand.c rename to cmd/cmd_nand.c diff --git a/common/cmd_net.c b/cmd/cmd_net.c similarity index 100% rename from common/cmd_net.c rename to cmd/cmd_net.c diff --git a/common/cmd_nvedit.c b/cmd/cmd_nvedit.c similarity index 100% rename from common/cmd_nvedit.c rename to cmd/cmd_nvedit.c diff --git a/common/cmd_onenand.c b/cmd/cmd_onenand.c similarity index 100% rename from common/cmd_onenand.c rename to cmd/cmd_onenand.c diff --git a/common/cmd_otp.c b/cmd/cmd_otp.c similarity index 100% rename from common/cmd_otp.c rename to cmd/cmd_otp.c diff --git a/common/cmd_part.c b/cmd/cmd_part.c similarity index 100% rename from common/cmd_part.c rename to cmd/cmd_part.c diff --git a/common/cmd_pci.c b/cmd/cmd_pci.c similarity index 100% rename from common/cmd_pci.c rename to cmd/cmd_pci.c diff --git a/common/cmd_pcmcia.c b/cmd/cmd_pcmcia.c similarity index 100% rename from common/cmd_pcmcia.c rename to cmd/cmd_pcmcia.c diff --git a/common/cmd_pmic.c b/cmd/cmd_pmic.c similarity index 100% rename from common/cmd_pmic.c rename to cmd/cmd_pmic.c diff --git a/common/cmd_portio.c b/cmd/cmd_portio.c similarity index 100% rename from common/cmd_portio.c rename to cmd/cmd_portio.c diff --git a/common/cmd_pxe.c b/cmd/cmd_pxe.c similarity index 100% rename from common/cmd_pxe.c rename to cmd/cmd_pxe.c diff --git a/common/cmd_read.c b/cmd/cmd_read.c similarity index 100% rename from common/cmd_read.c rename to cmd/cmd_read.c diff --git a/common/cmd_reginfo.c b/cmd/cmd_reginfo.c similarity index 100% rename from common/cmd_reginfo.c rename to cmd/cmd_reginfo.c diff --git a/common/cmd_regulator.c b/cmd/cmd_regulator.c similarity index 100% rename from common/cmd_regulator.c rename to cmd/cmd_regulator.c diff --git a/common/cmd_reiser.c b/cmd/cmd_reiser.c similarity index 100% rename from common/cmd_reiser.c rename to cmd/cmd_reiser.c diff --git a/common/cmd_remoteproc.c b/cmd/cmd_remoteproc.c similarity index 100% rename from common/cmd_remoteproc.c rename to cmd/cmd_remoteproc.c diff --git a/common/cmd_sata.c b/cmd/cmd_sata.c similarity index 100% rename from common/cmd_sata.c rename to cmd/cmd_sata.c diff --git a/common/cmd_scsi.c b/cmd/cmd_scsi.c similarity index 100% rename from common/cmd_scsi.c rename to cmd/cmd_scsi.c diff --git a/common/cmd_setexpr.c b/cmd/cmd_setexpr.c similarity index 100% rename from common/cmd_setexpr.c rename to cmd/cmd_setexpr.c diff --git a/common/cmd_sf.c b/cmd/cmd_sf.c similarity index 100% rename from common/cmd_sf.c rename to cmd/cmd_sf.c diff --git a/common/cmd_sha1sum.c b/cmd/cmd_sha1sum.c similarity index 100% rename from common/cmd_sha1sum.c rename to cmd/cmd_sha1sum.c diff --git a/common/cmd_softswitch.c b/cmd/cmd_softswitch.c similarity index 100% rename from common/cmd_softswitch.c rename to cmd/cmd_softswitch.c diff --git a/common/cmd_sound.c b/cmd/cmd_sound.c similarity index 100% rename from common/cmd_sound.c rename to cmd/cmd_sound.c diff --git a/common/cmd_source.c b/cmd/cmd_source.c similarity index 100% rename from common/cmd_source.c rename to cmd/cmd_source.c diff --git a/common/cmd_spi.c b/cmd/cmd_spi.c similarity index 100% rename from common/cmd_spi.c rename to cmd/cmd_spi.c diff --git a/common/cmd_spibootldr.c b/cmd/cmd_spibootldr.c similarity index 100% rename from common/cmd_spibootldr.c rename to cmd/cmd_spibootldr.c diff --git a/common/cmd_spl.c b/cmd/cmd_spl.c similarity index 100% rename from common/cmd_spl.c rename to cmd/cmd_spl.c diff --git a/common/cmd_strings.c b/cmd/cmd_strings.c similarity index 100% rename from common/cmd_strings.c rename to cmd/cmd_strings.c diff --git a/common/cmd_terminal.c b/cmd/cmd_terminal.c similarity index 100% rename from common/cmd_terminal.c rename to cmd/cmd_terminal.c diff --git a/common/cmd_test.c b/cmd/cmd_test.c similarity index 100% rename from common/cmd_test.c rename to cmd/cmd_test.c diff --git a/common/cmd_thordown.c b/cmd/cmd_thordown.c similarity index 100% rename from common/cmd_thordown.c rename to cmd/cmd_thordown.c diff --git a/common/cmd_time.c b/cmd/cmd_time.c similarity index 100% rename from common/cmd_time.c rename to cmd/cmd_time.c diff --git a/common/cmd_tpm.c b/cmd/cmd_tpm.c similarity index 100% rename from common/cmd_tpm.c rename to cmd/cmd_tpm.c diff --git a/common/cmd_tpm_test.c b/cmd/cmd_tpm_test.c similarity index 100% rename from common/cmd_tpm_test.c rename to cmd/cmd_tpm_test.c diff --git a/common/cmd_trace.c b/cmd/cmd_trace.c similarity index 100% rename from common/cmd_trace.c rename to cmd/cmd_trace.c diff --git a/common/cmd_tsi148.c b/cmd/cmd_tsi148.c similarity index 100% rename from common/cmd_tsi148.c rename to cmd/cmd_tsi148.c diff --git a/common/cmd_ubi.c b/cmd/cmd_ubi.c similarity index 100% rename from common/cmd_ubi.c rename to cmd/cmd_ubi.c diff --git a/common/cmd_ubifs.c b/cmd/cmd_ubifs.c similarity index 100% rename from common/cmd_ubifs.c rename to cmd/cmd_ubifs.c diff --git a/common/cmd_universe.c b/cmd/cmd_universe.c similarity index 100% rename from common/cmd_universe.c rename to cmd/cmd_universe.c diff --git a/common/cmd_unzip.c b/cmd/cmd_unzip.c similarity index 100% rename from common/cmd_unzip.c rename to cmd/cmd_unzip.c diff --git a/common/cmd_usb.c b/cmd/cmd_usb.c similarity index 100% rename from common/cmd_usb.c rename to cmd/cmd_usb.c diff --git a/common/cmd_usb_mass_storage.c b/cmd/cmd_usb_mass_storage.c similarity index 100% rename from common/cmd_usb_mass_storage.c rename to cmd/cmd_usb_mass_storage.c diff --git a/common/cmd_version.c b/cmd/cmd_version.c similarity index 100% rename from common/cmd_version.c rename to cmd/cmd_version.c diff --git a/common/cmd_ximg.c b/cmd/cmd_ximg.c similarity index 100% rename from common/cmd_ximg.c rename to cmd/cmd_ximg.c diff --git a/common/cmd_yaffs2.c b/cmd/cmd_yaffs2.c similarity index 100% rename from common/cmd_yaffs2.c rename to cmd/cmd_yaffs2.c diff --git a/common/cmd_zfs.c b/cmd/cmd_zfs.c similarity index 100% rename from common/cmd_zfs.c rename to cmd/cmd_zfs.c diff --git a/common/cmd_zip.c b/cmd/cmd_zip.c similarity index 100% rename from common/cmd_zip.c rename to cmd/cmd_zip.c diff --git a/common/Kconfig b/common/Kconfig index 9d446bf..067545d 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,522 +1,3 @@ -menu "Command line interface" - -config HUSH_PARSER - bool "Use hush shell" - select SYS_HUSH_PARSER - help - This option enables the "hush" shell (from Busybox) as command line - interpreter, thus enabling powerful command line syntax like - if...then...else...fi conditionals or `&&' and '||' - constructs ("shell scripts"). - - If disabled, you get the old, much simpler behaviour with a somewhat - smaller memory footprint. - -config SYS_HUSH_PARSER - bool - help - Backward compatibility. - -config SYS_PROMPT - string "Shell prompt" - default "=> " - help - This string is displayed in the command line to the left of the - cursor. - -menu "Autoboot options" - -config AUTOBOOT_KEYED - bool "Stop autobooting via specific input key / string" - default n - help - This option enables stopping (aborting) of the automatic - boot feature only by issuing a specific input key or - string. If not enabled, any input key will abort the - U-Boot automatic booting process and bring the device - to the U-Boot prompt for user input. - -config AUTOBOOT_PROMPT - string "Autoboot stop prompt" - depends on AUTOBOOT_KEYED - default "Autoboot in %d seconds\n" - help - This string is displayed before the boot delay selected by - CONFIG_BOOTDELAY starts. If it is not defined there is no - output indicating that autoboot is in progress. - - Note that this define is used as the (only) argument to a - printf() call, so it may contain '%' format specifications, - provided that it also includes, sepearated by commas exactly - like in a printf statement, the required arguments. It is - the responsibility of the user to select only such arguments - that are valid in the given context. - -config AUTOBOOT_ENCRYPTION - bool "Enable encryption in autoboot stopping" - depends on AUTOBOOT_KEYED - default n - -config AUTOBOOT_DELAY_STR - string "Delay autobooting via specific input key / string" - depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION - help - This option delays the automatic boot feature by issuing - a specific input key or string. If CONFIG_AUTOBOOT_DELAY_STR - or the environment variable "bootdelaykey" is specified - and this string is received from console input before - autoboot starts booting, U-Boot gives a command prompt. The - U-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME is - used, otherwise it never times out. - -config AUTOBOOT_STOP_STR - string "Stop autobooting via specific input key / string" - depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION - help - This option enables stopping (aborting) of the automatic - boot feature only by issuing a specific input key or - string. If CONFIG_AUTOBOOT_STOP_STR or the environment - variable "bootstopkey" is specified and this string is - received from console input before autoboot starts booting, - U-Boot gives a command prompt. The U-Boot prompt never - times out, even if CONFIG_BOOT_RETRY_TIME is used. - -config AUTOBOOT_KEYED_CTRLC - bool "Enable Ctrl-C autoboot interruption" - depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION - default n - help - This option allows for the boot sequence to be interrupted - by ctrl-c, in addition to the "bootdelaykey" and "bootstopkey". - Setting this variable provides an escape sequence from the - limited "password" strings. - -config AUTOBOOT_STOP_STR_SHA256 - string "Stop autobooting via SHA256 encrypted password" - depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION - help - This option adds the feature to only stop the autobooting, - and therefore boot into the U-Boot prompt, when the input - string / password matches a values that is encypted via - a SHA256 hash and saved in the environment. - -endmenu - -comment "Commands" - -menu "Info commands" - -config CMD_BDI - bool "bdinfo" - default y - help - Print board info - -config CMD_CONSOLE - bool "coninfo" - default y - help - Print console devices and information. - -config CMD_CPU - bool "cpu" - help - Print information about available CPUs. This normally shows the - number of CPUs, type (e.g. manufacturer, architecture, product or - internal name) and clock frequency. Other information may be - available depending on the CPU driver. - -config CMD_LICENSE - bool "license" - help - Print GPL license text - -endmenu - -menu "Boot commands" - -config CMD_BOOTD - bool "bootd" - default y - help - Run the command stored in the environment "bootcmd", i.e. - "bootd" does the same thing as "run bootcmd". - -config CMD_BOOTM - bool "bootm" - default y - help - Boot an application image from the memory. - -config CMD_ELF - bool "bootelf, bootvx" - default y - help - Boot an ELF/vxWorks image from the memory. - -config CMD_GO - bool "go" - default y - help - Start an application at a given address. - -config CMD_RUN - bool "run" - default y - help - Run the command in the given environment variable. - -config CMD_IMI - bool "iminfo" - default y - help - Print header information for application image. - -config CMD_IMLS - bool "imls" - default y - help - List all images found in flash - -config CMD_XIMG - bool "imxtract" - default y - help - Extract a part of a multi-image. - -config CMD_POWEROFF - bool - -endmenu - -menu "Environment commands" - -config CMD_EXPORTENV - bool "env export" - default y - help - Export environments. - -config CMD_IMPORTENV - bool "env import" - default y - help - Import environments. - -config CMD_EDITENV - bool "editenv" - default y - help - Edit environment variable. - -config CMD_SAVEENV - bool "saveenv" - default y - help - Save all environment variables into the compiled-in persistent - storage. - -config CMD_ENV_EXISTS - bool "env exists" - default y - help - Check if a variable is defined in the environment for use in - shell scripting. - -endmenu - -menu "Memory commands" - -config CMD_MEMORY - bool "md, mm, nm, mw, cp, cmp, base, loop" - default y - help - Memeory commands. - md - memory display - mm - memory modify (auto-incrementing address) - nm - memory modify (constant address) - mw - memory write (fill) - cp - memory copy - cmp - memory compare - base - print or set address offset - loop - initinite loop on address range - -config CMD_CRC32 - bool "crc32" - default y - help - Compute CRC32. - -config LOOPW - bool "loopw" - help - Infinite write loop on address range - -config CMD_MEMTEST - bool "memtest" - help - Simple RAM read/write test. - -config CMD_MX_CYCLIC - bool "mdc, mwc" - help - mdc - memory display cyclic - mwc - memory write cyclic - -config CMD_MEMINFO - bool "meminfo" - help - Display memory information. - -endmenu - -menu "Device access commands" - -config CMD_DM - bool "dm - Access to driver model information" - depends on DM - default y - help - Provides access to driver model data structures and information, - such as a list of devices, list of uclasses and the state of each - device (e.g. activated). This is not required for operation, but - 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 - 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_LOADB - bool "loadb" - default y - help - Load a binary file over serial line. - -config CMD_LOADS - bool "loads" - default y - 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_ARMFLASH - depends on FLASH_CFI_DRIVER - bool "armflash" - help - ARM Ltd reference designs flash partition access - -config CMD_NAND - bool "nand" - help - NAND support. - -config CMD_SF - bool "sf" - help - SPI Flash support - -config CMD_SPI - bool "sspi" - help - SPI utility command. - -config CMD_I2C - bool "i2c" - help - I2C support. - -config CMD_USB - bool "usb" - help - USB support. - -config CMD_FPGA - bool "fpga" - default y - help - FPGA support. - -config CMD_REMOTEPROC - bool "remoteproc" - depends on REMOTEPROC - help - Support for Remote Processor control - -config CMD_GPIO - bool "gpio" - help - GPIO support. - -endmenu - - -menu "Shell scripting commands" - -config CMD_ECHO - bool "echo" - default y - help - Echo args to console - -config CMD_ITEST - bool "itest" - default y - help - Return true/false on integer compare. - -config CMD_SOURCE - bool "source" - default y - help - Run script from memory - -config CMD_SETEXPR - bool "setexpr" - default y - help - Evaluate boolean and math expressions and store the result in an env - variable. - Also supports loading the value at a memory location into a variable. - If CONFIG_REGEX is enabled, setexpr also supports a gsub function. - -endmenu - -menu "Network commands" - -config CMD_NET - bool "bootp, tftpboot" - select NET - default y - help - Network commands. - bootp - boot image via network using BOOTP/TFTP protocol - tftpboot - boot image via network using TFTP protocol - -config CMD_TFTPPUT - bool "tftp put" - help - TFTP put command, for uploading files to a server - -config CMD_TFTPSRV - bool "tftpsrv" - help - Act as a TFTP server and boot the first received file - -config CMD_RARP - bool "rarpboot" - help - Boot image via network using RARP/TFTP protocol - -config CMD_DHCP - bool "dhcp" - help - Boot image via network using DHCP/TFTP protocol - -config CMD_NFS - bool "nfs" - default y - help - Boot image via network using NFS protocol. - -config CMD_PING - bool "ping" - help - Send ICMP ECHO_REQUEST to network host - -config CMD_CDP - bool "cdp" - help - Perform CDP network configuration - -config CMD_SNTP - bool "sntp" - help - Synchronize RTC via network - -config CMD_DNS - bool "dns" - help - Lookup the IP of a hostname - -config CMD_LINK_LOCAL - bool "linklocal" - help - Acquire a network IP address using the link-local protocol - -endmenu - -menu "Misc commands" - -config CMD_AMBAPP - bool "ambapp" - depends on LEON3 - default y - help - Lists AMBA Plug-n-Play information. - -config SYS_AMBAPP_PRINT_ON_STARTUP - bool "Show AMBA PnP info on startup" - depends on CMD_AMBAPP - default n - help - Show AMBA Plug-n-Play information on startup. - -config CMD_TIME - bool "time" - help - Run commands and summarize execution time. - -# TODO: rename to CMD_SLEEP -config CMD_MISC - bool "sleep" - default y - help - Delay execution for some time - -config CMD_TIMER - bool "timer" - help - Access the system timer. - -config CMD_SETGETDCR - bool "getdcr, setdcr, getidcr, setidcr" - depends on 4xx - default y - help - getdcr - Get an AMCC PPC 4xx DCR's value - setdcr - Set an AMCC PPC 4xx DCR's value - getidcr - Get a register value via indirect DCR addressing - setidcr - Set a register value via indirect DCR addressing - -config CMD_SOUND - bool "sound" - depends on SOUND - help - This provides basic access to the U-Boot's sound support. The main - feature is to play a beep. - - sound init - set up sound system - sound play - play a sound - -endmenu - menu "Boot timing"
config BOOTSTAGE @@ -565,13 +46,6 @@ config BOOTSTAGE_USER_COUNT a new ID will be allocated from this stash. If you exceed the limit, recording will stop.
-config CMD_BOOTSTAGE - bool "Enable the 'bootstage' command" - depends on BOOTSTAGE - help - Add a 'bootstage' command which supports printing a report - and un/stashing of bootstage data. - config BOOTSTAGE_FDT bool "Store boot timing information in the OS device tree" depends on BOOTSTAGE @@ -623,66 +97,6 @@ config BOOTSTAGE_STASH_SIZE
endmenu
-menu "Power commands" -config CMD_PMIC - bool "Enable Driver Model PMIC command" - depends on DM_PMIC - help - This is the pmic command, based on a driver model pmic's API. - Command features are unchanged: - - list - list pmic devices - - pmic dev <id> - show or [set] operating pmic device (NEW) - - pmic dump - dump registers - - pmic read address - read byte of register at address - - pmic write address - write byte to register at address - The only one change for this command is 'dev' subcommand. - -config CMD_REGULATOR - bool "Enable Driver Model REGULATOR command" - depends on DM_REGULATOR - help - This command is based on driver model regulator's API. - User interface features: - - list - list regulator devices - - regulator dev <id> - show or [set] operating regulator device - - regulator info - print constraints info - - regulator status - print operating status - - regulator value <val] <-f> - print/[set] voltage value [uV] - - regulator current <val> - print/[set] current value [uA] - - regulator mode <id> - print/[set] operating mode id - - regulator enable - enable the regulator output - - regulator disable - disable the regulator output - - The '-f' (force) option can be used for set the value which exceeds - the limits, which are found in device-tree and are kept in regulator's - uclass platdata structure. - -endmenu - -menu "Security commands" -config CMD_TPM - bool "Enable the 'tpm' command" - depends on TPM - help - This provides a means to talk to a TPM from the command line. A wide - range of commands if provided - see 'tpm help' for details. The - command requires a suitable TPM on your board and the correct driver - must be enabled. - -config CMD_TPM_TEST - bool "Enable the 'tpm test' command" - depends on CMD_TPM - help - This provides a a series of tests to confirm that the TPM is working - correctly. The tests cover initialisation, non-volatile RAM, extend, - global lock and checking that timing is within expectations. The - tests pass correctly on Infineon TPMs but may need to be adjusted - for other devices. - -endmenu - -endmenu - config CONSOLE_RECORD bool "Console recording" help diff --git a/common/Makefile b/common/Makefile index 2a1d9f8..fcf972d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,11 +31,7 @@ obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
-# core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o bootm.o bootm_os.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
# environment obj-y += env_attr.o @@ -58,143 +54,17 @@ obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
-# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o -ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o -endif -ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o -endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o -ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o -endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_OF_LIBFDT) += fdt_support.o + obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o -obj-$(CONFIG_CMD_MII) += cmd_mii.o -ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o -endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o -ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o -endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o -ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o -endif + ifdef CONFIG_CMD_USB -obj-y += cmd_usb.o obj-y += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o - -obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
# others obj-$(CONFIG_BOOTSTAGE) += bootstage.o @@ -214,14 +84,8 @@ obj-$(CONFIG_MODEM_SUPPORT) += modem.o obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_DFU_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
-# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o -endif +endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o @@ -232,9 +96,6 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -endif # environment ifdef CONFIG_SPL_ENV_SUPPORT obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o @@ -248,8 +109,6 @@ obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o endif endif -# core command -obj-y += cmd_nvedit.o #environment obj-y += env_common.o #others @@ -287,8 +146,6 @@ obj-y += fb_nand.o endif endif
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o - # We always have this since drivers/ddr/fs/interactive.c needs it obj-y += cli_simple.o
@@ -297,6 +154,5 @@ obj-y += cli_readline.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o -obj-y += cmd_disk.o
CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 96f414a..dff16b9 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -53,7 +53,7 @@ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/ libs-y += common/init/ -libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ +libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ libs-y += dts/
On Mon, Jan 18, 2016 at 11:53 AM, Simon Glass sjg@chromium.org wrote:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Kconfig | 2 + Makefile | 1 + cmd/Kconfig | 585 +++++++++++++++++++++++++++++++ cmd/Makefile | 166 +++++++++ {common => cmd}/cmd_aes.c | 0 {common => cmd}/cmd_ambapp.c | 0 {common => cmd}/cmd_armflash.c | 0 {common => cmd}/cmd_bdinfo.c | 0 {common => cmd}/cmd_bedbug.c | 0 {common => cmd}/cmd_blob.c | 0 {common => cmd}/cmd_bmp.c | 0 {common => cmd}/cmd_boot.c | 0 {common => cmd}/cmd_bootldr.c | 0 {common => cmd}/cmd_bootm.c | 0 {common => cmd}/cmd_bootmenu.c | 0 {common => cmd}/cmd_bootstage.c | 0 {common => cmd}/cmd_cache.c | 0 {common => cmd}/cmd_cbfs.c | 0 {common => cmd}/cmd_clk.c | 0 {common => cmd}/cmd_console.c | 0 {common => cmd}/cmd_cplbinfo.c | 0 {common => cmd}/cmd_cpu.c | 0 {common => cmd}/cmd_cramfs.c | 0 {common => cmd}/cmd_dataflash_mmc_mux.c | 0 {common => cmd}/cmd_date.c | 0 {common => cmd}/cmd_dcr.c | 0 {common => cmd}/cmd_demo.c | 0 {common => cmd}/cmd_dfu.c | 0 {common => cmd}/cmd_diag.c | 0 {common => cmd}/cmd_disk.c | 0 {common => cmd}/cmd_display.c | 0 {common => cmd}/cmd_dtt.c | 0 {common => cmd}/cmd_echo.c | 0 {common => cmd}/cmd_eeprom.c | 0 {common => cmd}/cmd_efi.c | 0 {common => cmd}/cmd_elf.c | 0 {common => cmd}/cmd_ethsw.c | 0 {common => cmd}/cmd_exit.c | 0 {common => cmd}/cmd_ext2.c | 0 {common => cmd}/cmd_ext4.c | 0 {common => cmd}/cmd_fastboot.c | 0 {common => cmd}/cmd_fat.c | 0 {common => cmd}/cmd_fdc.c | 0 {common => cmd}/cmd_fdt.c | 0 {common => cmd}/cmd_fitupd.c | 0 {common => cmd}/cmd_flash.c | 0 {common => cmd}/cmd_fpga.c | 0 {common => cmd}/cmd_fpgad.c | 0 {common => cmd}/cmd_fs.c | 0 {common => cmd}/cmd_fs_uuid.c | 0 {common => cmd}/cmd_fuse.c | 0 {common => cmd}/cmd_gettime.c | 0 {common => cmd}/cmd_gpio.c | 0 {common => cmd}/cmd_gpt.c | 0 {common => cmd}/cmd_hash.c | 0 {common => cmd}/cmd_help.c | 0 {common => cmd}/cmd_host.c | 0 {common => cmd}/cmd_i2c.c | 0 {common => cmd}/cmd_ide.c | 0 {common => cmd}/cmd_immap.c | 0 {common => cmd}/cmd_ini.c | 0 {common => cmd}/cmd_io.c | 0 {common => cmd}/cmd_iotrace.c | 0 {common => cmd}/cmd_irq.c | 0 {common => cmd}/cmd_itest.c | 0 {common => cmd}/cmd_jffs2.c | 0 {common => cmd}/cmd_ldrinfo.c | 0 {common => cmd}/cmd_led.c | 0 {common => cmd}/cmd_license.c | 0 {common => cmd}/cmd_load.c | 0 {common => cmd}/cmd_log.c | 0 {common => cmd}/cmd_lzmadec.c | 0 {common => cmd}/cmd_mac.c | 0 {common => cmd}/cmd_md5sum.c | 0 {common => cmd}/cmd_mdio.c | 0 {common => cmd}/cmd_mem.c | 0 {common => cmd}/cmd_mfsl.c | 0 {common => cmd}/cmd_mii.c | 0 {common => cmd}/cmd_misc.c | 0 {common => cmd}/cmd_mmc.c | 0 {common => cmd}/cmd_mmc_spi.c | 0 {common => cmd}/cmd_mp.c | 0 {common => cmd}/cmd_mtdparts.c | 0 {common => cmd}/cmd_nand.c | 0 {common => cmd}/cmd_net.c | 0 {common => cmd}/cmd_nvedit.c | 0 {common => cmd}/cmd_onenand.c | 0 {common => cmd}/cmd_otp.c | 0 {common => cmd}/cmd_part.c | 0 {common => cmd}/cmd_pci.c | 0 {common => cmd}/cmd_pcmcia.c | 0 {common => cmd}/cmd_pmic.c | 0 {common => cmd}/cmd_portio.c | 0 {common => cmd}/cmd_pxe.c | 0 {common => cmd}/cmd_read.c | 0 {common => cmd}/cmd_reginfo.c | 0 {common => cmd}/cmd_regulator.c | 0 {common => cmd}/cmd_reiser.c | 0 {common => cmd}/cmd_remoteproc.c | 0 {common => cmd}/cmd_sata.c | 0 {common => cmd}/cmd_scsi.c | 0 {common => cmd}/cmd_setexpr.c | 0 {common => cmd}/cmd_sf.c | 0 {common => cmd}/cmd_sha1sum.c | 0 {common => cmd}/cmd_softswitch.c | 0 {common => cmd}/cmd_sound.c | 0 {common => cmd}/cmd_source.c | 0 {common => cmd}/cmd_spi.c | 0 {common => cmd}/cmd_spibootldr.c | 0 {common => cmd}/cmd_spl.c | 0 {common => cmd}/cmd_strings.c | 0 {common => cmd}/cmd_terminal.c | 0 {common => cmd}/cmd_test.c | 0 {common => cmd}/cmd_thordown.c | 0 {common => cmd}/cmd_time.c | 0 {common => cmd}/cmd_tpm.c | 0 {common => cmd}/cmd_tpm_test.c | 0 {common => cmd}/cmd_trace.c | 0 {common => cmd}/cmd_tsi148.c | 0 {common => cmd}/cmd_ubi.c | 0 {common => cmd}/cmd_ubifs.c | 0 {common => cmd}/cmd_universe.c | 0 {common => cmd}/cmd_unzip.c | 0 {common => cmd}/cmd_usb.c | 0 {common => cmd}/cmd_usb_mass_storage.c | 0 {common => cmd}/cmd_version.c | 0 {common => cmd}/cmd_ximg.c | 0 {common => cmd}/cmd_yaffs2.c | 0 {common => cmd}/cmd_zfs.c | 0 {common => cmd}/cmd_zip.c | 0 common/Kconfig | 586 -------------------------------- common/Makefile | 156 +-------- scripts/Makefile.spl | 2 +- 133 files changed, 761 insertions(+), 737 deletions(-) create mode 100644 cmd/Kconfig create mode 100644 cmd/Makefile rename {common => cmd}/cmd_aes.c (100%) rename {common => cmd}/cmd_ambapp.c (100%) rename {common => cmd}/cmd_armflash.c (100%) rename {common => cmd}/cmd_bdinfo.c (100%) rename {common => cmd}/cmd_bedbug.c (100%) rename {common => cmd}/cmd_blob.c (100%) rename {common => cmd}/cmd_bmp.c (100%) rename {common => cmd}/cmd_boot.c (100%) rename {common => cmd}/cmd_bootldr.c (100%) rename {common => cmd}/cmd_bootm.c (100%) rename {common => cmd}/cmd_bootmenu.c (100%) rename {common => cmd}/cmd_bootstage.c (100%) rename {common => cmd}/cmd_cache.c (100%) rename {common => cmd}/cmd_cbfs.c (100%) rename {common => cmd}/cmd_clk.c (100%) rename {common => cmd}/cmd_console.c (100%) rename {common => cmd}/cmd_cplbinfo.c (100%) rename {common => cmd}/cmd_cpu.c (100%) rename {common => cmd}/cmd_cramfs.c (100%) rename {common => cmd}/cmd_dataflash_mmc_mux.c (100%) rename {common => cmd}/cmd_date.c (100%) rename {common => cmd}/cmd_dcr.c (100%) rename {common => cmd}/cmd_demo.c (100%) rename {common => cmd}/cmd_dfu.c (100%) rename {common => cmd}/cmd_diag.c (100%) rename {common => cmd}/cmd_disk.c (100%) rename {common => cmd}/cmd_display.c (100%) rename {common => cmd}/cmd_dtt.c (100%) rename {common => cmd}/cmd_echo.c (100%) rename {common => cmd}/cmd_eeprom.c (100%) rename {common => cmd}/cmd_efi.c (100%) rename {common => cmd}/cmd_elf.c (100%) rename {common => cmd}/cmd_ethsw.c (100%) rename {common => cmd}/cmd_exit.c (100%) rename {common => cmd}/cmd_ext2.c (100%) rename {common => cmd}/cmd_ext4.c (100%) rename {common => cmd}/cmd_fastboot.c (100%) rename {common => cmd}/cmd_fat.c (100%) rename {common => cmd}/cmd_fdc.c (100%) rename {common => cmd}/cmd_fdt.c (100%) rename {common => cmd}/cmd_fitupd.c (100%) rename {common => cmd}/cmd_flash.c (100%) rename {common => cmd}/cmd_fpga.c (100%) rename {common => cmd}/cmd_fpgad.c (100%) rename {common => cmd}/cmd_fs.c (100%) rename {common => cmd}/cmd_fs_uuid.c (100%) rename {common => cmd}/cmd_fuse.c (100%) rename {common => cmd}/cmd_gettime.c (100%) rename {common => cmd}/cmd_gpio.c (100%) rename {common => cmd}/cmd_gpt.c (100%) rename {common => cmd}/cmd_hash.c (100%) rename {common => cmd}/cmd_help.c (100%) rename {common => cmd}/cmd_host.c (100%) rename {common => cmd}/cmd_i2c.c (100%) rename {common => cmd}/cmd_ide.c (100%) rename {common => cmd}/cmd_immap.c (100%) rename {common => cmd}/cmd_ini.c (100%) rename {common => cmd}/cmd_io.c (100%) rename {common => cmd}/cmd_iotrace.c (100%) rename {common => cmd}/cmd_irq.c (100%) rename {common => cmd}/cmd_itest.c (100%) rename {common => cmd}/cmd_jffs2.c (100%) rename {common => cmd}/cmd_ldrinfo.c (100%) rename {common => cmd}/cmd_led.c (100%) rename {common => cmd}/cmd_license.c (100%) rename {common => cmd}/cmd_load.c (100%) rename {common => cmd}/cmd_log.c (100%) rename {common => cmd}/cmd_lzmadec.c (100%) rename {common => cmd}/cmd_mac.c (100%) rename {common => cmd}/cmd_md5sum.c (100%) rename {common => cmd}/cmd_mdio.c (100%) rename {common => cmd}/cmd_mem.c (100%) rename {common => cmd}/cmd_mfsl.c (100%) rename {common => cmd}/cmd_mii.c (100%) rename {common => cmd}/cmd_misc.c (100%) rename {common => cmd}/cmd_mmc.c (100%) rename {common => cmd}/cmd_mmc_spi.c (100%) rename {common => cmd}/cmd_mp.c (100%) rename {common => cmd}/cmd_mtdparts.c (100%) rename {common => cmd}/cmd_nand.c (100%) rename {common => cmd}/cmd_net.c (100%) rename {common => cmd}/cmd_nvedit.c (100%) rename {common => cmd}/cmd_onenand.c (100%) rename {common => cmd}/cmd_otp.c (100%) rename {common => cmd}/cmd_part.c (100%) rename {common => cmd}/cmd_pci.c (100%) rename {common => cmd}/cmd_pcmcia.c (100%) rename {common => cmd}/cmd_pmic.c (100%) rename {common => cmd}/cmd_portio.c (100%) rename {common => cmd}/cmd_pxe.c (100%) rename {common => cmd}/cmd_read.c (100%) rename {common => cmd}/cmd_reginfo.c (100%) rename {common => cmd}/cmd_regulator.c (100%) rename {common => cmd}/cmd_reiser.c (100%) rename {common => cmd}/cmd_remoteproc.c (100%) rename {common => cmd}/cmd_sata.c (100%) rename {common => cmd}/cmd_scsi.c (100%) rename {common => cmd}/cmd_setexpr.c (100%) rename {common => cmd}/cmd_sf.c (100%) rename {common => cmd}/cmd_sha1sum.c (100%) rename {common => cmd}/cmd_softswitch.c (100%) rename {common => cmd}/cmd_sound.c (100%) rename {common => cmd}/cmd_source.c (100%) rename {common => cmd}/cmd_spi.c (100%) rename {common => cmd}/cmd_spibootldr.c (100%) rename {common => cmd}/cmd_spl.c (100%) rename {common => cmd}/cmd_strings.c (100%) rename {common => cmd}/cmd_terminal.c (100%) rename {common => cmd}/cmd_test.c (100%) rename {common => cmd}/cmd_thordown.c (100%) rename {common => cmd}/cmd_time.c (100%) rename {common => cmd}/cmd_tpm.c (100%) rename {common => cmd}/cmd_tpm_test.c (100%) rename {common => cmd}/cmd_trace.c (100%) rename {common => cmd}/cmd_tsi148.c (100%) rename {common => cmd}/cmd_ubi.c (100%) rename {common => cmd}/cmd_ubifs.c (100%) rename {common => cmd}/cmd_universe.c (100%) rename {common => cmd}/cmd_unzip.c (100%) rename {common => cmd}/cmd_usb.c (100%) rename {common => cmd}/cmd_usb_mass_storage.c (100%) rename {common => cmd}/cmd_version.c (100%) rename {common => cmd}/cmd_ximg.c (100%) rename {common => cmd}/cmd_yaffs2.c (100%) rename {common => cmd}/cmd_zfs.c (100%) rename {common => cmd}/cmd_zip.c (100%)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hello Simon,
Am 18.01.2016 um 04:53 schrieb Simon Glass:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Thanks!
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
Kconfig | 2 + Makefile | 1 + cmd/Kconfig | 585 +++++++++++++++++++++++++++++++ cmd/Makefile | 166 +++++++++ {common => cmd}/cmd_aes.c | 0 {common => cmd}/cmd_ambapp.c | 0 {common => cmd}/cmd_armflash.c | 0 {common => cmd}/cmd_bdinfo.c | 0 {common => cmd}/cmd_bedbug.c | 0 {common => cmd}/cmd_blob.c | 0 {common => cmd}/cmd_bmp.c | 0 {common => cmd}/cmd_boot.c | 0 {common => cmd}/cmd_bootldr.c | 0 {common => cmd}/cmd_bootm.c | 0 {common => cmd}/cmd_bootmenu.c | 0 {common => cmd}/cmd_bootstage.c | 0 {common => cmd}/cmd_cache.c | 0 {common => cmd}/cmd_cbfs.c | 0 {common => cmd}/cmd_clk.c | 0 {common => cmd}/cmd_console.c | 0 {common => cmd}/cmd_cplbinfo.c | 0 {common => cmd}/cmd_cpu.c | 0 {common => cmd}/cmd_cramfs.c | 0 {common => cmd}/cmd_dataflash_mmc_mux.c | 0 {common => cmd}/cmd_date.c | 0 {common => cmd}/cmd_dcr.c | 0 {common => cmd}/cmd_demo.c | 0 {common => cmd}/cmd_dfu.c | 0 {common => cmd}/cmd_diag.c | 0 {common => cmd}/cmd_disk.c | 0 {common => cmd}/cmd_display.c | 0 {common => cmd}/cmd_dtt.c | 0 {common => cmd}/cmd_echo.c | 0 {common => cmd}/cmd_eeprom.c | 0 {common => cmd}/cmd_efi.c | 0 {common => cmd}/cmd_elf.c | 0 {common => cmd}/cmd_ethsw.c | 0 {common => cmd}/cmd_exit.c | 0 {common => cmd}/cmd_ext2.c | 0 {common => cmd}/cmd_ext4.c | 0 {common => cmd}/cmd_fastboot.c | 0 {common => cmd}/cmd_fat.c | 0 {common => cmd}/cmd_fdc.c | 0 {common => cmd}/cmd_fdt.c | 0 {common => cmd}/cmd_fitupd.c | 0 {common => cmd}/cmd_flash.c | 0 {common => cmd}/cmd_fpga.c | 0 {common => cmd}/cmd_fpgad.c | 0 {common => cmd}/cmd_fs.c | 0 {common => cmd}/cmd_fs_uuid.c | 0 {common => cmd}/cmd_fuse.c | 0 {common => cmd}/cmd_gettime.c | 0 {common => cmd}/cmd_gpio.c | 0 {common => cmd}/cmd_gpt.c | 0 {common => cmd}/cmd_hash.c | 0 {common => cmd}/cmd_help.c | 0 {common => cmd}/cmd_host.c | 0 {common => cmd}/cmd_i2c.c | 0 {common => cmd}/cmd_ide.c | 0 {common => cmd}/cmd_immap.c | 0 {common => cmd}/cmd_ini.c | 0 {common => cmd}/cmd_io.c | 0 {common => cmd}/cmd_iotrace.c | 0 {common => cmd}/cmd_irq.c | 0 {common => cmd}/cmd_itest.c | 0 {common => cmd}/cmd_jffs2.c | 0 {common => cmd}/cmd_ldrinfo.c | 0 {common => cmd}/cmd_led.c | 0 {common => cmd}/cmd_license.c | 0 {common => cmd}/cmd_load.c | 0 {common => cmd}/cmd_log.c | 0 {common => cmd}/cmd_lzmadec.c | 0 {common => cmd}/cmd_mac.c | 0 {common => cmd}/cmd_md5sum.c | 0 {common => cmd}/cmd_mdio.c | 0 {common => cmd}/cmd_mem.c | 0 {common => cmd}/cmd_mfsl.c | 0 {common => cmd}/cmd_mii.c | 0 {common => cmd}/cmd_misc.c | 0 {common => cmd}/cmd_mmc.c | 0 {common => cmd}/cmd_mmc_spi.c | 0 {common => cmd}/cmd_mp.c | 0 {common => cmd}/cmd_mtdparts.c | 0 {common => cmd}/cmd_nand.c | 0 {common => cmd}/cmd_net.c | 0 {common => cmd}/cmd_nvedit.c | 0 {common => cmd}/cmd_onenand.c | 0 {common => cmd}/cmd_otp.c | 0 {common => cmd}/cmd_part.c | 0 {common => cmd}/cmd_pci.c | 0 {common => cmd}/cmd_pcmcia.c | 0 {common => cmd}/cmd_pmic.c | 0 {common => cmd}/cmd_portio.c | 0 {common => cmd}/cmd_pxe.c | 0 {common => cmd}/cmd_read.c | 0 {common => cmd}/cmd_reginfo.c | 0 {common => cmd}/cmd_regulator.c | 0 {common => cmd}/cmd_reiser.c | 0 {common => cmd}/cmd_remoteproc.c | 0 {common => cmd}/cmd_sata.c | 0 {common => cmd}/cmd_scsi.c | 0 {common => cmd}/cmd_setexpr.c | 0 {common => cmd}/cmd_sf.c | 0 {common => cmd}/cmd_sha1sum.c | 0 {common => cmd}/cmd_softswitch.c | 0 {common => cmd}/cmd_sound.c | 0 {common => cmd}/cmd_source.c | 0 {common => cmd}/cmd_spi.c | 0 {common => cmd}/cmd_spibootldr.c | 0 {common => cmd}/cmd_spl.c | 0 {common => cmd}/cmd_strings.c | 0 {common => cmd}/cmd_terminal.c | 0 {common => cmd}/cmd_test.c | 0 {common => cmd}/cmd_thordown.c | 0 {common => cmd}/cmd_time.c | 0 {common => cmd}/cmd_tpm.c | 0 {common => cmd}/cmd_tpm_test.c | 0 {common => cmd}/cmd_trace.c | 0 {common => cmd}/cmd_tsi148.c | 0 {common => cmd}/cmd_ubi.c | 0 {common => cmd}/cmd_ubifs.c | 0 {common => cmd}/cmd_universe.c | 0 {common => cmd}/cmd_unzip.c | 0 {common => cmd}/cmd_usb.c | 0 {common => cmd}/cmd_usb_mass_storage.c | 0 {common => cmd}/cmd_version.c | 0 {common => cmd}/cmd_ximg.c | 0 {common => cmd}/cmd_yaffs2.c | 0 {common => cmd}/cmd_zfs.c | 0 {common => cmd}/cmd_zip.c | 0 common/Kconfig | 586 -------------------------------- common/Makefile | 156 +-------- scripts/Makefile.spl | 2 +- 133 files changed, 761 insertions(+), 737 deletions(-) create mode 100644 cmd/Kconfig create mode 100644 cmd/Makefile rename {common => cmd}/cmd_aes.c (100%) rename {common => cmd}/cmd_ambapp.c (100%) rename {common => cmd}/cmd_armflash.c (100%) rename {common => cmd}/cmd_bdinfo.c (100%) rename {common => cmd}/cmd_bedbug.c (100%) rename {common => cmd}/cmd_blob.c (100%) rename {common => cmd}/cmd_bmp.c (100%) rename {common => cmd}/cmd_boot.c (100%) rename {common => cmd}/cmd_bootldr.c (100%) rename {common => cmd}/cmd_bootm.c (100%) rename {common => cmd}/cmd_bootmenu.c (100%) rename {common => cmd}/cmd_bootstage.c (100%) rename {common => cmd}/cmd_cache.c (100%) rename {common => cmd}/cmd_cbfs.c (100%) rename {common => cmd}/cmd_clk.c (100%) rename {common => cmd}/cmd_console.c (100%) rename {common => cmd}/cmd_cplbinfo.c (100%) rename {common => cmd}/cmd_cpu.c (100%) rename {common => cmd}/cmd_cramfs.c (100%) rename {common => cmd}/cmd_dataflash_mmc_mux.c (100%) rename {common => cmd}/cmd_date.c (100%) rename {common => cmd}/cmd_dcr.c (100%) rename {common => cmd}/cmd_demo.c (100%) rename {common => cmd}/cmd_dfu.c (100%) rename {common => cmd}/cmd_diag.c (100%) rename {common => cmd}/cmd_disk.c (100%) rename {common => cmd}/cmd_display.c (100%) rename {common => cmd}/cmd_dtt.c (100%) rename {common => cmd}/cmd_echo.c (100%) rename {common => cmd}/cmd_eeprom.c (100%) rename {common => cmd}/cmd_efi.c (100%) rename {common => cmd}/cmd_elf.c (100%) rename {common => cmd}/cmd_ethsw.c (100%) rename {common => cmd}/cmd_exit.c (100%) rename {common => cmd}/cmd_ext2.c (100%) rename {common => cmd}/cmd_ext4.c (100%) rename {common => cmd}/cmd_fastboot.c (100%) rename {common => cmd}/cmd_fat.c (100%) rename {common => cmd}/cmd_fdc.c (100%) rename {common => cmd}/cmd_fdt.c (100%) rename {common => cmd}/cmd_fitupd.c (100%) rename {common => cmd}/cmd_flash.c (100%) rename {common => cmd}/cmd_fpga.c (100%) rename {common => cmd}/cmd_fpgad.c (100%) rename {common => cmd}/cmd_fs.c (100%) rename {common => cmd}/cmd_fs_uuid.c (100%) rename {common => cmd}/cmd_fuse.c (100%) rename {common => cmd}/cmd_gettime.c (100%) rename {common => cmd}/cmd_gpio.c (100%) rename {common => cmd}/cmd_gpt.c (100%) rename {common => cmd}/cmd_hash.c (100%) rename {common => cmd}/cmd_help.c (100%) rename {common => cmd}/cmd_host.c (100%) rename {common => cmd}/cmd_i2c.c (100%) rename {common => cmd}/cmd_ide.c (100%) rename {common => cmd}/cmd_immap.c (100%) rename {common => cmd}/cmd_ini.c (100%) rename {common => cmd}/cmd_io.c (100%) rename {common => cmd}/cmd_iotrace.c (100%) rename {common => cmd}/cmd_irq.c (100%) rename {common => cmd}/cmd_itest.c (100%) rename {common => cmd}/cmd_jffs2.c (100%) rename {common => cmd}/cmd_ldrinfo.c (100%) rename {common => cmd}/cmd_led.c (100%) rename {common => cmd}/cmd_license.c (100%) rename {common => cmd}/cmd_load.c (100%) rename {common => cmd}/cmd_log.c (100%) rename {common => cmd}/cmd_lzmadec.c (100%) rename {common => cmd}/cmd_mac.c (100%) rename {common => cmd}/cmd_md5sum.c (100%) rename {common => cmd}/cmd_mdio.c (100%) rename {common => cmd}/cmd_mem.c (100%) rename {common => cmd}/cmd_mfsl.c (100%) rename {common => cmd}/cmd_mii.c (100%) rename {common => cmd}/cmd_misc.c (100%) rename {common => cmd}/cmd_mmc.c (100%) rename {common => cmd}/cmd_mmc_spi.c (100%) rename {common => cmd}/cmd_mp.c (100%) rename {common => cmd}/cmd_mtdparts.c (100%) rename {common => cmd}/cmd_nand.c (100%) rename {common => cmd}/cmd_net.c (100%) rename {common => cmd}/cmd_nvedit.c (100%) rename {common => cmd}/cmd_onenand.c (100%) rename {common => cmd}/cmd_otp.c (100%) rename {common => cmd}/cmd_part.c (100%) rename {common => cmd}/cmd_pci.c (100%) rename {common => cmd}/cmd_pcmcia.c (100%) rename {common => cmd}/cmd_pmic.c (100%) rename {common => cmd}/cmd_portio.c (100%) rename {common => cmd}/cmd_pxe.c (100%) rename {common => cmd}/cmd_read.c (100%) rename {common => cmd}/cmd_reginfo.c (100%) rename {common => cmd}/cmd_regulator.c (100%) rename {common => cmd}/cmd_reiser.c (100%) rename {common => cmd}/cmd_remoteproc.c (100%) rename {common => cmd}/cmd_sata.c (100%) rename {common => cmd}/cmd_scsi.c (100%) rename {common => cmd}/cmd_setexpr.c (100%) rename {common => cmd}/cmd_sf.c (100%) rename {common => cmd}/cmd_sha1sum.c (100%) rename {common => cmd}/cmd_softswitch.c (100%) rename {common => cmd}/cmd_sound.c (100%) rename {common => cmd}/cmd_source.c (100%) rename {common => cmd}/cmd_spi.c (100%) rename {common => cmd}/cmd_spibootldr.c (100%) rename {common => cmd}/cmd_spl.c (100%) rename {common => cmd}/cmd_strings.c (100%) rename {common => cmd}/cmd_terminal.c (100%) rename {common => cmd}/cmd_test.c (100%) rename {common => cmd}/cmd_thordown.c (100%) rename {common => cmd}/cmd_time.c (100%) rename {common => cmd}/cmd_tpm.c (100%) rename {common => cmd}/cmd_tpm_test.c (100%) rename {common => cmd}/cmd_trace.c (100%) rename {common => cmd}/cmd_tsi148.c (100%) rename {common => cmd}/cmd_ubi.c (100%) rename {common => cmd}/cmd_ubifs.c (100%) rename {common => cmd}/cmd_universe.c (100%) rename {common => cmd}/cmd_unzip.c (100%) rename {common => cmd}/cmd_usb.c (100%) rename {common => cmd}/cmd_usb_mass_storage.c (100%) rename {common => cmd}/cmd_version.c (100%) rename {common => cmd}/cmd_ximg.c (100%) rename {common => cmd}/cmd_yaffs2.c (100%) rename {common => cmd}/cmd_zfs.c (100%) rename {common => cmd}/cmd_zip.c (100%)
diff --git a/Kconfig b/Kconfig index 821b464..d5e503a 100644 --- a/Kconfig +++ b/Kconfig @@ -224,6 +224,8 @@ endmenu # Boot images
source "common/Kconfig"
+source "cmd/Kconfig"
source "dts/Kconfig"
source "net/Kconfig"
diff --git a/Makefile b/Makefile index 5882c30..6a67efb 100644 --- a/Makefile +++ b/Makefile @@ -667,6 +667,7 @@ libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/phy/ libs-y += drivers/usb/ulpi/ +libs-y += cmd/ libs-y += common/ libs-$(CONFIG_API) += api/ libs-$(CONFIG_HAS_POST) += post/ diff --git a/cmd/Kconfig b/cmd/Kconfig new file mode 100644 index 0000000..2ed0263 --- /dev/null +++ b/cmd/Kconfig @@ -0,0 +1,585 @@ +menu "Command line interface"
+config HUSH_PARSER
- bool "Use hush shell"
- select SYS_HUSH_PARSER
- help
This option enables the "hush" shell (from Busybox) as command lineinterpreter, thus enabling powerful command line syntax likeif...then...else...fi conditionals or `&&' and '||'constructs ("shell scripts").If disabled, you get the old, much simpler behaviour with a somewhatsmaller memory footprint.+config SYS_HUSH_PARSER
- bool
- help
Backward compatibility.+config SYS_PROMPT
- string "Shell prompt"
- default "=> "
- help
This string is displayed in the command line to the left of thecursor.+menu "Autoboot options"
+config AUTOBOOT_KEYED
- bool "Stop autobooting via specific input key / string"
- default n
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If not enabled, any input key will abort theU-Boot automatic booting process and bring the deviceto the U-Boot prompt for user input.+config AUTOBOOT_PROMPT
- string "Autoboot stop prompt"
- depends on AUTOBOOT_KEYED
- default "Autoboot in %d seconds\n"
- help
This string is displayed before the boot delay selected byCONFIG_BOOTDELAY starts. If it is not defined there is nooutput indicating that autoboot is in progress.Note that this define is used as the (only) argument to aprintf() call, so it may contain '%' format specifications,provided that it also includes, sepearated by commas exactlylike in a printf statement, the required arguments. It isthe responsibility of the user to select only such argumentsthat are valid in the given context.+config AUTOBOOT_ENCRYPTION
- bool "Enable encryption in autoboot stopping"
- depends on AUTOBOOT_KEYED
- default n
+config AUTOBOOT_DELAY_STR
- string "Delay autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option delays the automatic boot feature by issuinga specific input key or string. If CONFIG_AUTOBOOT_DELAY_STRor the environment variable "bootdelaykey" is specifiedand this string is received from console input beforeautoboot starts booting, U-Boot gives a command prompt. TheU-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME isused, otherwise it never times out.+config AUTOBOOT_STOP_STR
- string "Stop autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If CONFIG_AUTOBOOT_STOP_STR or the environmentvariable "bootstopkey" is specified and this string isreceived from console input before autoboot starts booting,U-Boot gives a command prompt. The U-Boot prompt nevertimes out, even if CONFIG_BOOT_RETRY_TIME is used.+config AUTOBOOT_KEYED_CTRLC
- bool "Enable Ctrl-C autoboot interruption"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- default n
- help
This option allows for the boot sequence to be interruptedby ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".Setting this variable provides an escape sequence from thelimited "password" strings.+config AUTOBOOT_STOP_STR_SHA256
- string "Stop autobooting via SHA256 encrypted password"
- depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
- help
This option adds the feature to only stop the autobooting,and therefore boot into the U-Boot prompt, when the inputstring / password matches a values that is encypted viaa SHA256 hash and saved in the environment.+endmenu
+comment "Commands"
+menu "Info commands"
+config CMD_BDI
- bool "bdinfo"
- default y
- help
Print board info+config CMD_CONSOLE
- bool "coninfo"
- default y
- help
Print console devices and information.+config CMD_CPU
- bool "cpu"
- help
Print information about available CPUs. This normally shows thenumber of CPUs, type (e.g. manufacturer, architecture, product orinternal name) and clock frequency. Other information may beavailable depending on the CPU driver.+config CMD_LICENSE
- bool "license"
- help
Print GPL license text+endmenu
+menu "Boot commands"
+config CMD_BOOTD
- bool "bootd"
- default y
- help
Run the command stored in the environment "bootcmd", i.e."bootd" does the same thing as "run bootcmd".+config CMD_BOOTM
- bool "bootm"
- default y
- help
Boot an application image from the memory.+config CMD_ELF
- bool "bootelf, bootvx"
- default y
- help
Boot an ELF/vxWorks image from the memory.+config CMD_GO
- bool "go"
- default y
- help
Start an application at a given address.+config CMD_RUN
- bool "run"
- default y
- help
Run the command in the given environment variable.+config CMD_IMI
- bool "iminfo"
- default y
- help
Print header information for application image.+config CMD_IMLS
- bool "imls"
- default y
- help
List all images found in flash+config CMD_XIMG
- bool "imxtract"
- default y
- help
Extract a part of a multi-image.+config CMD_POWEROFF
- bool
+endmenu
+menu "Environment commands"
+config CMD_EXPORTENV
- bool "env export"
- default y
- help
Export environments.+config CMD_IMPORTENV
- bool "env import"
- default y
- help
Import environments.+config CMD_EDITENV
- bool "editenv"
- default y
- help
Edit environment variable.+config CMD_SAVEENV
- bool "saveenv"
- default y
- help
Save all environment variables into the compiled-in persistentstorage.+config CMD_ENV_EXISTS
- bool "env exists"
- default y
- help
Check if a variable is defined in the environment for use inshell scripting.+endmenu
+menu "Memory commands"
+config CMD_MEMORY
- bool "md, mm, nm, mw, cp, cmp, base, loop"
- default y
- help
Memeory commands.md - memory displaymm - memory modify (auto-incrementing address)nm - memory modify (constant address)mw - memory write (fill)cp - memory copycmp - memory comparebase - print or set address offsetloop - initinite loop on address range+config CMD_CRC32
- bool "crc32"
- default y
- help
Compute CRC32.+config LOOPW
- bool "loopw"
- help
Infinite write loop on address range+config CMD_MEMTEST
- bool "memtest"
- help
Simple RAM read/write test.+config CMD_MX_CYCLIC
- bool "mdc, mwc"
- help
mdc - memory display cyclicmwc - memory write cyclic+config CMD_MEMINFO
- bool "meminfo"
- help
Display memory information.+endmenu
+menu "Device access commands"
+config CMD_DM
- bool "dm - Access to driver model information"
- depends on DM
- default y
- help
Provides access to driver model data structures and information,such as a list of devices, list of uclasses and the state of eachdevice (e.g. activated). This is not required for operation, butcan be useful to see the state of driver model for debugging orinterest.+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 withdriver model. To use this properly you will need to enable one orboth of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE).Otherwise you will always get an empty list of devices. The demodevices are defined in the sandbox device tree, so the easiestoption is to use sandbox and pass the -d point to sandbox'su-boot.dtb file.+config CMD_LOADB
- bool "loadb"
- default y
- help
Load a binary file over serial line.+config CMD_LOADS
- bool "loads"
- default y
- 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 informationerase - FLASH memoryprotect - enable or disable FLASH write protection+config CMD_ARMFLASH
- depends on FLASH_CFI_DRIVER
- bool "armflash"
- help
ARM Ltd reference designs flash partition access+config CMD_NAND
- bool "nand"
- help
NAND support.+config CMD_SF
- bool "sf"
- help
SPI Flash support+config CMD_SPI
- bool "sspi"
- help
SPI utility command.+config CMD_I2C
- bool "i2c"
- help
I2C support.+config CMD_USB
- bool "usb"
- help
USB support.+config CMD_FPGA
- bool "fpga"
- default y
- help
FPGA support.+config CMD_REMOTEPROC
- bool "remoteproc"
- depends on REMOTEPROC
- help
Support for Remote Processor control+config CMD_GPIO
- bool "gpio"
- help
GPIO support.+endmenu
+menu "Shell scripting commands"
+config CMD_ECHO
- bool "echo"
- default y
- help
Echo args to console+config CMD_ITEST
- bool "itest"
- default y
- help
Return true/false on integer compare.+config CMD_SOURCE
- bool "source"
- default y
- help
Run script from memory+config CMD_SETEXPR
- bool "setexpr"
- default y
- help
Evaluate boolean and math expressions and store the result in an envvariable.Also supports loading the value at a memory location into a variable.If CONFIG_REGEX is enabled, setexpr also supports a gsub function.+endmenu
+menu "Network commands"
+config CMD_NET
- bool "bootp, tftpboot"
select NET- default y
- help
Network commands.bootp - boot image via network using BOOTP/TFTP protocoltftpboot - boot image via network using TFTP protocol+config CMD_TFTPPUT
- bool "tftp put"
- help
TFTP put command, for uploading files to a server+config CMD_TFTPSRV
- bool "tftpsrv"
- help
Act as a TFTP server and boot the first received file+config CMD_RARP
- bool "rarpboot"
- help
Boot image via network using RARP/TFTP protocol+config CMD_DHCP
- bool "dhcp"
- help
Boot image via network using DHCP/TFTP protocol+config CMD_NFS
- bool "nfs"
- default y
- help
Boot image via network using NFS protocol.+config CMD_PING
- bool "ping"
- help
Send ICMP ECHO_REQUEST to network host+config CMD_CDP
- bool "cdp"
- help
Perform CDP network configuration+config CMD_SNTP
- bool "sntp"
- help
Synchronize RTC via network+config CMD_DNS
- bool "dns"
- help
Lookup the IP of a hostname+config CMD_LINK_LOCAL
- bool "linklocal"
- help
Acquire a network IP address using the link-local protocol+endmenu
+menu "Misc commands"
+config CMD_AMBAPP
- bool "ambapp"
- depends on LEON3
- default y
- help
Lists AMBA Plug-n-Play information.+config SYS_AMBAPP_PRINT_ON_STARTUP
- bool "Show AMBA PnP info on startup"
- depends on CMD_AMBAPP
- default n
- help
Show AMBA Plug-n-Play information on startup.+config CMD_TIME
- bool "time"
- help
Run commands and summarize execution time.+# TODO: rename to CMD_SLEEP +config CMD_MISC
- bool "sleep"
- default y
- help
Delay execution for some time+config CMD_TIMER
- bool "timer"
- help
Access the system timer.+config CMD_SETGETDCR
- bool "getdcr, setdcr, getidcr, setidcr"
- depends on 4xx
- default y
- help
getdcr - Get an AMCC PPC 4xx DCR's valuesetdcr - Set an AMCC PPC 4xx DCR's valuegetidcr - Get a register value via indirect DCR addressingsetidcr - Set a register value via indirect DCR addressing+config CMD_SOUND
- bool "sound"
- depends on SOUND
- help
This provides basic access to the U-Boot's sound support. The mainfeature is to play a beep.sound init - set up sound systemsound play - play a sound+endmenu
+config CMD_BOOTSTAGE
- bool "Enable the 'bootstage' command"
- depends on BOOTSTAGE
- help
Add a 'bootstage' command which supports printing a reportand un/stashing of bootstage data.+menu "Power commands" +config CMD_PMIC
- bool "Enable Driver Model PMIC command"
- depends on DM_PMIC
- help
This is the pmic command, based on a driver model pmic's API.Command features are unchanged:- list - list pmic devices- pmic dev <id> - show or [set] operating pmic device (NEW)- pmic dump - dump registers- pmic read address - read byte of register at address- pmic write address - write byte to register at addressThe only one change for this command is 'dev' subcommand.+config CMD_REGULATOR
- bool "Enable Driver Model REGULATOR command"
- depends on DM_REGULATOR
- help
This command is based on driver model regulator's API.User interface features:- list - list regulator devices- regulator dev <id> - show or [set] operating regulator device- regulator info - print constraints info- regulator status - print operating status- regulator value <val] <-f> - print/[set] voltage value [uV]- regulator current <val> - print/[set] current value [uA]- regulator mode <id> - print/[set] operating mode id- regulator enable - enable the regulator output- regulator disable - disable the regulator outputThe '-f' (force) option can be used for set the value which exceedsthe limits, which are found in device-tree and are kept in regulator'suclass platdata structure.+endmenu
+menu "Security commands" +config CMD_TPM
- bool "Enable the 'tpm' command"
- depends on TPM
- help
This provides a means to talk to a TPM from the command line. A widerange of commands if provided - see 'tpm help' for details. Thecommand requires a suitable TPM on your board and the correct drivermust be enabled.+config CMD_TPM_TEST
- bool "Enable the 'tpm test' command"
- depends on CMD_TPM
- help
This provides a a series of tests to confirm that the TPM is workingcorrectly. The tests cover initialisation, non-volatile RAM, extend,global lock and checking that timing is within expectations. Thetests pass correctly on Infineon TPMs but may need to be adjustedfor other devices.+endmenu
+endmenu diff --git a/cmd/Makefile b/cmd/Makefile new file mode 100644 index 0000000..880a886 --- /dev/null +++ b/cmd/Makefile @@ -0,0 +1,166 @@ +# +# (C) Copyright 2004-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +#
+ifndef CONFIG_SPL_BUILD +# core command +obj-y += cmd_boot.o +obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o +obj-y += cmd_help.o +obj-y += cmd_version.o
+# command +obj-$(CONFIG_CMD_AES) += cmd_aes.o +obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o +obj-$(CONFIG_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o +obj-$(CONFIG_CMD_BMP) += cmd_bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o +obj-$(CONFIG_CMD_CACHE) += cmd_cache.o +obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o +obj-$(CONFIG_CMD_CLK) += cmd_clk.o +obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o +obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cmd_cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += cmd_date.o +obj-$(CONFIG_CMD_DEMO) += cmd_demo.o +obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +ifdef CONFIG_4xx +obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +endif +ifdef CONFIG_POST +obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +endif +obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o +obj-$(CONFIG_CMD_DTT) += cmd_dtt.o +obj-$(CONFIG_CMD_ECHO) += cmd_echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_EFI_STUB) += cmd_efi.o +obj-$(CONFIG_CMD_ELF) += cmd_elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o +obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o +obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o +obj-$(CONFIG_CMD_FAT) += cmd_fat.o +obj-$(CONFIG_CMD_FDC) += cmd_fdc.o +obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o +obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o +obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +ifdef CONFIG_FPGA +obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +endif +obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o +obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o +obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o +obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o +obj-$(CONFIG_CMD_I2C) += cmd_i2c.o +obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o +obj-$(CONFIG_CMD_HASH) += cmd_hash.o +obj-$(CONFIG_CMD_IDE) += cmd_ide.o +obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o +obj-$(CONFIG_CMD_INI) += cmd_ini.o +obj-$(CONFIG_CMD_IRQ) += cmd_irq.o +obj-$(CONFIG_CMD_ITEST) += cmd_itest.o +obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o +obj-$(CONFIG_CMD_LED) += cmd_led.o +obj-$(CONFIG_CMD_LICENSE) += cmd_license.o +obj-y += cmd_load.o +obj-$(CONFIG_LOGBUFFER) += cmd_log.o +obj-$(CONFIG_ID_EEPROM) += cmd_mac.o +obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o +obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o +obj-$(CONFIG_CMD_IO) += cmd_io.o +obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_MII) += cmd_mii.o +ifdef CONFIG_PHYLIB +obj-$(CONFIG_CMD_MII) += cmd_mdio.o +endif +obj-$(CONFIG_CMD_MISC) += cmd_misc.o +obj-$(CONFIG_CMD_MMC) += cmd_mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o +obj-$(CONFIG_MP) += cmd_mp.o +obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o +obj-$(CONFIG_CMD_NAND) += cmd_nand.o +obj-$(CONFIG_CMD_NET) += cmd_net.o +obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o +obj-$(CONFIG_CMD_OTP) += cmd_otp.o +obj-$(CONFIG_CMD_PART) += cmd_part.o +ifdef CONFIG_PCI +obj-$(CONFIG_CMD_PCI) += cmd_pci.o +endif +obj-y += cmd_pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o +obj-$(CONFIG_CMD_PXE) += cmd_pxe.o +obj-$(CONFIG_CMD_READ) += cmd_read.o +obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o +obj-$(CONFIG_CMD_REISER) += cmd_reiser.o +obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o +obj-$(CONFIG_SANDBOX) += cmd_host.o +obj-$(CONFIG_CMD_SATA) += cmd_sata.o +obj-$(CONFIG_CMD_SF) += cmd_sf.o +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o +obj-$(CONFIG_CMD_SPI) += cmd_spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o +obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o +obj-$(CONFIG_CMD_TIME) += cmd_time.o +obj-$(CONFIG_CMD_TRACE) += cmd_trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o +obj-$(CONFIG_CMD_TPM) += cmd_tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o +obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o +obj-$(CONFIG_CMD_UBI) += cmd_ubi.o +obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o +obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +ifdef CONFIG_LZMA +obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +endif
+obj-$(CONFIG_CMD_USB) += cmd_usb.o +obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o
+obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o +obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o +obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o +obj-$(CONFIG_CMD_SPL) += cmd_spl.o +obj-$(CONFIG_CMD_ZIP) += cmd_zip.o +obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
+obj-$(CONFIG_CMD_DFU) += cmd_dfu.o +obj-$(CONFIG_CMD_GPT) += cmd_gpt.o +obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
+# Power +obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o +obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +endif # !CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_BUILD +ifdef CONFIG_SPL_SATA_SUPPORT +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +endif +endif # CONFIG_SPL_BUILD
+obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
+# core command +obj-y += cmd_nvedit.o +obj-y += cmd_disk.o diff --git a/common/cmd_aes.c b/cmd/cmd_aes.c similarity index 100% rename from common/cmd_aes.c rename to cmd/cmd_aes.c diff --git a/common/cmd_ambapp.c b/cmd/cmd_ambapp.c similarity index 100% rename from common/cmd_ambapp.c rename to cmd/cmd_ambapp.c diff --git a/common/cmd_armflash.c b/cmd/cmd_armflash.c similarity index 100% rename from common/cmd_armflash.c rename to cmd/cmd_armflash.c diff --git a/common/cmd_bdinfo.c b/cmd/cmd_bdinfo.c similarity index 100% rename from common/cmd_bdinfo.c rename to cmd/cmd_bdinfo.c diff --git a/common/cmd_bedbug.c b/cmd/cmd_bedbug.c similarity index 100% rename from common/cmd_bedbug.c rename to cmd/cmd_bedbug.c diff --git a/common/cmd_blob.c b/cmd/cmd_blob.c similarity index 100% rename from common/cmd_blob.c rename to cmd/cmd_blob.c diff --git a/common/cmd_bmp.c b/cmd/cmd_bmp.c similarity index 100% rename from common/cmd_bmp.c rename to cmd/cmd_bmp.c diff --git a/common/cmd_boot.c b/cmd/cmd_boot.c similarity index 100% rename from common/cmd_boot.c rename to cmd/cmd_boot.c diff --git a/common/cmd_bootldr.c b/cmd/cmd_bootldr.c similarity index 100% rename from common/cmd_bootldr.c rename to cmd/cmd_bootldr.c diff --git a/common/cmd_bootm.c b/cmd/cmd_bootm.c similarity index 100% rename from common/cmd_bootm.c rename to cmd/cmd_bootm.c diff --git a/common/cmd_bootmenu.c b/cmd/cmd_bootmenu.c similarity index 100% rename from common/cmd_bootmenu.c rename to cmd/cmd_bootmenu.c diff --git a/common/cmd_bootstage.c b/cmd/cmd_bootstage.c similarity index 100% rename from common/cmd_bootstage.c rename to cmd/cmd_bootstage.c diff --git a/common/cmd_cache.c b/cmd/cmd_cache.c similarity index 100% rename from common/cmd_cache.c rename to cmd/cmd_cache.c diff --git a/common/cmd_cbfs.c b/cmd/cmd_cbfs.c similarity index 100% rename from common/cmd_cbfs.c rename to cmd/cmd_cbfs.c diff --git a/common/cmd_clk.c b/cmd/cmd_clk.c similarity index 100% rename from common/cmd_clk.c rename to cmd/cmd_clk.c diff --git a/common/cmd_console.c b/cmd/cmd_console.c similarity index 100% rename from common/cmd_console.c rename to cmd/cmd_console.c diff --git a/common/cmd_cplbinfo.c b/cmd/cmd_cplbinfo.c similarity index 100% rename from common/cmd_cplbinfo.c rename to cmd/cmd_cplbinfo.c diff --git a/common/cmd_cpu.c b/cmd/cmd_cpu.c similarity index 100% rename from common/cmd_cpu.c rename to cmd/cmd_cpu.c diff --git a/common/cmd_cramfs.c b/cmd/cmd_cramfs.c similarity index 100% rename from common/cmd_cramfs.c rename to cmd/cmd_cramfs.c diff --git a/common/cmd_dataflash_mmc_mux.c b/cmd/cmd_dataflash_mmc_mux.c similarity index 100% rename from common/cmd_dataflash_mmc_mux.c rename to cmd/cmd_dataflash_mmc_mux.c diff --git a/common/cmd_date.c b/cmd/cmd_date.c similarity index 100% rename from common/cmd_date.c rename to cmd/cmd_date.c diff --git a/common/cmd_dcr.c b/cmd/cmd_dcr.c similarity index 100% rename from common/cmd_dcr.c rename to cmd/cmd_dcr.c diff --git a/common/cmd_demo.c b/cmd/cmd_demo.c similarity index 100% rename from common/cmd_demo.c rename to cmd/cmd_demo.c diff --git a/common/cmd_dfu.c b/cmd/cmd_dfu.c similarity index 100% rename from common/cmd_dfu.c rename to cmd/cmd_dfu.c diff --git a/common/cmd_diag.c b/cmd/cmd_diag.c similarity index 100% rename from common/cmd_diag.c rename to cmd/cmd_diag.c diff --git a/common/cmd_disk.c b/cmd/cmd_disk.c similarity index 100% rename from common/cmd_disk.c rename to cmd/cmd_disk.c diff --git a/common/cmd_display.c b/cmd/cmd_display.c similarity index 100% rename from common/cmd_display.c rename to cmd/cmd_display.c diff --git a/common/cmd_dtt.c b/cmd/cmd_dtt.c similarity index 100% rename from common/cmd_dtt.c rename to cmd/cmd_dtt.c diff --git a/common/cmd_echo.c b/cmd/cmd_echo.c similarity index 100% rename from common/cmd_echo.c rename to cmd/cmd_echo.c diff --git a/common/cmd_eeprom.c b/cmd/cmd_eeprom.c similarity index 100% rename from common/cmd_eeprom.c rename to cmd/cmd_eeprom.c diff --git a/common/cmd_efi.c b/cmd/cmd_efi.c similarity index 100% rename from common/cmd_efi.c rename to cmd/cmd_efi.c diff --git a/common/cmd_elf.c b/cmd/cmd_elf.c similarity index 100% rename from common/cmd_elf.c rename to cmd/cmd_elf.c diff --git a/common/cmd_ethsw.c b/cmd/cmd_ethsw.c similarity index 100% rename from common/cmd_ethsw.c rename to cmd/cmd_ethsw.c diff --git a/common/cmd_exit.c b/cmd/cmd_exit.c similarity index 100% rename from common/cmd_exit.c rename to cmd/cmd_exit.c diff --git a/common/cmd_ext2.c b/cmd/cmd_ext2.c similarity index 100% rename from common/cmd_ext2.c rename to cmd/cmd_ext2.c diff --git a/common/cmd_ext4.c b/cmd/cmd_ext4.c similarity index 100% rename from common/cmd_ext4.c rename to cmd/cmd_ext4.c diff --git a/common/cmd_fastboot.c b/cmd/cmd_fastboot.c similarity index 100% rename from common/cmd_fastboot.c rename to cmd/cmd_fastboot.c diff --git a/common/cmd_fat.c b/cmd/cmd_fat.c similarity index 100% rename from common/cmd_fat.c rename to cmd/cmd_fat.c diff --git a/common/cmd_fdc.c b/cmd/cmd_fdc.c similarity index 100% rename from common/cmd_fdc.c rename to cmd/cmd_fdc.c diff --git a/common/cmd_fdt.c b/cmd/cmd_fdt.c similarity index 100% rename from common/cmd_fdt.c rename to cmd/cmd_fdt.c diff --git a/common/cmd_fitupd.c b/cmd/cmd_fitupd.c similarity index 100% rename from common/cmd_fitupd.c rename to cmd/cmd_fitupd.c diff --git a/common/cmd_flash.c b/cmd/cmd_flash.c similarity index 100% rename from common/cmd_flash.c rename to cmd/cmd_flash.c diff --git a/common/cmd_fpga.c b/cmd/cmd_fpga.c similarity index 100% rename from common/cmd_fpga.c rename to cmd/cmd_fpga.c diff --git a/common/cmd_fpgad.c b/cmd/cmd_fpgad.c similarity index 100% rename from common/cmd_fpgad.c rename to cmd/cmd_fpgad.c diff --git a/common/cmd_fs.c b/cmd/cmd_fs.c similarity index 100% rename from common/cmd_fs.c rename to cmd/cmd_fs.c diff --git a/common/cmd_fs_uuid.c b/cmd/cmd_fs_uuid.c similarity index 100% rename from common/cmd_fs_uuid.c rename to cmd/cmd_fs_uuid.c diff --git a/common/cmd_fuse.c b/cmd/cmd_fuse.c similarity index 100% rename from common/cmd_fuse.c rename to cmd/cmd_fuse.c diff --git a/common/cmd_gettime.c b/cmd/cmd_gettime.c similarity index 100% rename from common/cmd_gettime.c rename to cmd/cmd_gettime.c diff --git a/common/cmd_gpio.c b/cmd/cmd_gpio.c similarity index 100% rename from common/cmd_gpio.c rename to cmd/cmd_gpio.c diff --git a/common/cmd_gpt.c b/cmd/cmd_gpt.c similarity index 100% rename from common/cmd_gpt.c rename to cmd/cmd_gpt.c diff --git a/common/cmd_hash.c b/cmd/cmd_hash.c similarity index 100% rename from common/cmd_hash.c rename to cmd/cmd_hash.c diff --git a/common/cmd_help.c b/cmd/cmd_help.c similarity index 100% rename from common/cmd_help.c rename to cmd/cmd_help.c diff --git a/common/cmd_host.c b/cmd/cmd_host.c similarity index 100% rename from common/cmd_host.c rename to cmd/cmd_host.c diff --git a/common/cmd_i2c.c b/cmd/cmd_i2c.c similarity index 100% rename from common/cmd_i2c.c rename to cmd/cmd_i2c.c diff --git a/common/cmd_ide.c b/cmd/cmd_ide.c similarity index 100% rename from common/cmd_ide.c rename to cmd/cmd_ide.c diff --git a/common/cmd_immap.c b/cmd/cmd_immap.c similarity index 100% rename from common/cmd_immap.c rename to cmd/cmd_immap.c diff --git a/common/cmd_ini.c b/cmd/cmd_ini.c similarity index 100% rename from common/cmd_ini.c rename to cmd/cmd_ini.c diff --git a/common/cmd_io.c b/cmd/cmd_io.c similarity index 100% rename from common/cmd_io.c rename to cmd/cmd_io.c diff --git a/common/cmd_iotrace.c b/cmd/cmd_iotrace.c similarity index 100% rename from common/cmd_iotrace.c rename to cmd/cmd_iotrace.c diff --git a/common/cmd_irq.c b/cmd/cmd_irq.c similarity index 100% rename from common/cmd_irq.c rename to cmd/cmd_irq.c diff --git a/common/cmd_itest.c b/cmd/cmd_itest.c similarity index 100% rename from common/cmd_itest.c rename to cmd/cmd_itest.c diff --git a/common/cmd_jffs2.c b/cmd/cmd_jffs2.c similarity index 100% rename from common/cmd_jffs2.c rename to cmd/cmd_jffs2.c diff --git a/common/cmd_ldrinfo.c b/cmd/cmd_ldrinfo.c similarity index 100% rename from common/cmd_ldrinfo.c rename to cmd/cmd_ldrinfo.c diff --git a/common/cmd_led.c b/cmd/cmd_led.c similarity index 100% rename from common/cmd_led.c rename to cmd/cmd_led.c diff --git a/common/cmd_license.c b/cmd/cmd_license.c similarity index 100% rename from common/cmd_license.c rename to cmd/cmd_license.c diff --git a/common/cmd_load.c b/cmd/cmd_load.c similarity index 100% rename from common/cmd_load.c rename to cmd/cmd_load.c diff --git a/common/cmd_log.c b/cmd/cmd_log.c similarity index 100% rename from common/cmd_log.c rename to cmd/cmd_log.c diff --git a/common/cmd_lzmadec.c b/cmd/cmd_lzmadec.c similarity index 100% rename from common/cmd_lzmadec.c rename to cmd/cmd_lzmadec.c diff --git a/common/cmd_mac.c b/cmd/cmd_mac.c similarity index 100% rename from common/cmd_mac.c rename to cmd/cmd_mac.c diff --git a/common/cmd_md5sum.c b/cmd/cmd_md5sum.c similarity index 100% rename from common/cmd_md5sum.c rename to cmd/cmd_md5sum.c diff --git a/common/cmd_mdio.c b/cmd/cmd_mdio.c similarity index 100% rename from common/cmd_mdio.c rename to cmd/cmd_mdio.c diff --git a/common/cmd_mem.c b/cmd/cmd_mem.c similarity index 100% rename from common/cmd_mem.c rename to cmd/cmd_mem.c diff --git a/common/cmd_mfsl.c b/cmd/cmd_mfsl.c similarity index 100% rename from common/cmd_mfsl.c rename to cmd/cmd_mfsl.c diff --git a/common/cmd_mii.c b/cmd/cmd_mii.c similarity index 100% rename from common/cmd_mii.c rename to cmd/cmd_mii.c diff --git a/common/cmd_misc.c b/cmd/cmd_misc.c similarity index 100% rename from common/cmd_misc.c rename to cmd/cmd_misc.c diff --git a/common/cmd_mmc.c b/cmd/cmd_mmc.c similarity index 100% rename from common/cmd_mmc.c rename to cmd/cmd_mmc.c diff --git a/common/cmd_mmc_spi.c b/cmd/cmd_mmc_spi.c similarity index 100% rename from common/cmd_mmc_spi.c rename to cmd/cmd_mmc_spi.c diff --git a/common/cmd_mp.c b/cmd/cmd_mp.c similarity index 100% rename from common/cmd_mp.c rename to cmd/cmd_mp.c diff --git a/common/cmd_mtdparts.c b/cmd/cmd_mtdparts.c similarity index 100% rename from common/cmd_mtdparts.c rename to cmd/cmd_mtdparts.c diff --git a/common/cmd_nand.c b/cmd/cmd_nand.c similarity index 100% rename from common/cmd_nand.c rename to cmd/cmd_nand.c diff --git a/common/cmd_net.c b/cmd/cmd_net.c similarity index 100% rename from common/cmd_net.c rename to cmd/cmd_net.c diff --git a/common/cmd_nvedit.c b/cmd/cmd_nvedit.c similarity index 100% rename from common/cmd_nvedit.c rename to cmd/cmd_nvedit.c diff --git a/common/cmd_onenand.c b/cmd/cmd_onenand.c similarity index 100% rename from common/cmd_onenand.c rename to cmd/cmd_onenand.c diff --git a/common/cmd_otp.c b/cmd/cmd_otp.c similarity index 100% rename from common/cmd_otp.c rename to cmd/cmd_otp.c diff --git a/common/cmd_part.c b/cmd/cmd_part.c similarity index 100% rename from common/cmd_part.c rename to cmd/cmd_part.c diff --git a/common/cmd_pci.c b/cmd/cmd_pci.c similarity index 100% rename from common/cmd_pci.c rename to cmd/cmd_pci.c diff --git a/common/cmd_pcmcia.c b/cmd/cmd_pcmcia.c similarity index 100% rename from common/cmd_pcmcia.c rename to cmd/cmd_pcmcia.c diff --git a/common/cmd_pmic.c b/cmd/cmd_pmic.c similarity index 100% rename from common/cmd_pmic.c rename to cmd/cmd_pmic.c diff --git a/common/cmd_portio.c b/cmd/cmd_portio.c similarity index 100% rename from common/cmd_portio.c rename to cmd/cmd_portio.c diff --git a/common/cmd_pxe.c b/cmd/cmd_pxe.c similarity index 100% rename from common/cmd_pxe.c rename to cmd/cmd_pxe.c diff --git a/common/cmd_read.c b/cmd/cmd_read.c similarity index 100% rename from common/cmd_read.c rename to cmd/cmd_read.c diff --git a/common/cmd_reginfo.c b/cmd/cmd_reginfo.c similarity index 100% rename from common/cmd_reginfo.c rename to cmd/cmd_reginfo.c diff --git a/common/cmd_regulator.c b/cmd/cmd_regulator.c similarity index 100% rename from common/cmd_regulator.c rename to cmd/cmd_regulator.c diff --git a/common/cmd_reiser.c b/cmd/cmd_reiser.c similarity index 100% rename from common/cmd_reiser.c rename to cmd/cmd_reiser.c diff --git a/common/cmd_remoteproc.c b/cmd/cmd_remoteproc.c similarity index 100% rename from common/cmd_remoteproc.c rename to cmd/cmd_remoteproc.c diff --git a/common/cmd_sata.c b/cmd/cmd_sata.c similarity index 100% rename from common/cmd_sata.c rename to cmd/cmd_sata.c diff --git a/common/cmd_scsi.c b/cmd/cmd_scsi.c similarity index 100% rename from common/cmd_scsi.c rename to cmd/cmd_scsi.c diff --git a/common/cmd_setexpr.c b/cmd/cmd_setexpr.c similarity index 100% rename from common/cmd_setexpr.c rename to cmd/cmd_setexpr.c diff --git a/common/cmd_sf.c b/cmd/cmd_sf.c similarity index 100% rename from common/cmd_sf.c rename to cmd/cmd_sf.c diff --git a/common/cmd_sha1sum.c b/cmd/cmd_sha1sum.c similarity index 100% rename from common/cmd_sha1sum.c rename to cmd/cmd_sha1sum.c diff --git a/common/cmd_softswitch.c b/cmd/cmd_softswitch.c similarity index 100% rename from common/cmd_softswitch.c rename to cmd/cmd_softswitch.c diff --git a/common/cmd_sound.c b/cmd/cmd_sound.c similarity index 100% rename from common/cmd_sound.c rename to cmd/cmd_sound.c diff --git a/common/cmd_source.c b/cmd/cmd_source.c similarity index 100% rename from common/cmd_source.c rename to cmd/cmd_source.c diff --git a/common/cmd_spi.c b/cmd/cmd_spi.c similarity index 100% rename from common/cmd_spi.c rename to cmd/cmd_spi.c diff --git a/common/cmd_spibootldr.c b/cmd/cmd_spibootldr.c similarity index 100% rename from common/cmd_spibootldr.c rename to cmd/cmd_spibootldr.c diff --git a/common/cmd_spl.c b/cmd/cmd_spl.c similarity index 100% rename from common/cmd_spl.c rename to cmd/cmd_spl.c diff --git a/common/cmd_strings.c b/cmd/cmd_strings.c similarity index 100% rename from common/cmd_strings.c rename to cmd/cmd_strings.c diff --git a/common/cmd_terminal.c b/cmd/cmd_terminal.c similarity index 100% rename from common/cmd_terminal.c rename to cmd/cmd_terminal.c diff --git a/common/cmd_test.c b/cmd/cmd_test.c similarity index 100% rename from common/cmd_test.c rename to cmd/cmd_test.c diff --git a/common/cmd_thordown.c b/cmd/cmd_thordown.c similarity index 100% rename from common/cmd_thordown.c rename to cmd/cmd_thordown.c diff --git a/common/cmd_time.c b/cmd/cmd_time.c similarity index 100% rename from common/cmd_time.c rename to cmd/cmd_time.c diff --git a/common/cmd_tpm.c b/cmd/cmd_tpm.c similarity index 100% rename from common/cmd_tpm.c rename to cmd/cmd_tpm.c diff --git a/common/cmd_tpm_test.c b/cmd/cmd_tpm_test.c similarity index 100% rename from common/cmd_tpm_test.c rename to cmd/cmd_tpm_test.c diff --git a/common/cmd_trace.c b/cmd/cmd_trace.c similarity index 100% rename from common/cmd_trace.c rename to cmd/cmd_trace.c diff --git a/common/cmd_tsi148.c b/cmd/cmd_tsi148.c similarity index 100% rename from common/cmd_tsi148.c rename to cmd/cmd_tsi148.c diff --git a/common/cmd_ubi.c b/cmd/cmd_ubi.c similarity index 100% rename from common/cmd_ubi.c rename to cmd/cmd_ubi.c diff --git a/common/cmd_ubifs.c b/cmd/cmd_ubifs.c similarity index 100% rename from common/cmd_ubifs.c rename to cmd/cmd_ubifs.c diff --git a/common/cmd_universe.c b/cmd/cmd_universe.c similarity index 100% rename from common/cmd_universe.c rename to cmd/cmd_universe.c diff --git a/common/cmd_unzip.c b/cmd/cmd_unzip.c similarity index 100% rename from common/cmd_unzip.c rename to cmd/cmd_unzip.c diff --git a/common/cmd_usb.c b/cmd/cmd_usb.c similarity index 100% rename from common/cmd_usb.c rename to cmd/cmd_usb.c diff --git a/common/cmd_usb_mass_storage.c b/cmd/cmd_usb_mass_storage.c similarity index 100% rename from common/cmd_usb_mass_storage.c rename to cmd/cmd_usb_mass_storage.c diff --git a/common/cmd_version.c b/cmd/cmd_version.c similarity index 100% rename from common/cmd_version.c rename to cmd/cmd_version.c diff --git a/common/cmd_ximg.c b/cmd/cmd_ximg.c similarity index 100% rename from common/cmd_ximg.c rename to cmd/cmd_ximg.c diff --git a/common/cmd_yaffs2.c b/cmd/cmd_yaffs2.c similarity index 100% rename from common/cmd_yaffs2.c rename to cmd/cmd_yaffs2.c diff --git a/common/cmd_zfs.c b/cmd/cmd_zfs.c similarity index 100% rename from common/cmd_zfs.c rename to cmd/cmd_zfs.c diff --git a/common/cmd_zip.c b/cmd/cmd_zip.c similarity index 100% rename from common/cmd_zip.c rename to cmd/cmd_zip.c diff --git a/common/Kconfig b/common/Kconfig index 9d446bf..067545d 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,522 +1,3 @@ -menu "Command line interface"
-config HUSH_PARSER
- bool "Use hush shell"
- select SYS_HUSH_PARSER
- help
This option enables the "hush" shell (from Busybox) as command lineinterpreter, thus enabling powerful command line syntax likeif...then...else...fi conditionals or `&&' and '||'constructs ("shell scripts").If disabled, you get the old, much simpler behaviour with a somewhatsmaller memory footprint.-config SYS_HUSH_PARSER
- bool
- help
Backward compatibility.-config SYS_PROMPT
- string "Shell prompt"
- default "=> "
- help
This string is displayed in the command line to the left of thecursor.-menu "Autoboot options"
-config AUTOBOOT_KEYED
- bool "Stop autobooting via specific input key / string"
- default n
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If not enabled, any input key will abort theU-Boot automatic booting process and bring the deviceto the U-Boot prompt for user input.-config AUTOBOOT_PROMPT
- string "Autoboot stop prompt"
- depends on AUTOBOOT_KEYED
- default "Autoboot in %d seconds\n"
- help
This string is displayed before the boot delay selected byCONFIG_BOOTDELAY starts. If it is not defined there is nooutput indicating that autoboot is in progress.Note that this define is used as the (only) argument to aprintf() call, so it may contain '%' format specifications,provided that it also includes, sepearated by commas exactlylike in a printf statement, the required arguments. It isthe responsibility of the user to select only such argumentsthat are valid in the given context.-config AUTOBOOT_ENCRYPTION
- bool "Enable encryption in autoboot stopping"
- depends on AUTOBOOT_KEYED
- default n
-config AUTOBOOT_DELAY_STR
- string "Delay autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option delays the automatic boot feature by issuinga specific input key or string. If CONFIG_AUTOBOOT_DELAY_STRor the environment variable "bootdelaykey" is specifiedand this string is received from console input beforeautoboot starts booting, U-Boot gives a command prompt. TheU-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME isused, otherwise it never times out.-config AUTOBOOT_STOP_STR
- string "Stop autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If CONFIG_AUTOBOOT_STOP_STR or the environmentvariable "bootstopkey" is specified and this string isreceived from console input before autoboot starts booting,U-Boot gives a command prompt. The U-Boot prompt nevertimes out, even if CONFIG_BOOT_RETRY_TIME is used.-config AUTOBOOT_KEYED_CTRLC
- bool "Enable Ctrl-C autoboot interruption"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- default n
- help
This option allows for the boot sequence to be interruptedby ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".Setting this variable provides an escape sequence from thelimited "password" strings.-config AUTOBOOT_STOP_STR_SHA256
- string "Stop autobooting via SHA256 encrypted password"
- depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
- help
This option adds the feature to only stop the autobooting,and therefore boot into the U-Boot prompt, when the inputstring / password matches a values that is encypted viaa SHA256 hash and saved in the environment.-endmenu
-comment "Commands"
-menu "Info commands"
-config CMD_BDI
- bool "bdinfo"
- default y
- help
Print board info-config CMD_CONSOLE
- bool "coninfo"
- default y
- help
Print console devices and information.-config CMD_CPU
- bool "cpu"
- help
Print information about available CPUs. This normally shows thenumber of CPUs, type (e.g. manufacturer, architecture, product orinternal name) and clock frequency. Other information may beavailable depending on the CPU driver.-config CMD_LICENSE
- bool "license"
- help
Print GPL license text-endmenu
-menu "Boot commands"
-config CMD_BOOTD
- bool "bootd"
- default y
- help
Run the command stored in the environment "bootcmd", i.e."bootd" does the same thing as "run bootcmd".-config CMD_BOOTM
- bool "bootm"
- default y
- help
Boot an application image from the memory.-config CMD_ELF
- bool "bootelf, bootvx"
- default y
- help
Boot an ELF/vxWorks image from the memory.-config CMD_GO
- bool "go"
- default y
- help
Start an application at a given address.-config CMD_RUN
- bool "run"
- default y
- help
Run the command in the given environment variable.-config CMD_IMI
- bool "iminfo"
- default y
- help
Print header information for application image.-config CMD_IMLS
- bool "imls"
- default y
- help
List all images found in flash-config CMD_XIMG
- bool "imxtract"
- default y
- help
Extract a part of a multi-image.-config CMD_POWEROFF
- bool
-endmenu
-menu "Environment commands"
-config CMD_EXPORTENV
- bool "env export"
- default y
- help
Export environments.-config CMD_IMPORTENV
- bool "env import"
- default y
- help
Import environments.-config CMD_EDITENV
- bool "editenv"
- default y
- help
Edit environment variable.-config CMD_SAVEENV
- bool "saveenv"
- default y
- help
Save all environment variables into the compiled-in persistentstorage.-config CMD_ENV_EXISTS
- bool "env exists"
- default y
- help
Check if a variable is defined in the environment for use inshell scripting.-endmenu
-menu "Memory commands"
-config CMD_MEMORY
- bool "md, mm, nm, mw, cp, cmp, base, loop"
- default y
- help
Memeory commands.md - memory displaymm - memory modify (auto-incrementing address)nm - memory modify (constant address)mw - memory write (fill)cp - memory copycmp - memory comparebase - print or set address offsetloop - initinite loop on address range-config CMD_CRC32
- bool "crc32"
- default y
- help
Compute CRC32.-config LOOPW
- bool "loopw"
- help
Infinite write loop on address range-config CMD_MEMTEST
- bool "memtest"
- help
Simple RAM read/write test.-config CMD_MX_CYCLIC
- bool "mdc, mwc"
- help
mdc - memory display cyclicmwc - memory write cyclic-config CMD_MEMINFO
- bool "meminfo"
- help
Display memory information.-endmenu
-menu "Device access commands"
-config CMD_DM
- bool "dm - Access to driver model information"
- depends on DM
- default y
- help
Provides access to driver model data structures and information,such as a list of devices, list of uclasses and the state of eachdevice (e.g. activated). This is not required for operation, butcan be useful to see the state of driver model for debugging orinterest.-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 withdriver model. To use this properly you will need to enable one orboth of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE).Otherwise you will always get an empty list of devices. The demodevices are defined in the sandbox device tree, so the easiestoption is to use sandbox and pass the -d point to sandbox'su-boot.dtb file.-config CMD_LOADB
- bool "loadb"
- default y
- help
Load a binary file over serial line.-config CMD_LOADS
- bool "loads"
- default y
- 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 informationerase - FLASH memoryprotect - enable or disable FLASH write protection-config CMD_ARMFLASH
- depends on FLASH_CFI_DRIVER
- bool "armflash"
- help
ARM Ltd reference designs flash partition access-config CMD_NAND
- bool "nand"
- help
NAND support.-config CMD_SF
- bool "sf"
- help
SPI Flash support-config CMD_SPI
- bool "sspi"
- help
SPI utility command.-config CMD_I2C
- bool "i2c"
- help
I2C support.-config CMD_USB
- bool "usb"
- help
USB support.-config CMD_FPGA
- bool "fpga"
- default y
- help
FPGA support.-config CMD_REMOTEPROC
- bool "remoteproc"
- depends on REMOTEPROC
- help
Support for Remote Processor control-config CMD_GPIO
- bool "gpio"
- help
GPIO support.-endmenu
-menu "Shell scripting commands"
-config CMD_ECHO
- bool "echo"
- default y
- help
Echo args to console-config CMD_ITEST
- bool "itest"
- default y
- help
Return true/false on integer compare.-config CMD_SOURCE
- bool "source"
- default y
- help
Run script from memory-config CMD_SETEXPR
- bool "setexpr"
- default y
- help
Evaluate boolean and math expressions and store the result in an envvariable.Also supports loading the value at a memory location into a variable.If CONFIG_REGEX is enabled, setexpr also supports a gsub function.-endmenu
-menu "Network commands"
-config CMD_NET
- bool "bootp, tftpboot"
select NET- default y
- help
Network commands.bootp - boot image via network using BOOTP/TFTP protocoltftpboot - boot image via network using TFTP protocol-config CMD_TFTPPUT
- bool "tftp put"
- help
TFTP put command, for uploading files to a server-config CMD_TFTPSRV
- bool "tftpsrv"
- help
Act as a TFTP server and boot the first received file-config CMD_RARP
- bool "rarpboot"
- help
Boot image via network using RARP/TFTP protocol-config CMD_DHCP
- bool "dhcp"
- help
Boot image via network using DHCP/TFTP protocol-config CMD_NFS
- bool "nfs"
- default y
- help
Boot image via network using NFS protocol.-config CMD_PING
- bool "ping"
- help
Send ICMP ECHO_REQUEST to network host-config CMD_CDP
- bool "cdp"
- help
Perform CDP network configuration-config CMD_SNTP
- bool "sntp"
- help
Synchronize RTC via network-config CMD_DNS
- bool "dns"
- help
Lookup the IP of a hostname-config CMD_LINK_LOCAL
- bool "linklocal"
- help
Acquire a network IP address using the link-local protocol-endmenu
-menu "Misc commands"
-config CMD_AMBAPP
- bool "ambapp"
- depends on LEON3
- default y
- help
Lists AMBA Plug-n-Play information.-config SYS_AMBAPP_PRINT_ON_STARTUP
- bool "Show AMBA PnP info on startup"
- depends on CMD_AMBAPP
- default n
- help
Show AMBA Plug-n-Play information on startup.-config CMD_TIME
- bool "time"
- help
Run commands and summarize execution time.-# TODO: rename to CMD_SLEEP -config CMD_MISC
- bool "sleep"
- default y
- help
Delay execution for some time-config CMD_TIMER
- bool "timer"
- help
Access the system timer.-config CMD_SETGETDCR
- bool "getdcr, setdcr, getidcr, setidcr"
- depends on 4xx
- default y
- help
getdcr - Get an AMCC PPC 4xx DCR's valuesetdcr - Set an AMCC PPC 4xx DCR's valuegetidcr - Get a register value via indirect DCR addressingsetidcr - Set a register value via indirect DCR addressing-config CMD_SOUND
- bool "sound"
- depends on SOUND
- help
This provides basic access to the U-Boot's sound support. The mainfeature is to play a beep.sound init - set up sound systemsound play - play a sound-endmenu
menu "Boot timing"
config BOOTSTAGE
@@ -565,13 +46,6 @@ config BOOTSTAGE_USER_COUNT a new ID will be allocated from this stash. If you exceed the limit, recording will stop.
-config CMD_BOOTSTAGE
- bool "Enable the 'bootstage' command"
- depends on BOOTSTAGE
- help
Add a 'bootstage' command which supports printing a reportand un/stashing of bootstage data.- config BOOTSTAGE_FDT bool "Store boot timing information in the OS device tree" depends on BOOTSTAGE
@@ -623,66 +97,6 @@ config BOOTSTAGE_STASH_SIZE
endmenu
-menu "Power commands" -config CMD_PMIC
- bool "Enable Driver Model PMIC command"
- depends on DM_PMIC
- help
This is the pmic command, based on a driver model pmic's API.Command features are unchanged:- list - list pmic devices- pmic dev <id> - show or [set] operating pmic device (NEW)- pmic dump - dump registers- pmic read address - read byte of register at address- pmic write address - write byte to register at addressThe only one change for this command is 'dev' subcommand.-config CMD_REGULATOR
- bool "Enable Driver Model REGULATOR command"
- depends on DM_REGULATOR
- help
This command is based on driver model regulator's API.User interface features:- list - list regulator devices- regulator dev <id> - show or [set] operating regulator device- regulator info - print constraints info- regulator status - print operating status- regulator value <val] <-f> - print/[set] voltage value [uV]- regulator current <val> - print/[set] current value [uA]- regulator mode <id> - print/[set] operating mode id- regulator enable - enable the regulator output- regulator disable - disable the regulator outputThe '-f' (force) option can be used for set the value which exceedsthe limits, which are found in device-tree and are kept in regulator'suclass platdata structure.-endmenu
-menu "Security commands" -config CMD_TPM
- bool "Enable the 'tpm' command"
- depends on TPM
- help
This provides a means to talk to a TPM from the command line. A widerange of commands if provided - see 'tpm help' for details. Thecommand requires a suitable TPM on your board and the correct drivermust be enabled.-config CMD_TPM_TEST
- bool "Enable the 'tpm test' command"
- depends on CMD_TPM
- help
This provides a a series of tests to confirm that the TPM is workingcorrectly. The tests cover initialisation, non-volatile RAM, extend,global lock and checking that timing is within expectations. Thetests pass correctly on Infineon TPMs but may need to be adjustedfor other devices.-endmenu
-endmenu
- config CONSOLE_RECORD bool "Console recording" help
diff --git a/common/Makefile b/common/Makefile index 2a1d9f8..fcf972d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,11 +31,7 @@ obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
-# core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o bootm.o bootm_os.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
# environment obj-y += env_attr.o @@ -58,143 +54,17 @@ obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
-# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o -ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o -endif -ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o -endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o -ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o -endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_OF_LIBFDT) += fdt_support.o
- obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o
-obj-$(CONFIG_CMD_MII) += cmd_mii.o -ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o -endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o -ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o -endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o -ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o -endif
- ifdef CONFIG_CMD_USB
-obj-y += cmd_usb.o obj-y += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
# others obj-$(CONFIG_BOOTSTAGE) += bootstage.o @@ -214,14 +84,8 @@ obj-$(CONFIG_MODEM_SUPPORT) += modem.o obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_DFU_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
-# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o -endif +endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o @@ -232,9 +96,6 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -endif # environment ifdef CONFIG_SPL_ENV_SUPPORT obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o @@ -248,8 +109,6 @@ obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o endif endif -# core command -obj-y += cmd_nvedit.o #environment obj-y += env_common.o #others @@ -287,8 +146,6 @@ obj-y += fb_nand.o endif endif
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
- # We always have this since drivers/ddr/fs/interactive.c needs it obj-y += cli_simple.o
@@ -297,6 +154,5 @@ obj-y += cli_readline.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o -obj-y += cmd_disk.o
CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 96f414a..dff16b9 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -53,7 +53,7 @@ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/ libs-y += common/init/ -libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ +libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ libs-y += dts/
Hi Simon,
On 18.01.2016 04:53, Simon Glass wrote:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
I've been thinking about doing this as well lately. So:
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
Hello Simon,
On 01/18/2016 04:53 AM, Simon Glass wrote:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Kconfig | 2 + Makefile | 1 + cmd/Kconfig | 585 +++++++++++++++++++++++++++++++ cmd/Makefile | 166 +++++++++ {common => cmd}/cmd_aes.c | 0 {common => cmd}/cmd_ambapp.c | 0 {common => cmd}/cmd_armflash.c | 0 {common => cmd}/cmd_bdinfo.c | 0 {common => cmd}/cmd_bedbug.c | 0 {common => cmd}/cmd_blob.c | 0 {common => cmd}/cmd_bmp.c | 0 {common => cmd}/cmd_boot.c | 0 {common => cmd}/cmd_bootldr.c | 0 {common => cmd}/cmd_bootm.c | 0 {common => cmd}/cmd_bootmenu.c | 0 {common => cmd}/cmd_bootstage.c | 0 {common => cmd}/cmd_cache.c | 0 {common => cmd}/cmd_cbfs.c | 0 {common => cmd}/cmd_clk.c | 0 {common => cmd}/cmd_console.c | 0 {common => cmd}/cmd_cplbinfo.c | 0 {common => cmd}/cmd_cpu.c | 0 {common => cmd}/cmd_cramfs.c | 0 {common => cmd}/cmd_dataflash_mmc_mux.c | 0 {common => cmd}/cmd_date.c | 0 {common => cmd}/cmd_dcr.c | 0 {common => cmd}/cmd_demo.c | 0 {common => cmd}/cmd_dfu.c | 0 {common => cmd}/cmd_diag.c | 0 {common => cmd}/cmd_disk.c | 0 {common => cmd}/cmd_display.c | 0 {common => cmd}/cmd_dtt.c | 0 {common => cmd}/cmd_echo.c | 0 {common => cmd}/cmd_eeprom.c | 0 {common => cmd}/cmd_efi.c | 0 {common => cmd}/cmd_elf.c | 0 {common => cmd}/cmd_ethsw.c | 0 {common => cmd}/cmd_exit.c | 0 {common => cmd}/cmd_ext2.c | 0 {common => cmd}/cmd_ext4.c | 0 {common => cmd}/cmd_fastboot.c | 0 {common => cmd}/cmd_fat.c | 0 {common => cmd}/cmd_fdc.c | 0 {common => cmd}/cmd_fdt.c | 0 {common => cmd}/cmd_fitupd.c | 0 {common => cmd}/cmd_flash.c | 0 {common => cmd}/cmd_fpga.c | 0 {common => cmd}/cmd_fpgad.c | 0 {common => cmd}/cmd_fs.c | 0 {common => cmd}/cmd_fs_uuid.c | 0 {common => cmd}/cmd_fuse.c | 0 {common => cmd}/cmd_gettime.c | 0 {common => cmd}/cmd_gpio.c | 0 {common => cmd}/cmd_gpt.c | 0 {common => cmd}/cmd_hash.c | 0 {common => cmd}/cmd_help.c | 0 {common => cmd}/cmd_host.c | 0 {common => cmd}/cmd_i2c.c | 0 {common => cmd}/cmd_ide.c | 0 {common => cmd}/cmd_immap.c | 0 {common => cmd}/cmd_ini.c | 0 {common => cmd}/cmd_io.c | 0 {common => cmd}/cmd_iotrace.c | 0 {common => cmd}/cmd_irq.c | 0 {common => cmd}/cmd_itest.c | 0 {common => cmd}/cmd_jffs2.c | 0 {common => cmd}/cmd_ldrinfo.c | 0 {common => cmd}/cmd_led.c | 0 {common => cmd}/cmd_license.c | 0 {common => cmd}/cmd_load.c | 0 {common => cmd}/cmd_log.c | 0 {common => cmd}/cmd_lzmadec.c | 0 {common => cmd}/cmd_mac.c | 0 {common => cmd}/cmd_md5sum.c | 0 {common => cmd}/cmd_mdio.c | 0 {common => cmd}/cmd_mem.c | 0 {common => cmd}/cmd_mfsl.c | 0 {common => cmd}/cmd_mii.c | 0 {common => cmd}/cmd_misc.c | 0 {common => cmd}/cmd_mmc.c | 0 {common => cmd}/cmd_mmc_spi.c | 0 {common => cmd}/cmd_mp.c | 0 {common => cmd}/cmd_mtdparts.c | 0 {common => cmd}/cmd_nand.c | 0 {common => cmd}/cmd_net.c | 0 {common => cmd}/cmd_nvedit.c | 0 {common => cmd}/cmd_onenand.c | 0 {common => cmd}/cmd_otp.c | 0 {common => cmd}/cmd_part.c | 0 {common => cmd}/cmd_pci.c | 0 {common => cmd}/cmd_pcmcia.c | 0 {common => cmd}/cmd_pmic.c | 0 {common => cmd}/cmd_portio.c | 0 {common => cmd}/cmd_pxe.c | 0 {common => cmd}/cmd_read.c | 0 {common => cmd}/cmd_reginfo.c | 0 {common => cmd}/cmd_regulator.c | 0 {common => cmd}/cmd_reiser.c | 0 {common => cmd}/cmd_remoteproc.c | 0 {common => cmd}/cmd_sata.c | 0 {common => cmd}/cmd_scsi.c | 0 {common => cmd}/cmd_setexpr.c | 0 {common => cmd}/cmd_sf.c | 0 {common => cmd}/cmd_sha1sum.c | 0 {common => cmd}/cmd_softswitch.c | 0 {common => cmd}/cmd_sound.c | 0 {common => cmd}/cmd_source.c | 0 {common => cmd}/cmd_spi.c | 0 {common => cmd}/cmd_spibootldr.c | 0 {common => cmd}/cmd_spl.c | 0 {common => cmd}/cmd_strings.c | 0 {common => cmd}/cmd_terminal.c | 0 {common => cmd}/cmd_test.c | 0 {common => cmd}/cmd_thordown.c | 0 {common => cmd}/cmd_time.c | 0 {common => cmd}/cmd_tpm.c | 0 {common => cmd}/cmd_tpm_test.c | 0 {common => cmd}/cmd_trace.c | 0 {common => cmd}/cmd_tsi148.c | 0 {common => cmd}/cmd_ubi.c | 0 {common => cmd}/cmd_ubifs.c | 0 {common => cmd}/cmd_universe.c | 0 {common => cmd}/cmd_unzip.c | 0 {common => cmd}/cmd_usb.c | 0 {common => cmd}/cmd_usb_mass_storage.c | 0 {common => cmd}/cmd_version.c | 0 {common => cmd}/cmd_ximg.c | 0 {common => cmd}/cmd_yaffs2.c | 0 {common => cmd}/cmd_zfs.c | 0 {common => cmd}/cmd_zip.c | 0 common/Kconfig | 586 -------------------------------- common/Makefile | 156 +-------- scripts/Makefile.spl | 2 +- 133 files changed, 761 insertions(+), 737 deletions(-) create mode 100644 cmd/Kconfig create mode 100644 cmd/Makefile rename {common => cmd}/cmd_aes.c (100%) rename {common => cmd}/cmd_ambapp.c (100%) rename {common => cmd}/cmd_armflash.c (100%) rename {common => cmd}/cmd_bdinfo.c (100%) rename {common => cmd}/cmd_bedbug.c (100%) rename {common => cmd}/cmd_blob.c (100%) rename {common => cmd}/cmd_bmp.c (100%) rename {common => cmd}/cmd_boot.c (100%) rename {common => cmd}/cmd_bootldr.c (100%) rename {common => cmd}/cmd_bootm.c (100%) rename {common => cmd}/cmd_bootmenu.c (100%) rename {common => cmd}/cmd_bootstage.c (100%) rename {common => cmd}/cmd_cache.c (100%) rename {common => cmd}/cmd_cbfs.c (100%) rename {common => cmd}/cmd_clk.c (100%) rename {common => cmd}/cmd_console.c (100%) rename {common => cmd}/cmd_cplbinfo.c (100%) rename {common => cmd}/cmd_cpu.c (100%) rename {common => cmd}/cmd_cramfs.c (100%) rename {common => cmd}/cmd_dataflash_mmc_mux.c (100%) rename {common => cmd}/cmd_date.c (100%) rename {common => cmd}/cmd_dcr.c (100%) rename {common => cmd}/cmd_demo.c (100%) rename {common => cmd}/cmd_dfu.c (100%) rename {common => cmd}/cmd_diag.c (100%) rename {common => cmd}/cmd_disk.c (100%) rename {common => cmd}/cmd_display.c (100%) rename {common => cmd}/cmd_dtt.c (100%) rename {common => cmd}/cmd_echo.c (100%) rename {common => cmd}/cmd_eeprom.c (100%) rename {common => cmd}/cmd_efi.c (100%) rename {common => cmd}/cmd_elf.c (100%) rename {common => cmd}/cmd_ethsw.c (100%) rename {common => cmd}/cmd_exit.c (100%) rename {common => cmd}/cmd_ext2.c (100%) rename {common => cmd}/cmd_ext4.c (100%) rename {common => cmd}/cmd_fastboot.c (100%) rename {common => cmd}/cmd_fat.c (100%) rename {common => cmd}/cmd_fdc.c (100%) rename {common => cmd}/cmd_fdt.c (100%) rename {common => cmd}/cmd_fitupd.c (100%) rename {common => cmd}/cmd_flash.c (100%) rename {common => cmd}/cmd_fpga.c (100%) rename {common => cmd}/cmd_fpgad.c (100%) rename {common => cmd}/cmd_fs.c (100%) rename {common => cmd}/cmd_fs_uuid.c (100%) rename {common => cmd}/cmd_fuse.c (100%) rename {common => cmd}/cmd_gettime.c (100%) rename {common => cmd}/cmd_gpio.c (100%) rename {common => cmd}/cmd_gpt.c (100%) rename {common => cmd}/cmd_hash.c (100%) rename {common => cmd}/cmd_help.c (100%) rename {common => cmd}/cmd_host.c (100%) rename {common => cmd}/cmd_i2c.c (100%) rename {common => cmd}/cmd_ide.c (100%) rename {common => cmd}/cmd_immap.c (100%) rename {common => cmd}/cmd_ini.c (100%) rename {common => cmd}/cmd_io.c (100%) rename {common => cmd}/cmd_iotrace.c (100%) rename {common => cmd}/cmd_irq.c (100%) rename {common => cmd}/cmd_itest.c (100%) rename {common => cmd}/cmd_jffs2.c (100%) rename {common => cmd}/cmd_ldrinfo.c (100%) rename {common => cmd}/cmd_led.c (100%) rename {common => cmd}/cmd_license.c (100%) rename {common => cmd}/cmd_load.c (100%) rename {common => cmd}/cmd_log.c (100%) rename {common => cmd}/cmd_lzmadec.c (100%) rename {common => cmd}/cmd_mac.c (100%) rename {common => cmd}/cmd_md5sum.c (100%) rename {common => cmd}/cmd_mdio.c (100%) rename {common => cmd}/cmd_mem.c (100%) rename {common => cmd}/cmd_mfsl.c (100%) rename {common => cmd}/cmd_mii.c (100%) rename {common => cmd}/cmd_misc.c (100%) rename {common => cmd}/cmd_mmc.c (100%) rename {common => cmd}/cmd_mmc_spi.c (100%) rename {common => cmd}/cmd_mp.c (100%) rename {common => cmd}/cmd_mtdparts.c (100%) rename {common => cmd}/cmd_nand.c (100%) rename {common => cmd}/cmd_net.c (100%) rename {common => cmd}/cmd_nvedit.c (100%) rename {common => cmd}/cmd_onenand.c (100%) rename {common => cmd}/cmd_otp.c (100%) rename {common => cmd}/cmd_part.c (100%) rename {common => cmd}/cmd_pci.c (100%) rename {common => cmd}/cmd_pcmcia.c (100%) rename {common => cmd}/cmd_pmic.c (100%) rename {common => cmd}/cmd_portio.c (100%) rename {common => cmd}/cmd_pxe.c (100%) rename {common => cmd}/cmd_read.c (100%) rename {common => cmd}/cmd_reginfo.c (100%) rename {common => cmd}/cmd_regulator.c (100%) rename {common => cmd}/cmd_reiser.c (100%) rename {common => cmd}/cmd_remoteproc.c (100%) rename {common => cmd}/cmd_sata.c (100%) rename {common => cmd}/cmd_scsi.c (100%) rename {common => cmd}/cmd_setexpr.c (100%) rename {common => cmd}/cmd_sf.c (100%) rename {common => cmd}/cmd_sha1sum.c (100%) rename {common => cmd}/cmd_softswitch.c (100%) rename {common => cmd}/cmd_sound.c (100%) rename {common => cmd}/cmd_source.c (100%) rename {common => cmd}/cmd_spi.c (100%) rename {common => cmd}/cmd_spibootldr.c (100%) rename {common => cmd}/cmd_spl.c (100%) rename {common => cmd}/cmd_strings.c (100%) rename {common => cmd}/cmd_terminal.c (100%) rename {common => cmd}/cmd_test.c (100%) rename {common => cmd}/cmd_thordown.c (100%) rename {common => cmd}/cmd_time.c (100%) rename {common => cmd}/cmd_tpm.c (100%) rename {common => cmd}/cmd_tpm_test.c (100%) rename {common => cmd}/cmd_trace.c (100%) rename {common => cmd}/cmd_tsi148.c (100%) rename {common => cmd}/cmd_ubi.c (100%) rename {common => cmd}/cmd_ubifs.c (100%) rename {common => cmd}/cmd_universe.c (100%) rename {common => cmd}/cmd_unzip.c (100%) rename {common => cmd}/cmd_usb.c (100%) rename {common => cmd}/cmd_usb_mass_storage.c (100%) rename {common => cmd}/cmd_version.c (100%) rename {common => cmd}/cmd_ximg.c (100%) rename {common => cmd}/cmd_yaffs2.c (100%) rename {common => cmd}/cmd_zfs.c (100%) rename {common => cmd}/cmd_zip.c (100%)
diff --git a/Kconfig b/Kconfig index 821b464..d5e503a 100644 --- a/Kconfig +++ b/Kconfig @@ -224,6 +224,8 @@ endmenu # Boot images
source "common/Kconfig"
+source "cmd/Kconfig"
source "dts/Kconfig"
source "net/Kconfig"
diff --git a/Makefile b/Makefile index 5882c30..6a67efb 100644 --- a/Makefile +++ b/Makefile @@ -667,6 +667,7 @@ libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb-new/ libs-y += drivers/usb/phy/ libs-y += drivers/usb/ulpi/ +libs-y += cmd/ libs-y += common/ libs-$(CONFIG_API) += api/ libs-$(CONFIG_HAS_POST) += post/ diff --git a/cmd/Kconfig b/cmd/Kconfig new file mode 100644 index 0000000..2ed0263 --- /dev/null +++ b/cmd/Kconfig @@ -0,0 +1,585 @@ +menu "Command line interface"
+config HUSH_PARSER
- bool "Use hush shell"
- select SYS_HUSH_PARSER
- help
This option enables the "hush" shell (from Busybox) as command lineinterpreter, thus enabling powerful command line syntax likeif...then...else...fi conditionals or `&&' and '||'constructs ("shell scripts").If disabled, you get the old, much simpler behaviour with a somewhatsmaller memory footprint.+config SYS_HUSH_PARSER
- bool
- help
Backward compatibility.+config SYS_PROMPT
- string "Shell prompt"
- default "=> "
- help
This string is displayed in the command line to the left of thecursor.+menu "Autoboot options"
+config AUTOBOOT_KEYED
- bool "Stop autobooting via specific input key / string"
- default n
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If not enabled, any input key will abort theU-Boot automatic booting process and bring the deviceto the U-Boot prompt for user input.+config AUTOBOOT_PROMPT
- string "Autoboot stop prompt"
- depends on AUTOBOOT_KEYED
- default "Autoboot in %d seconds\n"
- help
This string is displayed before the boot delay selected byCONFIG_BOOTDELAY starts. If it is not defined there is nooutput indicating that autoboot is in progress.Note that this define is used as the (only) argument to aprintf() call, so it may contain '%' format specifications,provided that it also includes, sepearated by commas exactlylike in a printf statement, the required arguments. It isthe responsibility of the user to select only such argumentsthat are valid in the given context.+config AUTOBOOT_ENCRYPTION
- bool "Enable encryption in autoboot stopping"
- depends on AUTOBOOT_KEYED
- default n
+config AUTOBOOT_DELAY_STR
- string "Delay autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option delays the automatic boot feature by issuinga specific input key or string. If CONFIG_AUTOBOOT_DELAY_STRor the environment variable "bootdelaykey" is specifiedand this string is received from console input beforeautoboot starts booting, U-Boot gives a command prompt. TheU-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME isused, otherwise it never times out.+config AUTOBOOT_STOP_STR
- string "Stop autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If CONFIG_AUTOBOOT_STOP_STR or the environmentvariable "bootstopkey" is specified and this string isreceived from console input before autoboot starts booting,U-Boot gives a command prompt. The U-Boot prompt nevertimes out, even if CONFIG_BOOT_RETRY_TIME is used.+config AUTOBOOT_KEYED_CTRLC
- bool "Enable Ctrl-C autoboot interruption"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- default n
- help
This option allows for the boot sequence to be interruptedby ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".Setting this variable provides an escape sequence from thelimited "password" strings.+config AUTOBOOT_STOP_STR_SHA256
- string "Stop autobooting via SHA256 encrypted password"
- depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
- help
This option adds the feature to only stop the autobooting,and therefore boot into the U-Boot prompt, when the inputstring / password matches a values that is encypted viaa SHA256 hash and saved in the environment.+endmenu
+comment "Commands"
+menu "Info commands"
+config CMD_BDI
- bool "bdinfo"
- default y
- help
Print board info+config CMD_CONSOLE
- bool "coninfo"
- default y
- help
Print console devices and information.+config CMD_CPU
- bool "cpu"
- help
Print information about available CPUs. This normally shows thenumber of CPUs, type (e.g. manufacturer, architecture, product orinternal name) and clock frequency. Other information may beavailable depending on the CPU driver.+config CMD_LICENSE
- bool "license"
- help
Print GPL license text+endmenu
+menu "Boot commands"
+config CMD_BOOTD
- bool "bootd"
- default y
- help
Run the command stored in the environment "bootcmd", i.e."bootd" does the same thing as "run bootcmd".+config CMD_BOOTM
- bool "bootm"
- default y
- help
Boot an application image from the memory.+config CMD_ELF
- bool "bootelf, bootvx"
- default y
- help
Boot an ELF/vxWorks image from the memory.+config CMD_GO
- bool "go"
- default y
- help
Start an application at a given address.+config CMD_RUN
- bool "run"
- default y
- help
Run the command in the given environment variable.+config CMD_IMI
- bool "iminfo"
- default y
- help
Print header information for application image.+config CMD_IMLS
- bool "imls"
- default y
- help
List all images found in flash+config CMD_XIMG
- bool "imxtract"
- default y
- help
Extract a part of a multi-image.+config CMD_POWEROFF
- bool
+endmenu
+menu "Environment commands"
+config CMD_EXPORTENV
- bool "env export"
- default y
- help
Export environments.+config CMD_IMPORTENV
- bool "env import"
- default y
- help
Import environments.+config CMD_EDITENV
- bool "editenv"
- default y
- help
Edit environment variable.+config CMD_SAVEENV
- bool "saveenv"
- default y
- help
Save all environment variables into the compiled-in persistentstorage.+config CMD_ENV_EXISTS
- bool "env exists"
- default y
- help
Check if a variable is defined in the environment for use inshell scripting.+endmenu
+menu "Memory commands"
+config CMD_MEMORY
- bool "md, mm, nm, mw, cp, cmp, base, loop"
- default y
- help
Memeory commands.md - memory displaymm - memory modify (auto-incrementing address)nm - memory modify (constant address)mw - memory write (fill)cp - memory copycmp - memory comparebase - print or set address offsetloop - initinite loop on address range+config CMD_CRC32
- bool "crc32"
- default y
- help
Compute CRC32.+config LOOPW
- bool "loopw"
- help
Infinite write loop on address range+config CMD_MEMTEST
- bool "memtest"
- help
Simple RAM read/write test.+config CMD_MX_CYCLIC
- bool "mdc, mwc"
- help
mdc - memory display cyclicmwc - memory write cyclic+config CMD_MEMINFO
- bool "meminfo"
- help
Display memory information.+endmenu
+menu "Device access commands"
+config CMD_DM
- bool "dm - Access to driver model information"
- depends on DM
- default y
- help
Provides access to driver model data structures and information,such as a list of devices, list of uclasses and the state of eachdevice (e.g. activated). This is not required for operation, butcan be useful to see the state of driver model for debugging orinterest.+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 withdriver model. To use this properly you will need to enable one orboth of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE).Otherwise you will always get an empty list of devices. The demodevices are defined in the sandbox device tree, so the easiestoption is to use sandbox and pass the -d point to sandbox'su-boot.dtb file.+config CMD_LOADB
- bool "loadb"
- default y
- help
Load a binary file over serial line.+config CMD_LOADS
- bool "loads"
- default y
- 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 informationerase - FLASH memoryprotect - enable or disable FLASH write protection+config CMD_ARMFLASH
- depends on FLASH_CFI_DRIVER
- bool "armflash"
- help
ARM Ltd reference designs flash partition access+config CMD_NAND
- bool "nand"
- help
NAND support.+config CMD_SF
- bool "sf"
- help
SPI Flash support+config CMD_SPI
- bool "sspi"
- help
SPI utility command.+config CMD_I2C
- bool "i2c"
- help
I2C support.+config CMD_USB
- bool "usb"
- help
USB support.+config CMD_FPGA
- bool "fpga"
- default y
- help
FPGA support.+config CMD_REMOTEPROC
- bool "remoteproc"
- depends on REMOTEPROC
- help
Support for Remote Processor control+config CMD_GPIO
- bool "gpio"
- help
GPIO support.+endmenu
+menu "Shell scripting commands"
+config CMD_ECHO
- bool "echo"
- default y
- help
Echo args to console+config CMD_ITEST
- bool "itest"
- default y
- help
Return true/false on integer compare.+config CMD_SOURCE
- bool "source"
- default y
- help
Run script from memory+config CMD_SETEXPR
- bool "setexpr"
- default y
- help
Evaluate boolean and math expressions and store the result in an envvariable.Also supports loading the value at a memory location into a variable.If CONFIG_REGEX is enabled, setexpr also supports a gsub function.+endmenu
+menu "Network commands"
+config CMD_NET
- bool "bootp, tftpboot"
select NET- default y
- help
Network commands.bootp - boot image via network using BOOTP/TFTP protocoltftpboot - boot image via network using TFTP protocol+config CMD_TFTPPUT
- bool "tftp put"
- help
TFTP put command, for uploading files to a server+config CMD_TFTPSRV
- bool "tftpsrv"
- help
Act as a TFTP server and boot the first received file+config CMD_RARP
- bool "rarpboot"
- help
Boot image via network using RARP/TFTP protocol+config CMD_DHCP
- bool "dhcp"
- help
Boot image via network using DHCP/TFTP protocol+config CMD_NFS
- bool "nfs"
- default y
- help
Boot image via network using NFS protocol.+config CMD_PING
- bool "ping"
- help
Send ICMP ECHO_REQUEST to network host+config CMD_CDP
- bool "cdp"
- help
Perform CDP network configuration+config CMD_SNTP
- bool "sntp"
- help
Synchronize RTC via network+config CMD_DNS
- bool "dns"
- help
Lookup the IP of a hostname+config CMD_LINK_LOCAL
- bool "linklocal"
- help
Acquire a network IP address using the link-local protocol+endmenu
+menu "Misc commands"
+config CMD_AMBAPP
- bool "ambapp"
- depends on LEON3
- default y
- help
Lists AMBA Plug-n-Play information.+config SYS_AMBAPP_PRINT_ON_STARTUP
- bool "Show AMBA PnP info on startup"
- depends on CMD_AMBAPP
- default n
- help
Show AMBA Plug-n-Play information on startup.+config CMD_TIME
- bool "time"
- help
Run commands and summarize execution time.+# TODO: rename to CMD_SLEEP +config CMD_MISC
- bool "sleep"
- default y
- help
Delay execution for some time+config CMD_TIMER
- bool "timer"
- help
Access the system timer.+config CMD_SETGETDCR
- bool "getdcr, setdcr, getidcr, setidcr"
- depends on 4xx
- default y
- help
getdcr - Get an AMCC PPC 4xx DCR's valuesetdcr - Set an AMCC PPC 4xx DCR's valuegetidcr - Get a register value via indirect DCR addressingsetidcr - Set a register value via indirect DCR addressing+config CMD_SOUND
- bool "sound"
- depends on SOUND
- help
This provides basic access to the U-Boot's sound support. The mainfeature is to play a beep.sound init - set up sound systemsound play - play a sound+endmenu
+config CMD_BOOTSTAGE
- bool "Enable the 'bootstage' command"
- depends on BOOTSTAGE
- help
Add a 'bootstage' command which supports printing a reportand un/stashing of bootstage data.+menu "Power commands" +config CMD_PMIC
- bool "Enable Driver Model PMIC command"
- depends on DM_PMIC
- help
This is the pmic command, based on a driver model pmic's API.Command features are unchanged:- list - list pmic devices- pmic dev <id> - show or [set] operating pmic device (NEW)- pmic dump - dump registers- pmic read address - read byte of register at address- pmic write address - write byte to register at addressThe only one change for this command is 'dev' subcommand.+config CMD_REGULATOR
- bool "Enable Driver Model REGULATOR command"
- depends on DM_REGULATOR
- help
This command is based on driver model regulator's API.User interface features:- list - list regulator devices- regulator dev <id> - show or [set] operating regulator device- regulator info - print constraints info- regulator status - print operating status- regulator value <val] <-f> - print/[set] voltage value [uV]- regulator current <val> - print/[set] current value [uA]- regulator mode <id> - print/[set] operating mode id- regulator enable - enable the regulator output- regulator disable - disable the regulator outputThe '-f' (force) option can be used for set the value which exceedsthe limits, which are found in device-tree and are kept in regulator'suclass platdata structure.+endmenu
+menu "Security commands" +config CMD_TPM
- bool "Enable the 'tpm' command"
- depends on TPM
- help
This provides a means to talk to a TPM from the command line. A widerange of commands if provided - see 'tpm help' for details. Thecommand requires a suitable TPM on your board and the correct drivermust be enabled.+config CMD_TPM_TEST
- bool "Enable the 'tpm test' command"
- depends on CMD_TPM
- help
This provides a a series of tests to confirm that the TPM is workingcorrectly. The tests cover initialisation, non-volatile RAM, extend,global lock and checking that timing is within expectations. Thetests pass correctly on Infineon TPMs but may need to be adjustedfor other devices.+endmenu
+endmenu diff --git a/cmd/Makefile b/cmd/Makefile new file mode 100644 index 0000000..880a886 --- /dev/null +++ b/cmd/Makefile @@ -0,0 +1,166 @@ +# +# (C) Copyright 2004-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +#
+ifndef CONFIG_SPL_BUILD +# core command +obj-y += cmd_boot.o +obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o +obj-y += cmd_help.o +obj-y += cmd_version.o
+# command +obj-$(CONFIG_CMD_AES) += cmd_aes.o +obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o +obj-$(CONFIG_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_SOURCE) += cmd_source.o +obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o +obj-$(CONFIG_CMD_BMP) += cmd_bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o +obj-$(CONFIG_CMD_CACHE) += cmd_cache.o +obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o +obj-$(CONFIG_CMD_CLK) += cmd_clk.o +obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o +obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cmd_cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += cmd_date.o +obj-$(CONFIG_CMD_DEMO) += cmd_demo.o +obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +ifdef CONFIG_4xx +obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +endif +ifdef CONFIG_POST +obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +endif +obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o +obj-$(CONFIG_CMD_DTT) += cmd_dtt.o +obj-$(CONFIG_CMD_ECHO) += cmd_echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o +obj-$(CONFIG_EFI_STUB) += cmd_efi.o +obj-$(CONFIG_CMD_ELF) += cmd_elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o +obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o +obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o +obj-$(CONFIG_CMD_FAT) += cmd_fat.o +obj-$(CONFIG_CMD_FDC) += cmd_fdc.o +obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o +obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o +obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +ifdef CONFIG_FPGA +obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +endif +obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o +obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o +obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o +obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o +obj-$(CONFIG_CMD_I2C) += cmd_i2c.o +obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o +obj-$(CONFIG_CMD_HASH) += cmd_hash.o +obj-$(CONFIG_CMD_IDE) += cmd_ide.o +obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o +obj-$(CONFIG_CMD_INI) += cmd_ini.o +obj-$(CONFIG_CMD_IRQ) += cmd_irq.o +obj-$(CONFIG_CMD_ITEST) += cmd_itest.o +obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o +obj-$(CONFIG_CMD_LED) += cmd_led.o +obj-$(CONFIG_CMD_LICENSE) += cmd_license.o +obj-y += cmd_load.o +obj-$(CONFIG_LOGBUFFER) += cmd_log.o +obj-$(CONFIG_ID_EEPROM) += cmd_mac.o +obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o +obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o +obj-$(CONFIG_CMD_IO) += cmd_io.o +obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_MII) += cmd_mii.o +ifdef CONFIG_PHYLIB +obj-$(CONFIG_CMD_MII) += cmd_mdio.o +endif +obj-$(CONFIG_CMD_MISC) += cmd_misc.o +obj-$(CONFIG_CMD_MMC) += cmd_mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o +obj-$(CONFIG_MP) += cmd_mp.o +obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o +obj-$(CONFIG_CMD_NAND) += cmd_nand.o +obj-$(CONFIG_CMD_NET) += cmd_net.o +obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o +obj-$(CONFIG_CMD_OTP) += cmd_otp.o +obj-$(CONFIG_CMD_PART) += cmd_part.o +ifdef CONFIG_PCI +obj-$(CONFIG_CMD_PCI) += cmd_pci.o +endif +obj-y += cmd_pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o +obj-$(CONFIG_CMD_PXE) += cmd_pxe.o +obj-$(CONFIG_CMD_READ) += cmd_read.o +obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o +obj-$(CONFIG_CMD_REISER) += cmd_reiser.o +obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o +obj-$(CONFIG_SANDBOX) += cmd_host.o +obj-$(CONFIG_CMD_SATA) += cmd_sata.o +obj-$(CONFIG_CMD_SF) += cmd_sf.o +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o +obj-$(CONFIG_CMD_SPI) += cmd_spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o +obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o +obj-$(CONFIG_CMD_TIME) += cmd_time.o +obj-$(CONFIG_CMD_TRACE) += cmd_trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o +obj-$(CONFIG_CMD_TPM) += cmd_tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o +obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o +obj-$(CONFIG_CMD_UBI) += cmd_ubi.o +obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o +obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +ifdef CONFIG_LZMA +obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +endif
+obj-$(CONFIG_CMD_USB) += cmd_usb.o +obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o
+obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o +obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o +obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o +obj-$(CONFIG_CMD_SPL) += cmd_spl.o +obj-$(CONFIG_CMD_ZIP) += cmd_zip.o +obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
+obj-$(CONFIG_CMD_DFU) += cmd_dfu.o +obj-$(CONFIG_CMD_GPT) += cmd_gpt.o +obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
+# Power +obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o +obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +endif # !CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_BUILD +ifdef CONFIG_SPL_SATA_SUPPORT +obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +endif +endif # CONFIG_SPL_BUILD
+obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
+# core command +obj-y += cmd_nvedit.o +obj-y += cmd_disk.o diff --git a/common/cmd_aes.c b/cmd/cmd_aes.c similarity index 100% rename from common/cmd_aes.c rename to cmd/cmd_aes.c diff --git a/common/cmd_ambapp.c b/cmd/cmd_ambapp.c similarity index 100% rename from common/cmd_ambapp.c rename to cmd/cmd_ambapp.c diff --git a/common/cmd_armflash.c b/cmd/cmd_armflash.c similarity index 100% rename from common/cmd_armflash.c rename to cmd/cmd_armflash.c diff --git a/common/cmd_bdinfo.c b/cmd/cmd_bdinfo.c similarity index 100% rename from common/cmd_bdinfo.c rename to cmd/cmd_bdinfo.c diff --git a/common/cmd_bedbug.c b/cmd/cmd_bedbug.c similarity index 100% rename from common/cmd_bedbug.c rename to cmd/cmd_bedbug.c diff --git a/common/cmd_blob.c b/cmd/cmd_blob.c similarity index 100% rename from common/cmd_blob.c rename to cmd/cmd_blob.c diff --git a/common/cmd_bmp.c b/cmd/cmd_bmp.c similarity index 100% rename from common/cmd_bmp.c rename to cmd/cmd_bmp.c diff --git a/common/cmd_boot.c b/cmd/cmd_boot.c similarity index 100% rename from common/cmd_boot.c rename to cmd/cmd_boot.c diff --git a/common/cmd_bootldr.c b/cmd/cmd_bootldr.c similarity index 100% rename from common/cmd_bootldr.c rename to cmd/cmd_bootldr.c diff --git a/common/cmd_bootm.c b/cmd/cmd_bootm.c similarity index 100% rename from common/cmd_bootm.c rename to cmd/cmd_bootm.c diff --git a/common/cmd_bootmenu.c b/cmd/cmd_bootmenu.c similarity index 100% rename from common/cmd_bootmenu.c rename to cmd/cmd_bootmenu.c diff --git a/common/cmd_bootstage.c b/cmd/cmd_bootstage.c similarity index 100% rename from common/cmd_bootstage.c rename to cmd/cmd_bootstage.c diff --git a/common/cmd_cache.c b/cmd/cmd_cache.c similarity index 100% rename from common/cmd_cache.c rename to cmd/cmd_cache.c diff --git a/common/cmd_cbfs.c b/cmd/cmd_cbfs.c similarity index 100% rename from common/cmd_cbfs.c rename to cmd/cmd_cbfs.c diff --git a/common/cmd_clk.c b/cmd/cmd_clk.c similarity index 100% rename from common/cmd_clk.c rename to cmd/cmd_clk.c diff --git a/common/cmd_console.c b/cmd/cmd_console.c similarity index 100% rename from common/cmd_console.c rename to cmd/cmd_console.c diff --git a/common/cmd_cplbinfo.c b/cmd/cmd_cplbinfo.c similarity index 100% rename from common/cmd_cplbinfo.c rename to cmd/cmd_cplbinfo.c diff --git a/common/cmd_cpu.c b/cmd/cmd_cpu.c similarity index 100% rename from common/cmd_cpu.c rename to cmd/cmd_cpu.c diff --git a/common/cmd_cramfs.c b/cmd/cmd_cramfs.c similarity index 100% rename from common/cmd_cramfs.c rename to cmd/cmd_cramfs.c diff --git a/common/cmd_dataflash_mmc_mux.c b/cmd/cmd_dataflash_mmc_mux.c similarity index 100% rename from common/cmd_dataflash_mmc_mux.c rename to cmd/cmd_dataflash_mmc_mux.c diff --git a/common/cmd_date.c b/cmd/cmd_date.c similarity index 100% rename from common/cmd_date.c rename to cmd/cmd_date.c diff --git a/common/cmd_dcr.c b/cmd/cmd_dcr.c similarity index 100% rename from common/cmd_dcr.c rename to cmd/cmd_dcr.c diff --git a/common/cmd_demo.c b/cmd/cmd_demo.c similarity index 100% rename from common/cmd_demo.c rename to cmd/cmd_demo.c diff --git a/common/cmd_dfu.c b/cmd/cmd_dfu.c similarity index 100% rename from common/cmd_dfu.c rename to cmd/cmd_dfu.c diff --git a/common/cmd_diag.c b/cmd/cmd_diag.c similarity index 100% rename from common/cmd_diag.c rename to cmd/cmd_diag.c diff --git a/common/cmd_disk.c b/cmd/cmd_disk.c similarity index 100% rename from common/cmd_disk.c rename to cmd/cmd_disk.c diff --git a/common/cmd_display.c b/cmd/cmd_display.c similarity index 100% rename from common/cmd_display.c rename to cmd/cmd_display.c diff --git a/common/cmd_dtt.c b/cmd/cmd_dtt.c similarity index 100% rename from common/cmd_dtt.c rename to cmd/cmd_dtt.c diff --git a/common/cmd_echo.c b/cmd/cmd_echo.c similarity index 100% rename from common/cmd_echo.c rename to cmd/cmd_echo.c diff --git a/common/cmd_eeprom.c b/cmd/cmd_eeprom.c similarity index 100% rename from common/cmd_eeprom.c rename to cmd/cmd_eeprom.c diff --git a/common/cmd_efi.c b/cmd/cmd_efi.c similarity index 100% rename from common/cmd_efi.c rename to cmd/cmd_efi.c diff --git a/common/cmd_elf.c b/cmd/cmd_elf.c similarity index 100% rename from common/cmd_elf.c rename to cmd/cmd_elf.c diff --git a/common/cmd_ethsw.c b/cmd/cmd_ethsw.c similarity index 100% rename from common/cmd_ethsw.c rename to cmd/cmd_ethsw.c diff --git a/common/cmd_exit.c b/cmd/cmd_exit.c similarity index 100% rename from common/cmd_exit.c rename to cmd/cmd_exit.c diff --git a/common/cmd_ext2.c b/cmd/cmd_ext2.c similarity index 100% rename from common/cmd_ext2.c rename to cmd/cmd_ext2.c diff --git a/common/cmd_ext4.c b/cmd/cmd_ext4.c similarity index 100% rename from common/cmd_ext4.c rename to cmd/cmd_ext4.c diff --git a/common/cmd_fastboot.c b/cmd/cmd_fastboot.c similarity index 100% rename from common/cmd_fastboot.c rename to cmd/cmd_fastboot.c diff --git a/common/cmd_fat.c b/cmd/cmd_fat.c similarity index 100% rename from common/cmd_fat.c rename to cmd/cmd_fat.c diff --git a/common/cmd_fdc.c b/cmd/cmd_fdc.c similarity index 100% rename from common/cmd_fdc.c rename to cmd/cmd_fdc.c diff --git a/common/cmd_fdt.c b/cmd/cmd_fdt.c similarity index 100% rename from common/cmd_fdt.c rename to cmd/cmd_fdt.c diff --git a/common/cmd_fitupd.c b/cmd/cmd_fitupd.c similarity index 100% rename from common/cmd_fitupd.c rename to cmd/cmd_fitupd.c diff --git a/common/cmd_flash.c b/cmd/cmd_flash.c similarity index 100% rename from common/cmd_flash.c rename to cmd/cmd_flash.c diff --git a/common/cmd_fpga.c b/cmd/cmd_fpga.c similarity index 100% rename from common/cmd_fpga.c rename to cmd/cmd_fpga.c diff --git a/common/cmd_fpgad.c b/cmd/cmd_fpgad.c similarity index 100% rename from common/cmd_fpgad.c rename to cmd/cmd_fpgad.c diff --git a/common/cmd_fs.c b/cmd/cmd_fs.c similarity index 100% rename from common/cmd_fs.c rename to cmd/cmd_fs.c diff --git a/common/cmd_fs_uuid.c b/cmd/cmd_fs_uuid.c similarity index 100% rename from common/cmd_fs_uuid.c rename to cmd/cmd_fs_uuid.c diff --git a/common/cmd_fuse.c b/cmd/cmd_fuse.c similarity index 100% rename from common/cmd_fuse.c rename to cmd/cmd_fuse.c diff --git a/common/cmd_gettime.c b/cmd/cmd_gettime.c similarity index 100% rename from common/cmd_gettime.c rename to cmd/cmd_gettime.c diff --git a/common/cmd_gpio.c b/cmd/cmd_gpio.c similarity index 100% rename from common/cmd_gpio.c rename to cmd/cmd_gpio.c diff --git a/common/cmd_gpt.c b/cmd/cmd_gpt.c similarity index 100% rename from common/cmd_gpt.c rename to cmd/cmd_gpt.c diff --git a/common/cmd_hash.c b/cmd/cmd_hash.c similarity index 100% rename from common/cmd_hash.c rename to cmd/cmd_hash.c diff --git a/common/cmd_help.c b/cmd/cmd_help.c similarity index 100% rename from common/cmd_help.c rename to cmd/cmd_help.c diff --git a/common/cmd_host.c b/cmd/cmd_host.c similarity index 100% rename from common/cmd_host.c rename to cmd/cmd_host.c diff --git a/common/cmd_i2c.c b/cmd/cmd_i2c.c similarity index 100% rename from common/cmd_i2c.c rename to cmd/cmd_i2c.c diff --git a/common/cmd_ide.c b/cmd/cmd_ide.c similarity index 100% rename from common/cmd_ide.c rename to cmd/cmd_ide.c diff --git a/common/cmd_immap.c b/cmd/cmd_immap.c similarity index 100% rename from common/cmd_immap.c rename to cmd/cmd_immap.c diff --git a/common/cmd_ini.c b/cmd/cmd_ini.c similarity index 100% rename from common/cmd_ini.c rename to cmd/cmd_ini.c diff --git a/common/cmd_io.c b/cmd/cmd_io.c similarity index 100% rename from common/cmd_io.c rename to cmd/cmd_io.c diff --git a/common/cmd_iotrace.c b/cmd/cmd_iotrace.c similarity index 100% rename from common/cmd_iotrace.c rename to cmd/cmd_iotrace.c diff --git a/common/cmd_irq.c b/cmd/cmd_irq.c similarity index 100% rename from common/cmd_irq.c rename to cmd/cmd_irq.c diff --git a/common/cmd_itest.c b/cmd/cmd_itest.c similarity index 100% rename from common/cmd_itest.c rename to cmd/cmd_itest.c diff --git a/common/cmd_jffs2.c b/cmd/cmd_jffs2.c similarity index 100% rename from common/cmd_jffs2.c rename to cmd/cmd_jffs2.c diff --git a/common/cmd_ldrinfo.c b/cmd/cmd_ldrinfo.c similarity index 100% rename from common/cmd_ldrinfo.c rename to cmd/cmd_ldrinfo.c diff --git a/common/cmd_led.c b/cmd/cmd_led.c similarity index 100% rename from common/cmd_led.c rename to cmd/cmd_led.c diff --git a/common/cmd_license.c b/cmd/cmd_license.c similarity index 100% rename from common/cmd_license.c rename to cmd/cmd_license.c diff --git a/common/cmd_load.c b/cmd/cmd_load.c similarity index 100% rename from common/cmd_load.c rename to cmd/cmd_load.c diff --git a/common/cmd_log.c b/cmd/cmd_log.c similarity index 100% rename from common/cmd_log.c rename to cmd/cmd_log.c diff --git a/common/cmd_lzmadec.c b/cmd/cmd_lzmadec.c similarity index 100% rename from common/cmd_lzmadec.c rename to cmd/cmd_lzmadec.c diff --git a/common/cmd_mac.c b/cmd/cmd_mac.c similarity index 100% rename from common/cmd_mac.c rename to cmd/cmd_mac.c diff --git a/common/cmd_md5sum.c b/cmd/cmd_md5sum.c similarity index 100% rename from common/cmd_md5sum.c rename to cmd/cmd_md5sum.c diff --git a/common/cmd_mdio.c b/cmd/cmd_mdio.c similarity index 100% rename from common/cmd_mdio.c rename to cmd/cmd_mdio.c diff --git a/common/cmd_mem.c b/cmd/cmd_mem.c similarity index 100% rename from common/cmd_mem.c rename to cmd/cmd_mem.c diff --git a/common/cmd_mfsl.c b/cmd/cmd_mfsl.c similarity index 100% rename from common/cmd_mfsl.c rename to cmd/cmd_mfsl.c diff --git a/common/cmd_mii.c b/cmd/cmd_mii.c similarity index 100% rename from common/cmd_mii.c rename to cmd/cmd_mii.c diff --git a/common/cmd_misc.c b/cmd/cmd_misc.c similarity index 100% rename from common/cmd_misc.c rename to cmd/cmd_misc.c diff --git a/common/cmd_mmc.c b/cmd/cmd_mmc.c similarity index 100% rename from common/cmd_mmc.c rename to cmd/cmd_mmc.c diff --git a/common/cmd_mmc_spi.c b/cmd/cmd_mmc_spi.c similarity index 100% rename from common/cmd_mmc_spi.c rename to cmd/cmd_mmc_spi.c diff --git a/common/cmd_mp.c b/cmd/cmd_mp.c similarity index 100% rename from common/cmd_mp.c rename to cmd/cmd_mp.c diff --git a/common/cmd_mtdparts.c b/cmd/cmd_mtdparts.c similarity index 100% rename from common/cmd_mtdparts.c rename to cmd/cmd_mtdparts.c diff --git a/common/cmd_nand.c b/cmd/cmd_nand.c similarity index 100% rename from common/cmd_nand.c rename to cmd/cmd_nand.c diff --git a/common/cmd_net.c b/cmd/cmd_net.c similarity index 100% rename from common/cmd_net.c rename to cmd/cmd_net.c diff --git a/common/cmd_nvedit.c b/cmd/cmd_nvedit.c similarity index 100% rename from common/cmd_nvedit.c rename to cmd/cmd_nvedit.c diff --git a/common/cmd_onenand.c b/cmd/cmd_onenand.c similarity index 100% rename from common/cmd_onenand.c rename to cmd/cmd_onenand.c diff --git a/common/cmd_otp.c b/cmd/cmd_otp.c similarity index 100% rename from common/cmd_otp.c rename to cmd/cmd_otp.c diff --git a/common/cmd_part.c b/cmd/cmd_part.c similarity index 100% rename from common/cmd_part.c rename to cmd/cmd_part.c diff --git a/common/cmd_pci.c b/cmd/cmd_pci.c similarity index 100% rename from common/cmd_pci.c rename to cmd/cmd_pci.c diff --git a/common/cmd_pcmcia.c b/cmd/cmd_pcmcia.c similarity index 100% rename from common/cmd_pcmcia.c rename to cmd/cmd_pcmcia.c diff --git a/common/cmd_pmic.c b/cmd/cmd_pmic.c similarity index 100% rename from common/cmd_pmic.c rename to cmd/cmd_pmic.c diff --git a/common/cmd_portio.c b/cmd/cmd_portio.c similarity index 100% rename from common/cmd_portio.c rename to cmd/cmd_portio.c diff --git a/common/cmd_pxe.c b/cmd/cmd_pxe.c similarity index 100% rename from common/cmd_pxe.c rename to cmd/cmd_pxe.c diff --git a/common/cmd_read.c b/cmd/cmd_read.c similarity index 100% rename from common/cmd_read.c rename to cmd/cmd_read.c diff --git a/common/cmd_reginfo.c b/cmd/cmd_reginfo.c similarity index 100% rename from common/cmd_reginfo.c rename to cmd/cmd_reginfo.c diff --git a/common/cmd_regulator.c b/cmd/cmd_regulator.c similarity index 100% rename from common/cmd_regulator.c rename to cmd/cmd_regulator.c diff --git a/common/cmd_reiser.c b/cmd/cmd_reiser.c similarity index 100% rename from common/cmd_reiser.c rename to cmd/cmd_reiser.c diff --git a/common/cmd_remoteproc.c b/cmd/cmd_remoteproc.c similarity index 100% rename from common/cmd_remoteproc.c rename to cmd/cmd_remoteproc.c diff --git a/common/cmd_sata.c b/cmd/cmd_sata.c similarity index 100% rename from common/cmd_sata.c rename to cmd/cmd_sata.c diff --git a/common/cmd_scsi.c b/cmd/cmd_scsi.c similarity index 100% rename from common/cmd_scsi.c rename to cmd/cmd_scsi.c diff --git a/common/cmd_setexpr.c b/cmd/cmd_setexpr.c similarity index 100% rename from common/cmd_setexpr.c rename to cmd/cmd_setexpr.c diff --git a/common/cmd_sf.c b/cmd/cmd_sf.c similarity index 100% rename from common/cmd_sf.c rename to cmd/cmd_sf.c diff --git a/common/cmd_sha1sum.c b/cmd/cmd_sha1sum.c similarity index 100% rename from common/cmd_sha1sum.c rename to cmd/cmd_sha1sum.c diff --git a/common/cmd_softswitch.c b/cmd/cmd_softswitch.c similarity index 100% rename from common/cmd_softswitch.c rename to cmd/cmd_softswitch.c diff --git a/common/cmd_sound.c b/cmd/cmd_sound.c similarity index 100% rename from common/cmd_sound.c rename to cmd/cmd_sound.c diff --git a/common/cmd_source.c b/cmd/cmd_source.c similarity index 100% rename from common/cmd_source.c rename to cmd/cmd_source.c diff --git a/common/cmd_spi.c b/cmd/cmd_spi.c similarity index 100% rename from common/cmd_spi.c rename to cmd/cmd_spi.c diff --git a/common/cmd_spibootldr.c b/cmd/cmd_spibootldr.c similarity index 100% rename from common/cmd_spibootldr.c rename to cmd/cmd_spibootldr.c diff --git a/common/cmd_spl.c b/cmd/cmd_spl.c similarity index 100% rename from common/cmd_spl.c rename to cmd/cmd_spl.c diff --git a/common/cmd_strings.c b/cmd/cmd_strings.c similarity index 100% rename from common/cmd_strings.c rename to cmd/cmd_strings.c diff --git a/common/cmd_terminal.c b/cmd/cmd_terminal.c similarity index 100% rename from common/cmd_terminal.c rename to cmd/cmd_terminal.c diff --git a/common/cmd_test.c b/cmd/cmd_test.c similarity index 100% rename from common/cmd_test.c rename to cmd/cmd_test.c diff --git a/common/cmd_thordown.c b/cmd/cmd_thordown.c similarity index 100% rename from common/cmd_thordown.c rename to cmd/cmd_thordown.c diff --git a/common/cmd_time.c b/cmd/cmd_time.c similarity index 100% rename from common/cmd_time.c rename to cmd/cmd_time.c diff --git a/common/cmd_tpm.c b/cmd/cmd_tpm.c similarity index 100% rename from common/cmd_tpm.c rename to cmd/cmd_tpm.c diff --git a/common/cmd_tpm_test.c b/cmd/cmd_tpm_test.c similarity index 100% rename from common/cmd_tpm_test.c rename to cmd/cmd_tpm_test.c diff --git a/common/cmd_trace.c b/cmd/cmd_trace.c similarity index 100% rename from common/cmd_trace.c rename to cmd/cmd_trace.c diff --git a/common/cmd_tsi148.c b/cmd/cmd_tsi148.c similarity index 100% rename from common/cmd_tsi148.c rename to cmd/cmd_tsi148.c diff --git a/common/cmd_ubi.c b/cmd/cmd_ubi.c similarity index 100% rename from common/cmd_ubi.c rename to cmd/cmd_ubi.c diff --git a/common/cmd_ubifs.c b/cmd/cmd_ubifs.c similarity index 100% rename from common/cmd_ubifs.c rename to cmd/cmd_ubifs.c diff --git a/common/cmd_universe.c b/cmd/cmd_universe.c similarity index 100% rename from common/cmd_universe.c rename to cmd/cmd_universe.c diff --git a/common/cmd_unzip.c b/cmd/cmd_unzip.c similarity index 100% rename from common/cmd_unzip.c rename to cmd/cmd_unzip.c diff --git a/common/cmd_usb.c b/cmd/cmd_usb.c similarity index 100% rename from common/cmd_usb.c rename to cmd/cmd_usb.c diff --git a/common/cmd_usb_mass_storage.c b/cmd/cmd_usb_mass_storage.c similarity index 100% rename from common/cmd_usb_mass_storage.c rename to cmd/cmd_usb_mass_storage.c diff --git a/common/cmd_version.c b/cmd/cmd_version.c similarity index 100% rename from common/cmd_version.c rename to cmd/cmd_version.c diff --git a/common/cmd_ximg.c b/cmd/cmd_ximg.c similarity index 100% rename from common/cmd_ximg.c rename to cmd/cmd_ximg.c diff --git a/common/cmd_yaffs2.c b/cmd/cmd_yaffs2.c similarity index 100% rename from common/cmd_yaffs2.c rename to cmd/cmd_yaffs2.c diff --git a/common/cmd_zfs.c b/cmd/cmd_zfs.c similarity index 100% rename from common/cmd_zfs.c rename to cmd/cmd_zfs.c diff --git a/common/cmd_zip.c b/cmd/cmd_zip.c similarity index 100% rename from common/cmd_zip.c rename to cmd/cmd_zip.c diff --git a/common/Kconfig b/common/Kconfig index 9d446bf..067545d 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1,522 +1,3 @@ -menu "Command line interface"
-config HUSH_PARSER
- bool "Use hush shell"
- select SYS_HUSH_PARSER
- help
This option enables the "hush" shell (from Busybox) as command lineinterpreter, thus enabling powerful command line syntax likeif...then...else...fi conditionals or `&&' and '||'constructs ("shell scripts").If disabled, you get the old, much simpler behaviour with a somewhatsmaller memory footprint.-config SYS_HUSH_PARSER
- bool
- help
Backward compatibility.-config SYS_PROMPT
- string "Shell prompt"
- default "=> "
- help
This string is displayed in the command line to the left of thecursor.-menu "Autoboot options"
-config AUTOBOOT_KEYED
- bool "Stop autobooting via specific input key / string"
- default n
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If not enabled, any input key will abort theU-Boot automatic booting process and bring the deviceto the U-Boot prompt for user input.-config AUTOBOOT_PROMPT
- string "Autoboot stop prompt"
- depends on AUTOBOOT_KEYED
- default "Autoboot in %d seconds\n"
- help
This string is displayed before the boot delay selected byCONFIG_BOOTDELAY starts. If it is not defined there is nooutput indicating that autoboot is in progress.Note that this define is used as the (only) argument to aprintf() call, so it may contain '%' format specifications,provided that it also includes, sepearated by commas exactlylike in a printf statement, the required arguments. It isthe responsibility of the user to select only such argumentsthat are valid in the given context.-config AUTOBOOT_ENCRYPTION
- bool "Enable encryption in autoboot stopping"
- depends on AUTOBOOT_KEYED
- default n
-config AUTOBOOT_DELAY_STR
- string "Delay autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option delays the automatic boot feature by issuinga specific input key or string. If CONFIG_AUTOBOOT_DELAY_STRor the environment variable "bootdelaykey" is specifiedand this string is received from console input beforeautoboot starts booting, U-Boot gives a command prompt. TheU-Boot prompt will time out if CONFIG_BOOT_RETRY_TIME isused, otherwise it never times out.-config AUTOBOOT_STOP_STR
- string "Stop autobooting via specific input key / string"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- help
This option enables stopping (aborting) of the automaticboot feature only by issuing a specific input key orstring. If CONFIG_AUTOBOOT_STOP_STR or the environmentvariable "bootstopkey" is specified and this string isreceived from console input before autoboot starts booting,U-Boot gives a command prompt. The U-Boot prompt nevertimes out, even if CONFIG_BOOT_RETRY_TIME is used.-config AUTOBOOT_KEYED_CTRLC
- bool "Enable Ctrl-C autoboot interruption"
- depends on AUTOBOOT_KEYED && !AUTOBOOT_ENCRYPTION
- default n
- help
This option allows for the boot sequence to be interruptedby ctrl-c, in addition to the "bootdelaykey" and "bootstopkey".Setting this variable provides an escape sequence from thelimited "password" strings.-config AUTOBOOT_STOP_STR_SHA256
- string "Stop autobooting via SHA256 encrypted password"
- depends on AUTOBOOT_KEYED && AUTOBOOT_ENCRYPTION
- help
This option adds the feature to only stop the autobooting,and therefore boot into the U-Boot prompt, when the inputstring / password matches a values that is encypted viaa SHA256 hash and saved in the environment.-endmenu
-comment "Commands"
-menu "Info commands"
-config CMD_BDI
- bool "bdinfo"
- default y
- help
Print board info-config CMD_CONSOLE
- bool "coninfo"
- default y
- help
Print console devices and information.-config CMD_CPU
- bool "cpu"
- help
Print information about available CPUs. This normally shows thenumber of CPUs, type (e.g. manufacturer, architecture, product orinternal name) and clock frequency. Other information may beavailable depending on the CPU driver.-config CMD_LICENSE
- bool "license"
- help
Print GPL license text-endmenu
-menu "Boot commands"
-config CMD_BOOTD
- bool "bootd"
- default y
- help
Run the command stored in the environment "bootcmd", i.e."bootd" does the same thing as "run bootcmd".-config CMD_BOOTM
- bool "bootm"
- default y
- help
Boot an application image from the memory.-config CMD_ELF
- bool "bootelf, bootvx"
- default y
- help
Boot an ELF/vxWorks image from the memory.-config CMD_GO
- bool "go"
- default y
- help
Start an application at a given address.-config CMD_RUN
- bool "run"
- default y
- help
Run the command in the given environment variable.-config CMD_IMI
- bool "iminfo"
- default y
- help
Print header information for application image.-config CMD_IMLS
- bool "imls"
- default y
- help
List all images found in flash-config CMD_XIMG
- bool "imxtract"
- default y
- help
Extract a part of a multi-image.-config CMD_POWEROFF
- bool
-endmenu
-menu "Environment commands"
-config CMD_EXPORTENV
- bool "env export"
- default y
- help
Export environments.-config CMD_IMPORTENV
- bool "env import"
- default y
- help
Import environments.-config CMD_EDITENV
- bool "editenv"
- default y
- help
Edit environment variable.-config CMD_SAVEENV
- bool "saveenv"
- default y
- help
Save all environment variables into the compiled-in persistentstorage.-config CMD_ENV_EXISTS
- bool "env exists"
- default y
- help
Check if a variable is defined in the environment for use inshell scripting.-endmenu
-menu "Memory commands"
-config CMD_MEMORY
- bool "md, mm, nm, mw, cp, cmp, base, loop"
- default y
- help
Memeory commands.md - memory displaymm - memory modify (auto-incrementing address)nm - memory modify (constant address)mw - memory write (fill)cp - memory copycmp - memory comparebase - print or set address offsetloop - initinite loop on address range-config CMD_CRC32
- bool "crc32"
- default y
- help
Compute CRC32.-config LOOPW
- bool "loopw"
- help
Infinite write loop on address range-config CMD_MEMTEST
- bool "memtest"
- help
Simple RAM read/write test.-config CMD_MX_CYCLIC
- bool "mdc, mwc"
- help
mdc - memory display cyclicmwc - memory write cyclic-config CMD_MEMINFO
- bool "meminfo"
- help
Display memory information.-endmenu
-menu "Device access commands"
-config CMD_DM
- bool "dm - Access to driver model information"
- depends on DM
- default y
- help
Provides access to driver model data structures and information,such as a list of devices, list of uclasses and the state of eachdevice (e.g. activated). This is not required for operation, butcan be useful to see the state of driver model for debugging orinterest.-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 withdriver model. To use this properly you will need to enable one orboth of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE).Otherwise you will always get an empty list of devices. The demodevices are defined in the sandbox device tree, so the easiestoption is to use sandbox and pass the -d point to sandbox'su-boot.dtb file.-config CMD_LOADB
- bool "loadb"
- default y
- help
Load a binary file over serial line.-config CMD_LOADS
- bool "loads"
- default y
- 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 informationerase - FLASH memoryprotect - enable or disable FLASH write protection-config CMD_ARMFLASH
- depends on FLASH_CFI_DRIVER
- bool "armflash"
- help
ARM Ltd reference designs flash partition access-config CMD_NAND
- bool "nand"
- help
NAND support.-config CMD_SF
- bool "sf"
- help
SPI Flash support-config CMD_SPI
- bool "sspi"
- help
SPI utility command.-config CMD_I2C
- bool "i2c"
- help
I2C support.-config CMD_USB
- bool "usb"
- help
USB support.-config CMD_FPGA
- bool "fpga"
- default y
- help
FPGA support.-config CMD_REMOTEPROC
- bool "remoteproc"
- depends on REMOTEPROC
- help
Support for Remote Processor control-config CMD_GPIO
- bool "gpio"
- help
GPIO support.-endmenu
-menu "Shell scripting commands"
-config CMD_ECHO
- bool "echo"
- default y
- help
Echo args to console-config CMD_ITEST
- bool "itest"
- default y
- help
Return true/false on integer compare.-config CMD_SOURCE
- bool "source"
- default y
- help
Run script from memory-config CMD_SETEXPR
- bool "setexpr"
- default y
- help
Evaluate boolean and math expressions and store the result in an envvariable.Also supports loading the value at a memory location into a variable.If CONFIG_REGEX is enabled, setexpr also supports a gsub function.-endmenu
-menu "Network commands"
-config CMD_NET
- bool "bootp, tftpboot"
select NET- default y
- help
Network commands.bootp - boot image via network using BOOTP/TFTP protocoltftpboot - boot image via network using TFTP protocol-config CMD_TFTPPUT
- bool "tftp put"
- help
TFTP put command, for uploading files to a server-config CMD_TFTPSRV
- bool "tftpsrv"
- help
Act as a TFTP server and boot the first received file-config CMD_RARP
- bool "rarpboot"
- help
Boot image via network using RARP/TFTP protocol-config CMD_DHCP
- bool "dhcp"
- help
Boot image via network using DHCP/TFTP protocol-config CMD_NFS
- bool "nfs"
- default y
- help
Boot image via network using NFS protocol.-config CMD_PING
- bool "ping"
- help
Send ICMP ECHO_REQUEST to network host-config CMD_CDP
- bool "cdp"
- help
Perform CDP network configuration-config CMD_SNTP
- bool "sntp"
- help
Synchronize RTC via network-config CMD_DNS
- bool "dns"
- help
Lookup the IP of a hostname-config CMD_LINK_LOCAL
- bool "linklocal"
- help
Acquire a network IP address using the link-local protocol-endmenu
-menu "Misc commands"
-config CMD_AMBAPP
- bool "ambapp"
- depends on LEON3
- default y
- help
Lists AMBA Plug-n-Play information.-config SYS_AMBAPP_PRINT_ON_STARTUP
- bool "Show AMBA PnP info on startup"
- depends on CMD_AMBAPP
- default n
- help
Show AMBA Plug-n-Play information on startup.-config CMD_TIME
- bool "time"
- help
Run commands and summarize execution time.-# TODO: rename to CMD_SLEEP -config CMD_MISC
- bool "sleep"
- default y
- help
Delay execution for some time-config CMD_TIMER
- bool "timer"
- help
Access the system timer.-config CMD_SETGETDCR
- bool "getdcr, setdcr, getidcr, setidcr"
- depends on 4xx
- default y
- help
getdcr - Get an AMCC PPC 4xx DCR's valuesetdcr - Set an AMCC PPC 4xx DCR's valuegetidcr - Get a register value via indirect DCR addressingsetidcr - Set a register value via indirect DCR addressing-config CMD_SOUND
- bool "sound"
- depends on SOUND
- help
This provides basic access to the U-Boot's sound support. The mainfeature is to play a beep.sound init - set up sound systemsound play - play a sound-endmenu
menu "Boot timing"
config BOOTSTAGE
@@ -565,13 +46,6 @@ config BOOTSTAGE_USER_COUNT a new ID will be allocated from this stash. If you exceed the limit, recording will stop.
-config CMD_BOOTSTAGE
- bool "Enable the 'bootstage' command"
- depends on BOOTSTAGE
- help
Add a 'bootstage' command which supports printing a reportand un/stashing of bootstage data.- config BOOTSTAGE_FDT bool "Store boot timing information in the OS device tree" depends on BOOTSTAGE
@@ -623,66 +97,6 @@ config BOOTSTAGE_STASH_SIZE
endmenu
-menu "Power commands" -config CMD_PMIC
- bool "Enable Driver Model PMIC command"
- depends on DM_PMIC
- help
This is the pmic command, based on a driver model pmic's API.Command features are unchanged:- list - list pmic devices- pmic dev <id> - show or [set] operating pmic device (NEW)- pmic dump - dump registers- pmic read address - read byte of register at address- pmic write address - write byte to register at addressThe only one change for this command is 'dev' subcommand.-config CMD_REGULATOR
- bool "Enable Driver Model REGULATOR command"
- depends on DM_REGULATOR
- help
This command is based on driver model regulator's API.User interface features:- list - list regulator devices- regulator dev <id> - show or [set] operating regulator device- regulator info - print constraints info- regulator status - print operating status- regulator value <val] <-f> - print/[set] voltage value [uV]- regulator current <val> - print/[set] current value [uA]- regulator mode <id> - print/[set] operating mode id- regulator enable - enable the regulator output- regulator disable - disable the regulator outputThe '-f' (force) option can be used for set the value which exceedsthe limits, which are found in device-tree and are kept in regulator'suclass platdata structure.-endmenu
-menu "Security commands" -config CMD_TPM
- bool "Enable the 'tpm' command"
- depends on TPM
- help
This provides a means to talk to a TPM from the command line. A widerange of commands if provided - see 'tpm help' for details. Thecommand requires a suitable TPM on your board and the correct drivermust be enabled.-config CMD_TPM_TEST
- bool "Enable the 'tpm test' command"
- depends on CMD_TPM
- help
This provides a a series of tests to confirm that the TPM is workingcorrectly. The tests cover initialisation, non-volatile RAM, extend,global lock and checking that timing is within expectations. Thetests pass correctly on Infineon TPMs but may need to be adjustedfor other devices.-endmenu
-endmenu
- config CONSOLE_RECORD bool "Console recording" help
diff --git a/common/Makefile b/common/Makefile index 2a1d9f8..fcf972d 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,11 +31,7 @@ obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
-# core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o bootm.o bootm_os.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
# environment obj-y += env_attr.o @@ -58,143 +54,17 @@ obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
-# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o -ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o -endif -ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o -endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o -ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o -endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_OF_LIBFDT) += fdt_support.o
- obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o
-obj-$(CONFIG_CMD_MII) += cmd_mii.o -ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o -endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o -ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o -endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o -ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o -endif
- ifdef CONFIG_CMD_USB
-obj-y += cmd_usb.o obj-y += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o
# others obj-$(CONFIG_BOOTSTAGE) += bootstage.o @@ -214,14 +84,8 @@ obj-$(CONFIG_MODEM_SUPPORT) += modem.o obj-$(CONFIG_UPDATE_TFTP) += update.o obj-$(CONFIG_DFU_TFTP) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o
-# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o -endif +endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o @@ -232,9 +96,6 @@ ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif -ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -endif # environment ifdef CONFIG_SPL_ENV_SUPPORT obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o @@ -248,8 +109,6 @@ obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o endif endif -# core command -obj-y += cmd_nvedit.o #environment obj-y += env_common.o #others @@ -287,8 +146,6 @@ obj-y += fb_nand.o endif endif
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o
- # We always have this since drivers/ddr/fs/interactive.c needs it obj-y += cli_simple.o
@@ -297,6 +154,5 @@ obj-y += cli_readline.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o -obj-y += cmd_disk.o
CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 96f414a..dff16b9 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -53,7 +53,7 @@ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/ libs-y += common/init/ -libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ +libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ libs-y += dts/
Acked-by: Przemyslaw Marczak p.marczak@samsung.com
Best regards,
Hi Simon,
2016-01-18 12:53 GMT+09:00 Simon Glass sjg@chromium.org:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Thanks for working on this!
This is a nice improvement, but we might want to think about the best place for device access commands in the future.
I mean,
cmd_nand.c in drivers/mtd/nand/ rather than cmd/ cmd_mmc.c in drivers/mmc/ rather than cmd/ cmd_usb.c in drivers/usb/ rather thant cmd/
etc.
This patch moves cmd_usb.c, but leaves common/usb*.c.
With this patch, USB files are located in three places: - cmd/cmd_usb.c - common/usb*.c - drivers/usb/
Is collecting all them into drivers/usb/ more logical?
I think this needs closer look and more discussion, though.
On Tue, Jan 19, 2016 at 12:59:10PM +0900, Masahiro Yamada wrote:
Hi Simon,
2016-01-18 12:53 GMT+09:00 Simon Glass sjg@chromium.org:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Thanks for working on this!
This is a nice improvement, but we might want to think about the best place for device access commands in the future.
I mean,
cmd_nand.c in drivers/mtd/nand/ rather than cmd/ cmd_mmc.c in drivers/mmc/ rather than cmd/ cmd_usb.c in drivers/usb/ rather thant cmd/
etc.
But we're not going to have anywhere near a 1:1 mapping of commands to some subdirectories. So I would make the inverse point, we would have commands in drivers/mtd/nand, drivers/mmc, drivers/usb/host, drivers/usb/gadget, drivers/dm, board/foo instead of being able to say "If you add a new command, it goes into cmd/" and similarly, "Did you see cmd/foo.c? That sound a whole lot like what you're doing in cmd/fauxoo.c" and possibly even short-circuting that problem at the design phase when people see that someone else already had a similar problem and solved it.
This patch moves cmd_usb.c, but leaves common/usb*.c.
With this patch, USB files are located in three places:
- cmd/cmd_usb.c
- common/usb*.c
- drivers/usb/
Is collecting all them into drivers/usb/ more logical?
Skimming common/usb*.c, I think a lot of that needs to move into drivers/usb/<various dirs>.
I think this needs closer look and more discussion, though.
I like this approach as it does expose some of the problems with the current lack-of-structure, ie all of the non-command stuff in the cmd files, and other things we've shoved into common/ that don't quite belong there now really. It will also make it easier to split up the current command files where we have a lot of 'hidden' commands.
Hi,
On 19 January 2016 at 08:53, Tom Rini trini@konsulko.com wrote:
On Tue, Jan 19, 2016 at 12:59:10PM +0900, Masahiro Yamada wrote:
Hi Simon,
2016-01-18 12:53 GMT+09:00 Simon Glass sjg@chromium.org:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org
Thanks for working on this!
This is a nice improvement, but we might want to think about the best place for device access commands in the future.
I mean,
cmd_nand.c in drivers/mtd/nand/ rather than cmd/ cmd_mmc.c in drivers/mmc/ rather than cmd/ cmd_usb.c in drivers/usb/ rather thant cmd/
etc.
But we're not going to have anywhere near a 1:1 mapping of commands to some subdirectories. So I would make the inverse point, we would have commands in drivers/mtd/nand, drivers/mmc, drivers/usb/host, drivers/usb/gadget, drivers/dm, board/foo instead of being able to say "If you add a new command, it goes into cmd/" and similarly, "Did you see cmd/foo.c? That sound a whole lot like what you're doing in cmd/fauxoo.c" and possibly even short-circuting that problem at the design phase when people see that someone else already had a similar problem and solved it.
Yes I think it helps to have commands in one directory. There may be some board-specific commands elsewhere in the tree, but I think it is useful.
This patch moves cmd_usb.c, but leaves common/usb*.c.
With this patch, USB files are located in three places:
- cmd/cmd_usb.c
- common/usb*.c
- drivers/usb/
Is collecting all them into drivers/usb/ more logical?
Skimming common/usb*.c, I think a lot of that needs to move into drivers/usb/<various dirs>.
Yes, and in cases where there is non-command logic in cmd/ we should try to fix it.
I think this needs closer look and more discussion, though.
I like this approach as it does expose some of the problems with the current lack-of-structure, ie all of the non-command stuff in the cmd files, and other things we've shoved into common/ that don't quite belong there now really. It will also make it easier to split up the current command files where we have a lot of 'hidden' commands.
-- Tom
That's my feeling too. In principle I think the commands should be a veneer on top of the implementation. Ideally there should not be a lot of processing logic in the cmd/ files. We are close to this in most cases, but things like USB and SCSI need work.
Regards, Simon
On Sun, Jan 17, 2016 at 08:53:51PM -0700, Simon Glass wrote:
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical.
Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command.
Unfortunately, with m68k I get this error:
m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o
I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Heiko Schocher hs@denx.de Acked-by: Stefan Roese sr@denx.de Acked-by: Przemyslaw Marczak p.marczak@samsung.com
Applied to u-boot/master, thanks!
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org ---
cmd/Makefile | 258 ++++++++++----------- cmd/{cmd_aes.c => aes.c} | 0 cmd/{cmd_ambapp.c => ambapp.c} | 0 cmd/{cmd_armflash.c => armflash.c} | 0 cmd/{cmd_bdinfo.c => bdinfo.c} | 0 cmd/{cmd_bedbug.c => bedbug.c} | 0 cmd/{cmd_blob.c => blob.c} | 0 cmd/{cmd_bmp.c => bmp.c} | 0 cmd/{cmd_boot.c => boot.c} | 0 cmd/{cmd_bootldr.c => bootldr.c} | 0 cmd/{cmd_bootm.c => bootm.c} | 0 cmd/{cmd_bootmenu.c => bootmenu.c} | 0 cmd/{cmd_bootstage.c => bootstage.c} | 0 cmd/{cmd_cache.c => cache.c} | 0 cmd/{cmd_cbfs.c => cbfs.c} | 0 cmd/{cmd_clk.c => clk.c} | 0 cmd/{cmd_console.c => console.c} | 0 cmd/{cmd_cplbinfo.c => cplbinfo.c} | 0 cmd/{cmd_cpu.c => cpu.c} | 0 cmd/{cmd_cramfs.c => cramfs.c} | 0 ...cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} | 0 cmd/{cmd_date.c => date.c} | 0 cmd/{cmd_dcr.c => dcr.c} | 0 cmd/{cmd_demo.c => demo.c} | 0 cmd/{cmd_dfu.c => dfu.c} | 0 cmd/{cmd_diag.c => diag.c} | 0 cmd/{cmd_disk.c => disk.c} | 0 cmd/{cmd_display.c => display.c} | 0 cmd/{cmd_dtt.c => dtt.c} | 0 cmd/{cmd_echo.c => echo.c} | 0 cmd/{cmd_eeprom.c => eeprom.c} | 0 cmd/{cmd_efi.c => efi.c} | 0 cmd/{cmd_elf.c => elf.c} | 0 cmd/{cmd_ethsw.c => ethsw.c} | 0 cmd/{cmd_exit.c => exit.c} | 0 cmd/{cmd_ext2.c => ext2.c} | 0 cmd/{cmd_ext4.c => ext4.c} | 0 cmd/{cmd_fastboot.c => fastboot.c} | 0 cmd/{cmd_fat.c => fat.c} | 0 cmd/{cmd_fdc.c => fdc.c} | 0 cmd/{cmd_fdt.c => fdt.c} | 0 cmd/{cmd_fitupd.c => fitupd.c} | 0 cmd/{cmd_flash.c => flash.c} | 0 cmd/{cmd_fpga.c => fpga.c} | 0 cmd/{cmd_fpgad.c => fpgad.c} | 0 cmd/{cmd_fs.c => fs.c} | 0 cmd/{cmd_fs_uuid.c => fs_uuid.c} | 0 cmd/{cmd_fuse.c => fuse.c} | 0 cmd/{cmd_gettime.c => gettime.c} | 0 cmd/{cmd_gpio.c => gpio.c} | 0 cmd/{cmd_gpt.c => gpt.c} | 0 cmd/{cmd_hash.c => hash.c} | 0 cmd/{cmd_help.c => help.c} | 0 cmd/{cmd_host.c => host.c} | 0 cmd/{cmd_i2c.c => i2c.c} | 0 cmd/{cmd_ide.c => ide.c} | 0 cmd/{cmd_immap.c => immap.c} | 0 cmd/{cmd_ini.c => ini.c} | 0 cmd/{cmd_io.c => io.c} | 0 cmd/{cmd_iotrace.c => iotrace.c} | 0 cmd/{cmd_irq.c => irq.c} | 0 cmd/{cmd_itest.c => itest.c} | 0 cmd/{cmd_jffs2.c => jffs2.c} | 0 cmd/{cmd_ldrinfo.c => ldrinfo.c} | 0 cmd/{cmd_led.c => led.c} | 0 cmd/{cmd_license.c => license.c} | 0 cmd/{cmd_load.c => load.c} | 0 cmd/{cmd_log.c => log.c} | 0 cmd/{cmd_lzmadec.c => lzmadec.c} | 0 cmd/{cmd_mac.c => mac.c} | 0 cmd/{cmd_md5sum.c => md5sum.c} | 0 cmd/{cmd_mdio.c => mdio.c} | 0 cmd/{cmd_mem.c => mem.c} | 0 cmd/{cmd_mfsl.c => mfsl.c} | 0 cmd/{cmd_mii.c => mii.c} | 0 cmd/{cmd_misc.c => misc.c} | 0 cmd/{cmd_mmc.c => mmc.c} | 0 cmd/{cmd_mmc_spi.c => mmc_spi.c} | 0 cmd/{cmd_mp.c => mp.c} | 0 cmd/{cmd_mtdparts.c => mtdparts.c} | 0 cmd/{cmd_nand.c => nand.c} | 0 cmd/{cmd_net.c => net.c} | 0 cmd/{cmd_nvedit.c => nvedit.c} | 0 cmd/{cmd_onenand.c => onenand.c} | 0 cmd/{cmd_otp.c => otp.c} | 0 cmd/{cmd_part.c => part.c} | 0 cmd/{cmd_pci.c => pci.c} | 0 cmd/{cmd_pcmcia.c => pcmcia.c} | 0 cmd/{cmd_pmic.c => pmic.c} | 0 cmd/{cmd_portio.c => portio.c} | 0 cmd/{cmd_pxe.c => pxe.c} | 0 cmd/{cmd_read.c => read.c} | 0 cmd/{cmd_reginfo.c => reginfo.c} | 0 cmd/{cmd_regulator.c => regulator.c} | 0 cmd/{cmd_reiser.c => reiser.c} | 0 cmd/{cmd_remoteproc.c => remoteproc.c} | 0 cmd/{cmd_sata.c => sata.c} | 0 cmd/{cmd_scsi.c => scsi.c} | 0 cmd/{cmd_setexpr.c => setexpr.c} | 0 cmd/{cmd_sf.c => sf.c} | 0 cmd/{cmd_sha1sum.c => sha1sum.c} | 0 cmd/{cmd_softswitch.c => softswitch.c} | 0 cmd/{cmd_sound.c => sound.c} | 0 cmd/{cmd_source.c => source.c} | 0 cmd/{cmd_spi.c => spi.c} | 0 cmd/{cmd_spibootldr.c => spibootldr.c} | 0 cmd/{cmd_spl.c => spl.c} | 0 cmd/{cmd_strings.c => strings.c} | 0 cmd/{cmd_terminal.c => terminal.c} | 0 cmd/{cmd_test.c => test.c} | 0 cmd/{cmd_thordown.c => thordown.c} | 0 cmd/{cmd_time.c => time.c} | 0 cmd/{cmd_tpm.c => tpm.c} | 0 cmd/{cmd_tpm_test.c => tpm_test.c} | 0 cmd/{cmd_trace.c => trace.c} | 0 cmd/{cmd_tsi148.c => tsi148.c} | 0 cmd/{cmd_ubi.c => ubi.c} | 0 cmd/{cmd_ubifs.c => ubifs.c} | 0 cmd/{cmd_universe.c => universe.c} | 0 cmd/{cmd_unzip.c => unzip.c} | 0 cmd/{cmd_usb.c => usb.c} | 0 cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} | 0 cmd/{cmd_version.c => version.c} | 0 cmd/{cmd_ximg.c => ximg.c} | 0 cmd/{cmd_yaffs2.c => yaffs2.c} | 0 cmd/{cmd_zfs.c => zfs.c} | 0 cmd/{cmd_zip.c => zip.c} | 0 127 files changed, 129 insertions(+), 129 deletions(-) rename cmd/{cmd_aes.c => aes.c} (100%) rename cmd/{cmd_ambapp.c => ambapp.c} (100%) rename cmd/{cmd_armflash.c => armflash.c} (100%) rename cmd/{cmd_bdinfo.c => bdinfo.c} (100%) rename cmd/{cmd_bedbug.c => bedbug.c} (100%) rename cmd/{cmd_blob.c => blob.c} (100%) rename cmd/{cmd_bmp.c => bmp.c} (100%) rename cmd/{cmd_boot.c => boot.c} (100%) rename cmd/{cmd_bootldr.c => bootldr.c} (100%) rename cmd/{cmd_bootm.c => bootm.c} (100%) rename cmd/{cmd_bootmenu.c => bootmenu.c} (100%) rename cmd/{cmd_bootstage.c => bootstage.c} (100%) rename cmd/{cmd_cache.c => cache.c} (100%) rename cmd/{cmd_cbfs.c => cbfs.c} (100%) rename cmd/{cmd_clk.c => clk.c} (100%) rename cmd/{cmd_console.c => console.c} (100%) rename cmd/{cmd_cplbinfo.c => cplbinfo.c} (100%) rename cmd/{cmd_cpu.c => cpu.c} (100%) rename cmd/{cmd_cramfs.c => cramfs.c} (100%) rename cmd/{cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} (100%) rename cmd/{cmd_date.c => date.c} (100%) rename cmd/{cmd_dcr.c => dcr.c} (100%) rename cmd/{cmd_demo.c => demo.c} (100%) rename cmd/{cmd_dfu.c => dfu.c} (100%) rename cmd/{cmd_diag.c => diag.c} (100%) rename cmd/{cmd_disk.c => disk.c} (100%) rename cmd/{cmd_display.c => display.c} (100%) rename cmd/{cmd_dtt.c => dtt.c} (100%) rename cmd/{cmd_echo.c => echo.c} (100%) rename cmd/{cmd_eeprom.c => eeprom.c} (100%) rename cmd/{cmd_efi.c => efi.c} (100%) rename cmd/{cmd_elf.c => elf.c} (100%) rename cmd/{cmd_ethsw.c => ethsw.c} (100%) rename cmd/{cmd_exit.c => exit.c} (100%) rename cmd/{cmd_ext2.c => ext2.c} (100%) rename cmd/{cmd_ext4.c => ext4.c} (100%) rename cmd/{cmd_fastboot.c => fastboot.c} (100%) rename cmd/{cmd_fat.c => fat.c} (100%) rename cmd/{cmd_fdc.c => fdc.c} (100%) rename cmd/{cmd_fdt.c => fdt.c} (100%) rename cmd/{cmd_fitupd.c => fitupd.c} (100%) rename cmd/{cmd_flash.c => flash.c} (100%) rename cmd/{cmd_fpga.c => fpga.c} (100%) rename cmd/{cmd_fpgad.c => fpgad.c} (100%) rename cmd/{cmd_fs.c => fs.c} (100%) rename cmd/{cmd_fs_uuid.c => fs_uuid.c} (100%) rename cmd/{cmd_fuse.c => fuse.c} (100%) rename cmd/{cmd_gettime.c => gettime.c} (100%) rename cmd/{cmd_gpio.c => gpio.c} (100%) rename cmd/{cmd_gpt.c => gpt.c} (100%) rename cmd/{cmd_hash.c => hash.c} (100%) rename cmd/{cmd_help.c => help.c} (100%) rename cmd/{cmd_host.c => host.c} (100%) rename cmd/{cmd_i2c.c => i2c.c} (100%) rename cmd/{cmd_ide.c => ide.c} (100%) rename cmd/{cmd_immap.c => immap.c} (100%) rename cmd/{cmd_ini.c => ini.c} (100%) rename cmd/{cmd_io.c => io.c} (100%) rename cmd/{cmd_iotrace.c => iotrace.c} (100%) rename cmd/{cmd_irq.c => irq.c} (100%) rename cmd/{cmd_itest.c => itest.c} (100%) rename cmd/{cmd_jffs2.c => jffs2.c} (100%) rename cmd/{cmd_ldrinfo.c => ldrinfo.c} (100%) rename cmd/{cmd_led.c => led.c} (100%) rename cmd/{cmd_license.c => license.c} (100%) rename cmd/{cmd_load.c => load.c} (100%) rename cmd/{cmd_log.c => log.c} (100%) rename cmd/{cmd_lzmadec.c => lzmadec.c} (100%) rename cmd/{cmd_mac.c => mac.c} (100%) rename cmd/{cmd_md5sum.c => md5sum.c} (100%) rename cmd/{cmd_mdio.c => mdio.c} (100%) rename cmd/{cmd_mem.c => mem.c} (100%) rename cmd/{cmd_mfsl.c => mfsl.c} (100%) rename cmd/{cmd_mii.c => mii.c} (100%) rename cmd/{cmd_misc.c => misc.c} (100%) rename cmd/{cmd_mmc.c => mmc.c} (100%) rename cmd/{cmd_mmc_spi.c => mmc_spi.c} (100%) rename cmd/{cmd_mp.c => mp.c} (100%) rename cmd/{cmd_mtdparts.c => mtdparts.c} (100%) rename cmd/{cmd_nand.c => nand.c} (100%) rename cmd/{cmd_net.c => net.c} (100%) rename cmd/{cmd_nvedit.c => nvedit.c} (100%) rename cmd/{cmd_onenand.c => onenand.c} (100%) rename cmd/{cmd_otp.c => otp.c} (100%) rename cmd/{cmd_part.c => part.c} (100%) rename cmd/{cmd_pci.c => pci.c} (100%) rename cmd/{cmd_pcmcia.c => pcmcia.c} (100%) rename cmd/{cmd_pmic.c => pmic.c} (100%) rename cmd/{cmd_portio.c => portio.c} (100%) rename cmd/{cmd_pxe.c => pxe.c} (100%) rename cmd/{cmd_read.c => read.c} (100%) rename cmd/{cmd_reginfo.c => reginfo.c} (100%) rename cmd/{cmd_regulator.c => regulator.c} (100%) rename cmd/{cmd_reiser.c => reiser.c} (100%) rename cmd/{cmd_remoteproc.c => remoteproc.c} (100%) rename cmd/{cmd_sata.c => sata.c} (100%) rename cmd/{cmd_scsi.c => scsi.c} (100%) rename cmd/{cmd_setexpr.c => setexpr.c} (100%) rename cmd/{cmd_sf.c => sf.c} (100%) rename cmd/{cmd_sha1sum.c => sha1sum.c} (100%) rename cmd/{cmd_softswitch.c => softswitch.c} (100%) rename cmd/{cmd_sound.c => sound.c} (100%) rename cmd/{cmd_source.c => source.c} (100%) rename cmd/{cmd_spi.c => spi.c} (100%) rename cmd/{cmd_spibootldr.c => spibootldr.c} (100%) rename cmd/{cmd_spl.c => spl.c} (100%) rename cmd/{cmd_strings.c => strings.c} (100%) rename cmd/{cmd_terminal.c => terminal.c} (100%) rename cmd/{cmd_test.c => test.c} (100%) rename cmd/{cmd_thordown.c => thordown.c} (100%) rename cmd/{cmd_time.c => time.c} (100%) rename cmd/{cmd_tpm.c => tpm.c} (100%) rename cmd/{cmd_tpm_test.c => tpm_test.c} (100%) rename cmd/{cmd_trace.c => trace.c} (100%) rename cmd/{cmd_tsi148.c => tsi148.c} (100%) rename cmd/{cmd_ubi.c => ubi.c} (100%) rename cmd/{cmd_ubifs.c => ubifs.c} (100%) rename cmd/{cmd_universe.c => universe.c} (100%) rename cmd/{cmd_unzip.c => unzip.c} (100%) rename cmd/{cmd_usb.c => usb.c} (100%) rename cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} (100%) rename cmd/{cmd_version.c => version.c} (100%) rename cmd/{cmd_ximg.c => ximg.c} (100%) rename cmd/{cmd_yaffs2.c => yaffs2.c} (100%) rename cmd/{cmd_zfs.c => zfs.c} (100%) rename cmd/{cmd_zip.c => zip.c} (100%)
diff --git a/cmd/Makefile b/cmd/Makefile index 880a886..03f7e0a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -7,160 +7,160 @@
ifndef CONFIG_SPL_BUILD # core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-y += boot.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-y += help.o +obj-y += version.o
# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +obj-$(CONFIG_CMD_AES) += aes.o +obj-$(CONFIG_CMD_AMBAPP) += ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += armflash.o +obj-$(CONFIG_SOURCE) += source.o +obj-$(CONFIG_CMD_SOURCE) += source.o +obj-$(CONFIG_CMD_BDI) += bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_CMD_BMP) += bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o +obj-$(CONFIG_CMD_CACHE) += cache.o +obj-$(CONFIG_CMD_CBFS) += cbfs.o +obj-$(CONFIG_CMD_CLK) += clk.o +obj-$(CONFIG_CMD_CONSOLE) += console.o +obj-$(CONFIG_CMD_CPLBINFO) += cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += date.o +obj-$(CONFIG_CMD_DEMO) += demo.o +obj-$(CONFIG_CMD_SOUND) += sound.o ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +obj-$(CONFIG_CMD_SETGETDCR) += dcr.o endif ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +obj-$(CONFIG_CMD_DIAG) += diag.o endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +obj-$(CONFIG_CMD_DISPLAY) += display.o +obj-$(CONFIG_CMD_DTT) += dtt.o +obj-$(CONFIG_CMD_ECHO) += echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o +obj-$(CONFIG_CMD_EEPROM) += eeprom.o +obj-$(CONFIG_EFI_STUB) += efi.o +obj-$(CONFIG_CMD_ELF) += elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += exit.o +obj-$(CONFIG_CMD_EXT4) += ext4.o +obj-$(CONFIG_CMD_EXT2) += ext2.o +obj-$(CONFIG_CMD_FAT) += fat.o +obj-$(CONFIG_CMD_FDC) += fdc.o +obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FITUPD) += fitupd.o +obj-$(CONFIG_CMD_FLASH) += flash.o ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +obj-$(CONFIG_CMD_FPGA) += fpga.o endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o -obj-$(CONFIG_CMD_MII) += cmd_mii.o +obj-$(CONFIG_CMD_FPGAD) += fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += fs.o +obj-$(CONFIG_CMD_FUSE) += fuse.o +obj-$(CONFIG_CMD_GETTIME) += gettime.o +obj-$(CONFIG_CMD_GPIO) += gpio.o +obj-$(CONFIG_CMD_I2C) += i2c.o +obj-$(CONFIG_CMD_IOTRACE) += iotrace.o +obj-$(CONFIG_CMD_HASH) += hash.o +obj-$(CONFIG_CMD_IDE) += ide.o +obj-$(CONFIG_CMD_IMMAP) += immap.o +obj-$(CONFIG_CMD_INI) += ini.o +obj-$(CONFIG_CMD_IRQ) += irq.o +obj-$(CONFIG_CMD_ITEST) += itest.o +obj-$(CONFIG_CMD_JFFS2) += jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += ldrinfo.o +obj-$(CONFIG_CMD_LED) += led.o +obj-$(CONFIG_CMD_LICENSE) += license.o +obj-y += load.o +obj-$(CONFIG_LOGBUFFER) += log.o +obj-$(CONFIG_ID_EEPROM) += mac.o +obj-$(CONFIG_CMD_MD5SUM) += md5sum.o +obj-$(CONFIG_CMD_MEMORY) += mem.o +obj-$(CONFIG_CMD_IO) += io.o +obj-$(CONFIG_CMD_MFSL) += mfsl.o +obj-$(CONFIG_CMD_MII) += mii.o ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o +obj-$(CONFIG_CMD_MII) += mdio.o endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o +obj-$(CONFIG_CMD_MISC) += misc.o +obj-$(CONFIG_CMD_MMC) += mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += mmc_spi.o +obj-$(CONFIG_MP) += mp.o +obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o +obj-$(CONFIG_CMD_NAND) += nand.o +obj-$(CONFIG_CMD_NET) += net.o +obj-$(CONFIG_CMD_ONENAND) += onenand.o +obj-$(CONFIG_CMD_OTP) += otp.o +obj-$(CONFIG_CMD_PART) += part.o ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o +obj-$(CONFIG_CMD_PCI) += pci.o endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +obj-y += pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += portio.o +obj-$(CONFIG_CMD_PXE) += pxe.o +obj-$(CONFIG_CMD_READ) += read.o +obj-$(CONFIG_CMD_REGINFO) += reginfo.o +obj-$(CONFIG_CMD_REISER) += reiser.o +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_CMD_SCSI) += scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o +obj-$(CONFIG_CMD_SPI) += spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += strings.o +obj-$(CONFIG_CMD_TERMINAL) += terminal.o +obj-$(CONFIG_CMD_TIME) += time.o +obj-$(CONFIG_CMD_TRACE) += trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += test.o +obj-$(CONFIG_CMD_TPM) += tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o +obj-$(CONFIG_CMD_TSI148) += tsi148.o +obj-$(CONFIG_CMD_UBI) += ubi.o +obj-$(CONFIG_CMD_UBIFS) += ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += universe.o +obj-$(CONFIG_CMD_UNZIP) += unzip.o ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o endif
-obj-$(CONFIG_CMD_USB) += cmd_usb.o -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o +obj-$(CONFIG_CMD_USB) += usb.o +obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o +obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o +obj-$(CONFIG_CMD_XIMG) += ximg.o +obj-$(CONFIG_YAFFS2) += yaffs2.o +obj-$(CONFIG_CMD_SPL) += spl.o +obj-$(CONFIG_CMD_ZIP) += zip.o +obj-$(CONFIG_CMD_ZFS) += zfs.o
-obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o +obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_CMD_GPT) += gpt.o +obj-$(CONFIG_CMD_ETHSW) += ethsw.o
# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +obj-$(CONFIG_CMD_PMIC) += pmic.o +obj-$(CONFIG_CMD_REGULATOR) += regulator.o endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SCSI) += scsi.o endif endif # CONFIG_SPL_BUILD
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o +obj-$(CONFIG_CMD_BLOB) += blob.o
# core command -obj-y += cmd_nvedit.o -obj-y += cmd_disk.o +obj-y += nvedit.o +obj-y += disk.o diff --git a/cmd/cmd_aes.c b/cmd/aes.c similarity index 100% rename from cmd/cmd_aes.c rename to cmd/aes.c diff --git a/cmd/cmd_ambapp.c b/cmd/ambapp.c similarity index 100% rename from cmd/cmd_ambapp.c rename to cmd/ambapp.c diff --git a/cmd/cmd_armflash.c b/cmd/armflash.c similarity index 100% rename from cmd/cmd_armflash.c rename to cmd/armflash.c diff --git a/cmd/cmd_bdinfo.c b/cmd/bdinfo.c similarity index 100% rename from cmd/cmd_bdinfo.c rename to cmd/bdinfo.c diff --git a/cmd/cmd_bedbug.c b/cmd/bedbug.c similarity index 100% rename from cmd/cmd_bedbug.c rename to cmd/bedbug.c diff --git a/cmd/cmd_blob.c b/cmd/blob.c similarity index 100% rename from cmd/cmd_blob.c rename to cmd/blob.c diff --git a/cmd/cmd_bmp.c b/cmd/bmp.c similarity index 100% rename from cmd/cmd_bmp.c rename to cmd/bmp.c diff --git a/cmd/cmd_boot.c b/cmd/boot.c similarity index 100% rename from cmd/cmd_boot.c rename to cmd/boot.c diff --git a/cmd/cmd_bootldr.c b/cmd/bootldr.c similarity index 100% rename from cmd/cmd_bootldr.c rename to cmd/bootldr.c diff --git a/cmd/cmd_bootm.c b/cmd/bootm.c similarity index 100% rename from cmd/cmd_bootm.c rename to cmd/bootm.c diff --git a/cmd/cmd_bootmenu.c b/cmd/bootmenu.c similarity index 100% rename from cmd/cmd_bootmenu.c rename to cmd/bootmenu.c diff --git a/cmd/cmd_bootstage.c b/cmd/bootstage.c similarity index 100% rename from cmd/cmd_bootstage.c rename to cmd/bootstage.c diff --git a/cmd/cmd_cache.c b/cmd/cache.c similarity index 100% rename from cmd/cmd_cache.c rename to cmd/cache.c diff --git a/cmd/cmd_cbfs.c b/cmd/cbfs.c similarity index 100% rename from cmd/cmd_cbfs.c rename to cmd/cbfs.c diff --git a/cmd/cmd_clk.c b/cmd/clk.c similarity index 100% rename from cmd/cmd_clk.c rename to cmd/clk.c diff --git a/cmd/cmd_console.c b/cmd/console.c similarity index 100% rename from cmd/cmd_console.c rename to cmd/console.c diff --git a/cmd/cmd_cplbinfo.c b/cmd/cplbinfo.c similarity index 100% rename from cmd/cmd_cplbinfo.c rename to cmd/cplbinfo.c diff --git a/cmd/cmd_cpu.c b/cmd/cpu.c similarity index 100% rename from cmd/cmd_cpu.c rename to cmd/cpu.c diff --git a/cmd/cmd_cramfs.c b/cmd/cramfs.c similarity index 100% rename from cmd/cmd_cramfs.c rename to cmd/cramfs.c diff --git a/cmd/cmd_dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c similarity index 100% rename from cmd/cmd_dataflash_mmc_mux.c rename to cmd/dataflash_mmc_mux.c diff --git a/cmd/cmd_date.c b/cmd/date.c similarity index 100% rename from cmd/cmd_date.c rename to cmd/date.c diff --git a/cmd/cmd_dcr.c b/cmd/dcr.c similarity index 100% rename from cmd/cmd_dcr.c rename to cmd/dcr.c diff --git a/cmd/cmd_demo.c b/cmd/demo.c similarity index 100% rename from cmd/cmd_demo.c rename to cmd/demo.c diff --git a/cmd/cmd_dfu.c b/cmd/dfu.c similarity index 100% rename from cmd/cmd_dfu.c rename to cmd/dfu.c diff --git a/cmd/cmd_diag.c b/cmd/diag.c similarity index 100% rename from cmd/cmd_diag.c rename to cmd/diag.c diff --git a/cmd/cmd_disk.c b/cmd/disk.c similarity index 100% rename from cmd/cmd_disk.c rename to cmd/disk.c diff --git a/cmd/cmd_display.c b/cmd/display.c similarity index 100% rename from cmd/cmd_display.c rename to cmd/display.c diff --git a/cmd/cmd_dtt.c b/cmd/dtt.c similarity index 100% rename from cmd/cmd_dtt.c rename to cmd/dtt.c diff --git a/cmd/cmd_echo.c b/cmd/echo.c similarity index 100% rename from cmd/cmd_echo.c rename to cmd/echo.c diff --git a/cmd/cmd_eeprom.c b/cmd/eeprom.c similarity index 100% rename from cmd/cmd_eeprom.c rename to cmd/eeprom.c diff --git a/cmd/cmd_efi.c b/cmd/efi.c similarity index 100% rename from cmd/cmd_efi.c rename to cmd/efi.c diff --git a/cmd/cmd_elf.c b/cmd/elf.c similarity index 100% rename from cmd/cmd_elf.c rename to cmd/elf.c diff --git a/cmd/cmd_ethsw.c b/cmd/ethsw.c similarity index 100% rename from cmd/cmd_ethsw.c rename to cmd/ethsw.c diff --git a/cmd/cmd_exit.c b/cmd/exit.c similarity index 100% rename from cmd/cmd_exit.c rename to cmd/exit.c diff --git a/cmd/cmd_ext2.c b/cmd/ext2.c similarity index 100% rename from cmd/cmd_ext2.c rename to cmd/ext2.c diff --git a/cmd/cmd_ext4.c b/cmd/ext4.c similarity index 100% rename from cmd/cmd_ext4.c rename to cmd/ext4.c diff --git a/cmd/cmd_fastboot.c b/cmd/fastboot.c similarity index 100% rename from cmd/cmd_fastboot.c rename to cmd/fastboot.c diff --git a/cmd/cmd_fat.c b/cmd/fat.c similarity index 100% rename from cmd/cmd_fat.c rename to cmd/fat.c diff --git a/cmd/cmd_fdc.c b/cmd/fdc.c similarity index 100% rename from cmd/cmd_fdc.c rename to cmd/fdc.c diff --git a/cmd/cmd_fdt.c b/cmd/fdt.c similarity index 100% rename from cmd/cmd_fdt.c rename to cmd/fdt.c diff --git a/cmd/cmd_fitupd.c b/cmd/fitupd.c similarity index 100% rename from cmd/cmd_fitupd.c rename to cmd/fitupd.c diff --git a/cmd/cmd_flash.c b/cmd/flash.c similarity index 100% rename from cmd/cmd_flash.c rename to cmd/flash.c diff --git a/cmd/cmd_fpga.c b/cmd/fpga.c similarity index 100% rename from cmd/cmd_fpga.c rename to cmd/fpga.c diff --git a/cmd/cmd_fpgad.c b/cmd/fpgad.c similarity index 100% rename from cmd/cmd_fpgad.c rename to cmd/fpgad.c diff --git a/cmd/cmd_fs.c b/cmd/fs.c similarity index 100% rename from cmd/cmd_fs.c rename to cmd/fs.c diff --git a/cmd/cmd_fs_uuid.c b/cmd/fs_uuid.c similarity index 100% rename from cmd/cmd_fs_uuid.c rename to cmd/fs_uuid.c diff --git a/cmd/cmd_fuse.c b/cmd/fuse.c similarity index 100% rename from cmd/cmd_fuse.c rename to cmd/fuse.c diff --git a/cmd/cmd_gettime.c b/cmd/gettime.c similarity index 100% rename from cmd/cmd_gettime.c rename to cmd/gettime.c diff --git a/cmd/cmd_gpio.c b/cmd/gpio.c similarity index 100% rename from cmd/cmd_gpio.c rename to cmd/gpio.c diff --git a/cmd/cmd_gpt.c b/cmd/gpt.c similarity index 100% rename from cmd/cmd_gpt.c rename to cmd/gpt.c diff --git a/cmd/cmd_hash.c b/cmd/hash.c similarity index 100% rename from cmd/cmd_hash.c rename to cmd/hash.c diff --git a/cmd/cmd_help.c b/cmd/help.c similarity index 100% rename from cmd/cmd_help.c rename to cmd/help.c diff --git a/cmd/cmd_host.c b/cmd/host.c similarity index 100% rename from cmd/cmd_host.c rename to cmd/host.c diff --git a/cmd/cmd_i2c.c b/cmd/i2c.c similarity index 100% rename from cmd/cmd_i2c.c rename to cmd/i2c.c diff --git a/cmd/cmd_ide.c b/cmd/ide.c similarity index 100% rename from cmd/cmd_ide.c rename to cmd/ide.c diff --git a/cmd/cmd_immap.c b/cmd/immap.c similarity index 100% rename from cmd/cmd_immap.c rename to cmd/immap.c diff --git a/cmd/cmd_ini.c b/cmd/ini.c similarity index 100% rename from cmd/cmd_ini.c rename to cmd/ini.c diff --git a/cmd/cmd_io.c b/cmd/io.c similarity index 100% rename from cmd/cmd_io.c rename to cmd/io.c diff --git a/cmd/cmd_iotrace.c b/cmd/iotrace.c similarity index 100% rename from cmd/cmd_iotrace.c rename to cmd/iotrace.c diff --git a/cmd/cmd_irq.c b/cmd/irq.c similarity index 100% rename from cmd/cmd_irq.c rename to cmd/irq.c diff --git a/cmd/cmd_itest.c b/cmd/itest.c similarity index 100% rename from cmd/cmd_itest.c rename to cmd/itest.c diff --git a/cmd/cmd_jffs2.c b/cmd/jffs2.c similarity index 100% rename from cmd/cmd_jffs2.c rename to cmd/jffs2.c diff --git a/cmd/cmd_ldrinfo.c b/cmd/ldrinfo.c similarity index 100% rename from cmd/cmd_ldrinfo.c rename to cmd/ldrinfo.c diff --git a/cmd/cmd_led.c b/cmd/led.c similarity index 100% rename from cmd/cmd_led.c rename to cmd/led.c diff --git a/cmd/cmd_license.c b/cmd/license.c similarity index 100% rename from cmd/cmd_license.c rename to cmd/license.c diff --git a/cmd/cmd_load.c b/cmd/load.c similarity index 100% rename from cmd/cmd_load.c rename to cmd/load.c diff --git a/cmd/cmd_log.c b/cmd/log.c similarity index 100% rename from cmd/cmd_log.c rename to cmd/log.c diff --git a/cmd/cmd_lzmadec.c b/cmd/lzmadec.c similarity index 100% rename from cmd/cmd_lzmadec.c rename to cmd/lzmadec.c diff --git a/cmd/cmd_mac.c b/cmd/mac.c similarity index 100% rename from cmd/cmd_mac.c rename to cmd/mac.c diff --git a/cmd/cmd_md5sum.c b/cmd/md5sum.c similarity index 100% rename from cmd/cmd_md5sum.c rename to cmd/md5sum.c diff --git a/cmd/cmd_mdio.c b/cmd/mdio.c similarity index 100% rename from cmd/cmd_mdio.c rename to cmd/mdio.c diff --git a/cmd/cmd_mem.c b/cmd/mem.c similarity index 100% rename from cmd/cmd_mem.c rename to cmd/mem.c diff --git a/cmd/cmd_mfsl.c b/cmd/mfsl.c similarity index 100% rename from cmd/cmd_mfsl.c rename to cmd/mfsl.c diff --git a/cmd/cmd_mii.c b/cmd/mii.c similarity index 100% rename from cmd/cmd_mii.c rename to cmd/mii.c diff --git a/cmd/cmd_misc.c b/cmd/misc.c similarity index 100% rename from cmd/cmd_misc.c rename to cmd/misc.c diff --git a/cmd/cmd_mmc.c b/cmd/mmc.c similarity index 100% rename from cmd/cmd_mmc.c rename to cmd/mmc.c diff --git a/cmd/cmd_mmc_spi.c b/cmd/mmc_spi.c similarity index 100% rename from cmd/cmd_mmc_spi.c rename to cmd/mmc_spi.c diff --git a/cmd/cmd_mp.c b/cmd/mp.c similarity index 100% rename from cmd/cmd_mp.c rename to cmd/mp.c diff --git a/cmd/cmd_mtdparts.c b/cmd/mtdparts.c similarity index 100% rename from cmd/cmd_mtdparts.c rename to cmd/mtdparts.c diff --git a/cmd/cmd_nand.c b/cmd/nand.c similarity index 100% rename from cmd/cmd_nand.c rename to cmd/nand.c diff --git a/cmd/cmd_net.c b/cmd/net.c similarity index 100% rename from cmd/cmd_net.c rename to cmd/net.c diff --git a/cmd/cmd_nvedit.c b/cmd/nvedit.c similarity index 100% rename from cmd/cmd_nvedit.c rename to cmd/nvedit.c diff --git a/cmd/cmd_onenand.c b/cmd/onenand.c similarity index 100% rename from cmd/cmd_onenand.c rename to cmd/onenand.c diff --git a/cmd/cmd_otp.c b/cmd/otp.c similarity index 100% rename from cmd/cmd_otp.c rename to cmd/otp.c diff --git a/cmd/cmd_part.c b/cmd/part.c similarity index 100% rename from cmd/cmd_part.c rename to cmd/part.c diff --git a/cmd/cmd_pci.c b/cmd/pci.c similarity index 100% rename from cmd/cmd_pci.c rename to cmd/pci.c diff --git a/cmd/cmd_pcmcia.c b/cmd/pcmcia.c similarity index 100% rename from cmd/cmd_pcmcia.c rename to cmd/pcmcia.c diff --git a/cmd/cmd_pmic.c b/cmd/pmic.c similarity index 100% rename from cmd/cmd_pmic.c rename to cmd/pmic.c diff --git a/cmd/cmd_portio.c b/cmd/portio.c similarity index 100% rename from cmd/cmd_portio.c rename to cmd/portio.c diff --git a/cmd/cmd_pxe.c b/cmd/pxe.c similarity index 100% rename from cmd/cmd_pxe.c rename to cmd/pxe.c diff --git a/cmd/cmd_read.c b/cmd/read.c similarity index 100% rename from cmd/cmd_read.c rename to cmd/read.c diff --git a/cmd/cmd_reginfo.c b/cmd/reginfo.c similarity index 100% rename from cmd/cmd_reginfo.c rename to cmd/reginfo.c diff --git a/cmd/cmd_regulator.c b/cmd/regulator.c similarity index 100% rename from cmd/cmd_regulator.c rename to cmd/regulator.c diff --git a/cmd/cmd_reiser.c b/cmd/reiser.c similarity index 100% rename from cmd/cmd_reiser.c rename to cmd/reiser.c diff --git a/cmd/cmd_remoteproc.c b/cmd/remoteproc.c similarity index 100% rename from cmd/cmd_remoteproc.c rename to cmd/remoteproc.c diff --git a/cmd/cmd_sata.c b/cmd/sata.c similarity index 100% rename from cmd/cmd_sata.c rename to cmd/sata.c diff --git a/cmd/cmd_scsi.c b/cmd/scsi.c similarity index 100% rename from cmd/cmd_scsi.c rename to cmd/scsi.c diff --git a/cmd/cmd_setexpr.c b/cmd/setexpr.c similarity index 100% rename from cmd/cmd_setexpr.c rename to cmd/setexpr.c diff --git a/cmd/cmd_sf.c b/cmd/sf.c similarity index 100% rename from cmd/cmd_sf.c rename to cmd/sf.c diff --git a/cmd/cmd_sha1sum.c b/cmd/sha1sum.c similarity index 100% rename from cmd/cmd_sha1sum.c rename to cmd/sha1sum.c diff --git a/cmd/cmd_softswitch.c b/cmd/softswitch.c similarity index 100% rename from cmd/cmd_softswitch.c rename to cmd/softswitch.c diff --git a/cmd/cmd_sound.c b/cmd/sound.c similarity index 100% rename from cmd/cmd_sound.c rename to cmd/sound.c diff --git a/cmd/cmd_source.c b/cmd/source.c similarity index 100% rename from cmd/cmd_source.c rename to cmd/source.c diff --git a/cmd/cmd_spi.c b/cmd/spi.c similarity index 100% rename from cmd/cmd_spi.c rename to cmd/spi.c diff --git a/cmd/cmd_spibootldr.c b/cmd/spibootldr.c similarity index 100% rename from cmd/cmd_spibootldr.c rename to cmd/spibootldr.c diff --git a/cmd/cmd_spl.c b/cmd/spl.c similarity index 100% rename from cmd/cmd_spl.c rename to cmd/spl.c diff --git a/cmd/cmd_strings.c b/cmd/strings.c similarity index 100% rename from cmd/cmd_strings.c rename to cmd/strings.c diff --git a/cmd/cmd_terminal.c b/cmd/terminal.c similarity index 100% rename from cmd/cmd_terminal.c rename to cmd/terminal.c diff --git a/cmd/cmd_test.c b/cmd/test.c similarity index 100% rename from cmd/cmd_test.c rename to cmd/test.c diff --git a/cmd/cmd_thordown.c b/cmd/thordown.c similarity index 100% rename from cmd/cmd_thordown.c rename to cmd/thordown.c diff --git a/cmd/cmd_time.c b/cmd/time.c similarity index 100% rename from cmd/cmd_time.c rename to cmd/time.c diff --git a/cmd/cmd_tpm.c b/cmd/tpm.c similarity index 100% rename from cmd/cmd_tpm.c rename to cmd/tpm.c diff --git a/cmd/cmd_tpm_test.c b/cmd/tpm_test.c similarity index 100% rename from cmd/cmd_tpm_test.c rename to cmd/tpm_test.c diff --git a/cmd/cmd_trace.c b/cmd/trace.c similarity index 100% rename from cmd/cmd_trace.c rename to cmd/trace.c diff --git a/cmd/cmd_tsi148.c b/cmd/tsi148.c similarity index 100% rename from cmd/cmd_tsi148.c rename to cmd/tsi148.c diff --git a/cmd/cmd_ubi.c b/cmd/ubi.c similarity index 100% rename from cmd/cmd_ubi.c rename to cmd/ubi.c diff --git a/cmd/cmd_ubifs.c b/cmd/ubifs.c similarity index 100% rename from cmd/cmd_ubifs.c rename to cmd/ubifs.c diff --git a/cmd/cmd_universe.c b/cmd/universe.c similarity index 100% rename from cmd/cmd_universe.c rename to cmd/universe.c diff --git a/cmd/cmd_unzip.c b/cmd/unzip.c similarity index 100% rename from cmd/cmd_unzip.c rename to cmd/unzip.c diff --git a/cmd/cmd_usb.c b/cmd/usb.c similarity index 100% rename from cmd/cmd_usb.c rename to cmd/usb.c diff --git a/cmd/cmd_usb_mass_storage.c b/cmd/usb_mass_storage.c similarity index 100% rename from cmd/cmd_usb_mass_storage.c rename to cmd/usb_mass_storage.c diff --git a/cmd/cmd_version.c b/cmd/version.c similarity index 100% rename from cmd/cmd_version.c rename to cmd/version.c diff --git a/cmd/cmd_ximg.c b/cmd/ximg.c similarity index 100% rename from cmd/cmd_ximg.c rename to cmd/ximg.c diff --git a/cmd/cmd_yaffs2.c b/cmd/yaffs2.c similarity index 100% rename from cmd/cmd_yaffs2.c rename to cmd/yaffs2.c diff --git a/cmd/cmd_zfs.c b/cmd/zfs.c similarity index 100% rename from cmd/cmd_zfs.c rename to cmd/zfs.c diff --git a/cmd/cmd_zip.c b/cmd/zip.c similarity index 100% rename from cmd/cmd_zip.c rename to cmd/zip.c
On Mon, Jan 18, 2016 at 11:53 AM, Simon Glass sjg@chromium.org wrote:
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org
cmd/Makefile | 258 ++++++++++----------- cmd/{cmd_aes.c => aes.c} | 0 cmd/{cmd_ambapp.c => ambapp.c} | 0 cmd/{cmd_armflash.c => armflash.c} | 0 cmd/{cmd_bdinfo.c => bdinfo.c} | 0 cmd/{cmd_bedbug.c => bedbug.c} | 0 cmd/{cmd_blob.c => blob.c} | 0 cmd/{cmd_bmp.c => bmp.c} | 0 cmd/{cmd_boot.c => boot.c} | 0 cmd/{cmd_bootldr.c => bootldr.c} | 0 cmd/{cmd_bootm.c => bootm.c} | 0 cmd/{cmd_bootmenu.c => bootmenu.c} | 0 cmd/{cmd_bootstage.c => bootstage.c} | 0 cmd/{cmd_cache.c => cache.c} | 0 cmd/{cmd_cbfs.c => cbfs.c} | 0 cmd/{cmd_clk.c => clk.c} | 0 cmd/{cmd_console.c => console.c} | 0 cmd/{cmd_cplbinfo.c => cplbinfo.c} | 0 cmd/{cmd_cpu.c => cpu.c} | 0 cmd/{cmd_cramfs.c => cramfs.c} | 0 ...cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} | 0 cmd/{cmd_date.c => date.c} | 0 cmd/{cmd_dcr.c => dcr.c} | 0 cmd/{cmd_demo.c => demo.c} | 0 cmd/{cmd_dfu.c => dfu.c} | 0 cmd/{cmd_diag.c => diag.c} | 0 cmd/{cmd_disk.c => disk.c} | 0 cmd/{cmd_display.c => display.c} | 0 cmd/{cmd_dtt.c => dtt.c} | 0 cmd/{cmd_echo.c => echo.c} | 0 cmd/{cmd_eeprom.c => eeprom.c} | 0 cmd/{cmd_efi.c => efi.c} | 0 cmd/{cmd_elf.c => elf.c} | 0 cmd/{cmd_ethsw.c => ethsw.c} | 0 cmd/{cmd_exit.c => exit.c} | 0 cmd/{cmd_ext2.c => ext2.c} | 0 cmd/{cmd_ext4.c => ext4.c} | 0 cmd/{cmd_fastboot.c => fastboot.c} | 0 cmd/{cmd_fat.c => fat.c} | 0 cmd/{cmd_fdc.c => fdc.c} | 0 cmd/{cmd_fdt.c => fdt.c} | 0 cmd/{cmd_fitupd.c => fitupd.c} | 0 cmd/{cmd_flash.c => flash.c} | 0 cmd/{cmd_fpga.c => fpga.c} | 0 cmd/{cmd_fpgad.c => fpgad.c} | 0 cmd/{cmd_fs.c => fs.c} | 0 cmd/{cmd_fs_uuid.c => fs_uuid.c} | 0 cmd/{cmd_fuse.c => fuse.c} | 0 cmd/{cmd_gettime.c => gettime.c} | 0 cmd/{cmd_gpio.c => gpio.c} | 0 cmd/{cmd_gpt.c => gpt.c} | 0 cmd/{cmd_hash.c => hash.c} | 0 cmd/{cmd_help.c => help.c} | 0 cmd/{cmd_host.c => host.c} | 0 cmd/{cmd_i2c.c => i2c.c} | 0 cmd/{cmd_ide.c => ide.c} | 0 cmd/{cmd_immap.c => immap.c} | 0 cmd/{cmd_ini.c => ini.c} | 0 cmd/{cmd_io.c => io.c} | 0 cmd/{cmd_iotrace.c => iotrace.c} | 0 cmd/{cmd_irq.c => irq.c} | 0 cmd/{cmd_itest.c => itest.c} | 0 cmd/{cmd_jffs2.c => jffs2.c} | 0 cmd/{cmd_ldrinfo.c => ldrinfo.c} | 0 cmd/{cmd_led.c => led.c} | 0 cmd/{cmd_license.c => license.c} | 0 cmd/{cmd_load.c => load.c} | 0 cmd/{cmd_log.c => log.c} | 0 cmd/{cmd_lzmadec.c => lzmadec.c} | 0 cmd/{cmd_mac.c => mac.c} | 0 cmd/{cmd_md5sum.c => md5sum.c} | 0 cmd/{cmd_mdio.c => mdio.c} | 0 cmd/{cmd_mem.c => mem.c} | 0 cmd/{cmd_mfsl.c => mfsl.c} | 0 cmd/{cmd_mii.c => mii.c} | 0 cmd/{cmd_misc.c => misc.c} | 0 cmd/{cmd_mmc.c => mmc.c} | 0 cmd/{cmd_mmc_spi.c => mmc_spi.c} | 0 cmd/{cmd_mp.c => mp.c} | 0 cmd/{cmd_mtdparts.c => mtdparts.c} | 0 cmd/{cmd_nand.c => nand.c} | 0 cmd/{cmd_net.c => net.c} | 0 cmd/{cmd_nvedit.c => nvedit.c} | 0 cmd/{cmd_onenand.c => onenand.c} | 0 cmd/{cmd_otp.c => otp.c} | 0 cmd/{cmd_part.c => part.c} | 0 cmd/{cmd_pci.c => pci.c} | 0 cmd/{cmd_pcmcia.c => pcmcia.c} | 0 cmd/{cmd_pmic.c => pmic.c} | 0 cmd/{cmd_portio.c => portio.c} | 0 cmd/{cmd_pxe.c => pxe.c} | 0 cmd/{cmd_read.c => read.c} | 0 cmd/{cmd_reginfo.c => reginfo.c} | 0 cmd/{cmd_regulator.c => regulator.c} | 0 cmd/{cmd_reiser.c => reiser.c} | 0 cmd/{cmd_remoteproc.c => remoteproc.c} | 0 cmd/{cmd_sata.c => sata.c} | 0 cmd/{cmd_scsi.c => scsi.c} | 0 cmd/{cmd_setexpr.c => setexpr.c} | 0 cmd/{cmd_sf.c => sf.c} | 0 cmd/{cmd_sha1sum.c => sha1sum.c} | 0 cmd/{cmd_softswitch.c => softswitch.c} | 0 cmd/{cmd_sound.c => sound.c} | 0 cmd/{cmd_source.c => source.c} | 0 cmd/{cmd_spi.c => spi.c} | 0 cmd/{cmd_spibootldr.c => spibootldr.c} | 0 cmd/{cmd_spl.c => spl.c} | 0 cmd/{cmd_strings.c => strings.c} | 0 cmd/{cmd_terminal.c => terminal.c} | 0 cmd/{cmd_test.c => test.c} | 0 cmd/{cmd_thordown.c => thordown.c} | 0 cmd/{cmd_time.c => time.c} | 0 cmd/{cmd_tpm.c => tpm.c} | 0 cmd/{cmd_tpm_test.c => tpm_test.c} | 0 cmd/{cmd_trace.c => trace.c} | 0 cmd/{cmd_tsi148.c => tsi148.c} | 0 cmd/{cmd_ubi.c => ubi.c} | 0 cmd/{cmd_ubifs.c => ubifs.c} | 0 cmd/{cmd_universe.c => universe.c} | 0 cmd/{cmd_unzip.c => unzip.c} | 0 cmd/{cmd_usb.c => usb.c} | 0 cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} | 0 cmd/{cmd_version.c => version.c} | 0 cmd/{cmd_ximg.c => ximg.c} | 0 cmd/{cmd_yaffs2.c => yaffs2.c} | 0 cmd/{cmd_zfs.c => zfs.c} | 0 cmd/{cmd_zip.c => zip.c} | 0 127 files changed, 129 insertions(+), 129 deletions(-) rename cmd/{cmd_aes.c => aes.c} (100%) rename cmd/{cmd_ambapp.c => ambapp.c} (100%) rename cmd/{cmd_armflash.c => armflash.c} (100%) rename cmd/{cmd_bdinfo.c => bdinfo.c} (100%) rename cmd/{cmd_bedbug.c => bedbug.c} (100%) rename cmd/{cmd_blob.c => blob.c} (100%) rename cmd/{cmd_bmp.c => bmp.c} (100%) rename cmd/{cmd_boot.c => boot.c} (100%) rename cmd/{cmd_bootldr.c => bootldr.c} (100%) rename cmd/{cmd_bootm.c => bootm.c} (100%) rename cmd/{cmd_bootmenu.c => bootmenu.c} (100%) rename cmd/{cmd_bootstage.c => bootstage.c} (100%) rename cmd/{cmd_cache.c => cache.c} (100%) rename cmd/{cmd_cbfs.c => cbfs.c} (100%) rename cmd/{cmd_clk.c => clk.c} (100%) rename cmd/{cmd_console.c => console.c} (100%) rename cmd/{cmd_cplbinfo.c => cplbinfo.c} (100%) rename cmd/{cmd_cpu.c => cpu.c} (100%) rename cmd/{cmd_cramfs.c => cramfs.c} (100%) rename cmd/{cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} (100%) rename cmd/{cmd_date.c => date.c} (100%) rename cmd/{cmd_dcr.c => dcr.c} (100%) rename cmd/{cmd_demo.c => demo.c} (100%) rename cmd/{cmd_dfu.c => dfu.c} (100%) rename cmd/{cmd_diag.c => diag.c} (100%) rename cmd/{cmd_disk.c => disk.c} (100%) rename cmd/{cmd_display.c => display.c} (100%) rename cmd/{cmd_dtt.c => dtt.c} (100%) rename cmd/{cmd_echo.c => echo.c} (100%) rename cmd/{cmd_eeprom.c => eeprom.c} (100%) rename cmd/{cmd_efi.c => efi.c} (100%) rename cmd/{cmd_elf.c => elf.c} (100%) rename cmd/{cmd_ethsw.c => ethsw.c} (100%) rename cmd/{cmd_exit.c => exit.c} (100%) rename cmd/{cmd_ext2.c => ext2.c} (100%) rename cmd/{cmd_ext4.c => ext4.c} (100%) rename cmd/{cmd_fastboot.c => fastboot.c} (100%) rename cmd/{cmd_fat.c => fat.c} (100%) rename cmd/{cmd_fdc.c => fdc.c} (100%) rename cmd/{cmd_fdt.c => fdt.c} (100%) rename cmd/{cmd_fitupd.c => fitupd.c} (100%) rename cmd/{cmd_flash.c => flash.c} (100%) rename cmd/{cmd_fpga.c => fpga.c} (100%) rename cmd/{cmd_fpgad.c => fpgad.c} (100%) rename cmd/{cmd_fs.c => fs.c} (100%) rename cmd/{cmd_fs_uuid.c => fs_uuid.c} (100%) rename cmd/{cmd_fuse.c => fuse.c} (100%) rename cmd/{cmd_gettime.c => gettime.c} (100%) rename cmd/{cmd_gpio.c => gpio.c} (100%) rename cmd/{cmd_gpt.c => gpt.c} (100%) rename cmd/{cmd_hash.c => hash.c} (100%) rename cmd/{cmd_help.c => help.c} (100%) rename cmd/{cmd_host.c => host.c} (100%) rename cmd/{cmd_i2c.c => i2c.c} (100%) rename cmd/{cmd_ide.c => ide.c} (100%) rename cmd/{cmd_immap.c => immap.c} (100%) rename cmd/{cmd_ini.c => ini.c} (100%) rename cmd/{cmd_io.c => io.c} (100%) rename cmd/{cmd_iotrace.c => iotrace.c} (100%) rename cmd/{cmd_irq.c => irq.c} (100%) rename cmd/{cmd_itest.c => itest.c} (100%) rename cmd/{cmd_jffs2.c => jffs2.c} (100%) rename cmd/{cmd_ldrinfo.c => ldrinfo.c} (100%) rename cmd/{cmd_led.c => led.c} (100%) rename cmd/{cmd_license.c => license.c} (100%) rename cmd/{cmd_load.c => load.c} (100%) rename cmd/{cmd_log.c => log.c} (100%) rename cmd/{cmd_lzmadec.c => lzmadec.c} (100%) rename cmd/{cmd_mac.c => mac.c} (100%) rename cmd/{cmd_md5sum.c => md5sum.c} (100%) rename cmd/{cmd_mdio.c => mdio.c} (100%) rename cmd/{cmd_mem.c => mem.c} (100%) rename cmd/{cmd_mfsl.c => mfsl.c} (100%) rename cmd/{cmd_mii.c => mii.c} (100%) rename cmd/{cmd_misc.c => misc.c} (100%) rename cmd/{cmd_mmc.c => mmc.c} (100%) rename cmd/{cmd_mmc_spi.c => mmc_spi.c} (100%) rename cmd/{cmd_mp.c => mp.c} (100%) rename cmd/{cmd_mtdparts.c => mtdparts.c} (100%) rename cmd/{cmd_nand.c => nand.c} (100%) rename cmd/{cmd_net.c => net.c} (100%) rename cmd/{cmd_nvedit.c => nvedit.c} (100%) rename cmd/{cmd_onenand.c => onenand.c} (100%) rename cmd/{cmd_otp.c => otp.c} (100%) rename cmd/{cmd_part.c => part.c} (100%) rename cmd/{cmd_pci.c => pci.c} (100%) rename cmd/{cmd_pcmcia.c => pcmcia.c} (100%) rename cmd/{cmd_pmic.c => pmic.c} (100%) rename cmd/{cmd_portio.c => portio.c} (100%) rename cmd/{cmd_pxe.c => pxe.c} (100%) rename cmd/{cmd_read.c => read.c} (100%) rename cmd/{cmd_reginfo.c => reginfo.c} (100%) rename cmd/{cmd_regulator.c => regulator.c} (100%) rename cmd/{cmd_reiser.c => reiser.c} (100%) rename cmd/{cmd_remoteproc.c => remoteproc.c} (100%) rename cmd/{cmd_sata.c => sata.c} (100%) rename cmd/{cmd_scsi.c => scsi.c} (100%) rename cmd/{cmd_setexpr.c => setexpr.c} (100%) rename cmd/{cmd_sf.c => sf.c} (100%) rename cmd/{cmd_sha1sum.c => sha1sum.c} (100%) rename cmd/{cmd_softswitch.c => softswitch.c} (100%) rename cmd/{cmd_sound.c => sound.c} (100%) rename cmd/{cmd_source.c => source.c} (100%) rename cmd/{cmd_spi.c => spi.c} (100%) rename cmd/{cmd_spibootldr.c => spibootldr.c} (100%) rename cmd/{cmd_spl.c => spl.c} (100%) rename cmd/{cmd_strings.c => strings.c} (100%) rename cmd/{cmd_terminal.c => terminal.c} (100%) rename cmd/{cmd_test.c => test.c} (100%) rename cmd/{cmd_thordown.c => thordown.c} (100%) rename cmd/{cmd_time.c => time.c} (100%) rename cmd/{cmd_tpm.c => tpm.c} (100%) rename cmd/{cmd_tpm_test.c => tpm_test.c} (100%) rename cmd/{cmd_trace.c => trace.c} (100%) rename cmd/{cmd_tsi148.c => tsi148.c} (100%) rename cmd/{cmd_ubi.c => ubi.c} (100%) rename cmd/{cmd_ubifs.c => ubifs.c} (100%) rename cmd/{cmd_universe.c => universe.c} (100%) rename cmd/{cmd_unzip.c => unzip.c} (100%) rename cmd/{cmd_usb.c => usb.c} (100%) rename cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} (100%) rename cmd/{cmd_version.c => version.c} (100%) rename cmd/{cmd_ximg.c => ximg.c} (100%) rename cmd/{cmd_yaffs2.c => yaffs2.c} (100%) rename cmd/{cmd_zfs.c => zfs.c} (100%) rename cmd/{cmd_zip.c => zip.c} (100%)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hello Simon,
Am 18.01.2016 um 04:53 schrieb Simon Glass:
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org
Thanks!
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
cmd/Makefile | 258 ++++++++++----------- cmd/{cmd_aes.c => aes.c} | 0 cmd/{cmd_ambapp.c => ambapp.c} | 0 cmd/{cmd_armflash.c => armflash.c} | 0 cmd/{cmd_bdinfo.c => bdinfo.c} | 0 cmd/{cmd_bedbug.c => bedbug.c} | 0 cmd/{cmd_blob.c => blob.c} | 0 cmd/{cmd_bmp.c => bmp.c} | 0 cmd/{cmd_boot.c => boot.c} | 0 cmd/{cmd_bootldr.c => bootldr.c} | 0 cmd/{cmd_bootm.c => bootm.c} | 0 cmd/{cmd_bootmenu.c => bootmenu.c} | 0 cmd/{cmd_bootstage.c => bootstage.c} | 0 cmd/{cmd_cache.c => cache.c} | 0 cmd/{cmd_cbfs.c => cbfs.c} | 0 cmd/{cmd_clk.c => clk.c} | 0 cmd/{cmd_console.c => console.c} | 0 cmd/{cmd_cplbinfo.c => cplbinfo.c} | 0 cmd/{cmd_cpu.c => cpu.c} | 0 cmd/{cmd_cramfs.c => cramfs.c} | 0 ...cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} | 0 cmd/{cmd_date.c => date.c} | 0 cmd/{cmd_dcr.c => dcr.c} | 0 cmd/{cmd_demo.c => demo.c} | 0 cmd/{cmd_dfu.c => dfu.c} | 0 cmd/{cmd_diag.c => diag.c} | 0 cmd/{cmd_disk.c => disk.c} | 0 cmd/{cmd_display.c => display.c} | 0 cmd/{cmd_dtt.c => dtt.c} | 0 cmd/{cmd_echo.c => echo.c} | 0 cmd/{cmd_eeprom.c => eeprom.c} | 0 cmd/{cmd_efi.c => efi.c} | 0 cmd/{cmd_elf.c => elf.c} | 0 cmd/{cmd_ethsw.c => ethsw.c} | 0 cmd/{cmd_exit.c => exit.c} | 0 cmd/{cmd_ext2.c => ext2.c} | 0 cmd/{cmd_ext4.c => ext4.c} | 0 cmd/{cmd_fastboot.c => fastboot.c} | 0 cmd/{cmd_fat.c => fat.c} | 0 cmd/{cmd_fdc.c => fdc.c} | 0 cmd/{cmd_fdt.c => fdt.c} | 0 cmd/{cmd_fitupd.c => fitupd.c} | 0 cmd/{cmd_flash.c => flash.c} | 0 cmd/{cmd_fpga.c => fpga.c} | 0 cmd/{cmd_fpgad.c => fpgad.c} | 0 cmd/{cmd_fs.c => fs.c} | 0 cmd/{cmd_fs_uuid.c => fs_uuid.c} | 0 cmd/{cmd_fuse.c => fuse.c} | 0 cmd/{cmd_gettime.c => gettime.c} | 0 cmd/{cmd_gpio.c => gpio.c} | 0 cmd/{cmd_gpt.c => gpt.c} | 0 cmd/{cmd_hash.c => hash.c} | 0 cmd/{cmd_help.c => help.c} | 0 cmd/{cmd_host.c => host.c} | 0 cmd/{cmd_i2c.c => i2c.c} | 0 cmd/{cmd_ide.c => ide.c} | 0 cmd/{cmd_immap.c => immap.c} | 0 cmd/{cmd_ini.c => ini.c} | 0 cmd/{cmd_io.c => io.c} | 0 cmd/{cmd_iotrace.c => iotrace.c} | 0 cmd/{cmd_irq.c => irq.c} | 0 cmd/{cmd_itest.c => itest.c} | 0 cmd/{cmd_jffs2.c => jffs2.c} | 0 cmd/{cmd_ldrinfo.c => ldrinfo.c} | 0 cmd/{cmd_led.c => led.c} | 0 cmd/{cmd_license.c => license.c} | 0 cmd/{cmd_load.c => load.c} | 0 cmd/{cmd_log.c => log.c} | 0 cmd/{cmd_lzmadec.c => lzmadec.c} | 0 cmd/{cmd_mac.c => mac.c} | 0 cmd/{cmd_md5sum.c => md5sum.c} | 0 cmd/{cmd_mdio.c => mdio.c} | 0 cmd/{cmd_mem.c => mem.c} | 0 cmd/{cmd_mfsl.c => mfsl.c} | 0 cmd/{cmd_mii.c => mii.c} | 0 cmd/{cmd_misc.c => misc.c} | 0 cmd/{cmd_mmc.c => mmc.c} | 0 cmd/{cmd_mmc_spi.c => mmc_spi.c} | 0 cmd/{cmd_mp.c => mp.c} | 0 cmd/{cmd_mtdparts.c => mtdparts.c} | 0 cmd/{cmd_nand.c => nand.c} | 0 cmd/{cmd_net.c => net.c} | 0 cmd/{cmd_nvedit.c => nvedit.c} | 0 cmd/{cmd_onenand.c => onenand.c} | 0 cmd/{cmd_otp.c => otp.c} | 0 cmd/{cmd_part.c => part.c} | 0 cmd/{cmd_pci.c => pci.c} | 0 cmd/{cmd_pcmcia.c => pcmcia.c} | 0 cmd/{cmd_pmic.c => pmic.c} | 0 cmd/{cmd_portio.c => portio.c} | 0 cmd/{cmd_pxe.c => pxe.c} | 0 cmd/{cmd_read.c => read.c} | 0 cmd/{cmd_reginfo.c => reginfo.c} | 0 cmd/{cmd_regulator.c => regulator.c} | 0 cmd/{cmd_reiser.c => reiser.c} | 0 cmd/{cmd_remoteproc.c => remoteproc.c} | 0 cmd/{cmd_sata.c => sata.c} | 0 cmd/{cmd_scsi.c => scsi.c} | 0 cmd/{cmd_setexpr.c => setexpr.c} | 0 cmd/{cmd_sf.c => sf.c} | 0 cmd/{cmd_sha1sum.c => sha1sum.c} | 0 cmd/{cmd_softswitch.c => softswitch.c} | 0 cmd/{cmd_sound.c => sound.c} | 0 cmd/{cmd_source.c => source.c} | 0 cmd/{cmd_spi.c => spi.c} | 0 cmd/{cmd_spibootldr.c => spibootldr.c} | 0 cmd/{cmd_spl.c => spl.c} | 0 cmd/{cmd_strings.c => strings.c} | 0 cmd/{cmd_terminal.c => terminal.c} | 0 cmd/{cmd_test.c => test.c} | 0 cmd/{cmd_thordown.c => thordown.c} | 0 cmd/{cmd_time.c => time.c} | 0 cmd/{cmd_tpm.c => tpm.c} | 0 cmd/{cmd_tpm_test.c => tpm_test.c} | 0 cmd/{cmd_trace.c => trace.c} | 0 cmd/{cmd_tsi148.c => tsi148.c} | 0 cmd/{cmd_ubi.c => ubi.c} | 0 cmd/{cmd_ubifs.c => ubifs.c} | 0 cmd/{cmd_universe.c => universe.c} | 0 cmd/{cmd_unzip.c => unzip.c} | 0 cmd/{cmd_usb.c => usb.c} | 0 cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} | 0 cmd/{cmd_version.c => version.c} | 0 cmd/{cmd_ximg.c => ximg.c} | 0 cmd/{cmd_yaffs2.c => yaffs2.c} | 0 cmd/{cmd_zfs.c => zfs.c} | 0 cmd/{cmd_zip.c => zip.c} | 0 127 files changed, 129 insertions(+), 129 deletions(-) rename cmd/{cmd_aes.c => aes.c} (100%) rename cmd/{cmd_ambapp.c => ambapp.c} (100%) rename cmd/{cmd_armflash.c => armflash.c} (100%) rename cmd/{cmd_bdinfo.c => bdinfo.c} (100%) rename cmd/{cmd_bedbug.c => bedbug.c} (100%) rename cmd/{cmd_blob.c => blob.c} (100%) rename cmd/{cmd_bmp.c => bmp.c} (100%) rename cmd/{cmd_boot.c => boot.c} (100%) rename cmd/{cmd_bootldr.c => bootldr.c} (100%) rename cmd/{cmd_bootm.c => bootm.c} (100%) rename cmd/{cmd_bootmenu.c => bootmenu.c} (100%) rename cmd/{cmd_bootstage.c => bootstage.c} (100%) rename cmd/{cmd_cache.c => cache.c} (100%) rename cmd/{cmd_cbfs.c => cbfs.c} (100%) rename cmd/{cmd_clk.c => clk.c} (100%) rename cmd/{cmd_console.c => console.c} (100%) rename cmd/{cmd_cplbinfo.c => cplbinfo.c} (100%) rename cmd/{cmd_cpu.c => cpu.c} (100%) rename cmd/{cmd_cramfs.c => cramfs.c} (100%) rename cmd/{cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} (100%) rename cmd/{cmd_date.c => date.c} (100%) rename cmd/{cmd_dcr.c => dcr.c} (100%) rename cmd/{cmd_demo.c => demo.c} (100%) rename cmd/{cmd_dfu.c => dfu.c} (100%) rename cmd/{cmd_diag.c => diag.c} (100%) rename cmd/{cmd_disk.c => disk.c} (100%) rename cmd/{cmd_display.c => display.c} (100%) rename cmd/{cmd_dtt.c => dtt.c} (100%) rename cmd/{cmd_echo.c => echo.c} (100%) rename cmd/{cmd_eeprom.c => eeprom.c} (100%) rename cmd/{cmd_efi.c => efi.c} (100%) rename cmd/{cmd_elf.c => elf.c} (100%) rename cmd/{cmd_ethsw.c => ethsw.c} (100%) rename cmd/{cmd_exit.c => exit.c} (100%) rename cmd/{cmd_ext2.c => ext2.c} (100%) rename cmd/{cmd_ext4.c => ext4.c} (100%) rename cmd/{cmd_fastboot.c => fastboot.c} (100%) rename cmd/{cmd_fat.c => fat.c} (100%) rename cmd/{cmd_fdc.c => fdc.c} (100%) rename cmd/{cmd_fdt.c => fdt.c} (100%) rename cmd/{cmd_fitupd.c => fitupd.c} (100%) rename cmd/{cmd_flash.c => flash.c} (100%) rename cmd/{cmd_fpga.c => fpga.c} (100%) rename cmd/{cmd_fpgad.c => fpgad.c} (100%) rename cmd/{cmd_fs.c => fs.c} (100%) rename cmd/{cmd_fs_uuid.c => fs_uuid.c} (100%) rename cmd/{cmd_fuse.c => fuse.c} (100%) rename cmd/{cmd_gettime.c => gettime.c} (100%) rename cmd/{cmd_gpio.c => gpio.c} (100%) rename cmd/{cmd_gpt.c => gpt.c} (100%) rename cmd/{cmd_hash.c => hash.c} (100%) rename cmd/{cmd_help.c => help.c} (100%) rename cmd/{cmd_host.c => host.c} (100%) rename cmd/{cmd_i2c.c => i2c.c} (100%) rename cmd/{cmd_ide.c => ide.c} (100%) rename cmd/{cmd_immap.c => immap.c} (100%) rename cmd/{cmd_ini.c => ini.c} (100%) rename cmd/{cmd_io.c => io.c} (100%) rename cmd/{cmd_iotrace.c => iotrace.c} (100%) rename cmd/{cmd_irq.c => irq.c} (100%) rename cmd/{cmd_itest.c => itest.c} (100%) rename cmd/{cmd_jffs2.c => jffs2.c} (100%) rename cmd/{cmd_ldrinfo.c => ldrinfo.c} (100%) rename cmd/{cmd_led.c => led.c} (100%) rename cmd/{cmd_license.c => license.c} (100%) rename cmd/{cmd_load.c => load.c} (100%) rename cmd/{cmd_log.c => log.c} (100%) rename cmd/{cmd_lzmadec.c => lzmadec.c} (100%) rename cmd/{cmd_mac.c => mac.c} (100%) rename cmd/{cmd_md5sum.c => md5sum.c} (100%) rename cmd/{cmd_mdio.c => mdio.c} (100%) rename cmd/{cmd_mem.c => mem.c} (100%) rename cmd/{cmd_mfsl.c => mfsl.c} (100%) rename cmd/{cmd_mii.c => mii.c} (100%) rename cmd/{cmd_misc.c => misc.c} (100%) rename cmd/{cmd_mmc.c => mmc.c} (100%) rename cmd/{cmd_mmc_spi.c => mmc_spi.c} (100%) rename cmd/{cmd_mp.c => mp.c} (100%) rename cmd/{cmd_mtdparts.c => mtdparts.c} (100%) rename cmd/{cmd_nand.c => nand.c} (100%) rename cmd/{cmd_net.c => net.c} (100%) rename cmd/{cmd_nvedit.c => nvedit.c} (100%) rename cmd/{cmd_onenand.c => onenand.c} (100%) rename cmd/{cmd_otp.c => otp.c} (100%) rename cmd/{cmd_part.c => part.c} (100%) rename cmd/{cmd_pci.c => pci.c} (100%) rename cmd/{cmd_pcmcia.c => pcmcia.c} (100%) rename cmd/{cmd_pmic.c => pmic.c} (100%) rename cmd/{cmd_portio.c => portio.c} (100%) rename cmd/{cmd_pxe.c => pxe.c} (100%) rename cmd/{cmd_read.c => read.c} (100%) rename cmd/{cmd_reginfo.c => reginfo.c} (100%) rename cmd/{cmd_regulator.c => regulator.c} (100%) rename cmd/{cmd_reiser.c => reiser.c} (100%) rename cmd/{cmd_remoteproc.c => remoteproc.c} (100%) rename cmd/{cmd_sata.c => sata.c} (100%) rename cmd/{cmd_scsi.c => scsi.c} (100%) rename cmd/{cmd_setexpr.c => setexpr.c} (100%) rename cmd/{cmd_sf.c => sf.c} (100%) rename cmd/{cmd_sha1sum.c => sha1sum.c} (100%) rename cmd/{cmd_softswitch.c => softswitch.c} (100%) rename cmd/{cmd_sound.c => sound.c} (100%) rename cmd/{cmd_source.c => source.c} (100%) rename cmd/{cmd_spi.c => spi.c} (100%) rename cmd/{cmd_spibootldr.c => spibootldr.c} (100%) rename cmd/{cmd_spl.c => spl.c} (100%) rename cmd/{cmd_strings.c => strings.c} (100%) rename cmd/{cmd_terminal.c => terminal.c} (100%) rename cmd/{cmd_test.c => test.c} (100%) rename cmd/{cmd_thordown.c => thordown.c} (100%) rename cmd/{cmd_time.c => time.c} (100%) rename cmd/{cmd_tpm.c => tpm.c} (100%) rename cmd/{cmd_tpm_test.c => tpm_test.c} (100%) rename cmd/{cmd_trace.c => trace.c} (100%) rename cmd/{cmd_tsi148.c => tsi148.c} (100%) rename cmd/{cmd_ubi.c => ubi.c} (100%) rename cmd/{cmd_ubifs.c => ubifs.c} (100%) rename cmd/{cmd_universe.c => universe.c} (100%) rename cmd/{cmd_unzip.c => unzip.c} (100%) rename cmd/{cmd_usb.c => usb.c} (100%) rename cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} (100%) rename cmd/{cmd_version.c => version.c} (100%) rename cmd/{cmd_ximg.c => ximg.c} (100%) rename cmd/{cmd_yaffs2.c => yaffs2.c} (100%) rename cmd/{cmd_zfs.c => zfs.c} (100%) rename cmd/{cmd_zip.c => zip.c} (100%)
diff --git a/cmd/Makefile b/cmd/Makefile index 880a886..03f7e0a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -7,160 +7,160 @@
ifndef CONFIG_SPL_BUILD # core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-y += boot.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-y += help.o +obj-y += version.o
# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +obj-$(CONFIG_CMD_AES) += aes.o +obj-$(CONFIG_CMD_AMBAPP) += ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += armflash.o +obj-$(CONFIG_SOURCE) += source.o +obj-$(CONFIG_CMD_SOURCE) += source.o +obj-$(CONFIG_CMD_BDI) += bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_CMD_BMP) += bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o +obj-$(CONFIG_CMD_CACHE) += cache.o +obj-$(CONFIG_CMD_CBFS) += cbfs.o +obj-$(CONFIG_CMD_CLK) += clk.o +obj-$(CONFIG_CMD_CONSOLE) += console.o +obj-$(CONFIG_CMD_CPLBINFO) += cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += date.o +obj-$(CONFIG_CMD_DEMO) += demo.o +obj-$(CONFIG_CMD_SOUND) += sound.o ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +obj-$(CONFIG_CMD_SETGETDCR) += dcr.o endif ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +obj-$(CONFIG_CMD_DIAG) += diag.o endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +obj-$(CONFIG_CMD_DISPLAY) += display.o +obj-$(CONFIG_CMD_DTT) += dtt.o +obj-$(CONFIG_CMD_ECHO) += echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o +obj-$(CONFIG_CMD_EEPROM) += eeprom.o +obj-$(CONFIG_EFI_STUB) += efi.o +obj-$(CONFIG_CMD_ELF) += elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += exit.o +obj-$(CONFIG_CMD_EXT4) += ext4.o +obj-$(CONFIG_CMD_EXT2) += ext2.o +obj-$(CONFIG_CMD_FAT) += fat.o +obj-$(CONFIG_CMD_FDC) += fdc.o +obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FITUPD) += fitupd.o +obj-$(CONFIG_CMD_FLASH) += flash.o ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +obj-$(CONFIG_CMD_FPGA) += fpga.o endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o -obj-$(CONFIG_CMD_MII) += cmd_mii.o +obj-$(CONFIG_CMD_FPGAD) += fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += fs.o +obj-$(CONFIG_CMD_FUSE) += fuse.o +obj-$(CONFIG_CMD_GETTIME) += gettime.o +obj-$(CONFIG_CMD_GPIO) += gpio.o +obj-$(CONFIG_CMD_I2C) += i2c.o +obj-$(CONFIG_CMD_IOTRACE) += iotrace.o +obj-$(CONFIG_CMD_HASH) += hash.o +obj-$(CONFIG_CMD_IDE) += ide.o +obj-$(CONFIG_CMD_IMMAP) += immap.o +obj-$(CONFIG_CMD_INI) += ini.o +obj-$(CONFIG_CMD_IRQ) += irq.o +obj-$(CONFIG_CMD_ITEST) += itest.o +obj-$(CONFIG_CMD_JFFS2) += jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += ldrinfo.o +obj-$(CONFIG_CMD_LED) += led.o +obj-$(CONFIG_CMD_LICENSE) += license.o +obj-y += load.o +obj-$(CONFIG_LOGBUFFER) += log.o +obj-$(CONFIG_ID_EEPROM) += mac.o +obj-$(CONFIG_CMD_MD5SUM) += md5sum.o +obj-$(CONFIG_CMD_MEMORY) += mem.o +obj-$(CONFIG_CMD_IO) += io.o +obj-$(CONFIG_CMD_MFSL) += mfsl.o +obj-$(CONFIG_CMD_MII) += mii.o ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o +obj-$(CONFIG_CMD_MII) += mdio.o endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o +obj-$(CONFIG_CMD_MISC) += misc.o +obj-$(CONFIG_CMD_MMC) += mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += mmc_spi.o +obj-$(CONFIG_MP) += mp.o +obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o +obj-$(CONFIG_CMD_NAND) += nand.o +obj-$(CONFIG_CMD_NET) += net.o +obj-$(CONFIG_CMD_ONENAND) += onenand.o +obj-$(CONFIG_CMD_OTP) += otp.o +obj-$(CONFIG_CMD_PART) += part.o ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o +obj-$(CONFIG_CMD_PCI) += pci.o endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +obj-y += pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += portio.o +obj-$(CONFIG_CMD_PXE) += pxe.o +obj-$(CONFIG_CMD_READ) += read.o +obj-$(CONFIG_CMD_REGINFO) += reginfo.o +obj-$(CONFIG_CMD_REISER) += reiser.o +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_CMD_SCSI) += scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o +obj-$(CONFIG_CMD_SPI) += spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += strings.o +obj-$(CONFIG_CMD_TERMINAL) += terminal.o +obj-$(CONFIG_CMD_TIME) += time.o +obj-$(CONFIG_CMD_TRACE) += trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += test.o +obj-$(CONFIG_CMD_TPM) += tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o +obj-$(CONFIG_CMD_TSI148) += tsi148.o +obj-$(CONFIG_CMD_UBI) += ubi.o +obj-$(CONFIG_CMD_UBIFS) += ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += universe.o +obj-$(CONFIG_CMD_UNZIP) += unzip.o ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o endif
-obj-$(CONFIG_CMD_USB) += cmd_usb.o -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o +obj-$(CONFIG_CMD_USB) += usb.o +obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o +obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o +obj-$(CONFIG_CMD_XIMG) += ximg.o +obj-$(CONFIG_YAFFS2) += yaffs2.o +obj-$(CONFIG_CMD_SPL) += spl.o +obj-$(CONFIG_CMD_ZIP) += zip.o +obj-$(CONFIG_CMD_ZFS) += zfs.o
-obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o +obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_CMD_GPT) += gpt.o +obj-$(CONFIG_CMD_ETHSW) += ethsw.o
# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +obj-$(CONFIG_CMD_PMIC) += pmic.o +obj-$(CONFIG_CMD_REGULATOR) += regulator.o endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SCSI) += scsi.o endif endif # CONFIG_SPL_BUILD
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o +obj-$(CONFIG_CMD_BLOB) += blob.o
# core command -obj-y += cmd_nvedit.o -obj-y += cmd_disk.o +obj-y += nvedit.o +obj-y += disk.o diff --git a/cmd/cmd_aes.c b/cmd/aes.c similarity index 100% rename from cmd/cmd_aes.c rename to cmd/aes.c diff --git a/cmd/cmd_ambapp.c b/cmd/ambapp.c similarity index 100% rename from cmd/cmd_ambapp.c rename to cmd/ambapp.c diff --git a/cmd/cmd_armflash.c b/cmd/armflash.c similarity index 100% rename from cmd/cmd_armflash.c rename to cmd/armflash.c diff --git a/cmd/cmd_bdinfo.c b/cmd/bdinfo.c similarity index 100% rename from cmd/cmd_bdinfo.c rename to cmd/bdinfo.c diff --git a/cmd/cmd_bedbug.c b/cmd/bedbug.c similarity index 100% rename from cmd/cmd_bedbug.c rename to cmd/bedbug.c diff --git a/cmd/cmd_blob.c b/cmd/blob.c similarity index 100% rename from cmd/cmd_blob.c rename to cmd/blob.c diff --git a/cmd/cmd_bmp.c b/cmd/bmp.c similarity index 100% rename from cmd/cmd_bmp.c rename to cmd/bmp.c diff --git a/cmd/cmd_boot.c b/cmd/boot.c similarity index 100% rename from cmd/cmd_boot.c rename to cmd/boot.c diff --git a/cmd/cmd_bootldr.c b/cmd/bootldr.c similarity index 100% rename from cmd/cmd_bootldr.c rename to cmd/bootldr.c diff --git a/cmd/cmd_bootm.c b/cmd/bootm.c similarity index 100% rename from cmd/cmd_bootm.c rename to cmd/bootm.c diff --git a/cmd/cmd_bootmenu.c b/cmd/bootmenu.c similarity index 100% rename from cmd/cmd_bootmenu.c rename to cmd/bootmenu.c diff --git a/cmd/cmd_bootstage.c b/cmd/bootstage.c similarity index 100% rename from cmd/cmd_bootstage.c rename to cmd/bootstage.c diff --git a/cmd/cmd_cache.c b/cmd/cache.c similarity index 100% rename from cmd/cmd_cache.c rename to cmd/cache.c diff --git a/cmd/cmd_cbfs.c b/cmd/cbfs.c similarity index 100% rename from cmd/cmd_cbfs.c rename to cmd/cbfs.c diff --git a/cmd/cmd_clk.c b/cmd/clk.c similarity index 100% rename from cmd/cmd_clk.c rename to cmd/clk.c diff --git a/cmd/cmd_console.c b/cmd/console.c similarity index 100% rename from cmd/cmd_console.c rename to cmd/console.c diff --git a/cmd/cmd_cplbinfo.c b/cmd/cplbinfo.c similarity index 100% rename from cmd/cmd_cplbinfo.c rename to cmd/cplbinfo.c diff --git a/cmd/cmd_cpu.c b/cmd/cpu.c similarity index 100% rename from cmd/cmd_cpu.c rename to cmd/cpu.c diff --git a/cmd/cmd_cramfs.c b/cmd/cramfs.c similarity index 100% rename from cmd/cmd_cramfs.c rename to cmd/cramfs.c diff --git a/cmd/cmd_dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c similarity index 100% rename from cmd/cmd_dataflash_mmc_mux.c rename to cmd/dataflash_mmc_mux.c diff --git a/cmd/cmd_date.c b/cmd/date.c similarity index 100% rename from cmd/cmd_date.c rename to cmd/date.c diff --git a/cmd/cmd_dcr.c b/cmd/dcr.c similarity index 100% rename from cmd/cmd_dcr.c rename to cmd/dcr.c diff --git a/cmd/cmd_demo.c b/cmd/demo.c similarity index 100% rename from cmd/cmd_demo.c rename to cmd/demo.c diff --git a/cmd/cmd_dfu.c b/cmd/dfu.c similarity index 100% rename from cmd/cmd_dfu.c rename to cmd/dfu.c diff --git a/cmd/cmd_diag.c b/cmd/diag.c similarity index 100% rename from cmd/cmd_diag.c rename to cmd/diag.c diff --git a/cmd/cmd_disk.c b/cmd/disk.c similarity index 100% rename from cmd/cmd_disk.c rename to cmd/disk.c diff --git a/cmd/cmd_display.c b/cmd/display.c similarity index 100% rename from cmd/cmd_display.c rename to cmd/display.c diff --git a/cmd/cmd_dtt.c b/cmd/dtt.c similarity index 100% rename from cmd/cmd_dtt.c rename to cmd/dtt.c diff --git a/cmd/cmd_echo.c b/cmd/echo.c similarity index 100% rename from cmd/cmd_echo.c rename to cmd/echo.c diff --git a/cmd/cmd_eeprom.c b/cmd/eeprom.c similarity index 100% rename from cmd/cmd_eeprom.c rename to cmd/eeprom.c diff --git a/cmd/cmd_efi.c b/cmd/efi.c similarity index 100% rename from cmd/cmd_efi.c rename to cmd/efi.c diff --git a/cmd/cmd_elf.c b/cmd/elf.c similarity index 100% rename from cmd/cmd_elf.c rename to cmd/elf.c diff --git a/cmd/cmd_ethsw.c b/cmd/ethsw.c similarity index 100% rename from cmd/cmd_ethsw.c rename to cmd/ethsw.c diff --git a/cmd/cmd_exit.c b/cmd/exit.c similarity index 100% rename from cmd/cmd_exit.c rename to cmd/exit.c diff --git a/cmd/cmd_ext2.c b/cmd/ext2.c similarity index 100% rename from cmd/cmd_ext2.c rename to cmd/ext2.c diff --git a/cmd/cmd_ext4.c b/cmd/ext4.c similarity index 100% rename from cmd/cmd_ext4.c rename to cmd/ext4.c diff --git a/cmd/cmd_fastboot.c b/cmd/fastboot.c similarity index 100% rename from cmd/cmd_fastboot.c rename to cmd/fastboot.c diff --git a/cmd/cmd_fat.c b/cmd/fat.c similarity index 100% rename from cmd/cmd_fat.c rename to cmd/fat.c diff --git a/cmd/cmd_fdc.c b/cmd/fdc.c similarity index 100% rename from cmd/cmd_fdc.c rename to cmd/fdc.c diff --git a/cmd/cmd_fdt.c b/cmd/fdt.c similarity index 100% rename from cmd/cmd_fdt.c rename to cmd/fdt.c diff --git a/cmd/cmd_fitupd.c b/cmd/fitupd.c similarity index 100% rename from cmd/cmd_fitupd.c rename to cmd/fitupd.c diff --git a/cmd/cmd_flash.c b/cmd/flash.c similarity index 100% rename from cmd/cmd_flash.c rename to cmd/flash.c diff --git a/cmd/cmd_fpga.c b/cmd/fpga.c similarity index 100% rename from cmd/cmd_fpga.c rename to cmd/fpga.c diff --git a/cmd/cmd_fpgad.c b/cmd/fpgad.c similarity index 100% rename from cmd/cmd_fpgad.c rename to cmd/fpgad.c diff --git a/cmd/cmd_fs.c b/cmd/fs.c similarity index 100% rename from cmd/cmd_fs.c rename to cmd/fs.c diff --git a/cmd/cmd_fs_uuid.c b/cmd/fs_uuid.c similarity index 100% rename from cmd/cmd_fs_uuid.c rename to cmd/fs_uuid.c diff --git a/cmd/cmd_fuse.c b/cmd/fuse.c similarity index 100% rename from cmd/cmd_fuse.c rename to cmd/fuse.c diff --git a/cmd/cmd_gettime.c b/cmd/gettime.c similarity index 100% rename from cmd/cmd_gettime.c rename to cmd/gettime.c diff --git a/cmd/cmd_gpio.c b/cmd/gpio.c similarity index 100% rename from cmd/cmd_gpio.c rename to cmd/gpio.c diff --git a/cmd/cmd_gpt.c b/cmd/gpt.c similarity index 100% rename from cmd/cmd_gpt.c rename to cmd/gpt.c diff --git a/cmd/cmd_hash.c b/cmd/hash.c similarity index 100% rename from cmd/cmd_hash.c rename to cmd/hash.c diff --git a/cmd/cmd_help.c b/cmd/help.c similarity index 100% rename from cmd/cmd_help.c rename to cmd/help.c diff --git a/cmd/cmd_host.c b/cmd/host.c similarity index 100% rename from cmd/cmd_host.c rename to cmd/host.c diff --git a/cmd/cmd_i2c.c b/cmd/i2c.c similarity index 100% rename from cmd/cmd_i2c.c rename to cmd/i2c.c diff --git a/cmd/cmd_ide.c b/cmd/ide.c similarity index 100% rename from cmd/cmd_ide.c rename to cmd/ide.c diff --git a/cmd/cmd_immap.c b/cmd/immap.c similarity index 100% rename from cmd/cmd_immap.c rename to cmd/immap.c diff --git a/cmd/cmd_ini.c b/cmd/ini.c similarity index 100% rename from cmd/cmd_ini.c rename to cmd/ini.c diff --git a/cmd/cmd_io.c b/cmd/io.c similarity index 100% rename from cmd/cmd_io.c rename to cmd/io.c diff --git a/cmd/cmd_iotrace.c b/cmd/iotrace.c similarity index 100% rename from cmd/cmd_iotrace.c rename to cmd/iotrace.c diff --git a/cmd/cmd_irq.c b/cmd/irq.c similarity index 100% rename from cmd/cmd_irq.c rename to cmd/irq.c diff --git a/cmd/cmd_itest.c b/cmd/itest.c similarity index 100% rename from cmd/cmd_itest.c rename to cmd/itest.c diff --git a/cmd/cmd_jffs2.c b/cmd/jffs2.c similarity index 100% rename from cmd/cmd_jffs2.c rename to cmd/jffs2.c diff --git a/cmd/cmd_ldrinfo.c b/cmd/ldrinfo.c similarity index 100% rename from cmd/cmd_ldrinfo.c rename to cmd/ldrinfo.c diff --git a/cmd/cmd_led.c b/cmd/led.c similarity index 100% rename from cmd/cmd_led.c rename to cmd/led.c diff --git a/cmd/cmd_license.c b/cmd/license.c similarity index 100% rename from cmd/cmd_license.c rename to cmd/license.c diff --git a/cmd/cmd_load.c b/cmd/load.c similarity index 100% rename from cmd/cmd_load.c rename to cmd/load.c diff --git a/cmd/cmd_log.c b/cmd/log.c similarity index 100% rename from cmd/cmd_log.c rename to cmd/log.c diff --git a/cmd/cmd_lzmadec.c b/cmd/lzmadec.c similarity index 100% rename from cmd/cmd_lzmadec.c rename to cmd/lzmadec.c diff --git a/cmd/cmd_mac.c b/cmd/mac.c similarity index 100% rename from cmd/cmd_mac.c rename to cmd/mac.c diff --git a/cmd/cmd_md5sum.c b/cmd/md5sum.c similarity index 100% rename from cmd/cmd_md5sum.c rename to cmd/md5sum.c diff --git a/cmd/cmd_mdio.c b/cmd/mdio.c similarity index 100% rename from cmd/cmd_mdio.c rename to cmd/mdio.c diff --git a/cmd/cmd_mem.c b/cmd/mem.c similarity index 100% rename from cmd/cmd_mem.c rename to cmd/mem.c diff --git a/cmd/cmd_mfsl.c b/cmd/mfsl.c similarity index 100% rename from cmd/cmd_mfsl.c rename to cmd/mfsl.c diff --git a/cmd/cmd_mii.c b/cmd/mii.c similarity index 100% rename from cmd/cmd_mii.c rename to cmd/mii.c diff --git a/cmd/cmd_misc.c b/cmd/misc.c similarity index 100% rename from cmd/cmd_misc.c rename to cmd/misc.c diff --git a/cmd/cmd_mmc.c b/cmd/mmc.c similarity index 100% rename from cmd/cmd_mmc.c rename to cmd/mmc.c diff --git a/cmd/cmd_mmc_spi.c b/cmd/mmc_spi.c similarity index 100% rename from cmd/cmd_mmc_spi.c rename to cmd/mmc_spi.c diff --git a/cmd/cmd_mp.c b/cmd/mp.c similarity index 100% rename from cmd/cmd_mp.c rename to cmd/mp.c diff --git a/cmd/cmd_mtdparts.c b/cmd/mtdparts.c similarity index 100% rename from cmd/cmd_mtdparts.c rename to cmd/mtdparts.c diff --git a/cmd/cmd_nand.c b/cmd/nand.c similarity index 100% rename from cmd/cmd_nand.c rename to cmd/nand.c diff --git a/cmd/cmd_net.c b/cmd/net.c similarity index 100% rename from cmd/cmd_net.c rename to cmd/net.c diff --git a/cmd/cmd_nvedit.c b/cmd/nvedit.c similarity index 100% rename from cmd/cmd_nvedit.c rename to cmd/nvedit.c diff --git a/cmd/cmd_onenand.c b/cmd/onenand.c similarity index 100% rename from cmd/cmd_onenand.c rename to cmd/onenand.c diff --git a/cmd/cmd_otp.c b/cmd/otp.c similarity index 100% rename from cmd/cmd_otp.c rename to cmd/otp.c diff --git a/cmd/cmd_part.c b/cmd/part.c similarity index 100% rename from cmd/cmd_part.c rename to cmd/part.c diff --git a/cmd/cmd_pci.c b/cmd/pci.c similarity index 100% rename from cmd/cmd_pci.c rename to cmd/pci.c diff --git a/cmd/cmd_pcmcia.c b/cmd/pcmcia.c similarity index 100% rename from cmd/cmd_pcmcia.c rename to cmd/pcmcia.c diff --git a/cmd/cmd_pmic.c b/cmd/pmic.c similarity index 100% rename from cmd/cmd_pmic.c rename to cmd/pmic.c diff --git a/cmd/cmd_portio.c b/cmd/portio.c similarity index 100% rename from cmd/cmd_portio.c rename to cmd/portio.c diff --git a/cmd/cmd_pxe.c b/cmd/pxe.c similarity index 100% rename from cmd/cmd_pxe.c rename to cmd/pxe.c diff --git a/cmd/cmd_read.c b/cmd/read.c similarity index 100% rename from cmd/cmd_read.c rename to cmd/read.c diff --git a/cmd/cmd_reginfo.c b/cmd/reginfo.c similarity index 100% rename from cmd/cmd_reginfo.c rename to cmd/reginfo.c diff --git a/cmd/cmd_regulator.c b/cmd/regulator.c similarity index 100% rename from cmd/cmd_regulator.c rename to cmd/regulator.c diff --git a/cmd/cmd_reiser.c b/cmd/reiser.c similarity index 100% rename from cmd/cmd_reiser.c rename to cmd/reiser.c diff --git a/cmd/cmd_remoteproc.c b/cmd/remoteproc.c similarity index 100% rename from cmd/cmd_remoteproc.c rename to cmd/remoteproc.c diff --git a/cmd/cmd_sata.c b/cmd/sata.c similarity index 100% rename from cmd/cmd_sata.c rename to cmd/sata.c diff --git a/cmd/cmd_scsi.c b/cmd/scsi.c similarity index 100% rename from cmd/cmd_scsi.c rename to cmd/scsi.c diff --git a/cmd/cmd_setexpr.c b/cmd/setexpr.c similarity index 100% rename from cmd/cmd_setexpr.c rename to cmd/setexpr.c diff --git a/cmd/cmd_sf.c b/cmd/sf.c similarity index 100% rename from cmd/cmd_sf.c rename to cmd/sf.c diff --git a/cmd/cmd_sha1sum.c b/cmd/sha1sum.c similarity index 100% rename from cmd/cmd_sha1sum.c rename to cmd/sha1sum.c diff --git a/cmd/cmd_softswitch.c b/cmd/softswitch.c similarity index 100% rename from cmd/cmd_softswitch.c rename to cmd/softswitch.c diff --git a/cmd/cmd_sound.c b/cmd/sound.c similarity index 100% rename from cmd/cmd_sound.c rename to cmd/sound.c diff --git a/cmd/cmd_source.c b/cmd/source.c similarity index 100% rename from cmd/cmd_source.c rename to cmd/source.c diff --git a/cmd/cmd_spi.c b/cmd/spi.c similarity index 100% rename from cmd/cmd_spi.c rename to cmd/spi.c diff --git a/cmd/cmd_spibootldr.c b/cmd/spibootldr.c similarity index 100% rename from cmd/cmd_spibootldr.c rename to cmd/spibootldr.c diff --git a/cmd/cmd_spl.c b/cmd/spl.c similarity index 100% rename from cmd/cmd_spl.c rename to cmd/spl.c diff --git a/cmd/cmd_strings.c b/cmd/strings.c similarity index 100% rename from cmd/cmd_strings.c rename to cmd/strings.c diff --git a/cmd/cmd_terminal.c b/cmd/terminal.c similarity index 100% rename from cmd/cmd_terminal.c rename to cmd/terminal.c diff --git a/cmd/cmd_test.c b/cmd/test.c similarity index 100% rename from cmd/cmd_test.c rename to cmd/test.c diff --git a/cmd/cmd_thordown.c b/cmd/thordown.c similarity index 100% rename from cmd/cmd_thordown.c rename to cmd/thordown.c diff --git a/cmd/cmd_time.c b/cmd/time.c similarity index 100% rename from cmd/cmd_time.c rename to cmd/time.c diff --git a/cmd/cmd_tpm.c b/cmd/tpm.c similarity index 100% rename from cmd/cmd_tpm.c rename to cmd/tpm.c diff --git a/cmd/cmd_tpm_test.c b/cmd/tpm_test.c similarity index 100% rename from cmd/cmd_tpm_test.c rename to cmd/tpm_test.c diff --git a/cmd/cmd_trace.c b/cmd/trace.c similarity index 100% rename from cmd/cmd_trace.c rename to cmd/trace.c diff --git a/cmd/cmd_tsi148.c b/cmd/tsi148.c similarity index 100% rename from cmd/cmd_tsi148.c rename to cmd/tsi148.c diff --git a/cmd/cmd_ubi.c b/cmd/ubi.c similarity index 100% rename from cmd/cmd_ubi.c rename to cmd/ubi.c diff --git a/cmd/cmd_ubifs.c b/cmd/ubifs.c similarity index 100% rename from cmd/cmd_ubifs.c rename to cmd/ubifs.c diff --git a/cmd/cmd_universe.c b/cmd/universe.c similarity index 100% rename from cmd/cmd_universe.c rename to cmd/universe.c diff --git a/cmd/cmd_unzip.c b/cmd/unzip.c similarity index 100% rename from cmd/cmd_unzip.c rename to cmd/unzip.c diff --git a/cmd/cmd_usb.c b/cmd/usb.c similarity index 100% rename from cmd/cmd_usb.c rename to cmd/usb.c diff --git a/cmd/cmd_usb_mass_storage.c b/cmd/usb_mass_storage.c similarity index 100% rename from cmd/cmd_usb_mass_storage.c rename to cmd/usb_mass_storage.c diff --git a/cmd/cmd_version.c b/cmd/version.c similarity index 100% rename from cmd/cmd_version.c rename to cmd/version.c diff --git a/cmd/cmd_ximg.c b/cmd/ximg.c similarity index 100% rename from cmd/cmd_ximg.c rename to cmd/ximg.c diff --git a/cmd/cmd_yaffs2.c b/cmd/yaffs2.c similarity index 100% rename from cmd/cmd_yaffs2.c rename to cmd/yaffs2.c diff --git a/cmd/cmd_zfs.c b/cmd/zfs.c similarity index 100% rename from cmd/cmd_zfs.c rename to cmd/zfs.c diff --git a/cmd/cmd_zip.c b/cmd/zip.c similarity index 100% rename from cmd/cmd_zip.c rename to cmd/zip.c
Hi Simon,
On 18.01.2016 04:53, Simon Glass wrote:
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org
Acked-by: Stefan Roese sr@denx.de
Thanks, Stefan
Hello Simon,
On 01/18/2016 04:53 AM, Simon Glass wrote:
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org
cmd/Makefile | 258 ++++++++++----------- cmd/{cmd_aes.c => aes.c} | 0 cmd/{cmd_ambapp.c => ambapp.c} | 0 cmd/{cmd_armflash.c => armflash.c} | 0 cmd/{cmd_bdinfo.c => bdinfo.c} | 0 cmd/{cmd_bedbug.c => bedbug.c} | 0 cmd/{cmd_blob.c => blob.c} | 0 cmd/{cmd_bmp.c => bmp.c} | 0 cmd/{cmd_boot.c => boot.c} | 0 cmd/{cmd_bootldr.c => bootldr.c} | 0 cmd/{cmd_bootm.c => bootm.c} | 0 cmd/{cmd_bootmenu.c => bootmenu.c} | 0 cmd/{cmd_bootstage.c => bootstage.c} | 0 cmd/{cmd_cache.c => cache.c} | 0 cmd/{cmd_cbfs.c => cbfs.c} | 0 cmd/{cmd_clk.c => clk.c} | 0 cmd/{cmd_console.c => console.c} | 0 cmd/{cmd_cplbinfo.c => cplbinfo.c} | 0 cmd/{cmd_cpu.c => cpu.c} | 0 cmd/{cmd_cramfs.c => cramfs.c} | 0 ...cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} | 0 cmd/{cmd_date.c => date.c} | 0 cmd/{cmd_dcr.c => dcr.c} | 0 cmd/{cmd_demo.c => demo.c} | 0 cmd/{cmd_dfu.c => dfu.c} | 0 cmd/{cmd_diag.c => diag.c} | 0 cmd/{cmd_disk.c => disk.c} | 0 cmd/{cmd_display.c => display.c} | 0 cmd/{cmd_dtt.c => dtt.c} | 0 cmd/{cmd_echo.c => echo.c} | 0 cmd/{cmd_eeprom.c => eeprom.c} | 0 cmd/{cmd_efi.c => efi.c} | 0 cmd/{cmd_elf.c => elf.c} | 0 cmd/{cmd_ethsw.c => ethsw.c} | 0 cmd/{cmd_exit.c => exit.c} | 0 cmd/{cmd_ext2.c => ext2.c} | 0 cmd/{cmd_ext4.c => ext4.c} | 0 cmd/{cmd_fastboot.c => fastboot.c} | 0 cmd/{cmd_fat.c => fat.c} | 0 cmd/{cmd_fdc.c => fdc.c} | 0 cmd/{cmd_fdt.c => fdt.c} | 0 cmd/{cmd_fitupd.c => fitupd.c} | 0 cmd/{cmd_flash.c => flash.c} | 0 cmd/{cmd_fpga.c => fpga.c} | 0 cmd/{cmd_fpgad.c => fpgad.c} | 0 cmd/{cmd_fs.c => fs.c} | 0 cmd/{cmd_fs_uuid.c => fs_uuid.c} | 0 cmd/{cmd_fuse.c => fuse.c} | 0 cmd/{cmd_gettime.c => gettime.c} | 0 cmd/{cmd_gpio.c => gpio.c} | 0 cmd/{cmd_gpt.c => gpt.c} | 0 cmd/{cmd_hash.c => hash.c} | 0 cmd/{cmd_help.c => help.c} | 0 cmd/{cmd_host.c => host.c} | 0 cmd/{cmd_i2c.c => i2c.c} | 0 cmd/{cmd_ide.c => ide.c} | 0 cmd/{cmd_immap.c => immap.c} | 0 cmd/{cmd_ini.c => ini.c} | 0 cmd/{cmd_io.c => io.c} | 0 cmd/{cmd_iotrace.c => iotrace.c} | 0 cmd/{cmd_irq.c => irq.c} | 0 cmd/{cmd_itest.c => itest.c} | 0 cmd/{cmd_jffs2.c => jffs2.c} | 0 cmd/{cmd_ldrinfo.c => ldrinfo.c} | 0 cmd/{cmd_led.c => led.c} | 0 cmd/{cmd_license.c => license.c} | 0 cmd/{cmd_load.c => load.c} | 0 cmd/{cmd_log.c => log.c} | 0 cmd/{cmd_lzmadec.c => lzmadec.c} | 0 cmd/{cmd_mac.c => mac.c} | 0 cmd/{cmd_md5sum.c => md5sum.c} | 0 cmd/{cmd_mdio.c => mdio.c} | 0 cmd/{cmd_mem.c => mem.c} | 0 cmd/{cmd_mfsl.c => mfsl.c} | 0 cmd/{cmd_mii.c => mii.c} | 0 cmd/{cmd_misc.c => misc.c} | 0 cmd/{cmd_mmc.c => mmc.c} | 0 cmd/{cmd_mmc_spi.c => mmc_spi.c} | 0 cmd/{cmd_mp.c => mp.c} | 0 cmd/{cmd_mtdparts.c => mtdparts.c} | 0 cmd/{cmd_nand.c => nand.c} | 0 cmd/{cmd_net.c => net.c} | 0 cmd/{cmd_nvedit.c => nvedit.c} | 0 cmd/{cmd_onenand.c => onenand.c} | 0 cmd/{cmd_otp.c => otp.c} | 0 cmd/{cmd_part.c => part.c} | 0 cmd/{cmd_pci.c => pci.c} | 0 cmd/{cmd_pcmcia.c => pcmcia.c} | 0 cmd/{cmd_pmic.c => pmic.c} | 0 cmd/{cmd_portio.c => portio.c} | 0 cmd/{cmd_pxe.c => pxe.c} | 0 cmd/{cmd_read.c => read.c} | 0 cmd/{cmd_reginfo.c => reginfo.c} | 0 cmd/{cmd_regulator.c => regulator.c} | 0 cmd/{cmd_reiser.c => reiser.c} | 0 cmd/{cmd_remoteproc.c => remoteproc.c} | 0 cmd/{cmd_sata.c => sata.c} | 0 cmd/{cmd_scsi.c => scsi.c} | 0 cmd/{cmd_setexpr.c => setexpr.c} | 0 cmd/{cmd_sf.c => sf.c} | 0 cmd/{cmd_sha1sum.c => sha1sum.c} | 0 cmd/{cmd_softswitch.c => softswitch.c} | 0 cmd/{cmd_sound.c => sound.c} | 0 cmd/{cmd_source.c => source.c} | 0 cmd/{cmd_spi.c => spi.c} | 0 cmd/{cmd_spibootldr.c => spibootldr.c} | 0 cmd/{cmd_spl.c => spl.c} | 0 cmd/{cmd_strings.c => strings.c} | 0 cmd/{cmd_terminal.c => terminal.c} | 0 cmd/{cmd_test.c => test.c} | 0 cmd/{cmd_thordown.c => thordown.c} | 0 cmd/{cmd_time.c => time.c} | 0 cmd/{cmd_tpm.c => tpm.c} | 0 cmd/{cmd_tpm_test.c => tpm_test.c} | 0 cmd/{cmd_trace.c => trace.c} | 0 cmd/{cmd_tsi148.c => tsi148.c} | 0 cmd/{cmd_ubi.c => ubi.c} | 0 cmd/{cmd_ubifs.c => ubifs.c} | 0 cmd/{cmd_universe.c => universe.c} | 0 cmd/{cmd_unzip.c => unzip.c} | 0 cmd/{cmd_usb.c => usb.c} | 0 cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} | 0 cmd/{cmd_version.c => version.c} | 0 cmd/{cmd_ximg.c => ximg.c} | 0 cmd/{cmd_yaffs2.c => yaffs2.c} | 0 cmd/{cmd_zfs.c => zfs.c} | 0 cmd/{cmd_zip.c => zip.c} | 0 127 files changed, 129 insertions(+), 129 deletions(-) rename cmd/{cmd_aes.c => aes.c} (100%) rename cmd/{cmd_ambapp.c => ambapp.c} (100%) rename cmd/{cmd_armflash.c => armflash.c} (100%) rename cmd/{cmd_bdinfo.c => bdinfo.c} (100%) rename cmd/{cmd_bedbug.c => bedbug.c} (100%) rename cmd/{cmd_blob.c => blob.c} (100%) rename cmd/{cmd_bmp.c => bmp.c} (100%) rename cmd/{cmd_boot.c => boot.c} (100%) rename cmd/{cmd_bootldr.c => bootldr.c} (100%) rename cmd/{cmd_bootm.c => bootm.c} (100%) rename cmd/{cmd_bootmenu.c => bootmenu.c} (100%) rename cmd/{cmd_bootstage.c => bootstage.c} (100%) rename cmd/{cmd_cache.c => cache.c} (100%) rename cmd/{cmd_cbfs.c => cbfs.c} (100%) rename cmd/{cmd_clk.c => clk.c} (100%) rename cmd/{cmd_console.c => console.c} (100%) rename cmd/{cmd_cplbinfo.c => cplbinfo.c} (100%) rename cmd/{cmd_cpu.c => cpu.c} (100%) rename cmd/{cmd_cramfs.c => cramfs.c} (100%) rename cmd/{cmd_dataflash_mmc_mux.c => dataflash_mmc_mux.c} (100%) rename cmd/{cmd_date.c => date.c} (100%) rename cmd/{cmd_dcr.c => dcr.c} (100%) rename cmd/{cmd_demo.c => demo.c} (100%) rename cmd/{cmd_dfu.c => dfu.c} (100%) rename cmd/{cmd_diag.c => diag.c} (100%) rename cmd/{cmd_disk.c => disk.c} (100%) rename cmd/{cmd_display.c => display.c} (100%) rename cmd/{cmd_dtt.c => dtt.c} (100%) rename cmd/{cmd_echo.c => echo.c} (100%) rename cmd/{cmd_eeprom.c => eeprom.c} (100%) rename cmd/{cmd_efi.c => efi.c} (100%) rename cmd/{cmd_elf.c => elf.c} (100%) rename cmd/{cmd_ethsw.c => ethsw.c} (100%) rename cmd/{cmd_exit.c => exit.c} (100%) rename cmd/{cmd_ext2.c => ext2.c} (100%) rename cmd/{cmd_ext4.c => ext4.c} (100%) rename cmd/{cmd_fastboot.c => fastboot.c} (100%) rename cmd/{cmd_fat.c => fat.c} (100%) rename cmd/{cmd_fdc.c => fdc.c} (100%) rename cmd/{cmd_fdt.c => fdt.c} (100%) rename cmd/{cmd_fitupd.c => fitupd.c} (100%) rename cmd/{cmd_flash.c => flash.c} (100%) rename cmd/{cmd_fpga.c => fpga.c} (100%) rename cmd/{cmd_fpgad.c => fpgad.c} (100%) rename cmd/{cmd_fs.c => fs.c} (100%) rename cmd/{cmd_fs_uuid.c => fs_uuid.c} (100%) rename cmd/{cmd_fuse.c => fuse.c} (100%) rename cmd/{cmd_gettime.c => gettime.c} (100%) rename cmd/{cmd_gpio.c => gpio.c} (100%) rename cmd/{cmd_gpt.c => gpt.c} (100%) rename cmd/{cmd_hash.c => hash.c} (100%) rename cmd/{cmd_help.c => help.c} (100%) rename cmd/{cmd_host.c => host.c} (100%) rename cmd/{cmd_i2c.c => i2c.c} (100%) rename cmd/{cmd_ide.c => ide.c} (100%) rename cmd/{cmd_immap.c => immap.c} (100%) rename cmd/{cmd_ini.c => ini.c} (100%) rename cmd/{cmd_io.c => io.c} (100%) rename cmd/{cmd_iotrace.c => iotrace.c} (100%) rename cmd/{cmd_irq.c => irq.c} (100%) rename cmd/{cmd_itest.c => itest.c} (100%) rename cmd/{cmd_jffs2.c => jffs2.c} (100%) rename cmd/{cmd_ldrinfo.c => ldrinfo.c} (100%) rename cmd/{cmd_led.c => led.c} (100%) rename cmd/{cmd_license.c => license.c} (100%) rename cmd/{cmd_load.c => load.c} (100%) rename cmd/{cmd_log.c => log.c} (100%) rename cmd/{cmd_lzmadec.c => lzmadec.c} (100%) rename cmd/{cmd_mac.c => mac.c} (100%) rename cmd/{cmd_md5sum.c => md5sum.c} (100%) rename cmd/{cmd_mdio.c => mdio.c} (100%) rename cmd/{cmd_mem.c => mem.c} (100%) rename cmd/{cmd_mfsl.c => mfsl.c} (100%) rename cmd/{cmd_mii.c => mii.c} (100%) rename cmd/{cmd_misc.c => misc.c} (100%) rename cmd/{cmd_mmc.c => mmc.c} (100%) rename cmd/{cmd_mmc_spi.c => mmc_spi.c} (100%) rename cmd/{cmd_mp.c => mp.c} (100%) rename cmd/{cmd_mtdparts.c => mtdparts.c} (100%) rename cmd/{cmd_nand.c => nand.c} (100%) rename cmd/{cmd_net.c => net.c} (100%) rename cmd/{cmd_nvedit.c => nvedit.c} (100%) rename cmd/{cmd_onenand.c => onenand.c} (100%) rename cmd/{cmd_otp.c => otp.c} (100%) rename cmd/{cmd_part.c => part.c} (100%) rename cmd/{cmd_pci.c => pci.c} (100%) rename cmd/{cmd_pcmcia.c => pcmcia.c} (100%) rename cmd/{cmd_pmic.c => pmic.c} (100%) rename cmd/{cmd_portio.c => portio.c} (100%) rename cmd/{cmd_pxe.c => pxe.c} (100%) rename cmd/{cmd_read.c => read.c} (100%) rename cmd/{cmd_reginfo.c => reginfo.c} (100%) rename cmd/{cmd_regulator.c => regulator.c} (100%) rename cmd/{cmd_reiser.c => reiser.c} (100%) rename cmd/{cmd_remoteproc.c => remoteproc.c} (100%) rename cmd/{cmd_sata.c => sata.c} (100%) rename cmd/{cmd_scsi.c => scsi.c} (100%) rename cmd/{cmd_setexpr.c => setexpr.c} (100%) rename cmd/{cmd_sf.c => sf.c} (100%) rename cmd/{cmd_sha1sum.c => sha1sum.c} (100%) rename cmd/{cmd_softswitch.c => softswitch.c} (100%) rename cmd/{cmd_sound.c => sound.c} (100%) rename cmd/{cmd_source.c => source.c} (100%) rename cmd/{cmd_spi.c => spi.c} (100%) rename cmd/{cmd_spibootldr.c => spibootldr.c} (100%) rename cmd/{cmd_spl.c => spl.c} (100%) rename cmd/{cmd_strings.c => strings.c} (100%) rename cmd/{cmd_terminal.c => terminal.c} (100%) rename cmd/{cmd_test.c => test.c} (100%) rename cmd/{cmd_thordown.c => thordown.c} (100%) rename cmd/{cmd_time.c => time.c} (100%) rename cmd/{cmd_tpm.c => tpm.c} (100%) rename cmd/{cmd_tpm_test.c => tpm_test.c} (100%) rename cmd/{cmd_trace.c => trace.c} (100%) rename cmd/{cmd_tsi148.c => tsi148.c} (100%) rename cmd/{cmd_ubi.c => ubi.c} (100%) rename cmd/{cmd_ubifs.c => ubifs.c} (100%) rename cmd/{cmd_universe.c => universe.c} (100%) rename cmd/{cmd_unzip.c => unzip.c} (100%) rename cmd/{cmd_usb.c => usb.c} (100%) rename cmd/{cmd_usb_mass_storage.c => usb_mass_storage.c} (100%) rename cmd/{cmd_version.c => version.c} (100%) rename cmd/{cmd_ximg.c => ximg.c} (100%) rename cmd/{cmd_yaffs2.c => yaffs2.c} (100%) rename cmd/{cmd_zfs.c => zfs.c} (100%) rename cmd/{cmd_zip.c => zip.c} (100%)
diff --git a/cmd/Makefile b/cmd/Makefile index 880a886..03f7e0a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -7,160 +7,160 @@
ifndef CONFIG_SPL_BUILD # core command -obj-y += cmd_boot.o -obj-$(CONFIG_CMD_BOOTM) += cmd_bootm.o -obj-y += cmd_help.o -obj-y += cmd_version.o +obj-y += boot.o +obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-y += help.o +obj-y += version.o
# command -obj-$(CONFIG_CMD_AES) += cmd_aes.o -obj-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o -obj-$(CONFIG_CMD_ARMFLASH) += cmd_armflash.o -obj-$(CONFIG_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_SOURCE) += cmd_source.o -obj-$(CONFIG_CMD_BDI) += cmd_bdinfo.o -obj-$(CONFIG_CMD_BEDBUG) += cmd_bedbug.o -obj-$(CONFIG_CMD_BMP) += cmd_bmp.o -obj-$(CONFIG_CMD_BOOTMENU) += cmd_bootmenu.o -obj-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o -obj-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o -obj-$(CONFIG_CMD_CACHE) += cmd_cache.o -obj-$(CONFIG_CMD_CBFS) += cmd_cbfs.o -obj-$(CONFIG_CMD_CLK) += cmd_clk.o -obj-$(CONFIG_CMD_CONSOLE) += cmd_console.o -obj-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o -obj-$(CONFIG_CMD_CPU) += cmd_cpu.o -obj-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o -obj-$(CONFIG_CMD_DATE) += cmd_date.o -obj-$(CONFIG_CMD_DEMO) += cmd_demo.o -obj-$(CONFIG_CMD_SOUND) += cmd_sound.o +obj-$(CONFIG_CMD_AES) += aes.o +obj-$(CONFIG_CMD_AMBAPP) += ambapp.o +obj-$(CONFIG_CMD_ARMFLASH) += armflash.o +obj-$(CONFIG_SOURCE) += source.o +obj-$(CONFIG_CMD_SOURCE) += source.o +obj-$(CONFIG_CMD_BDI) += bdinfo.o +obj-$(CONFIG_CMD_BEDBUG) += bedbug.o +obj-$(CONFIG_CMD_BMP) += bmp.o +obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o +obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o +obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o +obj-$(CONFIG_CMD_CACHE) += cache.o +obj-$(CONFIG_CMD_CBFS) += cbfs.o +obj-$(CONFIG_CMD_CLK) += clk.o +obj-$(CONFIG_CMD_CONSOLE) += console.o +obj-$(CONFIG_CMD_CPLBINFO) += cplbinfo.o +obj-$(CONFIG_CMD_CPU) += cpu.o +obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o +obj-$(CONFIG_CMD_DATE) += date.o +obj-$(CONFIG_CMD_DEMO) += demo.o +obj-$(CONFIG_CMD_SOUND) += sound.o ifdef CONFIG_4xx -obj-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o +obj-$(CONFIG_CMD_SETGETDCR) += dcr.o endif ifdef CONFIG_POST -obj-$(CONFIG_CMD_DIAG) += cmd_diag.o +obj-$(CONFIG_CMD_DIAG) += diag.o endif -obj-$(CONFIG_CMD_DISPLAY) += cmd_display.o -obj-$(CONFIG_CMD_DTT) += cmd_dtt.o -obj-$(CONFIG_CMD_ECHO) += cmd_echo.o -obj-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o -obj-$(CONFIG_EFI_STUB) += cmd_efi.o -obj-$(CONFIG_CMD_ELF) += cmd_elf.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o -obj-$(CONFIG_CMD_EXT4) += cmd_ext4.o -obj-$(CONFIG_CMD_EXT2) += cmd_ext2.o -obj-$(CONFIG_CMD_FAT) += cmd_fat.o -obj-$(CONFIG_CMD_FDC) += cmd_fdc.o -obj-$(CONFIG_OF_LIBFDT) += cmd_fdt.o -obj-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o -obj-$(CONFIG_CMD_FLASH) += cmd_flash.o +obj-$(CONFIG_CMD_DISPLAY) += display.o +obj-$(CONFIG_CMD_DTT) += dtt.o +obj-$(CONFIG_CMD_ECHO) += echo.o +obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o +obj-$(CONFIG_CMD_EEPROM) += eeprom.o +obj-$(CONFIG_EFI_STUB) += efi.o +obj-$(CONFIG_CMD_ELF) += elf.o +obj-$(CONFIG_SYS_HUSH_PARSER) += exit.o +obj-$(CONFIG_CMD_EXT4) += ext4.o +obj-$(CONFIG_CMD_EXT2) += ext2.o +obj-$(CONFIG_CMD_FAT) += fat.o +obj-$(CONFIG_CMD_FDC) += fdc.o +obj-$(CONFIG_OF_LIBFDT) += fdt.o +obj-$(CONFIG_CMD_FITUPD) += fitupd.o +obj-$(CONFIG_CMD_FLASH) += flash.o ifdef CONFIG_FPGA -obj-$(CONFIG_CMD_FPGA) += cmd_fpga.o +obj-$(CONFIG_CMD_FPGA) += fpga.o endif -obj-$(CONFIG_CMD_FPGAD) += cmd_fpgad.o -obj-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o -obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o -obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o -obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o -obj-$(CONFIG_CMD_I2C) += cmd_i2c.o -obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o -obj-$(CONFIG_CMD_HASH) += cmd_hash.o -obj-$(CONFIG_CMD_IDE) += cmd_ide.o -obj-$(CONFIG_CMD_IMMAP) += cmd_immap.o -obj-$(CONFIG_CMD_INI) += cmd_ini.o -obj-$(CONFIG_CMD_IRQ) += cmd_irq.o -obj-$(CONFIG_CMD_ITEST) += cmd_itest.o -obj-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o -obj-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o -obj-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o -obj-$(CONFIG_CMD_LED) += cmd_led.o -obj-$(CONFIG_CMD_LICENSE) += cmd_license.o -obj-y += cmd_load.o -obj-$(CONFIG_LOGBUFFER) += cmd_log.o -obj-$(CONFIG_ID_EEPROM) += cmd_mac.o -obj-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o -obj-$(CONFIG_CMD_MEMORY) += cmd_mem.o -obj-$(CONFIG_CMD_IO) += cmd_io.o -obj-$(CONFIG_CMD_MFSL) += cmd_mfsl.o -obj-$(CONFIG_CMD_MII) += cmd_mii.o +obj-$(CONFIG_CMD_FPGAD) += fpgad.o +obj-$(CONFIG_CMD_FS_GENERIC) += fs.o +obj-$(CONFIG_CMD_FUSE) += fuse.o +obj-$(CONFIG_CMD_GETTIME) += gettime.o +obj-$(CONFIG_CMD_GPIO) += gpio.o +obj-$(CONFIG_CMD_I2C) += i2c.o +obj-$(CONFIG_CMD_IOTRACE) += iotrace.o +obj-$(CONFIG_CMD_HASH) += hash.o +obj-$(CONFIG_CMD_IDE) += ide.o +obj-$(CONFIG_CMD_IMMAP) += immap.o +obj-$(CONFIG_CMD_INI) += ini.o +obj-$(CONFIG_CMD_IRQ) += irq.o +obj-$(CONFIG_CMD_ITEST) += itest.o +obj-$(CONFIG_CMD_JFFS2) += jffs2.o +obj-$(CONFIG_CMD_CRAMFS) += cramfs.o +obj-$(CONFIG_CMD_LDRINFO) += ldrinfo.o +obj-$(CONFIG_CMD_LED) += led.o +obj-$(CONFIG_CMD_LICENSE) += license.o +obj-y += load.o +obj-$(CONFIG_LOGBUFFER) += log.o +obj-$(CONFIG_ID_EEPROM) += mac.o +obj-$(CONFIG_CMD_MD5SUM) += md5sum.o +obj-$(CONFIG_CMD_MEMORY) += mem.o +obj-$(CONFIG_CMD_IO) += io.o +obj-$(CONFIG_CMD_MFSL) += mfsl.o +obj-$(CONFIG_CMD_MII) += mii.o ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += cmd_mdio.o +obj-$(CONFIG_CMD_MII) += mdio.o endif -obj-$(CONFIG_CMD_MISC) += cmd_misc.o -obj-$(CONFIG_CMD_MMC) += cmd_mmc.o -obj-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o -obj-$(CONFIG_MP) += cmd_mp.o -obj-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o -obj-$(CONFIG_CMD_NAND) += cmd_nand.o -obj-$(CONFIG_CMD_NET) += cmd_net.o -obj-$(CONFIG_CMD_ONENAND) += cmd_onenand.o -obj-$(CONFIG_CMD_OTP) += cmd_otp.o -obj-$(CONFIG_CMD_PART) += cmd_part.o +obj-$(CONFIG_CMD_MISC) += misc.o +obj-$(CONFIG_CMD_MMC) += mmc.o +obj-$(CONFIG_CMD_MMC_SPI) += mmc_spi.o +obj-$(CONFIG_MP) += mp.o +obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o +obj-$(CONFIG_CMD_NAND) += nand.o +obj-$(CONFIG_CMD_NET) += net.o +obj-$(CONFIG_CMD_ONENAND) += onenand.o +obj-$(CONFIG_CMD_OTP) += otp.o +obj-$(CONFIG_CMD_PART) += part.o ifdef CONFIG_PCI -obj-$(CONFIG_CMD_PCI) += cmd_pci.o +obj-$(CONFIG_CMD_PCI) += pci.o endif -obj-y += cmd_pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += cmd_portio.o -obj-$(CONFIG_CMD_PXE) += cmd_pxe.o -obj-$(CONFIG_CMD_READ) += cmd_read.o -obj-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o -obj-$(CONFIG_CMD_REISER) += cmd_reiser.o -obj-$(CONFIG_CMD_REMOTEPROC) += cmd_remoteproc.o -obj-$(CONFIG_SANDBOX) += cmd_host.o -obj-$(CONFIG_CMD_SATA) += cmd_sata.o -obj-$(CONFIG_CMD_SF) += cmd_sf.o -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o -obj-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o -obj-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o -obj-$(CONFIG_CMD_SOFTSWITCH) += cmd_softswitch.o -obj-$(CONFIG_CMD_SPI) += cmd_spi.o -obj-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o -obj-$(CONFIG_CMD_STRINGS) += cmd_strings.o -obj-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o -obj-$(CONFIG_CMD_TIME) += cmd_time.o -obj-$(CONFIG_CMD_TRACE) += cmd_trace.o -obj-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o -obj-$(CONFIG_CMD_TPM) += cmd_tpm.o -obj-$(CONFIG_CMD_TPM_TEST) += cmd_tpm_test.o -obj-$(CONFIG_CMD_TSI148) += cmd_tsi148.o -obj-$(CONFIG_CMD_UBI) += cmd_ubi.o -obj-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o -obj-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o -obj-$(CONFIG_CMD_UNZIP) += cmd_unzip.o +obj-y += pcmcia.o +obj-$(CONFIG_CMD_PORTIO) += portio.o +obj-$(CONFIG_CMD_PXE) += pxe.o +obj-$(CONFIG_CMD_READ) += read.o +obj-$(CONFIG_CMD_REGINFO) += reginfo.o +obj-$(CONFIG_CMD_REISER) += reiser.o +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_CMD_SCSI) += scsi.o +obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o +obj-$(CONFIG_CMD_SETEXPR) += setexpr.o +obj-$(CONFIG_CMD_SOFTSWITCH) += softswitch.o +obj-$(CONFIG_CMD_SPI) += spi.o +obj-$(CONFIG_CMD_SPIBOOTLDR) += spibootldr.o +obj-$(CONFIG_CMD_STRINGS) += strings.o +obj-$(CONFIG_CMD_TERMINAL) += terminal.o +obj-$(CONFIG_CMD_TIME) += time.o +obj-$(CONFIG_CMD_TRACE) += trace.o +obj-$(CONFIG_SYS_HUSH_PARSER) += test.o +obj-$(CONFIG_CMD_TPM) += tpm.o +obj-$(CONFIG_CMD_TPM_TEST) += tpm_test.o +obj-$(CONFIG_CMD_TSI148) += tsi148.o +obj-$(CONFIG_CMD_UBI) += ubi.o +obj-$(CONFIG_CMD_UBIFS) += ubifs.o +obj-$(CONFIG_CMD_UNIVERSE) += universe.o +obj-$(CONFIG_CMD_UNZIP) += unzip.o ifdef CONFIG_LZMA -obj-$(CONFIG_CMD_LZMADEC) += cmd_lzmadec.o +obj-$(CONFIG_CMD_LZMADEC) += lzmadec.o endif
-obj-$(CONFIG_CMD_USB) += cmd_usb.o -obj-$(CONFIG_CMD_FASTBOOT) += cmd_fastboot.o -obj-$(CONFIG_CMD_FS_UUID) += cmd_fs_uuid.o +obj-$(CONFIG_CMD_USB) += usb.o +obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o +obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o
-obj-$(CONFIG_CMD_USB_MASS_STORAGE) += cmd_usb_mass_storage.o -obj-$(CONFIG_CMD_THOR_DOWNLOAD) += cmd_thordown.o -obj-$(CONFIG_CMD_XIMG) += cmd_ximg.o -obj-$(CONFIG_YAFFS2) += cmd_yaffs2.o -obj-$(CONFIG_CMD_SPL) += cmd_spl.o -obj-$(CONFIG_CMD_ZIP) += cmd_zip.o -obj-$(CONFIG_CMD_ZFS) += cmd_zfs.o +obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o +obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o +obj-$(CONFIG_CMD_XIMG) += ximg.o +obj-$(CONFIG_YAFFS2) += yaffs2.o +obj-$(CONFIG_CMD_SPL) += spl.o +obj-$(CONFIG_CMD_ZIP) += zip.o +obj-$(CONFIG_CMD_ZFS) += zfs.o
-obj-$(CONFIG_CMD_DFU) += cmd_dfu.o -obj-$(CONFIG_CMD_GPT) += cmd_gpt.o -obj-$(CONFIG_CMD_ETHSW) += cmd_ethsw.o +obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_CMD_GPT) += gpt.o +obj-$(CONFIG_CMD_ETHSW) += ethsw.o
# Power -obj-$(CONFIG_CMD_PMIC) += cmd_pmic.o -obj-$(CONFIG_CMD_REGULATOR) += cmd_regulator.o +obj-$(CONFIG_CMD_PMIC) += pmic.o +obj-$(CONFIG_CMD_REGULATOR) += regulator.o endif # !CONFIG_SPL_BUILD
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_SATA_SUPPORT -obj-$(CONFIG_CMD_SCSI) += cmd_scsi.o +obj-$(CONFIG_CMD_SCSI) += scsi.o endif endif # CONFIG_SPL_BUILD
-obj-$(CONFIG_CMD_BLOB) += cmd_blob.o +obj-$(CONFIG_CMD_BLOB) += blob.o
# core command -obj-y += cmd_nvedit.o -obj-y += cmd_disk.o +obj-y += nvedit.o +obj-y += disk.o diff --git a/cmd/cmd_aes.c b/cmd/aes.c similarity index 100% rename from cmd/cmd_aes.c rename to cmd/aes.c diff --git a/cmd/cmd_ambapp.c b/cmd/ambapp.c similarity index 100% rename from cmd/cmd_ambapp.c rename to cmd/ambapp.c diff --git a/cmd/cmd_armflash.c b/cmd/armflash.c similarity index 100% rename from cmd/cmd_armflash.c rename to cmd/armflash.c diff --git a/cmd/cmd_bdinfo.c b/cmd/bdinfo.c similarity index 100% rename from cmd/cmd_bdinfo.c rename to cmd/bdinfo.c diff --git a/cmd/cmd_bedbug.c b/cmd/bedbug.c similarity index 100% rename from cmd/cmd_bedbug.c rename to cmd/bedbug.c diff --git a/cmd/cmd_blob.c b/cmd/blob.c similarity index 100% rename from cmd/cmd_blob.c rename to cmd/blob.c diff --git a/cmd/cmd_bmp.c b/cmd/bmp.c similarity index 100% rename from cmd/cmd_bmp.c rename to cmd/bmp.c diff --git a/cmd/cmd_boot.c b/cmd/boot.c similarity index 100% rename from cmd/cmd_boot.c rename to cmd/boot.c diff --git a/cmd/cmd_bootldr.c b/cmd/bootldr.c similarity index 100% rename from cmd/cmd_bootldr.c rename to cmd/bootldr.c diff --git a/cmd/cmd_bootm.c b/cmd/bootm.c similarity index 100% rename from cmd/cmd_bootm.c rename to cmd/bootm.c diff --git a/cmd/cmd_bootmenu.c b/cmd/bootmenu.c similarity index 100% rename from cmd/cmd_bootmenu.c rename to cmd/bootmenu.c diff --git a/cmd/cmd_bootstage.c b/cmd/bootstage.c similarity index 100% rename from cmd/cmd_bootstage.c rename to cmd/bootstage.c diff --git a/cmd/cmd_cache.c b/cmd/cache.c similarity index 100% rename from cmd/cmd_cache.c rename to cmd/cache.c diff --git a/cmd/cmd_cbfs.c b/cmd/cbfs.c similarity index 100% rename from cmd/cmd_cbfs.c rename to cmd/cbfs.c diff --git a/cmd/cmd_clk.c b/cmd/clk.c similarity index 100% rename from cmd/cmd_clk.c rename to cmd/clk.c diff --git a/cmd/cmd_console.c b/cmd/console.c similarity index 100% rename from cmd/cmd_console.c rename to cmd/console.c diff --git a/cmd/cmd_cplbinfo.c b/cmd/cplbinfo.c similarity index 100% rename from cmd/cmd_cplbinfo.c rename to cmd/cplbinfo.c diff --git a/cmd/cmd_cpu.c b/cmd/cpu.c similarity index 100% rename from cmd/cmd_cpu.c rename to cmd/cpu.c diff --git a/cmd/cmd_cramfs.c b/cmd/cramfs.c similarity index 100% rename from cmd/cmd_cramfs.c rename to cmd/cramfs.c diff --git a/cmd/cmd_dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c similarity index 100% rename from cmd/cmd_dataflash_mmc_mux.c rename to cmd/dataflash_mmc_mux.c diff --git a/cmd/cmd_date.c b/cmd/date.c similarity index 100% rename from cmd/cmd_date.c rename to cmd/date.c diff --git a/cmd/cmd_dcr.c b/cmd/dcr.c similarity index 100% rename from cmd/cmd_dcr.c rename to cmd/dcr.c diff --git a/cmd/cmd_demo.c b/cmd/demo.c similarity index 100% rename from cmd/cmd_demo.c rename to cmd/demo.c diff --git a/cmd/cmd_dfu.c b/cmd/dfu.c similarity index 100% rename from cmd/cmd_dfu.c rename to cmd/dfu.c diff --git a/cmd/cmd_diag.c b/cmd/diag.c similarity index 100% rename from cmd/cmd_diag.c rename to cmd/diag.c diff --git a/cmd/cmd_disk.c b/cmd/disk.c similarity index 100% rename from cmd/cmd_disk.c rename to cmd/disk.c diff --git a/cmd/cmd_display.c b/cmd/display.c similarity index 100% rename from cmd/cmd_display.c rename to cmd/display.c diff --git a/cmd/cmd_dtt.c b/cmd/dtt.c similarity index 100% rename from cmd/cmd_dtt.c rename to cmd/dtt.c diff --git a/cmd/cmd_echo.c b/cmd/echo.c similarity index 100% rename from cmd/cmd_echo.c rename to cmd/echo.c diff --git a/cmd/cmd_eeprom.c b/cmd/eeprom.c similarity index 100% rename from cmd/cmd_eeprom.c rename to cmd/eeprom.c diff --git a/cmd/cmd_efi.c b/cmd/efi.c similarity index 100% rename from cmd/cmd_efi.c rename to cmd/efi.c diff --git a/cmd/cmd_elf.c b/cmd/elf.c similarity index 100% rename from cmd/cmd_elf.c rename to cmd/elf.c diff --git a/cmd/cmd_ethsw.c b/cmd/ethsw.c similarity index 100% rename from cmd/cmd_ethsw.c rename to cmd/ethsw.c diff --git a/cmd/cmd_exit.c b/cmd/exit.c similarity index 100% rename from cmd/cmd_exit.c rename to cmd/exit.c diff --git a/cmd/cmd_ext2.c b/cmd/ext2.c similarity index 100% rename from cmd/cmd_ext2.c rename to cmd/ext2.c diff --git a/cmd/cmd_ext4.c b/cmd/ext4.c similarity index 100% rename from cmd/cmd_ext4.c rename to cmd/ext4.c diff --git a/cmd/cmd_fastboot.c b/cmd/fastboot.c similarity index 100% rename from cmd/cmd_fastboot.c rename to cmd/fastboot.c diff --git a/cmd/cmd_fat.c b/cmd/fat.c similarity index 100% rename from cmd/cmd_fat.c rename to cmd/fat.c diff --git a/cmd/cmd_fdc.c b/cmd/fdc.c similarity index 100% rename from cmd/cmd_fdc.c rename to cmd/fdc.c diff --git a/cmd/cmd_fdt.c b/cmd/fdt.c similarity index 100% rename from cmd/cmd_fdt.c rename to cmd/fdt.c diff --git a/cmd/cmd_fitupd.c b/cmd/fitupd.c similarity index 100% rename from cmd/cmd_fitupd.c rename to cmd/fitupd.c diff --git a/cmd/cmd_flash.c b/cmd/flash.c similarity index 100% rename from cmd/cmd_flash.c rename to cmd/flash.c diff --git a/cmd/cmd_fpga.c b/cmd/fpga.c similarity index 100% rename from cmd/cmd_fpga.c rename to cmd/fpga.c diff --git a/cmd/cmd_fpgad.c b/cmd/fpgad.c similarity index 100% rename from cmd/cmd_fpgad.c rename to cmd/fpgad.c diff --git a/cmd/cmd_fs.c b/cmd/fs.c similarity index 100% rename from cmd/cmd_fs.c rename to cmd/fs.c diff --git a/cmd/cmd_fs_uuid.c b/cmd/fs_uuid.c similarity index 100% rename from cmd/cmd_fs_uuid.c rename to cmd/fs_uuid.c diff --git a/cmd/cmd_fuse.c b/cmd/fuse.c similarity index 100% rename from cmd/cmd_fuse.c rename to cmd/fuse.c diff --git a/cmd/cmd_gettime.c b/cmd/gettime.c similarity index 100% rename from cmd/cmd_gettime.c rename to cmd/gettime.c diff --git a/cmd/cmd_gpio.c b/cmd/gpio.c similarity index 100% rename from cmd/cmd_gpio.c rename to cmd/gpio.c diff --git a/cmd/cmd_gpt.c b/cmd/gpt.c similarity index 100% rename from cmd/cmd_gpt.c rename to cmd/gpt.c diff --git a/cmd/cmd_hash.c b/cmd/hash.c similarity index 100% rename from cmd/cmd_hash.c rename to cmd/hash.c diff --git a/cmd/cmd_help.c b/cmd/help.c similarity index 100% rename from cmd/cmd_help.c rename to cmd/help.c diff --git a/cmd/cmd_host.c b/cmd/host.c similarity index 100% rename from cmd/cmd_host.c rename to cmd/host.c diff --git a/cmd/cmd_i2c.c b/cmd/i2c.c similarity index 100% rename from cmd/cmd_i2c.c rename to cmd/i2c.c diff --git a/cmd/cmd_ide.c b/cmd/ide.c similarity index 100% rename from cmd/cmd_ide.c rename to cmd/ide.c diff --git a/cmd/cmd_immap.c b/cmd/immap.c similarity index 100% rename from cmd/cmd_immap.c rename to cmd/immap.c diff --git a/cmd/cmd_ini.c b/cmd/ini.c similarity index 100% rename from cmd/cmd_ini.c rename to cmd/ini.c diff --git a/cmd/cmd_io.c b/cmd/io.c similarity index 100% rename from cmd/cmd_io.c rename to cmd/io.c diff --git a/cmd/cmd_iotrace.c b/cmd/iotrace.c similarity index 100% rename from cmd/cmd_iotrace.c rename to cmd/iotrace.c diff --git a/cmd/cmd_irq.c b/cmd/irq.c similarity index 100% rename from cmd/cmd_irq.c rename to cmd/irq.c diff --git a/cmd/cmd_itest.c b/cmd/itest.c similarity index 100% rename from cmd/cmd_itest.c rename to cmd/itest.c diff --git a/cmd/cmd_jffs2.c b/cmd/jffs2.c similarity index 100% rename from cmd/cmd_jffs2.c rename to cmd/jffs2.c diff --git a/cmd/cmd_ldrinfo.c b/cmd/ldrinfo.c similarity index 100% rename from cmd/cmd_ldrinfo.c rename to cmd/ldrinfo.c diff --git a/cmd/cmd_led.c b/cmd/led.c similarity index 100% rename from cmd/cmd_led.c rename to cmd/led.c diff --git a/cmd/cmd_license.c b/cmd/license.c similarity index 100% rename from cmd/cmd_license.c rename to cmd/license.c diff --git a/cmd/cmd_load.c b/cmd/load.c similarity index 100% rename from cmd/cmd_load.c rename to cmd/load.c diff --git a/cmd/cmd_log.c b/cmd/log.c similarity index 100% rename from cmd/cmd_log.c rename to cmd/log.c diff --git a/cmd/cmd_lzmadec.c b/cmd/lzmadec.c similarity index 100% rename from cmd/cmd_lzmadec.c rename to cmd/lzmadec.c diff --git a/cmd/cmd_mac.c b/cmd/mac.c similarity index 100% rename from cmd/cmd_mac.c rename to cmd/mac.c diff --git a/cmd/cmd_md5sum.c b/cmd/md5sum.c similarity index 100% rename from cmd/cmd_md5sum.c rename to cmd/md5sum.c diff --git a/cmd/cmd_mdio.c b/cmd/mdio.c similarity index 100% rename from cmd/cmd_mdio.c rename to cmd/mdio.c diff --git a/cmd/cmd_mem.c b/cmd/mem.c similarity index 100% rename from cmd/cmd_mem.c rename to cmd/mem.c diff --git a/cmd/cmd_mfsl.c b/cmd/mfsl.c similarity index 100% rename from cmd/cmd_mfsl.c rename to cmd/mfsl.c diff --git a/cmd/cmd_mii.c b/cmd/mii.c similarity index 100% rename from cmd/cmd_mii.c rename to cmd/mii.c diff --git a/cmd/cmd_misc.c b/cmd/misc.c similarity index 100% rename from cmd/cmd_misc.c rename to cmd/misc.c diff --git a/cmd/cmd_mmc.c b/cmd/mmc.c similarity index 100% rename from cmd/cmd_mmc.c rename to cmd/mmc.c diff --git a/cmd/cmd_mmc_spi.c b/cmd/mmc_spi.c similarity index 100% rename from cmd/cmd_mmc_spi.c rename to cmd/mmc_spi.c diff --git a/cmd/cmd_mp.c b/cmd/mp.c similarity index 100% rename from cmd/cmd_mp.c rename to cmd/mp.c diff --git a/cmd/cmd_mtdparts.c b/cmd/mtdparts.c similarity index 100% rename from cmd/cmd_mtdparts.c rename to cmd/mtdparts.c diff --git a/cmd/cmd_nand.c b/cmd/nand.c similarity index 100% rename from cmd/cmd_nand.c rename to cmd/nand.c diff --git a/cmd/cmd_net.c b/cmd/net.c similarity index 100% rename from cmd/cmd_net.c rename to cmd/net.c diff --git a/cmd/cmd_nvedit.c b/cmd/nvedit.c similarity index 100% rename from cmd/cmd_nvedit.c rename to cmd/nvedit.c diff --git a/cmd/cmd_onenand.c b/cmd/onenand.c similarity index 100% rename from cmd/cmd_onenand.c rename to cmd/onenand.c diff --git a/cmd/cmd_otp.c b/cmd/otp.c similarity index 100% rename from cmd/cmd_otp.c rename to cmd/otp.c diff --git a/cmd/cmd_part.c b/cmd/part.c similarity index 100% rename from cmd/cmd_part.c rename to cmd/part.c diff --git a/cmd/cmd_pci.c b/cmd/pci.c similarity index 100% rename from cmd/cmd_pci.c rename to cmd/pci.c diff --git a/cmd/cmd_pcmcia.c b/cmd/pcmcia.c similarity index 100% rename from cmd/cmd_pcmcia.c rename to cmd/pcmcia.c diff --git a/cmd/cmd_pmic.c b/cmd/pmic.c similarity index 100% rename from cmd/cmd_pmic.c rename to cmd/pmic.c diff --git a/cmd/cmd_portio.c b/cmd/portio.c similarity index 100% rename from cmd/cmd_portio.c rename to cmd/portio.c diff --git a/cmd/cmd_pxe.c b/cmd/pxe.c similarity index 100% rename from cmd/cmd_pxe.c rename to cmd/pxe.c diff --git a/cmd/cmd_read.c b/cmd/read.c similarity index 100% rename from cmd/cmd_read.c rename to cmd/read.c diff --git a/cmd/cmd_reginfo.c b/cmd/reginfo.c similarity index 100% rename from cmd/cmd_reginfo.c rename to cmd/reginfo.c diff --git a/cmd/cmd_regulator.c b/cmd/regulator.c similarity index 100% rename from cmd/cmd_regulator.c rename to cmd/regulator.c diff --git a/cmd/cmd_reiser.c b/cmd/reiser.c similarity index 100% rename from cmd/cmd_reiser.c rename to cmd/reiser.c diff --git a/cmd/cmd_remoteproc.c b/cmd/remoteproc.c similarity index 100% rename from cmd/cmd_remoteproc.c rename to cmd/remoteproc.c diff --git a/cmd/cmd_sata.c b/cmd/sata.c similarity index 100% rename from cmd/cmd_sata.c rename to cmd/sata.c diff --git a/cmd/cmd_scsi.c b/cmd/scsi.c similarity index 100% rename from cmd/cmd_scsi.c rename to cmd/scsi.c diff --git a/cmd/cmd_setexpr.c b/cmd/setexpr.c similarity index 100% rename from cmd/cmd_setexpr.c rename to cmd/setexpr.c diff --git a/cmd/cmd_sf.c b/cmd/sf.c similarity index 100% rename from cmd/cmd_sf.c rename to cmd/sf.c diff --git a/cmd/cmd_sha1sum.c b/cmd/sha1sum.c similarity index 100% rename from cmd/cmd_sha1sum.c rename to cmd/sha1sum.c diff --git a/cmd/cmd_softswitch.c b/cmd/softswitch.c similarity index 100% rename from cmd/cmd_softswitch.c rename to cmd/softswitch.c diff --git a/cmd/cmd_sound.c b/cmd/sound.c similarity index 100% rename from cmd/cmd_sound.c rename to cmd/sound.c diff --git a/cmd/cmd_source.c b/cmd/source.c similarity index 100% rename from cmd/cmd_source.c rename to cmd/source.c diff --git a/cmd/cmd_spi.c b/cmd/spi.c similarity index 100% rename from cmd/cmd_spi.c rename to cmd/spi.c diff --git a/cmd/cmd_spibootldr.c b/cmd/spibootldr.c similarity index 100% rename from cmd/cmd_spibootldr.c rename to cmd/spibootldr.c diff --git a/cmd/cmd_spl.c b/cmd/spl.c similarity index 100% rename from cmd/cmd_spl.c rename to cmd/spl.c diff --git a/cmd/cmd_strings.c b/cmd/strings.c similarity index 100% rename from cmd/cmd_strings.c rename to cmd/strings.c diff --git a/cmd/cmd_terminal.c b/cmd/terminal.c similarity index 100% rename from cmd/cmd_terminal.c rename to cmd/terminal.c diff --git a/cmd/cmd_test.c b/cmd/test.c similarity index 100% rename from cmd/cmd_test.c rename to cmd/test.c diff --git a/cmd/cmd_thordown.c b/cmd/thordown.c similarity index 100% rename from cmd/cmd_thordown.c rename to cmd/thordown.c diff --git a/cmd/cmd_time.c b/cmd/time.c similarity index 100% rename from cmd/cmd_time.c rename to cmd/time.c diff --git a/cmd/cmd_tpm.c b/cmd/tpm.c similarity index 100% rename from cmd/cmd_tpm.c rename to cmd/tpm.c diff --git a/cmd/cmd_tpm_test.c b/cmd/tpm_test.c similarity index 100% rename from cmd/cmd_tpm_test.c rename to cmd/tpm_test.c diff --git a/cmd/cmd_trace.c b/cmd/trace.c similarity index 100% rename from cmd/cmd_trace.c rename to cmd/trace.c diff --git a/cmd/cmd_tsi148.c b/cmd/tsi148.c similarity index 100% rename from cmd/cmd_tsi148.c rename to cmd/tsi148.c diff --git a/cmd/cmd_ubi.c b/cmd/ubi.c similarity index 100% rename from cmd/cmd_ubi.c rename to cmd/ubi.c diff --git a/cmd/cmd_ubifs.c b/cmd/ubifs.c similarity index 100% rename from cmd/cmd_ubifs.c rename to cmd/ubifs.c diff --git a/cmd/cmd_universe.c b/cmd/universe.c similarity index 100% rename from cmd/cmd_universe.c rename to cmd/universe.c diff --git a/cmd/cmd_unzip.c b/cmd/unzip.c similarity index 100% rename from cmd/cmd_unzip.c rename to cmd/unzip.c diff --git a/cmd/cmd_usb.c b/cmd/usb.c similarity index 100% rename from cmd/cmd_usb.c rename to cmd/usb.c diff --git a/cmd/cmd_usb_mass_storage.c b/cmd/usb_mass_storage.c similarity index 100% rename from cmd/cmd_usb_mass_storage.c rename to cmd/usb_mass_storage.c diff --git a/cmd/cmd_version.c b/cmd/version.c similarity index 100% rename from cmd/cmd_version.c rename to cmd/version.c diff --git a/cmd/cmd_ximg.c b/cmd/ximg.c similarity index 100% rename from cmd/cmd_ximg.c rename to cmd/ximg.c diff --git a/cmd/cmd_yaffs2.c b/cmd/yaffs2.c similarity index 100% rename from cmd/cmd_yaffs2.c rename to cmd/yaffs2.c diff --git a/cmd/cmd_zfs.c b/cmd/zfs.c similarity index 100% rename from cmd/cmd_zfs.c rename to cmd/zfs.c diff --git a/cmd/cmd_zip.c b/cmd/zip.c similarity index 100% rename from cmd/cmd_zip.c rename to cmd/zip.c
Acked-by: Przemyslaw Marczak p.marczak@samsung.com
Best regards,
On Sun, Jan 17, 2016 at 08:53:52PM -0700, Simon Glass wrote:
Now that they are in their own directory, we can remove this prefix. This makes it easier to find a file since the prefix does not get in the way.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Heiko Schocher hs@denx.de Acked-by: Stefan Roese sr@denx.de Acked-by: Przemyslaw Marczak p.marczak@samsung.com
Applied to u-boot/master, thanks!
participants (7)
-
Bin Meng -
Heiko Schocher -
Masahiro Yamada -
Przemyslaw Marczak -
Simon Glass -
Stefan Roese -
Tom Rini