Re: [U-Boot] [PATCH v2 22/42] Convert CONFIG_CMD_SF_TEST to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SF_TEST > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Fix typos in help > - Make X86 imply CMD_SF_TEST (except for efi-x86 which fails) > - Put Kconfig change in alphabetical order > > README | 6 -- > arch/Kconfig| 2 ++ > cmd/Kconfig | 11 +++ > configs/chromebit_mickey_defconfig | 1 + > configs/chromebook_jerry_defconfig | 1 + > configs/chromebook_minnie_defconfig | 1 + > configs/efi-x86_defconfig | 1 + > configs/sandbox_defconfig | 4 +--- > include/configs/efi-x86.h | 2 -- > include/configs/sandbox.h | 1 - > include/configs/veyron.h| 2 -- > include/configs/x86-common.h| 1 - > scripts/config_whitelist.txt| 1 - > 13 files changed, 18 insertions(+), 16 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 24/42] Convert CONFIG_CMD_SPL to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SPL > > Note that trats does not actually use SPL, so this option can no-longer be > set. > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Fix up microblaze-generic, gw_ventana, ipam390 > - Remove some now-superfluous /* commands */ comments in header files > > arch/arm/Kconfig | 1 + > arch/arm/mach-imx/mx6/Kconfig | 1 + > arch/arm/mach-omap2/am33xx/Kconfig| 1 + > cmd/Kconfig | 9 + > configs/am335x_boneblack_defconfig| 1 + > configs/am335x_boneblack_vboot_defconfig | 1 + > configs/am335x_evm_defconfig | 1 + > configs/am335x_evm_nor_defconfig | 1 + > configs/am335x_evm_usbspl_defconfig | 1 + > configs/am335x_igep003x_defconfig | 1 + > configs/am335x_sl50_defconfig | 1 + > configs/am43xx_evm_defconfig | 1 + > configs/am43xx_evm_ethboot_defconfig | 1 + > configs/am43xx_evm_usbhost_boot_defconfig | 1 + > configs/am57xx_evm_defconfig | 1 + > configs/am57xx_evm_nodt_defconfig | 1 + > configs/birdland_bav335a_defconfig| 1 + > configs/birdland_bav335b_defconfig| 1 + > configs/cairo_defconfig | 1 + > configs/devkit8000_defconfig | 1 + > configs/dra7xx_evm_defconfig | 1 + > configs/ipam390_defconfig | 1 + > configs/microblaze-generic_defconfig | 1 + > configs/mx6sabresd_defconfig | 1 + > configs/omap3_beagle_defconfig| 1 + > configs/omap3_logic_defconfig | 1 + > configs/omap3_overo_defconfig | 1 + > configs/omap4_panda_defconfig | 1 + > configs/omap5_uevm_defconfig | 1 + > configs/pcm051_rev1_defconfig | 1 + > configs/pcm051_rev3_defconfig | 1 + > configs/pengwyn_defconfig | 1 + > configs/twister_defconfig | 1 + > include/configs/gw_ventana.h | 1 - > include/configs/ipam390.h | 1 - > include/configs/microblaze-generic.h | 1 - > include/configs/mx6sabreauto.h| 1 - > include/configs/mx6sabresd.h | 1 - > include/configs/ti_armv7_common.h | 4 > include/configs/trats.h | 1 - > include/configs/twister.h | 1 - > include/configs/zynq-common.h | 1 - > scripts/config_whitelist.txt | 1 - > 43 files changed, 41 insertions(+), 13 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 23/42] Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SH_ZIMAGEBOOT > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Make this 'default y' and drop defconfig file changes > - Remove some now-superfluous /* commands */ comments in header files > - Rename the option to include 'zimageboot' > > arch/sh/Kconfig | 2 ++ > arch/sh/lib/Kconfig | 6 ++ > include/configs/r2dplus.h| 5 - > include/configs/sh7785lcr.h | 2 -- > scripts/config_whitelist.txt | 1 - > 5 files changed, 8 insertions(+), 8 deletions(-) > create mode 100644 arch/sh/lib/Kconfig > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 25/42] Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SPL_NAND_OFS > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Drop unwanted 'CONFIG_CMD_SPL_NAND_OFS=0x0' lines in defconfig > > cmd/Kconfig | 10 ++ > configs/am335x_evm_defconfig | 1 + > configs/am335x_evm_nor_defconfig | 1 + > configs/am335x_evm_usbspl_defconfig | 1 + > configs/am43xx_evm_defconfig | 1 + > configs/am43xx_evm_ethboot_defconfig | 1 + > configs/am43xx_evm_usbhost_boot_defconfig | 1 + > configs/cairo_defconfig | 1 + > configs/devkit8000_defconfig | 1 + > configs/gwventana_emmc_defconfig | 1 + > configs/gwventana_gw5904_defconfig| 1 + > configs/gwventana_nand_defconfig | 1 + > configs/igep0020_defconfig| 1 + > configs/igep0030_defconfig| 1 + > configs/igep0032_defconfig| 1 + > configs/ipam390_defconfig | 1 + > configs/omap3_beagle_defconfig| 1 + > configs/omap3_logic_defconfig | 1 + > configs/omap3_overo_defconfig | 1 + > configs/pengwyn_defconfig | 1 + > configs/twister_defconfig | 1 + > include/configs/am335x_evm.h | 1 - > include/configs/am43xx_evm.h | 1 - > include/configs/baltos.h | 1 - > include/configs/bav335x.h | 1 - > include/configs/brppt1.h | 1 - > include/configs/cm_t335.h | 1 - > include/configs/devkit8000.h | 2 -- > include/configs/dra7xx_evm.h | 1 - > include/configs/gw_ventana.h | 1 - > include/configs/ipam390.h | 1 - > include/configs/omap3_beagle.h| 1 - > include/configs/omap3_cairo.h | 1 - > include/configs/omap3_logic.h | 1 - > include/configs/omap3_overo.h | 1 - > include/configs/omap3_zoom1.h | 1 - > include/configs/pengwyn.h | 1 - > include/configs/twister.h | 2 -- > scripts/config_whitelist.txt | 1 - > 39 files changed, 30 insertions(+), 20 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 21/42] Convert CONFIG_CMD_SDRAM to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SDRAM > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Put Kconfig change in alphabetical order > - Remove some now-superfluous /* commands */ comments in header files > > README | 2 -- > cmd/Kconfig | 7 +++ > configs/MPC8349ITXGP_defconfig | 1 + > configs/MPC8349ITX_LOWBOOT_defconfig | 1 + > configs/MPC8349ITX_defconfig | 1 + > configs/MigoR_defconfig | 1 + > configs/alt_defconfig| 1 + > configs/ap325rxa_defconfig | 1 + > configs/ap_sh4a_4a_defconfig | 1 + > configs/armadillo-800eva_defconfig | 1 + > configs/blanche_defconfig| 1 + > configs/ecovec_defconfig | 1 + > configs/espt_defconfig | 1 + > configs/gose_defconfig | 1 + > configs/koelsch_defconfig| 1 + > configs/lager_defconfig | 1 + > configs/ms7720se_defconfig | 1 + > configs/ms7722se_defconfig | 1 + > configs/porter_defconfig | 1 + > configs/r0p7734_defconfig| 1 + > configs/r7780mp_defconfig| 1 + > configs/r8a7795_salvator-x_defconfig | 1 + > configs/r8a7796_salvator-x_defconfig | 1 + > configs/rsk7203_defconfig| 1 + > configs/sh7752evb_defconfig | 1 + > configs/sh7753evb_defconfig | 1 + > configs/sh7757lcr_defconfig | 1 + > configs/sh7763rdp_defconfig | 1 + > configs/sh7785lcr_32bit_defconfig| 1 + > configs/sh7785lcr_defconfig | 1 + > configs/shmin_defconfig | 1 + > configs/silk_defconfig | 1 + > configs/socrates_defconfig | 1 + > configs/stout_defconfig | 1 + > include/config_cmd_all.h | 1 - > include/configs/MPC8349ITX.h | 5 - > include/configs/MigoR.h | 2 -- > include/configs/ap325rxa.h | 2 -- > include/configs/ap_sh4a_4a.h | 2 -- > include/configs/armadillo-800eva.h | 2 -- > include/configs/ecovec.h | 2 -- > include/configs/espt.h | 5 - > include/configs/ms7720se.h | 2 -- > include/configs/ms7722se.h | 2 -- > include/configs/r0p7734.h| 2 -- > include/configs/r7780mp.h| 5 - > include/configs/rcar-gen2-common.h | 2 -- > include/configs/rcar-gen3-common.h | 1 - > include/configs/rsk7203.h| 2 -- > include/configs/sh7752evb.h | 2 -- > include/configs/sh7753evb.h | 2 -- > include/configs/sh7757lcr.h | 2 -- > include/configs/sh7763rdp.h | 5 - > include/configs/sh7785lcr.h | 1 - > include/configs/shmin.h | 2 -- > include/configs/socrates.h | 5 - > scripts/config_whitelist.txt | 1 - > 57 files changed, 39 insertions(+), 59 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 27/42] Kconfig: Sort the memory commands
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > These are currently not quite in alphabetical order. Before adding more, > sort them. Not all options have a CMD_ prefix, so ignore that when > sorting. > > Signed-off-by: Simon Glass > Suggested-by: Bin Meng > --- > > Changes in v2: > - Add new patch to sort the memory commands > > cmd/Kconfig | 60 ++-- > 1 file changed, 30 insertions(+), 30 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 19/42] Convert CONFIG_CMD_SAVES to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SAVES > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Put Kconfig change in alphabetical order > - Remove some now-superfluous /* commands */ comments in header files > > README | 1 - > arch/arm/Kconfig | 6 ++ > cmd/Kconfig | 6 ++ > configs/ethernut5_defconfig | 1 + > configs/microblaze-generic_defconfig | 1 + > configs/x600_defconfig | 1 + > configs/xtfpga_defconfig | 1 + > include/config_cmd_all.h | 1 - > include/configs/calimain.h | 8 > include/configs/da850evm.h | 5 - > include/configs/ea20.h | 5 - > include/configs/ethernut5.h | 1 - > include/configs/ipam390.h| 5 - > include/configs/legoev3.h| 5 - > include/configs/microblaze-generic.h | 18 -- > include/configs/omapl138_lcdk.h | 4 > include/configs/spear-common.h | 5 - > include/configs/ti_armv7_keystone2.h | 3 --- > include/configs/x600.h | 5 - > include/configs/xtfpga.h | 6 -- > scripts/config_whitelist.txt | 1 - > 21 files changed, 16 insertions(+), 73 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 20/42] Convert CONFIG_CMD_SCSI to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_SCSI > > Also update the Makefile to use CONFIG_CMD_SCSI instead of CONFIG_SCSI to > enable the command, fixing an earlier error. > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Update commit message to explain Makefile change > > arch/arm/Kconfig | 3 +++ > cmd/Kconfig | 9 + > cmd/Makefile | 2 +- > configs/cl-som-am57x_defconfig| 1 + > configs/controlcenterdc_defconfig | 1 + > configs/ls1012aqds_qspi_defconfig | 1 + > include/configs/cl-som-am57x.h| 1 - > include/configs/controlcenterdc.h | 1 - > include/configs/ls1012aqds.h | 1 - > include/configs/ls1012ardb.h | 1 - > include/configs/ls1021aiot.h | 1 - > include/configs/ls1043ardb.h | 1 - > scripts/config_whitelist.txt | 1 - > 13 files changed, 16 insertions(+), 8 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 16/42] Convert CONFIG_CMD_REGINFO to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > From: Christophe Leroy > > This patch converts CONFIG_CMD_REGINFO to Kconfig > > Signed-off-by: Christophe Leroy > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Fixed lots of merge conflicts with my series > - Pull in this patch from http://patchwork.ozlabs.org/patch/787724/ instead > > README | 1 - > arch/powerpc/Kconfig | 3 +++ > cmd/Kconfig | 5 + > include/config_cmd_all.h | 1 - > include/configs/B4860QDS.h | 5 - > include/configs/BSC9131RDB.h | 5 - > include/configs/BSC9132QDS.h | 5 - > include/configs/C29XPCIE.h | 5 - > include/configs/MCR3000.h| 3 --- > include/configs/MPC8536DS.h | 5 - > include/configs/MPC8541CDS.h | 5 - > include/configs/MPC8544DS.h | 5 - > include/configs/MPC8548CDS.h | 5 - > include/configs/MPC8555CDS.h | 5 - > include/configs/MPC8560ADS.h | 8 > include/configs/MPC8568MDS.h | 5 - > include/configs/MPC8569MDS.h | 5 - > include/configs/MPC8572DS.h | 5 - > include/configs/MPC8610HPCD.h| 2 -- > include/configs/MPC8641HPCN.h| 5 - > include/configs/P1010RDB.h | 5 - > include/configs/P1022DS.h| 5 - > include/configs/P1023RDB.h | 5 - > include/configs/T102xQDS.h | 5 - > include/configs/T102xRDB.h | 5 - > include/configs/T1040QDS.h | 5 - > include/configs/T104xRDB.h | 5 - > include/configs/T208xQDS.h | 5 - > include/configs/T208xRDB.h | 5 - > include/configs/T4240RDB.h | 2 -- > include/configs/TQM834x.h| 5 - > include/configs/UCP1020.h| 5 - > include/configs/controlcenterd.h | 3 --- > include/configs/corenet_ds.h | 5 - > include/configs/cyrus.h | 5 - > include/configs/p1_p2_rdb_pc.h | 5 - > include/configs/p1_twr.h | 5 - > include/configs/qemu-ppce500.h | 2 -- > include/configs/sbc8548.h| 5 - > include/configs/sbc8641d.h | 2 -- > include/configs/smdkc100.h | 3 --- > include/configs/socrates.h | 1 - > include/configs/t4qds.h | 2 -- > include/configs/xpedite517x.h| 5 - > include/configs/xpedite520x.h| 5 - > include/configs/xpedite537x.h| 5 - > include/configs/xpedite550x.h| 5 - > scripts/config_whitelist.txt | 1 - > 48 files changed, 8 insertions(+), 196 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 14/42] Kconfig: Drop CONFIG_CMD_PORTIO and associated command
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This command is not used by any board. It also looks quite similar to the > 'iod' and 'iow' commands which use the correct I/O macros. > > Drop it. > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Drop mention of this from several other places > - Move CMD_PORTIO changes in from the CMD_READ patch > > README | 1 - > cmd/Makefile | 1 - > cmd/portio.c | 145 > --- > include/command.h| 9 ++- > include/config_cmd_all.h | 1 - > scripts/config_whitelist.txt | 1 - > 6 files changed, 4 insertions(+), 154 deletions(-) > delete mode 100644 cmd/portio.c > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 15/42] Kconfig: Convert CMD_READ to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > Convert this option and enable it in sandbox. Also correct a bug which > was introduced with the block-device driver model conversion. > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Move CMD_PORTIO changes to previous patch > - Sort Kconfig options in alphabetical order > > README | 1 - > cmd/Kconfig | 5 + > cmd/read.c | 2 +- > configs/sandbox_defconfig| 3 +++ > include/config_cmd_all.h | 1 - > scripts/config_whitelist.txt | 1 - > 6 files changed, 9 insertions(+), 4 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 10/42] Convert CONFIG_CMD_PCI to Kconfig
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > This converts the following to Kconfig: >CONFIG_CMD_PCI > > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Fix indentation for CMD_PCI > - Sort Kconfig options in alphabetical order > > README | 1 - > arch/arm/cpu/armv7/ls102xa/Kconfig | 1 + > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + > arch/powerpc/cpu/mpc85xx/Kconfig| 6 ++ > cmd/Kconfig | 8 > configs/M5235EVB_Flash32_defconfig | 1 + > configs/M5235EVB_defconfig | 1 + > configs/M5475AFE_defconfig | 1 + > configs/M5475BFE_defconfig | 1 + > configs/M5475CFE_defconfig | 1 + > configs/M5475DFE_defconfig | 1 + > configs/M5475EFE_defconfig | 1 + > configs/M5475FFE_defconfig | 1 + > configs/M5475GFE_defconfig | 1 + > configs/M5485AFE_defconfig | 1 + > configs/M5485BFE_defconfig | 1 + > configs/M5485CFE_defconfig | 1 + > configs/M5485DFE_defconfig | 1 + > configs/M5485EFE_defconfig | 1 + > configs/M5485FFE_defconfig | 1 + > configs/M5485GFE_defconfig | 1 + > configs/M5485HFE_defconfig | 1 + > configs/MPC8308RDB_defconfig| 1 + > configs/MPC8313ERDB_33_defconfig| 1 + > configs/MPC8313ERDB_66_defconfig| 1 + > configs/MPC8313ERDB_NAND_33_defconfig | 1 + > configs/MPC8313ERDB_NAND_66_defconfig | 1 + > configs/MPC8315ERDB_defconfig | 1 + > configs/MPC8323ERDB_defconfig | 1 + > configs/MPC832XEMDS_HOST_33_defconfig | 1 + > configs/MPC832XEMDS_HOST_66_defconfig | 1 + > configs/MPC832XEMDS_SLAVE_defconfig | 1 + > configs/MPC8349ITXGP_defconfig | 1 + > configs/MPC8349ITX_LOWBOOT_defconfig| 1 + > configs/MPC8349ITX_defconfig| 1 + > configs/MPC837XEMDS_HOST_defconfig | 1 + > configs/MPC837XERDB_defconfig | 1 + > configs/MPC8536DS_36BIT_defconfig | 1 + > configs/MPC8536DS_SDCARD_defconfig | 1 + > configs/MPC8536DS_SPIFLASH_defconfig| 1 + > configs/MPC8536DS_defconfig | 1 + > configs/MPC8541CDS_defconfig| 1 + > configs/MPC8541CDS_legacy_defconfig | 1 + > configs/MPC8544DS_defconfig | 1 + > configs/MPC8548CDS_36BIT_defconfig | 1 + > configs/MPC8548CDS_defconfig| 1 + > configs/MPC8548CDS_legacy_defconfig | 1 + > configs/MPC8555CDS_defconfig| 1 + > configs/MPC8555CDS_legacy_defconfig | 1 + > configs/MPC8568MDS_defconfig| 1 + > configs/MPC8569MDS_ATM_defconfig| 1 + > configs/MPC8569MDS_defconfig| 1 + > configs/MPC8572DS_36BIT_defconfig | 1 + > configs/MPC8572DS_defconfig | 1 + > configs/MPC8610HPCD_defconfig | 1 + > configs/MPC8641HPCN_36BIT_defconfig | 1 + > configs/MPC8641HPCN_defconfig | 1 + > configs/P1021RDB-PC_36BIT_NAND_defconfig| 1 + > configs/P1021RDB-PC_36BIT_SDCARD_defconfig | 1 + > configs/P1021RDB-PC_36BIT_SPIFLASH_defconfig| 1 + > configs/P1021RDB-PC_36BIT_defconfig | 1 + > configs/P1021RDB-PC_NAND_defconfig | 1 + > configs/P1021RDB-PC_SDCARD_defconfig| 1 + > configs/P1021RDB-PC_SPIFLASH_defconfig | 1 + > configs/P1021RDB-PC_defconfig | 1 + > configs/P1022DS_36BIT_NAND_defconfig| 1 + > configs/P1022DS_36BIT_SDCARD_defconfig | 1 + > configs/P1022DS_36BIT_SPIFLASH_defconfig| 1 + > configs/P1022DS_36BIT_defconfig | 1 + > configs/P1022DS_NAND_defconfig | 1 + > configs/P1022DS_SDCARD_defconfig| 1 + > configs/P1022DS_SPIFLASH_defconfig | 1 + >
Re: [U-Boot] [PATCH v2 04/42] Kconfig: Sort the device-access commands
On Sat, Aug 5, 2017 at 6:34 AM, Simon Glasswrote: > These are currently not quite in alphabetical order. Before adding more, > sort them. > > Signed-off-by: Simon Glass > Suggested-by: Bin Meng > --- > > Changes in v2: > - Add new patch to sort the device-access commands > > cmd/Kconfig | 244 > ++-- > 1 file changed, 122 insertions(+), 122 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 10/41] Convert CONFIG_CMD_PCI to Kconfig
Hi Simon, On Sat, Aug 5, 2017 at 5:38 AM, Simon Glasswrote: > Hi Bin, > > On 22 July 2017 at 09:18, Bin Meng wrote: >> Hi Simon, >> >> On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass wrote: >>> This converts the following to Kconfig: >>>CONFIG_CMD_PCI >>> >>> Signed-off-by: Simon Glass >>> --- >>> > [..] > >>> diff --git a/README b/README >>> index 43691cc167..fe63a7090b 100644 >>> --- a/README >>> +++ b/README >>> @@ -813,7 +813,6 @@ The following options need to be configured: >>> CONFIG_CMD_NAND * NAND support >>> CONFIG_CMD_NETbootp, tftpboot, rarpboot >>> CONFIG_CMD_NFSNFS support >>> - CONFIG_CMD_PCI * pciinfo >>> CONFIG_CMD_PCMCIA * PCMCIA support >>> CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network >>> host >>> diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig >>> b/arch/arm/cpu/armv7/ls102xa/Kconfig >>> index 6a013b2183..fadfce4f05 100644 >>> --- a/arch/arm/cpu/armv7/ls102xa/Kconfig >>> +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig >>> @@ -15,6 +15,7 @@ config ARCH_LS1021A >>> select SYS_FSL_SEC_COMPAT_5 >>> select SYS_FSL_SEC_LE >>> imply SCSI >>> + imply CMD_PCI >> >> I assume this was converted by moveconfig. It seems some of the >> Kconfig files are updated to "imply CMD_PCI", but some are not (eg: >> all x86 boards defconfig files are updated instead). What's the logic >> for when to use "imply" vs. updating board defconfig file? > > If there are 5 or more boards which could benefit from an imply, then > it adds one. I sometimes change this (e.g. to 4 boards) but I think > figuring out exactly what each arch / board should imply is the job of > the maintainer. > > It is a lot of work to create these conversion series, and I don't > think we should strive for 100% perfection. That is the job of board > maintainers. Thanks for the clarifications! That makes perfect sense. Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/2] ARM: OMAP5: Remove OPP_LOW Definitions for ES2.0
ES2.0 descopes OPP_LOW definition. So remove it from macros defined. Signed-off-by: Nishanth Menon--- arch/arm/include/asm/arch-omap5/clock.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index 0c99bbdc9320..dd05e8ba8317 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -236,9 +236,6 @@ #define VDD_MPU_ES2_HIGH 1250 #define VDD_MM_ES2_OD 1120 -#define VDD_MPU_ES2_LOW 880 -#define VDD_MM_ES2_LOW 880 - /* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */ #define VDD_MPU_DRA7_NOM 1150 #define VDD_CORE_DRA7_NOM 1150 -- 2.12.2 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/2] ARM: OMAP5: Enable support for AVS0 for OMAP5 production devices
OMAP5432 did go into production with AVS class0 registers which were mutually exclusive from AVS Class 1.5 registers. Most OMAP5-uEVM boards use the pre-production Class1.5 which has production efuse registers set to 0. However on production devices, these are set to valid data. scale_vcore logic is already smart enough to detect this and use the "Nominal voltage" on devices that do not have efuse registers populated. On a test production device populated as follows: MPU OPP_NOM: => md.l 0x04A0021C4 1 4a0021c4: 03a003e9 (0x3e9 = 1.01v) vs nom voltage of 1.06v MPU OPP_HIGH: => md.l 0x04A0021C8 1 4a0021c8: 03400485 ..@. MM OPP_NOM: => md.l 0x04A0021A4 1 4a0021a4: 038003d4 (0x3d4 = 980mV) vs nom voltage of 1.025v MM OPP_OD: => md.l 0x04A0021A8 1 4a0021a8: 03600403 ..`. CORE OPP_NOM: => md.l 0x04A0021D8 1 4a0021d8: 03cf (0x3cf = 975mV) vs nom voltage of 1.040v Since the efuse values are'nt currently used, we do not regress on existing pre-production samples (they continue to use nominal voltage). But on boards that do have production samples populated, we can leverage the optimal voltages necessary for proper operation. Tested on: a) 720-2644-001 OMAP5UEVM with production sample. b) 750-2628-222(A) UEVM5432G-02 with pre-production sample. Data based on OMAP5432 Technical reference Manual SWPU282AF (May 2012-Revised Aug 2016) NOTE: All collaterals on OMAP5432 silicon itself seems to have been removed from ti.com, though EVM details are still available: http://www.ti.com/tool/OMAP5432-EVM Signed-off-by: Nishanth Menon--- arch/arm/include/asm/arch-omap5/clock.h | 16 arch/arm/include/asm/arch-omap5/omap.h | 4 ++-- arch/arm/mach-omap2/omap5/abb.c | 4 ++-- arch/arm/mach-omap2/omap5/hw_data.c | 9 + 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index dd05e8ba8317..dbe340d23e4f 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -236,6 +236,22 @@ #define VDD_MPU_ES2_HIGH 1250 #define VDD_MM_ES2_OD 1120 +/* Efuse register offsets for OMAP5 platform */ +#define OMAP5_ES2_EFUSE_BASE 0x4A002000 +#define OMAP5_ES2_PROD_REGBITS 16 + +/* CONTROL_STD_FUSE_OPP_VDD_CORE_3 */ +#define OMAP5_ES2_PROD_CORE_OPNO_VMIN (OMAP5_ES2_EFUSE_BASE + 0x1D8) + +/* CONTROL_STD_FUSE_OPP_VDD_MM_4 */ +#define OMAP5_ES2_PROD_MM_OPNO_VMIN(OMAP5_ES2_EFUSE_BASE + 0x1A4) +/* CONTROL_STD_FUSE_OPP_VDD_MM_5 */ +#define OMAP5_ES2_PROD_MM_OPOD_VMIN(OMAP5_ES2_EFUSE_BASE + 0x1A8) +/* CONTROL_STD_FUSE_OPP_VDD_MPU_6 */ +#define OMAP5_ES2_PROD_MPU_OPNO_VMIN (OMAP5_ES2_EFUSE_BASE + 0x1C4) +/* CONTROL_STD_FUSE_OPP_VDD_MPU_7 */ +#define OMAP5_ES2_PROD_MPU_OPHI_VMIN (OMAP5_ES2_EFUSE_BASE + 0x1C8) + /* DRA74x/75x/72x voltage settings in mv for OPP_NOM per DM */ #define VDD_MPU_DRA7_NOM 1150 #define VDD_CORE_DRA7_NOM 1150 diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index 2f005dd3ad92..b047f0d65081 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -224,8 +224,8 @@ struct s32ktimer { #define OMAP_ABB_GPU_TXDONE_MASK (0x1 << 28) /* ABB efuse masks */ -#define OMAP5_ABB_FUSE_VSET_MASK (0x1F << 24) -#define OMAP5_ABB_FUSE_ENABLE_MASK (0x1 << 29) +#define OMAP5_PROD_ABB_FUSE_VSET_MASK (0x1F << 20) +#define OMAP5_PROD_ABB_FUSE_ENABLE_MASK(0x1 << 25) #define DRA7_ABB_FUSE_VSET_MASK(0x1F << 20) #define DRA7_ABB_FUSE_ENABLE_MASK (0x1 << 25) #define OMAP5_ABB_LDOVBBMPU_MUX_CTRL_MASK (0x1 << 10) diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c index 3bf88979e5d6..1882c49e7df6 100644 --- a/arch/arm/mach-omap2/omap5/abb.c +++ b/arch/arm/mach-omap2/omap5/abb.c @@ -28,8 +28,8 @@ s8 abb_setup_ldovbb(u32 fuse, u32 ldovbb) { u32 vset; - u32 fuse_enable_mask = OMAP5_ABB_FUSE_ENABLE_MASK; - u32 fuse_vset_mask = OMAP5_ABB_FUSE_VSET_MASK; + u32 fuse_enable_mask = OMAP5_PROD_ABB_FUSE_ENABLE_MASK; + u32 fuse_vset_mask = OMAP5_PROD_ABB_FUSE_VSET_MASK; if (!is_omap54xx()) { /* DRA7 */ diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c index a8a6b8a869e5..4ad6b530d29c 100644 --- a/arch/arm/mach-omap2/omap5/hw_data.c +++ b/arch/arm/mach-omap2/omap5/hw_data.c @@ -329,6 +329,15 @@ struct vcores_data omap5430_volts_es2 = { .mm.addr = SMPS_REG_ADDR_45_IVA, .mm.pmic = , .mm.abb_tx_done_mask = OMAP_ABB_MM_TXDONE_MASK, + + .mpu.efuse.reg[OPP_NOM] = OMAP5_ES2_PROD_MPU_OPNO_VMIN, + .mpu.efuse.reg_bits =
[U-Boot] [PATCH 0/2] ARM: OMAP5: Add AVS support for ES2.0
Hi, OMAP5 went into production with AVS Class0 Vs pre-production configuration of AVS 1.5. Most of the current "in-the-wild" OMAP5 uEVMs are based on pre-production samples, however, the support for "production configuration" helps platforms such as pyra-handheld[1]. This original issue was reported by zmatt on #beagle freenode IRC channel, However, I donot have a email address to attribute to him/her :( (zmatt, if you are on the list, feel free to add your reported and/or tested) Series verified (with scope) on: a) 720-2644-001 OMAP5UEVM with production sample. b) 750-2628-222(A) UEVM5432G-02 with pre-production sample. build tested with: buildman -b omap5-evm omap5 [1] https://www.pyra-handheld.com/wiki/index.php?title=OMAP_5 Nishanth Menon (2): ARM: OMAP5: Remove OPP_LOW Definitions for ES2.0 ARM: OMAP5: Enable support for AVS0 for OMAP5 production devices arch/arm/include/asm/arch-omap5/clock.h | 17 +++-- arch/arm/include/asm/arch-omap5/omap.h | 4 ++-- arch/arm/mach-omap2/omap5/abb.c | 4 ++-- arch/arm/mach-omap2/omap5/hw_data.c | 9 + 4 files changed, 28 insertions(+), 6 deletions(-) -- 2.12.2 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v0 20/20] efi_loader: add bootmgr
On Fri, Aug 04, 2017 at 04:28:05PM -0400, Rob Clark wrote: > On Fri, Aug 4, 2017 at 4:06 PM, Heinrich Schuchardt> wrote: > > On 08/04/2017 09:32 PM, Rob Clark wrote: > >> Similar to a "real" UEFI implementation, the bootmgr looks at the > >> BootOrder and Boot variables to try to find an EFI payload to load > >> and boot. This is added as a sub-command of bootefi. > >> > >> The idea is that the distro bootcmd would first try loading a payload > >> via the bootmgr, and then if that fails (ie. first boot or corrupted > >> EFI variables) it would fallback to loading bootaa64.efi. (Which > >> would then load fallback.efi which would look for \EFI\*\boot.csv and > >> populate BootOrder and Boot based on what it found.) > > > > > > I wonder if this implementation is Fedora specific. > > > > For Debian I could not find any reference to boot.csv. > > And it is not mentioned in the UEFI 2.7 spec. > > > > Please, provide the specification that your work is based on. > > The references to boot.csv are based on looking at how shim/fallback > work.. perhaps that is not standardized. I'll let Peter Jones comment > on that if he knows better what windows and other linux distro's do. The boot.csv parts are part of fallback.efi, which is part of shim. It's not distro specific, though not every distro uses it (though I thought debian had started doing so very recently), and fallback.efi + boot.csv is still strictly optional. But as Rob says below - the boot methodology fallback employs is based on what the spec says the boot manager will do. A distro could also just stick a second copy of their normal bootloader in /EFI/BOOT/BOOTAA64.EFI and it would boot through the recovery path every time until somebody manually created a boot variable. fallback is just shim's method of setting the variables automatically, and it is fairly widely deployed. I'm pretty sure SuSE and Ubuntu both use it, for example. > The bootmanager implementation is based on UEFI spec (sect 3.1 in > v2.7), which does not depend on boot.csv or how shim/fallback program > the BootOrder/Boot variables. But simply that they do. I'm not > particularly familiar with the boot chain on Debian, it is entirely > possible that it works differently. My comments about boot.csv where > merely to try to provide context (and are quite possibly misleading on > some distro's), but are irrelevant to the bootmgr implementation which > only cares about BootOrder/Boot, as described in sect 3.1. > > (There are a lot of details that I skipped over in the bootmgr > implementation, simply because secure boot or setting of efi variables > from the OS is not implemented, so they are not yet relevant.) This is still all correct. -- Peter ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] cmd/fdt: support single value replacement within an array
Hi Hannes, (I'm not subscribed to the list, please keep me CC'ed on replies) On Tuesday 30 May 2017 13:05:00 Hannes Schmelzer wrote: > With this commit we can modify single values within an array of a dts > property. But with this commit U-Boot crashes if you try to create a new property with the fdt set command :-/ I've tested v2017.07 with the commit reverted, and fdt set works again for me. The issue is that your fdt_getprop() call fails and return NULL with len set to -1. You can easily imagine what the memcpy() following it will do. > This is useful if we have for example a pwm-backlight where we want to > modifiy the pwm frequency per u-boot script. > > The pwm is described in dts like this: > > backlight { > pwms = <0x002b 0x 0x004c4b40>; > }; > > For changing the frequency, here the 3rd parameter, we simply type: > > fdt set /backlight pwms ; > > For doing all this we: > - backup the property content into our 'SCRATCHPAD' > - only modify the array-cell if the new content doesn't start with '?' > > Signed-off-by: Hannes Schmelzer> > --- > > cmd/fdt.c | 29 + > 1 file changed, 21 insertions(+), 8 deletions(-) > > diff --git a/cmd/fdt.c b/cmd/fdt.c > index a21415d..e55102a 100644 > --- a/cmd/fdt.c > +++ b/cmd/fdt.c > @@ -257,6 +257,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, > char * const argv[])> > char *prop; /* property */ > int nodeoffset;/* node offset from libfdt */ > static char data[SCRATCHPAD]; /* storage for the property */ > + const void *ptmp; > int len; /* new length of the property */ > int ret; /* return value */ > > @@ -268,13 +269,6 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int > argc, char * const argv[])> > pathp = argv[2]; > prop = argv[3]; > > - if (argc == 4) { > - len = 0; > - } else { > - ret = fdt_parse_prop([4], argc - 4, data, ); > - if (ret != 0) > - return ret; > - } > > nodeoffset = fdt_path_offset (working_fdt, pathp); > if (nodeoffset < 0) { > @@ -286,6 +280,21 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int > argc, char * const argv[]) > return 1; > } > > + if (argc == 4) { > + len = 0; > + } else { > + ptmp = fdt_getprop(working_fdt, nodeoffset, prop, > ); > + if (len > SCRATCHPAD) { > + printf("prop (%d) doesn't fit in scratchpad! > \n", > +len); > + return 1; > + } > + memcpy(data, ptmp, len); > + ret = fdt_parse_prop([4], argc - 4, data, ); > + if (ret != 0) > + return ret; > + } > + > ret = fdt_setprop(working_fdt, nodeoffset, prop, data, len); > if (ret < 0) { > printf ("libfdt fdt_setprop(): %s\n", > fdt_strerror(ret)); > @@ -766,7 +775,11 @@ static int fdt_parse_prop(char * const *newval, int > count, char *data, int *len) > cp = newp; > tmp = simple_strtoul(cp, , 0); > > - *(fdt32_t *)data = cpu_to_fdt32(tmp); > + if (*cp != '?') > + *(fdt32_t *)data = cpu_to_fdt32(tmp); > + else > + newp++; > + > > data += 4; > *len += 4; -- Regards, Laurent Pinchart ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] Issues about u-boot tools (mkimage and dumpimage)
Hi all, I am working on a project related to secure boot. We are using NXP’s iMX7d development board. I am using `make –j32 V=1` to verbosely print build commands. The last command for making u-boot is `./tools/mkimage -n board/freescale/mx7dsabresd/imximage.cfg.cfgtmp -T imximage -e 0x8780 -d u-boot-dtb.bin u-boot-dtb.imx`. Then it will print out the image header imformation like this: ``` Image Type: Freescale IMX Boot Image Image Ver:2 (i.MX53/6/7 compatible) Mode: DCD Data Size:561152 Bytes = 548.00 KiB = 0.54 MiB Load Address: 877ff420 Entry Point: 8780 HAB Blocks: 877ff400 00086c00 DCD Blocks: 0091 002c 01b4 ``` The last two lines about “HAB” and “DCD” are special header fields for this type of board because of secure boot (i.e., high assurance boot). I’d like to later examine the values of HAB Blocks. I found `dumpimage` tools can print the header of built image. However, it will report segmentation fault. After spending some time to understand the code. I found it’s caused by `imximage_check_params()` function which requires a non-null `imagename` in `prams`. I tried to fix this issue. However, the dumpimage tool still cannot dump “HAB Blocks” information in the header. The reason is that the `print_header()` functions of `imximage` type needs a configuration file which located in "board/freescale/mx7dsabresd/imximage.cfg.cfgtmp" for my board. Again, I tried to fix it, but failed. Because the `print_header()` function only accept one parameter which is header and this is a unified function among all types of board. I cannot change the definition of it. In a nutshell, there are two issues with the code related with imximage type: 1. The mkimage tool *misuses* “-n” (i.e., image name) flag to pass an image configuration file path. 2. The dumpimage tool cannot dump the “HAB” header information due to the *lack* of the imx image configuration file. Here is my temporary workaround patch for imx board: ``` diff --git a/tools/dumpimage.c b/tools/dumpimage.c index 75a5d47..ad67f22 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -15,6 +15,7 @@ static void usage(void); /* parameters initialized by core will be used by the image type code */ static struct image_tool_params params = { .type = IH_TYPE_KERNEL, + .imagename = "board/freescale/mx7dsabresd/imximage.cfg.cfgtmp", }; /* diff --git a/tools/imximage.c b/tools/imximage.c index eb7e682..e495345 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -810,6 +810,21 @@ static void imximage_print_header(const void *ptr) struct imx_header *imx_hdr = (struct imx_header *) ptr; uint32_t version = detect_imximage_version(imx_hdr); + memset(_header, 0, sizeof(imximage_header)); + /* +* In order to not change the old imx cfg file +* by adding VERSION command into it, here need +* set up function ptr group to V1 by default. +*/ + imximage_version = IMXIMAGE_V1; + /* Be able to detect if the cfg file has no BOOT_FROM tag */ + imximage_ivt_offset = FLASH_OFFSET_UNDEFINED; + imximage_csf_size = 0; + set_hdr_func(); + + /* Parse dcd configuration file */ + parse_cfg_file(_header, "board/freescale/mx7dsabresd/imximage.cfg.cfgtmp"); + switch (version) { case IMXIMAGE_V1: print_hdr_v1(imx_hdr); ``` Is there any suggestion for me to contribute patches to the mainstream code in order to permanently fix above issues. Thank you. Best, Mingshen ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/3] spl: moveconfig: remove SPL_LDSCRIPT definitions for header-files
With the hierarchical defaults set up, we remove these from the header files. To do so, I've run moveconfig on SPL_LDSCRIPT and this commits the changes. Signed-off-by: Philipp Tomsich--- include/configs/am335x_evm.h | 2 -- include/configs/am335x_igep003x.h | 1 - include/configs/am335x_shc.h | 2 -- include/configs/am335x_sl50.h | 2 -- include/configs/am3517_crane.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/am43xx_evm.h | 2 -- include/configs/apf27.h| 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h| 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 2 -- include/configs/bur_am335x_common.h| 1 - include/configs/chiliboard.h | 2 -- include/configs/cm_t335.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t43.h | 2 -- include/configs/da850evm.h | 1 - include/configs/edminiv2.h | 1 - include/configs/exynos5-common.h | 1 - include/configs/imx6_spl.h | 1 - include/configs/ipam390.h | 1 - include/configs/kc1.h | 2 -- include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 2 -- include/configs/ls1046a_common.h | 2 -- include/configs/ls2080a_common.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/mcx.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mx31pdk.h | 1 - include/configs/mxs.h | 1 - include/configs/omap3_evm.h| 1 - include/configs/omapl138_lcdk.h| 1 - include/configs/origen.h | 1 - include/configs/pcm051.h | 2 -- include/configs/pengwyn.h | 2 -- include/configs/pepper.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/sama5d2_xplained.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h | 1 - include/configs/sama5d4ek.h| 1 - include/configs/siemens-am33x-common.h | 2 -- include/configs/smartweb.h | 1 - include/configs/smdkv310.h | 1 - include/configs/sniper.h | 2 -- include/configs/sunxi-common.h | 4 include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 2 -- include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap4_common.h | 1 - include/configs/ti_omap5_common.h | 1 - include/configs/tricorder.h| 1 - include/configs/woodburn_sd.h | 1 - include/configs/x600.h | 1 - include/configs/zynq-common.h | 2 -- 63 files changed, 85 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2a2e2ba..9df856c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -191,8 +191,6 @@ #define CONFIG_SYS_BOOTCOUNT_BE /* USB gadget RNDIS */ - -#define CONFIG_SPL_LDSCRIPT"arch/arm/mach-omap2/u-boot-spl.lds" #endif #ifdef CONFIG_NAND diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 4721b42..ae72543 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -125,7 +125,6 @@ #define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(SPL),-(UBI)" /* SPL */ -#define CONFIG_SPL_LDSCRIPT"arch/arm/mach-omap2/u-boot-spl.lds" /* UBI configuration */ #define CONFIG_SPL_UBI 1 diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f3b7767..d84d268 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -247,8 +247,6 @@ /* SPL */ -#define CONFIG_SPL_LDSCRIPT"arch/arm/mach-omap2/u-boot-spl.lds" - #ifndef CONFIG_SPL_USBETH_SUPPORT #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 75f9bef..7ea135e 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -78,8 +78,6 @@ #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE -#define CONFIG_SPL_LDSCRIPT"arch/arm/mach-omap2/u-boot-spl.lds" - #ifndef CONFIG_SPL_USBETH_SUPPORT #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #endif diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 36adea7..2cdf4c8 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -258,7
[U-Boot] [PATCH 0/3] rockchip: rk3368: spl: move SPL_LDSCRIPT from header-files to Kconfig
After applying the SPL/TPL infrastructure changes for the RK3368, a number of unexpected failures occurred during the buildman validation run. For a some of platforms, SPL_LDSCRIPT was now defined multiple times: once from Kconfig and once from a header file. This is a hot fix (i.e. it's needed before I can send out our pull-request) that adjusts the everything else to work again with SPL_LDSCRIPT moved to Kconfig. Note that I marked this as 'rockchip: spl: rk3368', as it is a change from integration/merging the changes already queued for our tree. Philipp Tomsich (3): spl: add hierarchical defaults for SPL_LDSCRIPT spl: moveconfig: remove SPL_LDSCRIPT definitions for header-files rockchip: rk3368: spl: move SPL_LDSCRIPT to Kconfig arch/arm/Kconfig | 12 arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 +++ arch/arm/mach-at91/Kconfig| 4 arch/arm/mach-davinci/Kconfig | 4 arch/arm/mach-exynos/Kconfig | 3 +++ arch/arm/mach-omap2/Kconfig | 3 +++ arch/arm/mach-orion5x/Kconfig | 3 +++ arch/arm/mach-rockchip/rk3368/Kconfig | 3 +++ arch/arm/mach-sunxi/Kconfig | 3 +++ arch/arm/mach-zynq/Kconfig| 3 +++ arch/microblaze/Kconfig | 3 +++ board/armadeus/apf27/Kconfig | 3 +++ board/freescale/mx31pdk/Kconfig | 3 +++ board/spear/x600/Kconfig | 3 +++ include/configs/am335x_evm.h | 2 -- include/configs/am335x_igep003x.h | 1 - include/configs/am335x_shc.h | 2 -- include/configs/am335x_sl50.h | 2 -- include/configs/am3517_crane.h| 1 - include/configs/am3517_evm.h | 1 - include/configs/am43xx_evm.h | 2 -- include/configs/apf27.h | 1 - include/configs/at91sam9m10g45ek.h| 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h| 1 - include/configs/baltos.h | 2 -- include/configs/bav335x.h | 2 -- include/configs/bur_am335x_common.h | 1 - include/configs/chiliboard.h | 2 -- include/configs/cm_t335.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t43.h | 2 -- include/configs/da850evm.h| 1 - include/configs/edminiv2.h| 1 - include/configs/exynos5-common.h | 1 - include/configs/imx6_spl.h| 1 - include/configs/ipam390.h | 1 - include/configs/kc1.h | 2 -- include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 1 - include/configs/ls1043a_common.h | 2 -- include/configs/ls1046a_common.h | 2 -- include/configs/ls2080a_common.h | 1 - include/configs/ma5d4evk.h| 1 - include/configs/mcx.h | 1 - include/configs/microblaze-generic.h | 2 -- include/configs/mx31pdk.h | 1 - include/configs/mxs.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omapl138_lcdk.h | 1 - include/configs/origen.h | 1 - include/configs/pcm051.h | 2 -- include/configs/pengwyn.h | 2 -- include/configs/pepper.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/sama5d2_xplained.h| 1 - include/configs/sama5d3_xplained.h| 1 - include/configs/sama5d3xek.h | 1 - include/configs/sama5d4_xplained.h| 1 - include/configs/sama5d4ek.h | 1 - include/configs/siemens-am33x-common.h| 2 -- include/configs/smartweb.h| 1 - include/configs/smdkv310.h| 1 - include/configs/sniper.h | 2 -- include/configs/sunxi-common.h| 4 include/configs/tam3517-common.h | 1 - include/configs/tao3530.h | 1 - include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 2 -- include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap4_common.h | 1 - include/configs/ti_omap5_common.h | 1 - include/configs/tricorder.h | 1 - include/configs/woodburn_sd.h | 1 - include/configs/x600.h| 1 - include/configs/zynq-common.h | 2 -- 77 files changed, 53 insertions(+), 85 deletions(-) -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/3] spl: add hierarchical defaults for SPL_LDSCRIPT
With SPL_LDSCRIPT moved to Kconfig (and this being a 'string' config node), all the lingering definitions in header files will cause errors due to the redefinition of the configuration item. As we don't want to pollute the defconfig files (and values should usually be identical for entire architectures), the defaults are moved into Kconfig. Kconfig will always pick the first default that matches, so please keep these values at the end of each file (to allow any board-specific Kconfig, which will be included earlier) to override with an unconditional default setting. Signed-off-by: Philipp Tomsich--- arch/arm/Kconfig | 12 arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 3 +++ arch/arm/mach-at91/Kconfig| 4 arch/arm/mach-davinci/Kconfig | 4 arch/arm/mach-exynos/Kconfig | 3 +++ arch/arm/mach-omap2/Kconfig | 3 +++ arch/arm/mach-orion5x/Kconfig | 3 +++ arch/arm/mach-sunxi/Kconfig | 3 +++ arch/arm/mach-zynq/Kconfig| 3 +++ arch/microblaze/Kconfig | 3 +++ board/armadeus/apf27/Kconfig | 3 +++ board/freescale/mx31pdk/Kconfig | 3 +++ board/spear/x600/Kconfig | 3 +++ 13 files changed, 50 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7f6ab4a..2b72810 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,6 +609,11 @@ config ARCH_MX6 select SYS_FSL_SEC_LE select SYS_THUMB_BUILD if SPL +if ARCH_MX6 +config SPL_LDSCRIPT +default "arch/arm/mach-omap2/u-boot-spl.lds" +endif + config ARCH_MX5 bool "Freescale MX5" select CPU_V7 @@ -1222,3 +1227,10 @@ source "board/zipitz2/Kconfig" source "arch/arm/Kconfig.debug" endmenu + +config SPL_LDSCRIPT +default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if CPU_ARM926EJS +default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 + default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + + diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 5825f9b..5ba347c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -392,3 +392,6 @@ config SYS_MC_RSV_MEM_ALIGN help Reserved memory needs to be aligned for MC to use. Default value is 512MB. + +config SPL_LDSCRIPT + default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 033c1ef..c81264b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -198,4 +198,8 @@ source "board/siemens/corvus/Kconfig" source "board/siemens/taurus/Kconfig" source "board/siemens/smartweb/Kconfig" +config SPL_LDSCRIPT + default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS + default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7 + endif diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 4757f24..35e4e9b 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -53,4 +53,8 @@ source "board/davinci/ea20/Kconfig" source "board/omicron/calimain/Kconfig" source "board/lego/ev3/Kconfig" +config SPL_LDSCRIPT + default "board/$(BOARDDIR)/u-boot-spl-ipam390.lds" if TARGET_IPAM390 + default "board/$(BOARDDIR)/u-boot-spl-da850evm.lds" + endif diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index d1aa68d..8b1389f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -161,4 +161,7 @@ source "board/samsung/smdk5250/Kconfig" source "board/samsung/smdk5420/Kconfig" source "board/samsung/espresso7420/Kconfig" +config SPL_LDSCRIPT + default "board/samsung/common/exynos-uboot-spl.lds" if ARCH_EXYNOS5 || ARCH_EXYNOS4 + endif diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 013586e..588ef8f 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -165,4 +165,7 @@ source "board/ti/am335x/Kconfig" source "board/compulab/cm_t335/Kconfig" source "board/compulab/cm_t43/Kconfig" +config SPL_LDSCRIPT +default "arch/arm/mach-omap2/u-boot-spl.lds" + endif diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 7644b8d..2984a3e 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -15,4 +15,7 @@ config SYS_SOC source "board/LaCie/edminiv2/Kconfig" +config SPL_LDSCRIPT + default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X + endif diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 94412ba..386befb 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,5 +1,8 @@ if ARCH_SUNXI +config SPL_LDSCRIPT + default
Re: [U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
On Sat, Aug 5, 2017 at 5:48 AM, Simon Glasswrote: > From: Andy Shevchenko > > Convert name to show explicitly that we are using milliseconds. For a > watchdog timer this is precise enough. > > No functional change intended. > > Signed-off-by: Andy Shevchenko > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Use milliseconds since microseconds seems too fine a control > - Update commit message to suit > > drivers/watchdog/wdt-uclass.c | 4 ++-- > include/wdt.h | 8 > 2 files changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Bin Meng ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] dm: scsi: fix callto function with wrong signature
Hi Philipp, On Sat, Aug 5, 2017 at 3:11 AM, Philipp Tomsichwrote: > buildman fails for the qemu-x86 with the following error: > drivers/ata/ahci-pci.c: In function 'ahci_pci_probe': > drivers/ata/ahci-pci.c:21:9: error: too few arguments to function > 'ahci_probe_scsi' > return ahci_probe_scsi(dev); >^ > In file included from drivers/ata/ahci-pci.c:8:0: > include/ahci.h:224:5: note: declared here > int ahci_probe_scsi(struct udevice *ahci_dev, ulong base); > > This changes the function call to call ahci_probe_scsi_pci (which > matches the signature and probes for a controller via on a PCI bus). > > Signed-off-by: Philipp Tomsich > --- > Thanks for the patch. This is already fixed in the u-boot/master. Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2] omap3evm: Update board and defconfig files
This patch brings the OMAP3 EVM to a bootable state, on master, as of v2017.09-rc1. Signed-off-by: Derald D. Woods--- Changes in v2: - Unset {EFI,ISO}_PARTITION - Unset EFI_LOADER - Unset SPL_EXT_SUPPORT - Unset THUMB_BUILD ** It does boot with THUMB_BUILD, it just should not be default --- board/ti/evm/evm.c | 126 +++--- board/ti/evm/evm.h | 25 +-- configs/omap3_evm_defconfig | 70 +++- include/configs/omap3_evm.h | 390 ++-- 4 files changed, 268 insertions(+), 343 deletions(-) diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c index fe8e79312f..e770ac04d0 100644 --- a/board/ti/evm/evm.c +++ b/board/ti/evm/evm.c @@ -12,6 +12,8 @@ * SPDX-License-Identifier:GPL-2.0+ */ #include +#include +#include #include #include #include @@ -22,14 +24,35 @@ #include #include #include +#include #include +#include +#include +#include #include "evm.h" -#define OMAP3EVM_GPIO_ETH_RST_GEN1 64 -#define OMAP3EVM_GPIO_ETH_RST_GEN2 7 +#ifdef CONFIG_USB_EHCI_HCD +#include +#include +#endif + +#define OMAP3EVM_GPIO_ETH_RST_GEN1 64 +#define OMAP3EVM_GPIO_ETH_RST_GEN2 7 DECLARE_GLOBAL_DATA_PTR; +static const struct ns16550_platdata omap3_evm_serial = { + .base = OMAP34XX_UART1, + .reg_shift = 2, + .clock = V_NS16550_CLK, + .fcr = UART_FCR_DEFVAL, +}; + +U_BOOT_DEVICE(omap3_evm_uart) = { + "ns16550_serial", + _evm_serial +}; + static u32 omap3_evm_version; u32 get_omap3_evm_rev(void) @@ -60,25 +83,19 @@ static void omap3_evm_get_revision(void) default: omap3_evm_version = OMAP3EVM_BOARD_GEN_2; } -#else +#else /* !CONFIG_CMD_NET */ #if defined(CONFIG_STATIC_BOARD_REV) - /* -* Look for static defintion of the board revision -*/ + /* Look for static defintion of the board revision */ omap3_evm_version = CONFIG_STATIC_BOARD_REV; #else - /* -* Fallback to the default above. -*/ + /* Fallback to the default above */ omap3_evm_version = OMAP3EVM_BOARD_GEN_2; -#endif -#endif /* CONFIG_CMD_NET */ +#endif /* CONFIG_STATIC_BOARD_REV */ +#endif /* CONFIG_CMD_NET */ } -#ifdef CONFIG_USB_OMAP3 -/* - * MUSB port on OMAP3EVM Rev >= E requires extvbus programming. - */ +#if defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST) +/* MUSB port on OMAP3EVM Rev >= E requires extvbus programming. */ u8 omap3_evm_need_extvbus(void) { u8 retval = 0; @@ -88,7 +105,7 @@ u8 omap3_evm_need_extvbus(void) return retval; } -#endif +#endif /* CONFIG_USB_MUSB_{GADGET,HOST} */ /* * Routine: board_init @@ -105,7 +122,7 @@ int board_init(void) return 0; } -#ifdef CONFIG_SPL_BUILD +#if defined(CONFIG_SPL_BUILD) /* * Routine: get_board_mem_timings * Description: If we use SPL then there is no x-loader nor config header @@ -138,7 +155,34 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; timings->mr = MICRON_V_MR_165; } -#endif +#endif /* CONFIG_SPL_BUILD */ + +#if defined(CONFIG_USB_MUSB_OMAP2PLUS) +static struct musb_hdrc_config musb_config = { + .multipoint = 1, + .dyn_fifo = 1, + .num_eps= 16, + .ram_bits = 12, +}; + +static struct omap_musb_board_data musb_board_data = { + .interface_type = MUSB_INTERFACE_ULPI, +}; + +static struct musb_hdrc_platform_data musb_plat = { +#if defined(CONFIG_USB_MUSB_HOST) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_MUSB_GADGET) + .mode = MUSB_PERIPHERAL, +#else +#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET" +#endif /* CONFIG_USB_MUSB_{GADGET,HOST} */ + .config = _config, + .power = 100, + .platform_ops = _ops, + .board_data = _board_data, +}; +#endif /* CONFIG_USB_MUSB_OMAP2PLUS */ /* * Routine: misc_init_r @@ -146,8 +190,9 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) */ int misc_init_r(void) { + twl4030_power_init(); -#ifdef CONFIG_SYS_I2C_OMAP34XX +#if defined(CONFIG_SYS_I2C_OMAP34XX) i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif @@ -161,6 +206,13 @@ int misc_init_r(void) #endif omap_die_id_display(); +#if defined(CONFIG_USB_MUSB_OMAP2PLUS) + musb_register(_plat, _board_data, (void *)MUSB_BASE); +#endif + +#if defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET) + omap_die_id_usbethaddr(); +#endif return 0; } @@ -175,7 +227,7 @@ void set_muxconf_regs(void) MUX_EVM(); } -#ifdef CONFIG_CMD_NET +#if defined(CONFIG_CMD_NET) /* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the @@ -237,7 +289,7 @@ static void reset_net_chip(void) int
[U-Boot] [PATCH v1 5/7] spl: add serial download protocol (SDP) support
From: Stefan AgnerAdd USB serial download protocol support to SPL. If the SoC started in recovery mode the SPL will immediately switch to SDP and wait for further downloads/commands from the host side. Signed-off-by: Stefan Agner --- common/spl/Kconfig | 6 ++ common/spl/Makefile | 1 + common/spl/spl_sdp.c| 38 ++ drivers/usb/gadget/Makefile | 1 + 4 files changed, 46 insertions(+) create mode 100644 common/spl/spl_sdp.c diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 4de81392b0..95378b98a0 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -646,6 +646,12 @@ config SPL_DFU_RAM endchoice +config SPL_USB_SDP_SUPPORT + bool "Support SDP (Serial Download Protocol)" + help + Enable Serial Download Protocol (SDP) device support in SPL. This + allows to download images into memory and execute (jump to) them + using the same protocol as implemented by the i.MX family's boot ROM. endif config SPL_WATCHDOG_SUPPORT diff --git a/common/spl/Makefile b/common/spl/Makefile index 47a64dd7d0..a979560acf 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -29,4 +29,5 @@ obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o obj-$(CONFIG_SPL_DFU_SUPPORT) += spl_dfu.o obj-$(CONFIG_SPL_SPI_LOAD) += spl_spi.o obj-$(CONFIG_SPL_RAM_SUPPORT) += spl_ram.o +obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += spl_sdp.o endif diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c new file mode 100644 index 00..faa74b8bec --- /dev/null +++ b/common/spl/spl_sdp.c @@ -0,0 +1,38 @@ +/* + * (C) Copyright 2016 Toradex + * Author: Stefan Agner + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static int spl_sdp_load_image(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev) +{ + int ret; + + g_dnl_clear_detach(); + g_dnl_register("usb_dnl_sdp"); + + ret = sdp_init(); + if (ret) { + error("SDP init failed: %d", ret); + return -ENODEV; + } + + ret = sdp_handle(); + if (ret) { + error("SDP failed: %d", ret); + return -ENODEV; + } + + return 0; +} +SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_UART, spl_sdp_load_image); diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 6a007d1bcb..7258099c1c 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_USB_GADGET_SUPPORT) += g_dnl.o obj-$(CONFIG_SPL_DFU_SUPPORT) += f_dfu.o +obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o endif # new USB gadget layer dependencies -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 6/7] apalis/colibri_imx6: use independent USB PID for SPL
From: Stefan AgnerUse a completely independent USB Product ID for SPL. This allows to differentiate a SDP running in SPL and SDP running in a U-Boot which could not read the config block successfully. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- board/toradex/apalis_imx6/apalis_imx6.c | 13 + board/toradex/colibri_imx6/colibri_imx6.c | 13 + 2 files changed, 26 insertions(+) diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 8e5613cb12..edaca5d346 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1233,6 +1234,18 @@ void reset_cpu(ulong addr) { } +#ifdef CONFIG_SPL_USB_GADGET_SUPPORT +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) +{ + unsigned short usb_pid; + + usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + 0xfff; + put_unaligned(usb_pid, >idProduct); + + return 0; +} +#endif + #endif static struct mxc_serial_platdata mxc_serial_plat = { diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index cbf7aa952a..0cc958a0a8 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1118,6 +1119,18 @@ void reset_cpu(ulong addr) { } +#ifdef CONFIG_SPL_USB_GADGET_SUPPORT +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) +{ + unsigned short usb_pid; + + usb_pid = TORADEX_USB_PRODUCT_NUM_OFFSET + 0xfff; + put_unaligned(usb_pid, >idProduct); + + return 0; +} +#endif + #endif static struct mxc_serial_platdata mxc_serial_plat = { -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 7/7] apalis/colibri_imx6: enable SDP by default
From: Stefan AgnerEnable Serial Download Protocol (SDP) in SPL and U-Boot. This is useful to make use of imx_usb to download the complete U-Boot (u-boot.img) after SPL has been downloaded. The U-Boot command sdp allows to enumerate as SDP capable device again, e.g. to download a Linux kernel and/or U-Boot script. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- configs/apalis_imx6_defconfig | 4 configs/colibri_imx6_defconfig | 4 2 files changed, 8 insertions(+) diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 4d88e70200..2a271f002c 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -17,6 +17,9 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Apalis iMX6 # " CONFIG_CMD_BOOTZ=y @@ -31,6 +34,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index a23975f858..d5d3e7a143 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -17,6 +17,9 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri iMX6 # " CONFIG_CMD_BOOTZ=y @@ -31,6 +34,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DFU=y +CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set CONFIG_CMD_GPIO=y -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 2/7] usb: gadget: add SDP driver
From: Stefan AgnerAdd SDP (Serial Downloader Protocol) implementation for U-Boot. The protocol is used in NXP SoC's boot ROM and allows to download program images. Beside that, it can also be used to read/write registers and download complete Device Configuration Data (DCD) sets. This basic implementation supports downloading images with the imx header format and reading registers. Signed-off-by: Stefan Agner --- drivers/usb/gadget/Kconfig | 7 + drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/f_sdp.c | 723 include/sdp.h | 16 + 4 files changed, 747 insertions(+) create mode 100644 drivers/usb/gadget/f_sdp.c create mode 100644 include/sdp.h diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 261ed128ac..225b66bc95 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -103,6 +103,13 @@ config USB_GADGET_DOWNLOAD if USB_GADGET_DOWNLOAD +config USB_FUNCTION_SDP + bool "Enable USB SDP (Serial Download Protocol)" + help + Enable Serial Download Protocol (SDP) device support in U-Boot. This + allows to download images into memory and execute (jump to) them + using the same protocol as implemented by the i.MX family's boot ROM. + config G_DNL_MANUFACTURER string "Vendor name of USB device" diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 5e316a7cff..6a007d1bcb 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o +obj-$(CONFIG_USB_FUNCTION_SDP) += f_sdp.o endif endif ifdef CONFIG_USB_ETHER diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c new file mode 100644 index 00..eb89695aaf --- /dev/null +++ b/drivers/usb/gadget/f_sdp.c @@ -0,0 +1,723 @@ +/* + * f_sdp.c -- USB HID Serial Download Protocol + * + * Copyright (C) 2016 Toradex + * Author: Stefan Agner + * + * This file implements the Serial Download Protocol (SDP) as specified in + * the i.MX 6 Reference Manual. The SDP is a USB HID based protocol and + * allows to download images directly to memory. The implementation + * works with the imx_loader (imx_usb) USB client software on host side. + * + * Not all commands are implemented, e.g. WRITE_REGISTER, DCD_WRITE and + * SKIP_DCD_HEADER are only stubs. + * + * Parts of the implementation are based on f_dfu and f_thor. + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#define HID_REPORT_ID_MASK 0x00ff + +/* + * HID class requests + */ +#define HID_REQ_GET_REPORT 0x01 +#define HID_REQ_GET_IDLE 0x02 +#define HID_REQ_GET_PROTOCOL 0x03 +#define HID_REQ_SET_REPORT 0x09 +#define HID_REQ_SET_IDLE 0x0A +#define HID_REQ_SET_PROTOCOL 0x0B + +#define HID_USAGE_PAGE_LEN 76 + +struct hid_report { + u8 usage_page[HID_USAGE_PAGE_LEN]; +} __packed; + +#define SDP_READ_REGISTER 0x0101 +#define SDP_WRITE_REGISTER 0x0202 +#define SDP_WRITE_FILE 0x0404 +#define SDP_ERROR_STATUS 0x0505 +#define SDP_DCD_WRITE 0x0a0a +#define SDP_JUMP_ADDRESS 0x0b0b +#define SDP_SKIP_DCD_HEADER0x0c0c + +#define SDP_WRITE_FILE_COMPLETE0x +#define SDP_WRITE_REGISTER_COMPLETE0x128A8A12 +#define SDP_SKIP_DCD_HEADER_COMPLETE 0x900DD009 +#define SDP_ERROR_IMXHEADER0x000a0533 + +#define SDP_COMMAND_LEN16 + +struct sdp_command { + u16 cmd; + u32 addr; + u8 format; + u32 cnt; + u32 data; + u8 rsvd; +} __packed; + +enum sdp_state { + SDP_STATE_IDLE, + SDP_STATE_RX_DCD_DATA, + SDP_STATE_RX_FILE_DATA, + SDP_STATE_TX_SEC_CONF, + SDP_STATE_TX_SEC_CONF_BUSY, + SDP_STATE_TX_REGISTER, + SDP_STATE_TX_REGISTER_BUSY, + SDP_STATE_TX_STATUS, + SDP_STATE_TX_STATUS_BUSY, + SDP_STATE_JUMP, +}; + +struct f_sdp { + struct usb_function usb_function; + + struct usb_descriptor_header**function; + + u8 altsetting; + enum sdp_state state; + enum sdp_state next_state; + u32 dnl_address; + u32 dnl_bytes_remaining; + u32 jmp_address; + boolalways_send_status; + u32 error_status; + + /* EP0 request */ + struct usb_request
[U-Boot] [PATCH v1 4/7] cmd: add sdp command
From: Stefan AgnerAdd a new command to start USB Serial Download Protocol (SDP) state machine. Signed-off-by: Stefan Agner --- cmd/Kconfig | 7 +++ cmd/Makefile | 1 + cmd/usb_gadget_sdp.c | 53 3 files changed, 61 insertions(+) create mode 100644 cmd/usb_gadget_sdp.c diff --git a/cmd/Kconfig b/cmd/Kconfig index f18efc1e88..87333b3a97 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -665,6 +665,13 @@ config CMD_DFU Enables the command "dfu" which is used to have U-Boot create a DFU class device via USB. +config CMD_USB_SDP + bool "sdp" + select USB_FUNCTION_SDP + help + Enables the command "sdp" which is used to have U-Boot emulating the + Serial Download Protocol (SDP) via USB. + config CMD_USB_MASS_STORAGE bool "UMS usb mass storage" help diff --git a/cmd/Makefile b/cmd/Makefile index bd231f24d8..e0b5940ba6 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -131,6 +131,7 @@ obj-$(CONFIG_CMD_FASTBOOT) += fastboot.o obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.o obj-$(CONFIG_CMD_USB_MASS_STORAGE) += usb_mass_storage.o +obj-$(CONFIG_CMD_USB_SDP) += usb_gadget_sdp.o obj-$(CONFIG_CMD_THOR_DOWNLOAD) += thordown.o obj-$(CONFIG_CMD_XIMG) += ximg.o obj-$(CONFIG_YAFFS2) += yaffs2.o diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c new file mode 100644 index 00..09ddb4f3aa --- /dev/null +++ b/cmd/usb_gadget_sdp.c @@ -0,0 +1,53 @@ +/* + * cmd_sdp.c -- sdp command + * + * Copyright (C) 2016 Toradex + * Author: Stefan Agner + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include + +static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int ret = CMD_RET_SUCCESS; + + if (argc < 2) + return CMD_RET_USAGE; + + char *usb_controller = argv[1]; + int controller_index = simple_strtoul(usb_controller, NULL, 0); + board_usb_init(controller_index, USB_INIT_DEVICE); + + g_dnl_clear_detach(); + g_dnl_register("usb_dnl_sdp"); + + ret = sdp_init(); + if (ret) { + error("SDP init failed: %d", ret); + ret = CMD_RET_FAILURE; + goto exit; + } + + ret = sdp_handle(); + if (ret) { + error("SDP failed: %d", ret); + ret = CMD_RET_FAILURE; + goto exit; + } + +exit: + g_dnl_unregister(); + + return ret; +} + +U_BOOT_CMD(sdp, 2, 1, do_sdp, + "Serial Downloader Protocol", + "\n" + " - serial downloader protocol via \n" +); -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 3/7] usb: gadget: sdp: extend images compatible for jumps
From: Stefan AgnerSupport U-Boot images in SPL so that u-boot.img files can be directly downloaded and executed. Furthermore support U-Boot scripts download and execution in full U-Boot so that custom recovery actions can be downloaded from the host in a third step. Signed-off-by: Stefan Agner --- drivers/usb/gadget/f_sdp.c | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index eb89695aaf..9a752843f0 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #define HID_REPORT_ID_MASK 0x00ff @@ -672,8 +674,22 @@ static void sdp_handle_in_ep(void) sdp_func->state = SDP_STATE_TX_REGISTER_BUSY; break; case SDP_STATE_JUMP: - printf("Checking imxheader at 0x%08x\n", f_sdp->jmp_address); - status = sdp_jump_imxheader((void *)f_sdp->jmp_address); + printf("Jumping to header at 0x%08x\n", sdp_func->jmp_address); + status = sdp_jump_imxheader((void *)sdp_func->jmp_address); + + /* If imx header fails, try some U-Boot specific headers */ + if (status) { +#ifdef CONFIG_SPL_BUILD + /* In SPL, allow jumps to U-Boot images */ + struct spl_image_info spl_image = {}; + spl_parse_image_header(_image, + (struct image_header *)sdp_func->jmp_address); + jump_to_image_no_args(_image); +#else + /* In U-Boot, allow jumps to scripts */ + source(sdp_func->jmp_address, "script@1"); +#endif + } sdp_func->next_state = SDP_STATE_IDLE; sdp_func->error_status = status; -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 1/7] imx: move imximage header to common location
From: Stefan AgnerMove the imximage.h header file to a common location so we can make use of it from U-Boot too. Signed-off-by: Stefan Agner --- {tools => include}/imximage.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {tools => include}/imximage.h (100%) diff --git a/tools/imximage.h b/include/imximage.h similarity index 100% rename from tools/imximage.h rename to include/imximage.h -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1 0/7] imx: add USB Serial Download Protocol (SDP) support
From: Stefan AgnerThis series adds NXP's Serial Download Protocol (SDP) support via USB for SPL/U-Boot. It allows to download U-Boot via USB from a (recovered) SPL using the same tools used to download SPL itself (specifically imx_usb, but also sb_loader seems to work). The idea has been brought up when the first targets started to make use of SPL for DDR initialization, see: https://lists.denx.de/pipermail/u-boot/2015-July/220330.html The initial SDP implementation (patch 2) requires the payload to have the imx specific headers (hence the move of the imx header file in patch 1). Patch 3 extends image header support beyond the SDP specification, specifically implements also support for U-Boot headers. This allows to use the same SPL/U-Boot binaries for recovery as used on the regular boot device (SD/eMMC). For that to work also the host side imx_usb tools needed an extension, currently available here: https://github.com/toradex/imx_loader/tree/imx_usb_batch_mode_refactored The full patchset allows to download SPL and U-Boot over USB to a target in recovery mode using the same usb_imx utility: The usb_imx utility also has a batch mode which allows to download multiple artifacts with a single invocation. The details are outlined in the imx_usb commit message: https://github.com/toradex/imx_loader/commit/5434415d921f1cc4d22332d9558bed6d42db9f60 In case this patchset gets accepted in U-Boot, I plan to push the imx_usb changes upstream as well. Stefan Agner (7): imx: move imximage header to common location usb: gadget: add SDP driver usb: gadget: sdp: extend images compatible for jumps cmd: add sdp command spl: add serial download protocol (SDP) support apalis/colibri_imx6: use independent USB PID for SPL apalis/colibri_imx6: enable SDP by default board/toradex/apalis_imx6/apalis_imx6.c | 13 + board/toradex/colibri_imx6/colibri_imx6.c | 13 + cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/usb_gadget_sdp.c | 53 +++ common/spl/Kconfig| 6 + common/spl/Makefile | 1 + common/spl/spl_sdp.c | 38 ++ configs/apalis_imx6_defconfig | 4 + configs/colibri_imx6_defconfig| 4 + drivers/usb/gadget/Kconfig| 7 + drivers/usb/gadget/Makefile | 2 + drivers/usb/gadget/f_sdp.c| 739 ++ {tools => include}/imximage.h | 0 include/sdp.h | 16 + 15 files changed, 904 insertions(+) create mode 100644 cmd/usb_gadget_sdp.c create mode 100644 common/spl/spl_sdp.c create mode 100644 drivers/usb/gadget/f_sdp.c rename {tools => include}/imximage.h (100%) create mode 100644 include/sdp.h -- 2.13.3 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 11/15] dm: sunxi: Linksprite_pcDuino3: Correct polarity of MMC card detect
Hi Maxime, On 5 July 2017 at 08:43, Maxime Ripardwrote: > Hi, > > On Tue, Jul 04, 2017 at 01:31:28PM -0600, Simon Glass wrote: >> This is shown as active high in the schematics[1], so fix it. >> >> [1] https://patchwork.ozlabs.org/patch/777890/ >> >> Signed-off-by: Simon Glass >> Reported-by: Maxime Ripard >> --- >> >> Changes in v2: >> - Add new patch to correct polarity of MMC card detect on Linksprite_pcDuino3 >> >> arch/arm/dts/sun7i-a20-pcduino3.dts | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/dts/sun7i-a20-pcduino3.dts >> b/arch/arm/dts/sun7i-a20-pcduino3.dts >> index 1a8b39be1d..37b1e0ee9b 100644 >> --- a/arch/arm/dts/sun7i-a20-pcduino3.dts >> +++ b/arch/arm/dts/sun7i-a20-pcduino3.dts >> @@ -164,7 +164,7 @@ >> pinctrl-0 = <_pins_a>, <_cd_pin_reference_design>; >> vmmc-supply = <_vcc3v3>; >> bus-width = <4>; >> - cd-gpios = < 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ >> + cd-gpios = < 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ > > Hmmm, are you sure? At least your commit log says otherwise :) The commit message is wrong, unfortunately. The schematics suggest it is active low and it does seem to work with this setting. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
Hi, On 4 August 2017 at 16:37, Dr. Philipp Tomsichwrote: > >> On 05 Aug 2017, at 00:30, Simon Glass wrote: >> >> +Tom >> >> Hi Philipp, >> >> On 4 August 2017 at 16:21, Dr. Philipp Tomsich >> wrote: >>> On 04 Aug 2017, at 23:48, Simon Glass wrote: From: Andy Shevchenko Convert name to show explicitly that we are using milliseconds. For a watchdog timer this is precise enough. No functional change intended. Signed-off-by: Andy Shevchenko Signed-off-by: Simon Glass --- Changes in v2: - Use milliseconds since microseconds seems too fine a control - Update commit message to suit drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index bb9ae80866..8a30f024fd 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -13,14 +13,14 @@ DECLARE_GLOBAL_DATA_PTR; -int wdt_start(struct udevice *dev, u64 timeout, ulong flags) +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { const struct wdt_ops *ops = device_get_ops(dev); if (!ops->start) return -ENOSYS; - return ops->start(dev, timeout, flags); + return ops->start(dev, timeout_ms, flags); } int wdt_stop(struct udevice *dev) diff --git a/include/wdt.h b/include/wdt.h index 0b5f05851a..9b90fbeeb3 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -21,12 +21,12 @@ * Start the timer * * @dev: WDT Device - * @timeout: Number of ticks before timer expires + * @timeout_ms: Number of ticks (milliseconds) before timer expires >>> >>> Should this not just be ‘number of milliseconds’ (as this would >>> otherwise equate ticks and milliseconds, which don’t necessarily >>> need to be the same)? >> >> I believe they are the same. We used to have a setting for it >> (CONFIG_SYS_HZ I think) but now everything is in milliseconds. See for >> example get_timer(). > > I had thought of my remark more as a nitpick. > Bit it seems there’s more to it, after all: at least lib/time.c still > treats ’ticks’ and ‘milliseconds' as separate concepts: > > uint64_t __weak notrace get_ticks(void) > { > unsigned long now = timer_read_counter(); > > /* increment tbu if tbl has rolled over */ > if (now < gd->timebase_l) > gd->timebase_h++; > gd->timebase_l = now; > return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l; > } > > /* Returns time in milliseconds */ > static uint64_t notrace tick_to_time(uint64_t tick) > { > ulong div = get_tbclk(); > > tick *= CONFIG_SYS_HZ; > do_div(tick, div); > return tick; > } > But see lib/Kconfig: config SYS_HZ int default 1000 help The frequency of the timer returned by get_timer(). get_timer() must operate in milliseconds and this option must be set to 1000. >> >>> * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); /* * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again. @@ -67,12 +67,12 @@ struct wdt_ops { * Start the timer * * @dev: WDT Device - * @timeout: Number of ticks before the timer expires + * @timeout_ms: Number of ticks (milliseconds) before the timer expires >>> >>> See above. >>> * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ - int (*start)(struct udevice *dev, u64 timeout, ulong flags); + int (*start)(struct udevice *dev, u64 timeout_ms, ulong flags); /* * Stop the timer * -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/3] rockchip: evb-rk3399: add ethaddr and serial# init
> Sync the code from puma-rk3399: > 8adc9d1 rockchip: board: puma_rk3399: derive ethaddr from cpuid > 9415b9a rockchip: board: puma_rk3399: add support for serial# and cpuid# > via efuses > > Signed-off-by: Kever Yang> --- > > board/rockchip/evb_rk3399/evb-rk3399.c | 123 > - > 1 file changed, 121 insertions(+), 2 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 3/4] rockchip: add BOOT_LOADER support for boot mode
> Rockchip using rockusb for flash emmc via USB, people > use 'reboot loader' in kernel and then want to get a rockusb > device in bootloader for firmware update. > > Signed-off-by: Kever Yang> --- > > arch/arm/mach-rockchip/rk3036-board.c | 4 > arch/arm/mach-rockchip/rk322x-board.c | 4 > arch/arm/mach-rockchip/rk3288-board.c | 4 > 3 files changed, 12 insertions(+) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] rockchip: rk322x: update MACRO for mmc clksel reg
> The description for eMMC/SDIO/SDMMC src is not correct, > update the CRU_CLKSEL11_CON value definition according to TRM. > > Signed-off-by: Kever Yang> --- > > arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 9 +++-- > 1 file changed, 3 insertions(+), 6 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, v3] rockchip: rk3288: Add reset reason detection
> Sometimes it's helpful to know the reset reason caused in the SoC. > Add reset reason detection for the RK3288 SoC. > This will set an environment variable which represents the reset reason. > > Signed-off-by: Wadim Egorov> --- > Changes in v3: > - Fixed typo in commit message > - Use enum for CRU_GLB_RST_ST register decoding > > --- > arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 12 + > arch/arm/mach-rockchip/rk3288-board.c | 35 > + > 2 files changed, 47 insertions(+) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/3] rockchip: firefly-rk3399: enable EFUSE driver
> Enable the EFUSE driver for get the cpuid and serial. > > Signed-off-by: Kever Yang> --- > > configs/firefly-rk3399_defconfig | 2 ++ > include/configs/evb_rk3399.h | 3 +++ > 2 files changed, 5 insertions(+) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 4/4] rockchip: enable rockusb for all rockchip SoCs
> Rockusb will be used by all the rockchip SoCs, enable it by > default in Kconfig, and it can be work if USB gadget is available. > > Signed-off-by: Kever Yang> --- > > arch/arm/Kconfig | 2 ++ > 1 file changed, 2 insertions(+) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/4] rockchip: rk3229: move usb gadget into defconfig
> Use the defconfig for all usb gadget and function related > option instead of define then in header file. > > Signed-off-by: Kever Yang> --- > > configs/evb-rk3229_defconfig| 20 ++-- > include/configs/evb_rk3229.h| 1 - > include/configs/rk322x_common.h | 20 > 3 files changed, 18 insertions(+), 23 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] rockchip: rk3288: update the mmc number for fastboot
> The emmc number is 0, correct it for fastboot parameter. > > Signed-off-by: Kever Yang> --- > > include/configs/rk3288_common.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 32/42] Kconfig: Drop CONFIG_CMD_TFTP
This is not a valid CONFIG option. Drop it. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None include/configs/dragonboard410c.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index d9dc639aeb..5a0b60ff66 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -49,7 +49,6 @@ /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ -#define CONFIG_CMD_TFTP /* Partition table support */ #define HAVE_BLOCK_DEVICE /* Needed for partition commands */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1753f4572f..cd87bafbed 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TFTP CONFIG_CMD_THOR_DOWNLOAD CONFIG_CMD_TRACE CONFIG_CMD_TSI148 -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2] rockchip: phycore: Read configuration EEPROM & set ethaddr in late init
> Read SoM information from EEPROM and set ethaddr in late init. > > Signed-off-by: Wadim Egorov> --- > Changes in v2: > - Fixed fdt_path_offset() error handling > > --- > board/phytec/phycore_rk3288/phycore-rk3288.c | 62 > > board/phytec/phycore_rk3288/som.h| 21 ++ > configs/phycore-rk3288_defconfig | 2 + > 3 files changed, 85 insertions(+) > create mode 100644 board/phytec/phycore_rk3288/som.h > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 26/42] Convert CONFIG_CMD_SPL_WRITE_SIZE to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SPL_WRITE_SIZE Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 9 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig| 1 + configs/gwventana_nand_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/mx6sabreauto.h| 1 - include/configs/mx6sabresd.h | 1 - include/configs/omap3_beagle.h| 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 1 - scripts/config_whitelist.txt | 1 - 31 files changed, 19 insertions(+), 20 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 065664db06..df16508e47 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -294,6 +294,15 @@ config CMD_SPL_NAND_OFS for full information about how to use this option (and also see board/gateworks/gw_ventana/README for an example). +config CMD_SPL_WRITE_SIZE + hex "Size of argument area" + depends on CMD_SPL + default 0x2000 + help + This provides the size of the command-line argument area in NAND + flash used by Falcon-mode boot. See the documentation until CMD_SPL + for detail. + endmenu menu "Environment commands" diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 29f0be28e3..0c8b784cd6 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x0010 +CONFIG_CMD_SPL_WRITE_SIZE=0x4 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index b5a2863328..f6a51a24a7 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x0010 +CONFIG_CMD_SPL_WRITE_SIZE=0x4 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 28302a4979..08686d8d9d 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x0010 +CONFIG_CMD_SPL_WRITE_SIZE=0x4 CONFIG_CMD_ASKENV=y CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index dadc8b6ab3..b3a602314a 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x68 +CONFIG_CMD_SPL_WRITE_SIZE=0x400 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 3318faee0f..944c0125e8 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL_NAND_OFS=0x110 +CONFIG_CMD_SPL_WRITE_SIZE=0x2 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 7830d90ca2..5b2672c2bf 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -33,6 +33,7 @@ CONFIG_SYS_PROMPT="Ventana > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL_NAND_OFS=0x110 +CONFIG_CMD_SPL_WRITE_SIZE=0x2 # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y
[U-Boot] [PATCH v2 27/42] Kconfig: Sort the memory commands
These are currently not quite in alphabetical order. Before adding more, sort them. Not all options have a CMD_ prefix, so ignore that when sorting. Signed-off-by: Simon GlassSuggested-by: Bin Meng --- Changes in v2: - Add new patch to sort the memory commands cmd/Kconfig | 60 ++-- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index df16508e47..bcf45fd119 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -369,20 +369,6 @@ endmenu menu "Memory commands" -config CMD_MEMORY - bool "md, mm, nm, mw, cp, cmp, base, loop" - default y - help - Memory 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 - initialize loop on address range - config CMD_CRC32 bool "crc32" select HASH @@ -444,6 +430,11 @@ config EEPROM_LAYOUT_HELP_STRING Help printed with the LAYOUT VERSIONS part of the 'eeprom' command's help. +config LOOPW + bool "loopw" + help + Infinite write loop on address range + config CMD_MD5SUM bool "md5sum" default n @@ -458,22 +449,24 @@ config MD5SUM_VERIFY help Add -v option to verify data against an MD5 checksum. -config CMD_SHA1SUM - bool "sha1sum" - select SHA1 - help - Compute SHA1 checksum. - -config SHA1SUM_VERIFY - bool "sha1sum -v" - depends on CMD_SHA1SUM +config CMD_MEMINFO + bool "meminfo" help - Add -v option to verify data against a SHA1 checksum. + Display memory information. -config LOOPW - bool "loopw" +config CMD_MEMORY + bool "md, mm, nm, mw, cp, cmp, base, loop" + default y help - Infinite write loop on address range + Memory 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 - initialize loop on address range config CMD_MEMTEST bool "memtest" @@ -486,10 +479,17 @@ config CMD_MX_CYCLIC mdc - memory display cyclic mwc - memory write cyclic -config CMD_MEMINFO - bool "meminfo" +config CMD_SHA1SUM + bool "sha1sum" + select SHA1 help - Display memory information. + Compute SHA1 checksum. + +config SHA1SUM_VERIFY + bool "sha1sum -v" + depends on CMD_SHA1SUM + help + Add -v option to verify data against a SHA1 checksum. endmenu -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] rockchip: rk3399-firefly: update gmac parameter
> Update the tx_deday and rx_delay to match the timing for > rk3399-firefly board to improve the stability of gmac data > transfer. > > Signed-off-by: Kever Yang> --- > > arch/arm/dts/rk3399-firefly.dts | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 30/42] Convert CONFIG_CMD_TCA642X to Kconfig
This converts the following to Kconfig: CONFIG_CMD_TCA642X Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None configs/omap5_uevm_defconfig | 1 + drivers/gpio/Kconfig | 9 + include/configs/omap5_uevm.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index c613433d12..273be58114 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y +CONFIG_CMD_TCA642X=y CONFIG_MMC_OMAP_HS=y CONFIG_SCSI=y CONFIG_SYS_NS16550=y diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d2e7c29e1d..ffeda9425a 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -165,6 +165,15 @@ config SANDBOX_GPIO_COUNT of 'anonymous' GPIOs that do not belong to any device or bank. Select a suitable value depending on your needs. +config CMD_TCA642X + bool "tca642x - Command to access tca642x state" + help + DEPRECATED - This needs conversion to driver model + + This provides a way to looking at the pin state of this device. + This mirrors the 'gpio' command and that should be used in preference + to custom code. + config TEGRA_GPIO bool "Tegra20..210 GPIO driver" depends on DM_GPIO diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 9b650090be..7e2a011843 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -46,7 +46,6 @@ /* Required support for the TCA642X GPIO we have on the uEVM */ #define CONFIG_TCA642X -#define CONFIG_CMD_TCA642X #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f5ec487668..4ce1273bed 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TCA642X CONFIG_CMD_TERMINAL CONFIG_CMD_TFTP CONFIG_CMD_THOR_DOWNLOAD -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 28/42] Convert CONFIG_CMD_STRINGS to Kconfig
This converts the following to Kconfig: CONFIG_CMD_STRINGS Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 8 include/configs/vct.h| 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index bcf45fd119..4c1cbe736f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -491,6 +491,14 @@ config SHA1SUM_VERIFY help Add -v option to verify data against a SHA1 checksum. +config CMD_STRINGS + bool "strings - display strings in memory" + help + This works similarly to the Unix 'strings' command except that it + works with a memory range. String of printable characters found + within the range are displayed. The minimum number of characters + for a sequence to be considered a string can be provided. + endmenu menu "Compression commands" diff --git a/include/configs/vct.h b/include/configs/vct.h index e3c3b0e71f..a98dae8e24 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -239,7 +239,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_STRINGS #undef CONFIG_CMD_TERMINAL #undef CONFIG_SMC911X diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d2f839a7a2..e89099472c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_STRINGS CONFIG_CMD_SX151X CONFIG_CMD_TCA642X CONFIG_CMD_TERMINAL -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 36/42] Convert CONFIG_CMD_TSI148 to Kconfig
This converts the following to Kconfig: CONFIG_CMD_TSI148 Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Sort Kconfig options in alphabetical order cmd/Kconfig | 6 ++ configs/caddy2_defconfig | 1 + configs/vme8349_defconfig| 1 + include/configs/vme8349.h| 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 425d1d1351..7934753232 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -848,6 +848,12 @@ config CMD_SPI help SPI utility command. +config CMD_TSI148 + bool "tsi148 - Command to access tsi148 device" + help + This provides various sub-commands to initialise and configure the + Turndra tsi148 device. See the command help for full details. + config CMD_USB bool "usb" help diff --git a/configs/caddy2_defconfig b/configs/caddy2_defconfig index 762a2c0a08..3bdcb8d776 100644 --- a/configs/caddy2_defconfig +++ b/configs/caddy2_defconfig @@ -9,6 +9,7 @@ CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_PCI=y +CONFIG_CMD_TSI148=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/vme8349_defconfig b/configs/vme8349_defconfig index 27d6c6bee0..e1e2f53a43 100644 --- a/configs/vme8349_defconfig +++ b/configs/vme8349_defconfig @@ -8,6 +8,7 @@ CONFIG_BOOTDELAY=6 CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_PCI=y +CONFIG_CMD_TSI148=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index 8e9abb264c..0aafbe261f 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -343,7 +343,6 @@ #define CONFIG_SYS_RTC_BUS_NUM 0x01 #define CONFIG_SYS_I2C_RTC_ADDR0x32 #define CONFIG_RTC_RX8025 -#define CONFIG_CMD_TSI148 /* Pass Ethernet MAC to VxWorks */ #define CONFIG_SYS_VXWORKS_MAC_PTR 0x43f0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 58f8bc4e87..42eb367aa3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TSI148 CONFIG_CMD_UNIVERSE CONFIG_CMD_UUID CONFIG_CMD_ZBOOT -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 38/42] Convert CONFIG_CMD_UUID to Kconfig
This converts the following to Kconfig: CONFIG_CMD_UUID Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README | 1 - cmd/Kconfig | 11 +++ scripts/config_whitelist.txt | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README b/README index d5684ce5b5..1def10f235 100644 --- a/README +++ b/README @@ -826,7 +826,6 @@ The following options need to be configured: CONFIG_CMD_USB * USB support CONFIG_CMD_CDP * Cisco Discover Protocol support CONFIG_CMD_XIMG Load part of Multi Image - CONFIG_CMD_UUID * Generate random UUID or GUID string EXAMPLE: If you want all functions except of network support you can write: diff --git a/cmd/Kconfig b/cmd/Kconfig index 4524370d23..de66c54ebc 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1113,6 +1113,17 @@ config CMD_TERMINAL is very simple with no special processing of characters. As with cu, you can press ~. (tilde followed by period) to exit. +config CMD_UUID + bool "uuid, guid - generation of unique IDs" + help + This enables two commands: + +uuid - generate random Universally Unique Identifier +guid - generate Globally Unique Identifier based on random UUID + + The two commands are very similar except for the endianness of the + output. + endmenu config CMD_BOOTSTAGE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31aee890d7..b2160567d6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_UUID CONFIG_CMD_ZBOOT CONFIG_CMD_ZFS CONFIG_CM_INIT -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 35/42] Convert CONFIG_CMD_TRACE to Kconfig
This converts the following to Kconfig: CONFIG_CMD_TRACE Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 9 + include/configs/exynos5-common.h | 1 - include/configs/sandbox.h| 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index f8017f885a..425d1d1351 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1407,6 +1407,15 @@ config CMD_KGDB single-stepping, inspecting variables, etc. This is supported only on PowerPC at present. +config CMD_TRACE + bool "trace - Support tracing of function calls and timing" + help + Enables a command to control using of function tracing within + U-Boot. This allows recording of call traces including timing + information. The command can write data to memory for exporting + for analsys (e.g. using bootchart). See doc/README.trace for full + details. + endmenu config CMD_UBI diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 3b73bbc525..9c9681e8ac 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -17,7 +17,6 @@ #ifdef FTRACE #define CONFIG_TRACE -#define CONFIG_CMD_TRACE #define CONFIG_TRACE_BUFFER_SIZE (16 << 20) #define CONFIG_TRACE_EARLY_SIZE(8 << 20) #define CONFIG_TRACE_EARLY diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 13777abb4c..7567ccd905 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -8,7 +8,6 @@ #ifdef FTRACE #define CONFIG_TRACE -#define CONFIG_CMD_TRACE #define CONFIG_TRACE_BUFFER_SIZE (16 << 20) #define CONFIG_TRACE_EARLY_SIZE(8 << 20) #define CONFIG_TRACE_EARLY diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 515ea8861d..58f8bc4e87 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TRACE CONFIG_CMD_TSI148 CONFIG_CMD_UNIVERSE CONFIG_CMD_UUID -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] rockchip: rk3399-firefly: update gmac parameter
> Update the tx_deday and rx_delay to match the timing for > rk3399-firefly board to improve the stability of gmac data > transfer. > > Signed-off-by: Kever Yang> --- > > arch/arm/dts/rk3399-firefly.dts | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/4] rockchip: rk322x: update the sysreg number for boot mode
> The boot mode for rk322x is stored in sysreg 0, update it. > > Signed-off-by: Kever Yang> --- > > arch/arm/mach-rockchip/rk322x-board.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 31/42] Convert CONFIG_CMD_TERMINAL to Kconfig
This converts the following to Kconfig: CONFIG_CMD_TERMINAL Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 8 include/config_cmd_all.h | 1 - include/configs/vct.h| 2 -- scripts/config_whitelist.txt | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 4c1cbe736f..a4c719d424 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1085,6 +1085,14 @@ config CMD_QFW source "cmd/mvebu/Kconfig" +config CMD_TERMINAL + bool "terminal - provides a way to attach a serial terminal" + help + Provides a 'cu'-like serial terminal command. This can be used to + access other serial ports from the system console. The terminal + is very simple with no special processing of characters. As with + cu, you can press ~. (tilde followed by period) to exit. + endmenu config CMD_BOOTSTAGE diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 25dd3c7355..f93d5508bb 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_TERMINAL/* built-in Serial Terminal */ #define CONFIG_CMD_UNIVERSE/* Tundra Universe Support */ #define CONFIG_CMD_ZFS /* ZFS Support */ diff --git a/include/configs/vct.h b/include/configs/vct.h index a98dae8e24..e7c3d4b589 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -239,8 +239,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_TERMINAL - #undef CONFIG_SMC911X #undef CONFIG_SYS_I2C_SOFT #undef CONFIG_SOURCE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4ce1273bed..1753f4572f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_TERMINAL CONFIG_CMD_TFTP CONFIG_CMD_THOR_DOWNLOAD CONFIG_CMD_TRACE -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 25/42] Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SPL_NAND_OFS Signed-off-by: Simon Glass--- Changes in v2: - Drop unwanted 'CONFIG_CMD_SPL_NAND_OFS=0x0' lines in defconfig cmd/Kconfig | 10 ++ configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig| 1 + configs/gwventana_nand_defconfig | 1 + configs/igep0020_defconfig| 1 + configs/igep0030_defconfig| 1 + configs/igep0032_defconfig| 1 + configs/ipam390_defconfig | 1 + configs/omap3_beagle_defconfig| 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/cm_t335.h | 1 - include/configs/devkit8000.h | 2 -- include/configs/dra7xx_evm.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/omap3_beagle.h| 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/pengwyn.h | 1 - include/configs/twister.h | 2 -- scripts/config_whitelist.txt | 1 - 39 files changed, 30 insertions(+), 20 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 9157900a18..065664db06 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -284,6 +284,16 @@ config CMD_SPL doc/README.falcon for full information about how to use this command. +config CMD_SPL_NAND_OFS + hex "Offset of OS command line args for Falcon-mode NAND boot" + depends on CMD_SPL + default 0 + help + This provides the offset of the command line arguments for Linux + when booting from NAND in Falcon mode. See doc/README.falcon + for full information about how to use this option (and also see + board/gateworks/gw_ventana/README for an example). + endmenu menu "Environment commands" diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 07d70db9f2..8ffb1d61a4 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x8100 CONFIG_FASTBOOT_BUF_SIZE=0x0700 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0008 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index eb5a0d6abb..5aac38f3c6 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -21,6 +21,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x0700 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y CONFIG_CMD_NAND=y +CONFIG_CMD_SPL_NAND_OFS=0x0008 # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_MTDPARTS=y CONFIG_DFU_MMC=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 7c7a5bd150..83d6aba8e5 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -23,6 +23,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x8100 CONFIG_FASTBOOT_BUF_SIZE=0x0700 # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0008 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 9cb1a6b2a3..29f0be28e3 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x0010 # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 75dbb38ebc..b5a2863328 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_SPL=y
[U-Boot] [PATCH v2 40/42] Convert CONFIG_CMD_ZFS to Kconfig
This converts the following to Kconfig: CONFIG_CMD_ZFS Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 11 +++ include/config_cmd_all.h | 2 -- scripts/config_whitelist.txt | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index c00353fff3..2c2669cdc3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1406,6 +1406,17 @@ config CMD_YAFFS2 that device writes are sequential regardless of filesystem activity. +config CMD_ZFS + bool "zfs - Access of ZFS filesystem" + help + This provides commands to accessing a ZFS filesystem, commonly used + on Solaris systems. Two sub-commands are provided: + + zfsls - list files in a directory + zfsload - load a file + + See doc/README.zfs for more details. + endmenu menu "Debug commands" diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index faddca88cd..df88df42e1 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,6 +13,4 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_ZFS /* ZFS Support */ - #endif /* _CONFIG_CMD_ALL_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c3d3e46f9..0b70937810 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ZFS CONFIG_CM_INIT CONFIG_CM_MULTIPLE_SSRAM CONFIG_CM_REMAP -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 34/42] Convert CONFIG_CMD_YAFFS2 to Kconfig
This converts the following to Kconfig: CONFIG_CMD_YAFFS2 Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 11 +++ cmd/Makefile | 2 +- fs/Kconfig| 2 ++ fs/yaffs2/Kconfig | 7 +++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fs/yaffs2/Kconfig diff --git a/cmd/Kconfig b/cmd/Kconfig index 6a895bbac5..f8017f885a 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1360,6 +1360,17 @@ config CMD_SCSI scan the bus, reset the bus, read and write data and get information about devices. +config CMD_YAFFS2 + bool "yaffs2 - Access of YAFFS2 filesystem" + depends on YAFFS2 + default y + help + This provides commands for accessing a YAFFS2 filesystem. Yet + Another Flash Filesystem 2 is a filesystem designed specifically + for NAND flash. It incorporates bad-block management and ensures + that device writes are sequential regardless of filesystem + activity. + endmenu menu "Debug commands" diff --git a/cmd/Makefile b/cmd/Makefile index a85fe25dda..1bf6e3f711 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -132,7 +132,7 @@ obj-$(CONFIG_CMD_FS_UUID) += fs_uuid.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_YAFFS2) += yaffs2.o obj-$(CONFIG_CMD_SPL) += spl.o obj-$(CONFIG_CMD_ZIP) += zip.o obj-$(CONFIG_CMD_ZFS) += zfs.o diff --git a/fs/Kconfig b/fs/Kconfig index e6438ad0ea..e6803ac8cb 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -18,4 +18,6 @@ source "fs/ubifs/Kconfig" source "fs/cramfs/Kconfig" +source "fs/yaffs2/Kconfig" + endmenu diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig new file mode 100644 index 00..45ffdf6c26 --- /dev/null +++ b/fs/yaffs2/Kconfig @@ -0,0 +1,7 @@ +config YAFFS2 + bool "YAFFS2 filesystem support" + help + This provides access to YAFFS2 filesystems. Yet Another Flash + Filesystem 2 is a filesystem designed specifically for NAND flash. + It incorporates bad-block management and ensures that device + writes are sequential regardless of filesystem activity. -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 29/42] gpio: Drop sx151x driver
This driver is not used in U-Boot. Drop it and its associated CONFIG options. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Drop include/sx151x.h also drivers/gpio/Makefile| 1 - drivers/gpio/sx151x.c| 242 --- include/sx151x.h | 17 --- scripts/config_whitelist.txt | 3 - 4 files changed, 263 deletions(-) delete mode 100644 drivers/gpio/sx151x.c delete mode 100644 include/sx151x.h diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 8937e99b47..1396467ab6 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_BCM2835_GPIO)+= bcm2835_gpio.o obj-$(CONFIG_XILINX_GPIO) += xilinx_gpio.o obj-$(CONFIG_ADI_GPIO2)+= adi_gpio2.o obj-$(CONFIG_TCA642X) += tca642x.o -oby-$(CONFIG_SX151X) += sx151x.o obj-$(CONFIG_SUNXI_GPIO) += sunxi_gpio.o obj-$(CONFIG_LPC32XX_GPIO) += lpc32xx_gpio.o obj-$(CONFIG_STM32_GPIO) += stm32_gpio.o diff --git a/drivers/gpio/sx151x.c b/drivers/gpio/sx151x.c deleted file mode 100644 index 167cf40c71..00 --- a/drivers/gpio/sx151x.c +++ /dev/null @@ -1,242 +0,0 @@ -/* - * (C) Copyright 2013 - * Viktar Palstsiuk, Promwad, viktar.palsts...@promwad.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -/* - * Driver for Semtech SX151x SPI GPIO Expanders - */ - -#include -#include -#include - -#ifndef CONFIG_SX151X_SPI_BUS -#define CONFIG_SX151X_SPI_BUS 0 -#endif - -/* - * The SX151x registers - */ - -#ifdef CONFIG_SX151X_GPIO_COUNT_8 -/* 8bit: SX1511 */ -#define SX151X_REG_DIR 0x07 -#define SX151X_REG_DATA0x08 -#else -/* 16bit: SX1512 */ -#define SX151X_REG_DIR 0x0F -#define SX151X_REG_DATA0x11 -#endif -#define SX151X_REG_RESET 0x7D - -static int sx151x_spi_write(int chip, unsigned char reg, unsigned char val) -{ - struct spi_slave *slave; - unsigned char buf[2]; - int ret; - - slave = spi_setup_slave(CONFIG_SX151X_SPI_BUS, chip, 100, - SPI_MODE_0); - if (!slave) - return 0; - - spi_claim_bus(slave); - - buf[0] = reg; - buf[1] = val; - - ret = spi_xfer(slave, 16, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END); - if (ret < 0) - printf("spi%d.%d write fail: can't write %02x to %02x: %d\n", - CONFIG_SX151X_SPI_BUS, chip, val, reg, ret); - else - printf("spi%d.%d write 0x%02x to register 0x%02x\n", - CONFIG_SX151X_SPI_BUS, chip, val, reg); - spi_release_bus(slave); - spi_free_slave(slave); - - return ret; -} - -static int sx151x_spi_read(int chip, unsigned char reg) -{ - struct spi_slave *slave; - int ret; - - slave = spi_setup_slave(CONFIG_SX151X_SPI_BUS, chip, 100, - SPI_MODE_0); - if (!slave) - return 0; - - spi_claim_bus(slave); - - ret = spi_w8r8(slave, reg | 0x80); - if (ret < 0) - printf("spi%d.%d read fail: can't read %02x: %d\n", - CONFIG_SX151X_SPI_BUS, chip, reg, ret); - else - printf("spi%d.%d read register 0x%02x: 0x%02x\n", - CONFIG_SX151X_SPI_BUS, chip, reg, ret); - - spi_release_bus(slave); - spi_free_slave(slave); - - return ret; -} - -static inline void sx151x_find_cfg(int gpio, unsigned char *reg, unsigned char *mask) -{ - *reg -= gpio / 8; - *mask = 1 << (gpio % 8); -} - -static int sx151x_write_cfg(int chip, unsigned char gpio, unsigned char reg, int val) -{ - unsigned char mask; - unsigned char data; - int ret; - - sx151x_find_cfg(gpio, , ); - ret = sx151x_spi_read(chip, reg); - if (ret < 0) - return ret; - else - data = ret; - data &= ~mask; - data |= (val << (gpio % 8)) & mask; - return sx151x_spi_write(chip, reg, data); -} - -int sx151x_get_value(int chip, int gpio) -{ - unsigned char reg = SX151X_REG_DATA; - unsigned char mask; - int ret; - - sx151x_find_cfg(gpio, , ); - ret = sx151x_spi_read(chip, reg); - if (ret >= 0) - ret = (ret & mask) != 0 ? 1 : 0; - - return ret; -} - -int sx151x_set_value(int chip, int gpio, int val) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DATA, (val ? 1 : 0)); -} - -int sx151x_direction_input(int chip, int gpio) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DIR, 1); -} - -int sx151x_direction_output(int chip, int gpio) -{ - return sx151x_write_cfg(chip, gpio, SX151X_REG_DIR, 0); -} - -int sx151x_reset(int chip) -{ - int err; - - err = sx151x_spi_write(chip, SX151X_REG_RESET, 0x12); - if (err < 0) - return err; - - err =
[U-Boot] [PATCH v2 22/42] Convert CONFIG_CMD_SF_TEST to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SF_TEST Signed-off-by: Simon Glass--- Changes in v2: - Fix typos in help - Make X86 imply CMD_SF_TEST (except for efi-x86 which fails) - Put Kconfig change in alphabetical order README | 6 -- arch/Kconfig| 2 ++ cmd/Kconfig | 11 +++ configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/efi-x86_defconfig | 1 + configs/sandbox_defconfig | 4 +--- include/configs/efi-x86.h | 2 -- include/configs/sandbox.h | 1 - include/configs/veyron.h| 2 -- include/configs/x86-common.h| 1 - scripts/config_whitelist.txt| 1 - 13 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README b/README index 2371304279..d5684ce5b5 100644 --- a/README +++ b/README @@ -2500,12 +2500,6 @@ The following options need to be configured: CONFIG_SF_DEFAULT_MODE (see include/spi.h) CONFIG_SF_DEFAULT_SPEED in Hz - CONFIG_CMD_SF_TEST - - Define this option to include a destructive SPI flash - test ('sf test'). - -- SystemACE Support: CONFIG_SYSTEMACE Adding this option adds support for Xilinx SystemACE diff --git a/arch/Kconfig b/arch/Kconfig index e063ee0d23..08f6e7f47d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -78,6 +78,7 @@ config SANDBOX imply LZMA imply SCSI imply CMD_SATA + imply CMD_SF_TEST config SH bool "SuperH architecture" @@ -111,6 +112,7 @@ config X86 imply CMD_GETTIME imply CMD_IO imply CMD_IRQ + imply CMD_SF_TEST config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 6431d7c70f..2a9c55f608 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -788,6 +788,17 @@ config CMD_SF help SPI Flash support +config CMD_SF_TEST + bool "sf test - Allow testing of SPI flash" + help + Provides a way to test that SPI flash is working correctly. The + test is destructive, in that an area of SPI flash must be provided + for the test to use. Performance information is also provided, + measuring the performance of reading, writing and erasing in + Mbps (Million Bits Per Second). This value should approximately + equal the SPI bus speed for a single-bit-wide SPI bus, assuming + everything is working properly. + config CMD_SPI bool "sspi" help diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 01032e7330..b4e727009c 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index b9d4fc9c12..8e91db4014 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index fb955e46c6..e512ce1ef8 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 789c5ce5bf..a23d402dee 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y +# CONFIG_CMD_SF_TEST is not set CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a1844d30a2..349d3c7270 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_GPIO=y CONFIG_CMD_PCI=y +CONFIG_CMD_READ=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y @@ -193,6 +194,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_MTDPARTS=y -CONFIG_CMD_MTDPARTS_SPREAD=y -CONFIG_CMD_READ=y diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 4a6b66507f..fa263632a2 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -9,8 +9,6 @@ #include -#undef CONFIG_CMD_SF_TEST - #undef
[U-Boot] [PATCH v2 15/42] Kconfig: Convert CMD_READ to Kconfig
Convert this option and enable it in sandbox. Also correct a bug which was introduced with the block-device driver model conversion. Signed-off-by: Simon Glass--- Changes in v2: - Move CMD_PORTIO changes to previous patch - Sort Kconfig options in alphabetical order README | 1 - cmd/Kconfig | 5 + cmd/read.c | 2 +- configs/sandbox_defconfig| 3 +++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README b/README index 06a9b2eca9..2e813b7bcb 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFSNFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_READ * Read raw data from partition CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUNrun command in env variable CONFIG_CMD_SANDBOX * sb command to access sandbox features diff --git a/cmd/Kconfig b/cmd/Kconfig index 7892b0b03f..15dcfbf1e9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -741,6 +741,11 @@ config CMD_PCMCIA about 1990. These devices are typically removable memory or network cards using a standard 68-pin connector. +config CMD_READ + bool "read - Read binary data from a partition" + help + Provides low-level access to the data in a partition. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/cmd/read.c b/cmd/read.c index 61d8ce73e4..ecf925426f 100644 --- a/cmd/read.c +++ b/cmd/read.c @@ -66,7 +66,7 @@ int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - if (blk_read(dev_desc, offset + blk, cnt, addr) < 0) { + if (blk_dread(dev_desc, offset + blk, cnt, addr) < 0) { printf("Error reading blocks\n"); return 1; } diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 3fe2702d30..a1844d30a2 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -193,3 +193,6 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_MTDPARTS_SPREAD=y +CONFIG_CMD_READ=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 35a6a529eb..edfc91ff9b 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_REGINFO /* Register dump*/ #define CONFIG_CMD_REISER /* Reiserfs support */ -#define CONFIG_CMD_READ/* Read data from partition */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 899fd501ad..33a408891e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_READ CONFIG_CMD_REGINFO CONFIG_CMD_REISER CONFIG_CMD_SANDBOX -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 14/42] Kconfig: Drop CONFIG_CMD_PORTIO and associated command
This command is not used by any board. It also looks quite similar to the 'iod' and 'iow' commands which use the correct I/O macros. Drop it. Signed-off-by: Simon Glass--- Changes in v2: - Drop mention of this from several other places - Move CMD_PORTIO changes in from the CMD_READ patch README | 1 - cmd/Makefile | 1 - cmd/portio.c | 145 --- include/command.h| 9 ++- include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 4 insertions(+), 154 deletions(-) delete mode 100644 cmd/portio.c diff --git a/README b/README index 186311bd88..06a9b2eca9 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFSNFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_PORTIO * Port I/O CONFIG_CMD_READ * Read raw data from partition CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUNrun command in env variable diff --git a/cmd/Makefile b/cmd/Makefile index bd231f24d8..eff6bd678f 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -97,7 +97,6 @@ ifdef CONFIG_PCI obj-$(CONFIG_CMD_PCI) += pci.o endif obj-y += pcmcia.o -obj-$(CONFIG_CMD_PORTIO) += portio.o obj-$(CONFIG_CMD_PXE) += pxe.o obj-$(CONFIG_CMD_QFW) += qfw.o obj-$(CONFIG_CMD_READ) += read.o diff --git a/cmd/portio.c b/cmd/portio.c deleted file mode 100644 index bf3a99791c..00 --- a/cmd/portio.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * (C) Copyright 2003 - * Marc Singer, e...@buici.com - * - * SPDX-License-Identifier:GPL-2.0+ - */ - -/* - * Port I/O Functions - * - * Copied from FADS ROM, Dan Malek (dma...@jlc.net) - */ - -#include -#include - -/* Display values from last command. - * Memory modify remembered values are different from display memory. - */ -static uint in_last_addr, in_last_size; -static uint out_last_addr, out_last_size, out_last_value; - - -int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) -{ - uint addr = out_last_addr; - uint size = out_last_size; - uint value = out_last_value; - - if (argc != 3) - return CMD_RET_USAGE; - - if ((flag & CMD_FLAG_REPEAT) == 0) { - /* -* New command specified. Check for a size specification. -* Defaults to long if no or incorrect specification. -*/ - size = cmd_get_data_size (argv[0], 1); - addr = simple_strtoul (argv[1], NULL, 16); - value = simple_strtoul (argv[2], NULL, 16); - } -#if defined (CONFIG_X86) - - { - unsigned short port = addr; - - switch (size) { - default: - case 1: - { - unsigned char ch = value; - __asm__ volatile ("out %0, %%dx"::"a" (ch), "d" (port)); - } - break; - case 2: - { - unsigned short w = value; - __asm__ volatile ("out %0, %%dx"::"a" (w), "d" (port)); - } - break; - case 4: - __asm__ volatile ("out %0, %%dx"::"a" (value), "d" (port)); - - break; - } - } - -#endif /* CONFIG_X86 */ - - out_last_addr = addr; - out_last_size = size; - out_last_value = value; - - return 0; -} - -U_BOOT_CMD( - out,3, 1, do_portio_out, - "write datum to IO port", - "[.b, .w, .l] port value\n- output to IO port" -); - -int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) -{ - uint addr = in_last_addr; - uint size = in_last_size; - - if (argc != 2) - return CMD_RET_USAGE; - - if ((flag & CMD_FLAG_REPEAT) == 0) { - /* -* New command specified. Check for a size specification. -* Defaults to long if no or incorrect specification. -*/ - size = cmd_get_data_size (argv[0], 1); - addr = simple_strtoul (argv[1], NULL, 16); - } -#if defined (CONFIG_X86) - - { - unsigned short port = addr; - - switch (size) { - default: - case 1: - { - unsigned char ch; - __asm__ volatile ("in %%dx, %0":"=a" (ch):"d" (port)); - - printf (" %02x\n", ch); - } - break; - case 2: -
Re: [U-Boot] [U-Boot, 3/3] rockchip: firefly-rk3399: enable ATF and dwmmc
> enable the ATF option and SDCard in defconfig. > > Signed-off-by: Kever Yang> --- > > configs/firefly-rk3399_defconfig | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 42/42] README: Drop information about commands
Most of this is duplicated in Kconfig help. Add some of that which is not, and remove the help from the README. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Drop patch to convert CONFIG_CMD_MTDPARTS to Kconfig (already done) README | 116 +-- cmd/Kconfig | 4 +- cmd/fastboot/Kconfig | 2 + 3 files changed, 6 insertions(+), 116 deletions(-) diff --git a/README b/README index 21639fdd3b..99a0a41c47 100644 --- a/README +++ b/README @@ -756,93 +756,6 @@ The following options need to be configured: Select one of the baudrates listed in CONFIG_SYS_BAUDRATE_TABLE, see below. -- Monitor Functions: - The default command configuration includes all commands - except those marked below with a "*". - - CONFIG_CMD_AESAES 128 CBC encrypt/decrypt - CONFIG_CMD_ASKENV * ask for env variable - CONFIG_CMD_BDIbdinfo - CONFIG_CMD_BOOTD bootd - CONFIG_CMD_BOOTI* ARM64 Linux kernel Image support - CONFIG_CMD_CACHE* icache, dcache - CONFIG_CMD_CONSOLEconinfo - CONFIG_CMD_DHCP * DHCP support - CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_ECHO echo arguments - CONFIG_CMD_EDITENVedit env variable - CONFIG_CMD_ELF * bootelf, bootvx - CONFIG_CMD_ENV_EXISTS * check existence of env variable - CONFIG_CMD_EXPORTENV* export the environment - CONFIG_CMD_EXT2 * ext2 command support - CONFIG_CMD_EXT4 * ext4 command support - CONFIG_CMD_FS_GENERIC * filesystem commands (e.g. load, ls) - that work for multiple fs types - CONFIG_CMD_FS_UUID * Look up a filesystem UUID - CONFIG_CMD_SAVEENVsaveenv - CONFIG_CMD_FLASH flinfo, erase, protect - CONFIG_CMD_FPGA FPGA device initialization support - CONFIG_CMD_GO * the 'go' command (exec code) - CONFIG_CMD_GREPENV * search environment - CONFIG_CMD_I2C * I2C serial bus support - CONFIG_CMD_IMIiminfo - CONFIG_CMD_IMLS List all images found in NOR flash - CONFIG_CMD_IMLS_NAND* List all images found in NAND flash - CONFIG_CMD_IMPORTENV* import an environment - CONFIG_CMD_INI * import data from an ini file into the env - CONFIG_CMD_ITEST Integer/string test of 2 values - CONFIG_CMD_LDRINFO * ldrinfo (display Blackfin loader) - CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration - (169.254.*.*) - CONFIG_CMD_LOADB loadb - CONFIG_CMD_LOADS loads - CONFIG_CMD_MD5SUM * print md5 message digest - (requires CONFIG_CMD_MEMORY and CONFIG_MD5) - CONFIG_CMD_MEMINFO * Display detailed memory information - CONFIG_CMD_MEMORY md, mm, nm, mw, cp, cmp, crc, base, - loop, loopw - CONFIG_CMD_MEMTEST * mtest - CONFIG_CMD_MISC Misc functions like sleep etc - CONFIG_CMD_MMC * MMC memory mapped support - CONFIG_CMD_MII * MII utility commands - CONFIG_CMD_NETbootp, tftpboot, rarpboot - CONFIG_CMD_NFSNFS support - CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network - host - CONFIG_CMD_RUNrun command in env variable - CONFIG_CMD_SF * Read/write/erase SPI NOR flash - CONFIG_CMD_SOFTSWITCH * Soft switch setting command for BF60x - CONFIG_CMD_SOURCE "source" command Support - CONFIG_CMD_SPI * SPI serial bus support - CONFIG_CMD_TFTPSRV * TFTP transfer in server mode - CONFIG_CMD_TFTPPUT * TFTP put command (upload) - CONFIG_CMD_TIME * run command and report execution time (ARM specific) - CONFIG_CMD_TIMER* access to the system tick timer - CONFIG_CMD_USB * USB support - CONFIG_CMD_CDP * Cisco Discover Protocol support - CONFIG_CMD_XIMG Load part of Multi Image - - EXAMPLE: If you want all functions except of
[U-Boot] [PATCH v2 20/42] Convert CONFIG_CMD_SCSI to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SCSI Also update the Makefile to use CONFIG_CMD_SCSI instead of CONFIG_SCSI to enable the command, fixing an earlier error. Signed-off-by: Simon Glass--- Changes in v2: - Update commit message to explain Makefile change arch/arm/Kconfig | 3 +++ cmd/Kconfig | 9 + cmd/Makefile | 2 +- configs/cl-som-am57x_defconfig| 1 + configs/controlcenterdc_defconfig | 1 + configs/ls1012aqds_qspi_defconfig | 1 + include/configs/cl-som-am57x.h| 1 - include/configs/controlcenterdc.h | 1 - include/configs/ls1012aqds.h | 1 - include/configs/ls1012ardb.h | 1 - include/configs/ls1021aiot.h | 1 - include/configs/ls1043ardb.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e42e7b030..477e76be29 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,6 +879,7 @@ config TARGET_LS1012ARDB select ARM64 select BOARD_LATE_INIT imply SCSI + imply CMD_SCSI help Support for Freescale LS1012ARDB platform. The LS1012A Reference design board (RDB) is a high-performance @@ -932,6 +933,7 @@ config TARGET_LS1021AIOT select ARCH_LS1021A select ARCH_SUPPORT_PSCI imply SCSI + imply CMD_SCSI help Support for Freescale LS1021AIOT platform. The LS1021A Freescale board (IOT) is a high-performance @@ -959,6 +961,7 @@ config TARGET_LS1043ARDB select SUPPORT_SPL select BOARD_EARLY_INIT_F imply SCSI + imply CMD_SCSI help Support for Freescale LS1043ARDB platform. diff --git a/cmd/Kconfig b/cmd/Kconfig index f90673f95b..c74acd535b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1281,6 +1281,15 @@ config CMD_REISER reiserls - list files reiserload - load a file +config CMD_SCSI + bool "scsi - Access to SCSI devices" + select SCSI + help + This provides a 'scsi' command which provides access to SCSI (Small + Computer System Interface) devices. The command provides a way to + scan the bus, reset the bus, read and write data and get information + about devices. + endmenu menu "Debug commands" diff --git a/cmd/Makefile b/cmd/Makefile index eff6bd678f..a85fe25dda 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -106,7 +106,7 @@ obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o obj-$(CONFIG_SANDBOX) += host.o obj-$(CONFIG_CMD_SATA) += sata.o obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_SCSI) += scsi.o disk.o +obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SPI) += spi.o diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index e0b7565ac0..71ce02d616 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_SCSI=y CONFIG_ISO_PARTITION=y CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index bb9c1b5d4f..4affd31ebd 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_TPM=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y +CONFIG_CMD_SCSI=y CONFIG_EFI_PARTITION=y CONFIG_OF_BOARD_FIXUP=y CONFIG_SPL_OF_TRANSLATE=y diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig index 383fc1a95f..dfc378677d 100644 --- a/configs/ls1012aqds_qspi_defconfig +++ b/configs/ls1012aqds_qspi_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_CMD_SCSI=y CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index b9d6454887..afab46caae 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -64,7 +64,6 @@ #ifndef CONFIG_SPL_BUILD /* SATA */ -#define CONFIG_CMD_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 979bb98850..715e9ed9c9 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -33,7 +33,6 @@ * Commands configuration */ #define CONFIG_CMD_I2C -#define CONFIG_CMD_SCSI #define CONFIG_CMD_SPI /* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 99f5dd4119..b3121d2c21 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -136,7 +136,6 @@ #define CONFIG_LIBATA #define
[U-Boot] [PATCH v2 33/42] Convert CONFIG_CMD_THOR_DOWNLOAD to Kconfig
This converts the following to Kconfig: CONFIG_CMD_THOR_DOWNLOAD Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 8 configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/origen_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/topic_miami_defconfig| 1 + configs/topic_miamilite_defconfig| 1 + configs/topic_miamiplus_defconfig| 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + include/configs/exynos4-common.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/smdkv310.h | 1 - include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h| 1 - scripts/config_whitelist.txt | 1 - 29 files changed, 29 insertions(+), 7 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index a4c719d424..6a895bbac5 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -303,6 +303,14 @@ config CMD_SPL_WRITE_SIZE flash used by Falcon-mode boot. See the documentation until CMD_SPL for detail. +config CMD_THOR_DOWNLOAD + bool "thor - TIZEN 'thor' download" + help + Implements the 'thor' download protocol. This is a way of + downloading a software update over USB from an attached host. + There is no documentation about this within the U-Boot source code + but you should be able to find something on the interwebs. + endmenu menu "Environment commands" diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index ffcecd5fd2..2354a00ad4 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -12,6 +12,7 @@ CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_SYS_PROMPT="ODROID-XU3 # " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_MMC=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 22e86e28c3..c9e55406eb 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="Odroid # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 573c9e29a7..0a27833f46 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="ORIGEN # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 0045f5e63e..8bfab751cb 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="Goni # " # CONFIG_AUTOBOOT is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 021e6c5102..cdbf12ceff 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_PROMPT="Universal # " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set +CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 1873791e79..1bc9e3849e 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -13,6 +13,7 @@ CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="zynq-uboot> " # CONFIG_CMD_IMLS is not set +CONFIG_CMD_THOR_DOWNLOAD=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index
[U-Boot] [PATCH v2 41/42] Drop config_cmd_all.h
This file does not include all commands and has not for a while. Let's drop it. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README | 5 - include/config_cmd_all.h | 16 2 files changed, 21 deletions(-) delete mode 100644 include/config_cmd_all.h diff --git a/README b/README index 1def10f235..21639fdd3b 100644 --- a/README +++ b/README @@ -757,11 +757,6 @@ The following options need to be configured: CONFIG_SYS_BAUDRATE_TABLE, see below. - Monitor Functions: - Monitor commands can be included or excluded - from the build by using the #include files -and #undef'ing unwanted - commands, or adding #define's for wanted commands. - The default command configuration includes all commands except those marked below with a "*". diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h deleted file mode 100644 index df88df42e1..00 --- a/include/config_cmd_all.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2007 Freescale Semiconductor, Inc. - * - * This file is licensed under the terms of the GNU General Public - * License Version 2. This file is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#ifndef _CONFIG_CMD_ALL_H -#define _CONFIG_CMD_ALL_H - -/* - * Alphabetical list of all possible commands. - */ - -#endif /* _CONFIG_CMD_ALL_H */ -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
> On 05 Aug 2017, at 00:30, Simon Glasswrote: > > +Tom > > Hi Philipp, > > On 4 August 2017 at 16:21, Dr. Philipp Tomsich > wrote: >> >>> On 04 Aug 2017, at 23:48, Simon Glass wrote: >>> >>> From: Andy Shevchenko >>> >>> Convert name to show explicitly that we are using milliseconds. For a >>> watchdog timer this is precise enough. >>> >>> No functional change intended. >>> >>> Signed-off-by: Andy Shevchenko >>> Signed-off-by: Simon Glass >>> --- >>> >>> Changes in v2: >>> - Use milliseconds since microseconds seems too fine a control >>> - Update commit message to suit >>> >>> drivers/watchdog/wdt-uclass.c | 4 ++-- >>> include/wdt.h | 8 >>> 2 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c >>> index bb9ae80866..8a30f024fd 100644 >>> --- a/drivers/watchdog/wdt-uclass.c >>> +++ b/drivers/watchdog/wdt-uclass.c >>> @@ -13,14 +13,14 @@ >>> >>> DECLARE_GLOBAL_DATA_PTR; >>> >>> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags) >>> +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) >>> { >>> const struct wdt_ops *ops = device_get_ops(dev); >>> >>> if (!ops->start) >>> return -ENOSYS; >>> >>> - return ops->start(dev, timeout, flags); >>> + return ops->start(dev, timeout_ms, flags); >>> } >>> >>> int wdt_stop(struct udevice *dev) >>> diff --git a/include/wdt.h b/include/wdt.h >>> index 0b5f05851a..9b90fbeeb3 100644 >>> --- a/include/wdt.h >>> +++ b/include/wdt.h >>> @@ -21,12 +21,12 @@ >>> * Start the timer >>> * >>> * @dev: WDT Device >>> - * @timeout: Number of ticks before timer expires >>> + * @timeout_ms: Number of ticks (milliseconds) before timer expires >> >> Should this not just be ‘number of milliseconds’ (as this would >> otherwise equate ticks and milliseconds, which don’t necessarily >> need to be the same)? > > I believe they are the same. We used to have a setting for it > (CONFIG_SYS_HZ I think) but now everything is in milliseconds. See for > example get_timer(). I had thought of my remark more as a nitpick. Bit it seems there’s more to it, after all: at least lib/time.c still treats ’ticks’ and ‘milliseconds' as separate concepts: uint64_t __weak notrace get_ticks(void) { unsigned long now = timer_read_counter(); /* increment tbu if tbl has rolled over */ if (now < gd->timebase_l) gd->timebase_h++; gd->timebase_l = now; return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l; } /* Returns time in milliseconds */ static uint64_t notrace tick_to_time(uint64_t tick) { ulong div = get_tbclk(); tick *= CONFIG_SYS_HZ; do_div(tick, div); return tick; } > >> >>> * @flags: Driver specific flags. This might be used to specify >>> * which action needs to be executed when the timer expires >>> * @return: 0 if OK, -ve on error >>> */ >>> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); >>> +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); >>> >>> /* >>> * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it >>> again. >>> @@ -67,12 +67,12 @@ struct wdt_ops { >>> * Start the timer >>> * >>> * @dev: WDT Device >>> - * @timeout: Number of ticks before the timer expires >>> + * @timeout_ms: Number of ticks (milliseconds) before the timer >>> expires >> >> See above. >> >>> * @flags: Driver specific flags. This might be used to specify >>> * which action needs to be executed when the timer expires >>> * @return: 0 if OK, -ve on error >>> */ >>> - int (*start)(struct udevice *dev, u64 timeout, ulong flags); >>> + int (*start)(struct udevice *dev, u64 timeout_ms, ulong flags); >>> /* >>> * Stop the timer >>> * >>> -- >>> 2.14.0.rc1.383.gd1ce394fe2-goog >>> >>> ___ >>> U-Boot mailing list >>> U-Boot@lists.denx.de >>> https://lists.denx.de/listinfo/u-boot >> > > Regards, > Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 23/42] Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SH_ZIMAGEBOOT Signed-off-by: Simon Glass--- Changes in v2: - Make this 'default y' and drop defconfig file changes - Remove some now-superfluous /* commands */ comments in header files - Rename the option to include 'zimageboot' arch/sh/Kconfig | 2 ++ arch/sh/lib/Kconfig | 6 ++ include/configs/r2dplus.h| 5 - include/configs/sh7785lcr.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 arch/sh/lib/Kconfig diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 1d40fe6845..fa32df02fc 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -128,6 +128,8 @@ config SYS_CPU default "sh3" if CPU_SH3 default "sh4" if CPU_SH4 +source "arch/sh/lib/Kconfig" + source "board/alphaproject/ap_sh4a_4a/Kconfig" source "board/espt/Kconfig" source "board/mpr2/Kconfig" diff --git a/arch/sh/lib/Kconfig b/arch/sh/lib/Kconfig new file mode 100644 index 00..cec8d09cc3 --- /dev/null +++ b/arch/sh/lib/Kconfig @@ -0,0 +1,6 @@ +config CMD_SH_ZIMAGEBOOT + bool "zimageboot - Boot a zImage on SH" + default y + help + This is special SH-specific command to boot a zImage (compressed + Linux image) on SH-architecture boards. diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index a604848073..4feaa0509a 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -8,11 +8,6 @@ #define CONFIG_DISPLAY_BOARDINFO -/* - * Command line configuration. - */ -#define CONFIG_CMD_SH_ZIMAGEBOOT - /* SCIF */ #define CONFIG_CONS_SCIF1 1 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index d4477c2794..da827aca87 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -12,8 +12,6 @@ #define CONFIG_CPU_SH7785 1 #define CONFIG_SH7785LCR 1 -#define CONFIG_CMD_SH_ZIMAGEBOOT - #define CONFIG_BOOTARGS"console=ttySC1,115200 root=/dev/nfs ip=dhcp" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3a81c7e3ad..08351b57e1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS CONFIG_CMD_SPL_WRITE_SIZE -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 39/42] Convert CONFIG_CMD_ZBOOT to Kconfig
This converts the following to Kconfig: CONFIG_CMD_ZBOOT Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Update edison also arch/Kconfig | 1 + cmd/Kconfig | 12 include/configs/edison.h | 1 - include/configs/x86-common.h | 2 -- scripts/config_whitelist.txt | 1 - 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 08f6e7f47d..78532f56ca 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -113,6 +113,7 @@ config X86 imply CMD_IO imply CMD_IRQ imply CMD_SF_TEST + imply CMD_ZBOOT config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index de66c54ebc..c00353fff3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -311,6 +311,18 @@ config CMD_THOR_DOWNLOAD There is no documentation about this within the U-Boot source code but you should be able to find something on the interwebs. +config CMD_ZBOOT + bool "zboot - x86 boot command" + help + With x86 machines it is common to boot a bzImage file which + contains both a kernel and a setup.bin file. The latter includes + configuration information from the dark ages which x86 boards still + need to pick things out of. + + Consider using FIT in preference to this since it supports directly + booting both 32- and 64-bit kernels, as well as secure boot. + Documentation is available in doc/uImage.FIT/x86-fit-boot.txt + endmenu menu "Environment commands" diff --git a/include/configs/edison.h b/include/configs/edison.h index 03aa702306..dfac340c2f 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -10,7 +10,6 @@ #include /* Boot */ -#define CONFIG_CMD_ZBOOT #define CONFIG_BOOTCOMMAND "run bootcmd" /* DISK Partition support */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 43af193344..7ff354a4ad 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -67,8 +67,6 @@ * Command line configuration. */ -#define CONFIG_CMD_ZBOOT - #define CONFIG_BOOTARGS\ "root=/dev/sdb3 init=/sbin/init rootwait ro" #define CONFIG_BOOTCOMMAND \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b2160567d6..8c3d3e46f9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_ZBOOT CONFIG_CMD_ZFS CONFIG_CM_INIT CONFIG_CM_MULTIPLE_SSRAM -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] rockchip: i2c: fix >32 byte reads
> The hw can read up to 32 bytes at a time. If we need > more than one chunk, we have to enter the plain RX mode. > > Signed-off-by: Wadim Egorov> --- > drivers/i2c/rk_i2c.c | 19 --- > 1 file changed, 16 insertions(+), 3 deletions(-) > Acked-by: Philipp Tomsich ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 37/42] Convert CONFIG_CMD_UNIVERSE to Kconfig
This converts the following to Kconfig: CONFIG_CMD_UNIVERSE Since no board uses this, perhaps we should drop this command? Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Add a note about dropping CMD_UNIVERSE - Sort Kconfig options in alphabetical order cmd/Kconfig | 6 ++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 7934753232..4524370d23 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -854,6 +854,12 @@ config CMD_TSI148 This provides various sub-commands to initialise and configure the Turndra tsi148 device. See the command help for full details. +config CMD_UNIVERSE + bool "universe - Command to set up the Turndra Universe controller" + help + This allows setting up the VMEbus provided by this controller. + See the command help for full details. + config CMD_USB bool "usb" help diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index f93d5508bb..faddca88cd 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_UNIVERSE/* Tundra Universe Support */ #define CONFIG_CMD_ZFS /* ZFS Support */ #endif /* _CONFIG_CMD_ALL_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 42eb367aa3..31aee890d7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_UNIVERSE CONFIG_CMD_UUID CONFIG_CMD_ZBOOT CONFIG_CMD_ZFS -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 17/42] Convert CONFIG_CMD_REISER to Kconfig
This converts the following to Kconfig: CONFIG_CMD_REISER Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 9 + configs/ethernut5_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/ethernut5.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 070536ac23..6a39e26256 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1266,6 +1266,15 @@ config CMD_MTDPARTS_SPREAD at least as large as the size specified in the mtdparts variable and 2) each partition starts on a good block. +config CMD_REISER + bool "reiser - Access to reiserfs filesystems" + help + This provides two commands which operate on a resierfs filesystem, + commonly used some years ago: + + reiserls - list files + reiserload - load a file + endmenu menu "Debug commands" diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 65a21732e7..6a34363f1e 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y +CONFIG_CMD_REISER=y CONFIG_CMD_UBI=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index cb0ab6d61a..00bc6fc88a 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 8bec154f43..cdad2e6d49 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -83,7 +83,6 @@ #define CONFIG_AT91_GPIO #ifndef MINIMAL_LOADER -#define CONFIG_CMD_REISER #define CONFIG_CMD_SAVES #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 01087839ee..64f18f0af1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_REISER CONFIG_CMD_SANDBOX CONFIG_CMD_SAVES CONFIG_CMD_SCSI -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 09/42] Kconfig: Drop CONFIG_CMD_PCA953X_INFO
It does not seem worth having an option to enable another sub-command in this legacy driver. Drop this option so that the sub-command is always available. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README | 1 - drivers/gpio/pca953x.c | 8 include/configs/cl-som-am57x.h | 1 - include/configs/cm_t335.h | 1 - include/configs/ot1200.h | 1 - include/configs/snapper9260.h | 3 --- include/configs/strider.h | 1 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 22 deletions(-) diff --git a/README b/README index 5f916c8d8e..addbf306f1 100644 --- a/README +++ b/README @@ -812,7 +812,6 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NETbootp, tftpboot, rarpboot CONFIG_CMD_NFSNFS support - CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 238e02805c..d1c1ae1411 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -143,7 +143,6 @@ int pca953x_get_val(uint8_t chip) } #ifdef CONFIG_CMD_PCA953X -#ifdef CONFIG_CMD_PCA953X_INFO /* * Display pca953x information */ @@ -193,16 +192,13 @@ static int pca953x_info(uint8_t chip) return 0; } -#endif /* CONFIG_CMD_PCA953X_INFO */ cmd_tbl_t cmd_pca953x[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(invert, 4, 0, (void *)PCA953X_CMD_INVERT, "", ""), -#ifdef CONFIG_CMD_PCA953X_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""), -#endif }; int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -231,13 +227,11 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ul_arg3 = simple_strtoul(argv[3], NULL, 16) & 0x1; switch ((long)c->cmd) { -#ifdef CONFIG_CMD_PCA953X_INFO case PCA953X_CMD_INFO: ret = pca953x_info(chip); if (ret) ret = CMD_RET_FAILURE; break; -#endif case PCA953X_CMD_DEVICE: if (argc == 3) @@ -287,10 +281,8 @@ U_BOOT_CMD( "pca953x gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_PCA953X_INFO "pca953x info\n" " - display info for current chip\n" -#endif "pca953x output pin 0|1\n" " - set pin as output and drive low or high\n" "pca953x invert pin 0|1\n" diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 8f3721cbfc..b9d6454887 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -74,7 +74,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* PCA9555 GPIO expander support */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH{ {0x20, 16} } diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 7331d4fe1f..bc52aae251 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -163,7 +163,6 @@ * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR0x26 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 1287282270..8a1a49653c 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -31,7 +31,6 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -#define CONFIG_CMD_PCA953X_INFO /* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 8ff0fa3412..e7828a5036 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -136,7 +136,4 @@ /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20) -/* Command line configuration */ -#define
[U-Boot] [PATCH v2 24/42] Convert CONFIG_CMD_SPL to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SPL Note that trats does not actually use SPL, so this option can no-longer be set. Signed-off-by: Simon Glass--- Changes in v2: - Fix up microblaze-generic, gw_ventana, ipam390 - Remove some now-superfluous /* commands */ comments in header files arch/arm/Kconfig | 1 + arch/arm/mach-imx/mx6/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig| 1 + cmd/Kconfig | 9 + configs/am335x_boneblack_defconfig| 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_igep003x_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_evm_nodt_defconfig | 1 + configs/birdland_bav335a_defconfig| 1 + configs/birdland_bav335b_defconfig| 1 + configs/cairo_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/omap3_beagle_defconfig| 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap4_panda_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/gw_ventana.h | 1 - include/configs/ipam390.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/mx6sabreauto.h| 1 - include/configs/mx6sabresd.h | 1 - include/configs/ti_armv7_common.h | 4 include/configs/trats.h | 1 - include/configs/twister.h | 1 - include/configs/zynq-common.h | 1 - scripts/config_whitelist.txt | 1 - 43 files changed, 41 insertions(+), 13 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 477e76be29..c0f1c2802e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -729,6 +729,7 @@ config ARCH_ZYNQ select CLK_ZYNQ imply CMD_CLK imply FAT_WRITE + imply CMD_SPL config ARCH_ZYNQMP bool "Support Xilinx ZynqMP Platform" diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index bb2ce33132..9bae748c67 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -145,6 +145,7 @@ config TARGET_GW_VENTANA bool "gw_ventana" select SUPPORT_SPL imply CMD_SATA + imply CMD_SPL config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index d8abba992a..7260d27877 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -81,6 +81,7 @@ config TARGET_AM335X_SHC select DM select DM_SERIAL select DM_GPIO + imply CMD_SPL config TARGET_AM335X_SL50 bool "Support am335x_sl50" diff --git a/cmd/Kconfig b/cmd/Kconfig index 2a9c55f608..9157900a18 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -275,6 +275,15 @@ config CMD_POWEROFF help Poweroff/Shutdown the system +config CMD_SPL + bool "spl export - Export boot information for Falcon boot" + depends on SPL + help + Falcon mode allows booting directly from SPL into an Operating + System such as Linux, thus skipping U-Boot proper. See + doc/README.falcon for full information about how to use this + command. + endmenu menu "Environment commands" diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index ae2adb792a..0e30575287 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -24,6 +24,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x8100 CONFIG_FASTBOOT_BUF_SIZE=0x0700 # CONFIG_CMD_IMLS is not set +CONFIG_CMD_SPL=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_DFU_TFTP=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 3ff6220dfc..2ea57ced8d 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -27,6 +27,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x8100
[U-Boot] [PATCH v2 07/42] Convert CONFIG_CMD_ONENAND to Kconfig
This converts the following to Kconfig: CONFIG_CMD_ONENAND Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 8 configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/smdkc100_defconfig | 1 + configs/vct_platinum_onenand_defconfig | 1 + configs/vct_platinum_onenand_small_defconfig| 1 + configs/vct_platinumavc_onenand_defconfig | 1 + configs/vct_platinumavc_onenand_small_defconfig | 1 + configs/vct_premium_onenand_defconfig | 1 + configs/vct_premium_onenand_small_defconfig | 1 + include/config_cmd_all.h| 1 - include/configs/exynos4-common.h| 2 -- include/configs/nokia_rx51.h| 6 -- include/configs/omap3_igep00x0.h| 2 -- include/configs/s5p_goni.h | 2 -- include/configs/smdkc100.h | 2 -- include/configs/vct.h | 4 scripts/config_whitelist.txt| 1 - 20 files changed, 19 insertions(+), 20 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 27b970975e..cbe4744272 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -710,6 +710,14 @@ config CMD_MMC_SPI to 20MHz. It is useful since it reduces the amount of protocol code required. +config CMD_ONENAND + bool "onenand - access to onenand device" + help + OneNAND is a brand of NAND ('Not AND' gate) flash which provides + various useful features. This command allows reading, writing, + and erasing blocks. It allso provides a way to show and change + bad blocks, and test the device. + config CMD_PART bool "part" select PARTITION_UUIDS diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 8ca5a84ec5..2375f861f1 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 8af6dd53d0..03da20162b 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index dd433309f9..fb8c925113 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 9c66a1826d..0045f5e63e 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Goni # " # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y +CONFIG_CMD_ONENAND=y CONFIG_CMD_DFU=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_FPGA is not set diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index ef8510d47d..82ba51c00d 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SMDKC100 # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y diff --git a/configs/vct_platinum_onenand_defconfig b/configs/vct_platinum_onenand_defconfig index 4c1615c537..4c242e8786 100644 --- a/configs/vct_platinum_onenand_defconfig +++ b/configs/vct_platinum_onenand_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_IMLS is not set CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index 20c0863b7b..845833c073 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index dfb8f04ce7..2a726144e9 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++
[U-Boot] [PATCH v2 21/42] Convert CONFIG_CMD_SDRAM to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SDRAM Signed-off-by: Simon Glass--- Changes in v2: - Put Kconfig change in alphabetical order - Remove some now-superfluous /* commands */ comments in header files README | 2 -- cmd/Kconfig | 7 +++ configs/MPC8349ITXGP_defconfig | 1 + configs/MPC8349ITX_LOWBOOT_defconfig | 1 + configs/MPC8349ITX_defconfig | 1 + configs/MigoR_defconfig | 1 + configs/alt_defconfig| 1 + configs/ap325rxa_defconfig | 1 + configs/ap_sh4a_4a_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/blanche_defconfig| 1 + configs/ecovec_defconfig | 1 + configs/espt_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig| 1 + configs/lager_defconfig | 1 + configs/ms7720se_defconfig | 1 + configs/ms7722se_defconfig | 1 + configs/porter_defconfig | 1 + configs/r0p7734_defconfig| 1 + configs/r7780mp_defconfig| 1 + configs/r8a7795_salvator-x_defconfig | 1 + configs/r8a7796_salvator-x_defconfig | 1 + configs/rsk7203_defconfig| 1 + configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/sh7763rdp_defconfig | 1 + configs/sh7785lcr_32bit_defconfig| 1 + configs/sh7785lcr_defconfig | 1 + configs/shmin_defconfig | 1 + configs/silk_defconfig | 1 + configs/socrates_defconfig | 1 + configs/stout_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/MPC8349ITX.h | 5 - include/configs/MigoR.h | 2 -- include/configs/ap325rxa.h | 2 -- include/configs/ap_sh4a_4a.h | 2 -- include/configs/armadillo-800eva.h | 2 -- include/configs/ecovec.h | 2 -- include/configs/espt.h | 5 - include/configs/ms7720se.h | 2 -- include/configs/ms7722se.h | 2 -- include/configs/r0p7734.h| 2 -- include/configs/r7780mp.h| 5 - include/configs/rcar-gen2-common.h | 2 -- include/configs/rcar-gen3-common.h | 1 - include/configs/rsk7203.h| 2 -- include/configs/sh7752evb.h | 2 -- include/configs/sh7753evb.h | 2 -- include/configs/sh7757lcr.h | 2 -- include/configs/sh7763rdp.h | 5 - include/configs/sh7785lcr.h | 1 - include/configs/shmin.h | 2 -- include/configs/socrates.h | 5 - scripts/config_whitelist.txt | 1 - 57 files changed, 39 insertions(+), 59 deletions(-) diff --git a/README b/README index 318a4aa25d..2371304279 100644 --- a/README +++ b/README @@ -815,8 +815,6 @@ The following options need to be configured: CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_RUNrun command in env variable - CONFIG_CMD_SDRAM* print SDRAM configuration information - (requires CONFIG_CMD_I2C) CONFIG_CMD_SF * Read/write/erase SPI NOR flash CONFIG_CMD_SOFTSWITCH * Soft switch setting command for BF60x CONFIG_CMD_SOURCE "source" command Support diff --git a/cmd/Kconfig b/cmd/Kconfig index c74acd535b..6431d7c70f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -776,6 +776,13 @@ config CMD_SAVES Provides a way to save a binary file using the Motorola S-Record format over the serial line. +config CMD_SDRAM + bool "sdram - Print SDRAM configuration information" + help + Provides information about attached SDRAM. This assumed that the + SDRAM has an EEPROM with information that can be read using the + I2C bus. This is only available on some boards. + config CMD_SF bool "sf" help diff --git a/configs/MPC8349ITXGP_defconfig b/configs/MPC8349ITXGP_defconfig index 09af09d4c3..f1cfd3705c 100644 --- a/configs/MPC8349ITXGP_defconfig +++ b/configs/MPC8349ITXGP_defconfig @@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="MPC8349E-mITX-GP> " CONFIG_CMD_I2C=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index 0650c7979a..4974dd1a9c 100644 --- a/configs/MPC8349ITX_LOWBOOT_defconfig +++ b/configs/MPC8349ITX_LOWBOOT_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_SATA=y CONFIG_CMD_PCI=y +CONFIG_CMD_SDRAM=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y diff --git
[U-Boot] [PATCH v2 19/42] Convert CONFIG_CMD_SAVES to Kconfig
This converts the following to Kconfig: CONFIG_CMD_SAVES Signed-off-by: Simon Glass--- Changes in v2: - Put Kconfig change in alphabetical order - Remove some now-superfluous /* commands */ comments in header files README | 1 - arch/arm/Kconfig | 6 ++ cmd/Kconfig | 6 ++ configs/ethernut5_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/x600_defconfig | 1 + configs/xtfpga_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/calimain.h | 8 include/configs/da850evm.h | 5 - include/configs/ea20.h | 5 - include/configs/ethernut5.h | 1 - include/configs/ipam390.h| 5 - include/configs/legoev3.h| 5 - include/configs/microblaze-generic.h | 18 -- include/configs/omapl138_lcdk.h | 4 include/configs/spear-common.h | 5 - include/configs/ti_armv7_keystone2.h | 3 --- include/configs/x600.h | 5 - include/configs/xtfpga.h | 6 -- scripts/config_whitelist.txt | 1 - 21 files changed, 16 insertions(+), 73 deletions(-) diff --git a/README b/README index 3a4e3a8f45..318a4aa25d 100644 --- a/README +++ b/README @@ -815,7 +815,6 @@ The following options need to be configured: CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_RUNrun command in env variable - CONFIG_CMD_SAVES* save S record dump CONFIG_CMD_SDRAM* print SDRAM configuration information (requires CONFIG_CMD_I2C) CONFIG_CMD_SF * Read/write/erase SPI NOR flash diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7f6ab4ac7e..5e42e7b030 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -308,6 +308,7 @@ config TARGET_GPLUGD config ARCH_DAVINCI bool "TI DaVinci" select CPU_ARM926EJS + imply CMD_SAVES help Support for TI's DaVinci platform. @@ -409,21 +410,25 @@ config TARGET_SPEAR300 bool "Support spear300" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES config TARGET_SPEAR310 bool "Support spear310" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES config TARGET_SPEAR320 bool "Support spear320" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES config TARGET_SPEAR600 bool "Support spear600" select CPU_ARM926EJS select BOARD_EARLY_INIT_F + imply CMD_SAVES config TARGET_STV0991 bool "Support stv0991" @@ -572,6 +577,7 @@ config ARCH_KEYSTONE select CMD_POWEROFF imply CMD_MTDPARTS imply FIT + imply CMD_SAVES config ARCH_OMAP2PLUS bool "TI OMAP2+" diff --git a/cmd/Kconfig b/cmd/Kconfig index 6a39e26256..f90673f95b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -770,6 +770,12 @@ config CMD_SATA Attachment, where AT refers to an IBM AT (Advanced Technology) computer released in 1984. +config CMD_SAVES + bool "saves - Save a file over serial in S-Record format" + help + Provides a way to save a binary file using the Motorola S-Record + format over the serial line. + config CMD_SF bool "sf" help diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 6a34363f1e..033e214a04 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y # CONFIG_CMD_FPGA is not set +CONFIG_CMD_SAVES=y CONFIG_CMD_RARP=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index f97459e6a8..789488e735 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -24,6 +24,7 @@ CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_MFSL=y +CONFIG_CMD_SAVES=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index d46289179f..cfc537a523 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SAVES=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index e52e62b201..f28c05f156 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -10,6 +10,7 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press to stop\n"
[U-Boot] [PATCH v2 12/42] Kconfig; Drop CONFIG_IDE_TI_CARDBUS and associated driver
This driver is not used by any board. Drop it. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None drivers/pcmcia/Makefile | 1 - drivers/pcmcia/ti_pci1410a.c | 623 --- 2 files changed, 624 deletions(-) delete mode 100644 drivers/pcmcia/ti_pci1410a.c diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b7e6188429..7d8cb5cb4c 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -5,5 +5,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o obj-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c deleted file mode 100644 index d83db3f022..00 --- a/drivers/pcmcia/ti_pci1410a.c +++ /dev/null @@ -1,623 +0,0 @@ -/* - * (C) Copyright 2000-2002 - * Wolfgang Denk, DENX Software Engineering, w...@denx.de. - * (C) Copyright 2002 - * Daniel Engström, Omicron Ceti AB - * - * SPDX-License-Identifier:GPL-2.0+ - * - - * - * Lots of code copied from: - * - * m8xx_pcmcia.c - Linux PCMCIA socket driver for the mpc8xx series. - * (C) 1999-2000 Magnus Damm - * - * "The ExCA standard specifies that socket controllers should provide - * two IO and five memory windows per socket, which can be independently - * configured and positioned in the host address space and mapped to - * arbitrary segments of card address space. " - David A Hinds. 1999 - * - * This controller does _not_ meet the ExCA standard. - * - * m8xx pcmcia controller brief info: - * + 8 windows (attrib, mem, i/o) - * + up to two slots (SLOT_A and SLOT_B) - * + inputpins, outputpins, event and mask registers. - * - no offset register. sigh. - * - * Because of the lacking offset register we must map the whole card. - * We assign each memory window PCMCIA_MEM_WIN_SIZE address space. - * Make sure there is (PCMCIA_MEM_WIN_SIZE * PCMCIA_MEM_WIN_NO - * * PCMCIA_SOCKETS_NO) bytes at PCMCIA_MEM_WIN_BASE. - * The i/o windows are dynamically allocated at PCMCIA_IO_WIN_BASE. - * They are maximum 64KByte each... - */ - - -#undef DEBUG /**/ - -/* - * PCMCIA support - */ -#include -#include -#include -#include -#include - -#include - -#if defined(CONFIG_CMD_PCMCIA) - -int pcmcia_on(int ide_base_bus); - -static int hardware_disable(int slot); -static int hardware_enable(int slot); -static int voltage_set(int slot, int vcc, int vpp); -static void print_funcid(int func); -static void print_fixed(volatile char *p); -static int identify(volatile char *p); -static int check_ide_device(int slot, int ide_base_bus); - - -/* - */ - - -const char *indent = "\t "; - -/* - */ - - -static struct pci_device_id supported[] = { - { PCI_VENDOR_ID_TI, 0xac50 }, /* Ti PCI1410A */ - { PCI_VENDOR_ID_TI, 0xac56 }, /* Ti PCI1510 */ - { } -}; - -static pci_dev_t devbusfn; -static u32 socket_base; -static u32 pcmcia_cis_ptr; - -int pcmcia_on(int ide_base_bus) -{ - u16 dev_id; - u32 socket_status; - int slot = 0; - int cis_len; - u16 io_base; - u16 io_len; - - /* -* Find the CardBus PCI device(s). -*/ - if ((devbusfn = pci_find_devices(supported, 0)) < 0) { - printf("Ti CardBus: not found\n"); - return 1; - } - - pci_read_config_word(devbusfn, PCI_DEVICE_ID, _id); - - if (dev_id == 0xac56) { - debug("Enable PCMCIA Ti PCI1510\n"); - } else { - debug("Enable PCMCIA Ti PCI1410A\n"); - } - - pcmcia_cis_ptr = CONFIG_SYS_PCMCIA_CIS_WIN; - cis_len = CONFIG_SYS_PCMCIA_CIS_WIN_SIZE; - - io_base = CONFIG_SYS_PCMCIA_IO_WIN; - io_len = CONFIG_SYS_PCMCIA_IO_WIN_SIZE; - - /* -* Setup the PCI device. -*/ - pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, _base); - socket_base &= ~0xf; - - socket_status = readl(socket_base+8); - if ((socket_status & 6) == 0) { - printf("Card Present: "); - - switch (socket_status & 0x3c00) { - - case 0x400: - printf("5V "); - break; - case 0x800: - printf("3.3V "); - break; - case 0xc00: - printf("3.3/5V "); - break; - default: - printf("unsupported Vcc "); - break; - } - switch (socket_status & 0x30) { - case 0x10: - printf("16bit PC-Card\n"); - break; - case 0x20: -
[U-Boot] [PATCH v2 18/42] Kconfig: sandbox: Drop CONFIG_CMD_SANDBOX option
This is no-longer used. Drop it. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README | 1 - include/config_cmd_all.h | 1 - include/configs/sandbox.h| 2 -- scripts/config_whitelist.txt | 1 - 4 files changed, 5 deletions(-) diff --git a/README b/README index 9b64ef06f4..3a4e3a8f45 100644 --- a/README +++ b/README @@ -815,7 +815,6 @@ The following options need to be configured: CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_RUNrun command in env variable - CONFIG_CMD_SANDBOX * sb command to access sandbox features CONFIG_CMD_SAVES* save S record dump CONFIG_CMD_SDRAM* print SDRAM configuration information (requires CONFIG_CMD_I2C) diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 00bc6fc88a..87fba76cc9 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */ #define CONFIG_CMD_TERMINAL/* built-in Serial Terminal */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 28ad0a12e1..beb5a124a2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -94,8 +94,6 @@ #define CONFIG_BOOTP_SERVERIP #define CONFIG_IP_DEFRAG -#define CONFIG_CMD_SANDBOX - #define CONFIG_BOOTARGS "" #ifndef SANDBOX_NO_SDL diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 64f18f0af1..fd093f797d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SANDBOX CONFIG_CMD_SAVES CONFIG_CMD_SCSI CONFIG_CMD_SDRAM -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 11/42] Kconfig: Drop CONFIG_CMD_PCI_ENUM
This option enables the 'pci enum' command. It is only enabled by a few board and these have not yet been converted to driver model, which always enables this command. It seems easiest to just remove this option. The affected boards can be converted to use driver model for PCI if needed. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/pci.c | 4 ++-- include/config_distro_bootcmd.h | 2 +- include/configs/ds414.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt| 1 - 8 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmd/pci.c b/cmd/pci.c index fe27b4f761..b8c799f9bd 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -694,7 +694,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if ((bdf = get_pci_dev(argv[2])) == -1) return 1; break; -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) case 'e': pci_init(); return 0; @@ -782,7 +782,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static char pci_help_text[] = "[bus] [long]\n" "- short or long list of PCI devices on bus 'bus'\n" -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) "pci enum\n" "- Enumerate PCI buses\n" #endif diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d8dab8e46a..9ed6b9892c 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -198,7 +198,7 @@ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) #define BOOTENV_RUN_NET_PCI_ENUM "run boot_net_pci_enum; " #define BOOTENV_SHARED_PCI \ "boot_net_pci_enum=pci enum\0" diff --git a/include/configs/ds414.h b/include/configs/ds414.h index f5998b4a52..0b84acdee8 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -48,7 +48,6 @@ /* PCIe support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_PCI_ENUM #define CONFIG_PCI_MVEBU #define CONFIG_PCI_SCAN_SHOW #endif diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 58325f2ec8..57fc16812e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 2bf12120b3..628de82767 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 2a345d4ac6..c599b22bc8 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 0a09ded4d1..c387d951c1 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea59f44733..9819f02985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCI_ENUM CONFIG_CMD_PCMCIA CONFIG_CMD_PORTIO CONFIG_CMD_READ -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 16/42] Convert CONFIG_CMD_REGINFO to Kconfig
From: Christophe LeroyThis patch converts CONFIG_CMD_REGINFO to Kconfig Signed-off-by: Christophe Leroy Signed-off-by: Simon Glass --- Changes in v2: - Fixed lots of merge conflicts with my series - Pull in this patch from http://patchwork.ozlabs.org/patch/787724/ instead README | 1 - arch/powerpc/Kconfig | 3 +++ cmd/Kconfig | 5 + include/config_cmd_all.h | 1 - include/configs/B4860QDS.h | 5 - include/configs/BSC9131RDB.h | 5 - include/configs/BSC9132QDS.h | 5 - include/configs/C29XPCIE.h | 5 - include/configs/MCR3000.h| 3 --- include/configs/MPC8536DS.h | 5 - include/configs/MPC8541CDS.h | 5 - include/configs/MPC8544DS.h | 5 - include/configs/MPC8548CDS.h | 5 - include/configs/MPC8555CDS.h | 5 - include/configs/MPC8560ADS.h | 8 include/configs/MPC8568MDS.h | 5 - include/configs/MPC8569MDS.h | 5 - include/configs/MPC8572DS.h | 5 - include/configs/MPC8610HPCD.h| 2 -- include/configs/MPC8641HPCN.h| 5 - include/configs/P1010RDB.h | 5 - include/configs/P1022DS.h| 5 - include/configs/P1023RDB.h | 5 - include/configs/T102xQDS.h | 5 - include/configs/T102xRDB.h | 5 - include/configs/T1040QDS.h | 5 - include/configs/T104xRDB.h | 5 - include/configs/T208xQDS.h | 5 - include/configs/T208xRDB.h | 5 - include/configs/T4240RDB.h | 2 -- include/configs/TQM834x.h| 5 - include/configs/UCP1020.h| 5 - include/configs/controlcenterd.h | 3 --- include/configs/corenet_ds.h | 5 - include/configs/cyrus.h | 5 - include/configs/p1_p2_rdb_pc.h | 5 - include/configs/p1_twr.h | 5 - include/configs/qemu-ppce500.h | 2 -- include/configs/sbc8548.h| 5 - include/configs/sbc8641d.h | 2 -- include/configs/smdkc100.h | 3 --- include/configs/socrates.h | 1 - include/configs/t4qds.h | 2 -- include/configs/xpedite517x.h| 5 - include/configs/xpedite520x.h| 5 - include/configs/xpedite537x.h| 5 - include/configs/xpedite550x.h| 5 - scripts/config_whitelist.txt | 1 - 48 files changed, 8 insertions(+), 196 deletions(-) diff --git a/README b/README index 2e813b7bcb..9b64ef06f4 100644 --- a/README +++ b/README @@ -814,7 +814,6 @@ The following options need to be configured: CONFIG_CMD_NFSNFS support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host - CONFIG_CMD_REGINFO * Register dump CONFIG_CMD_RUNrun command in env variable CONFIG_CMD_SANDBOX * sb command to access sandbox features CONFIG_CMD_SAVES* save S record dump diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8094416e4a..c79b247651 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -23,15 +23,18 @@ config MPC85xx imply USB_EHCI_HCD if USB imply CMD_HASH imply CMD_IRQ + imply CMD_REGINFO config MPC86xx bool "MPC86xx" select SYS_FSL_DDR select SYS_FSL_DDR_BE imply ENV_IS_IN_FLASH + imply CMD_REGINFO config 8xx bool "MPC8xx" + imply CMD_REGINFO endchoice diff --git a/cmd/Kconfig b/cmd/Kconfig index 15dcfbf1e9..070536ac23 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -158,6 +158,11 @@ config CMD_LICENSE help Print GPL license text +config CMD_REGINFO + bool "reginfo" + help + Register dump + endmenu menu "Boot commands" diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index edfc91ff9b..cb0ab6d61a 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_REGINFO /* Register dump*/ #define CONFIG_CMD_REISER /* Reiserfs support */ #define CONFIG_CMD_SANDBOX /* sb command to access sandbox features */ #define CONFIG_CMD_SAVES /* save S record dump */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 984803d440..ce9be95e7e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -690,11 +690,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -/* - * Command line configuration. - */ -#define CONFIG_CMD_REGINFO - /* * USB */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index a7c97a3b79..38407af3c7 100644 ---
[U-Boot] [PATCH v2 06/42] Convert CONFIG_CMD_MTDPARTS_SPREAD to Kconfig
This converts the following to Kconfig: CONFIG_CMD_MTDPARTS_SPREAD Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None cmd/Kconfig | 10 ++ configs/sandbox_defconfig| 1 + scripts/config_whitelist.txt | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 4b63efe80c..27b970975e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1222,6 +1222,16 @@ config MTDPARTS_DEFAULT Defines a default MTD partitioning scheme in the Linux MTD command line partitions format +config CMD_MTDPARTS_SPREAD + string "Padd partition size to take account of bad blocks" + depends on CMD_MTDPARTS + help + This enables the 'spread' sub-command of the mtdparts command. + This command will modify the existing mtdparts variable by increasing + the size of the partitions such that 1) each partition's net size is + at least as large as the size specified in the mtdparts variable and + 2) each partition starts on a good block. + endmenu menu "Debug commands" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index fd0b952e1d..698ced0256 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -61,6 +61,7 @@ CONFIG_CMD_TPM_TEST=y CONFIG_CMD_CBFS=y CONFIG_CMD_CRAMFS=y CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_MTDPARTS=y CONFIG_MAC_PARTITION=y CONFIG_AMIGA_PARTITION=y CONFIG_OF_CONTROL=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 60d13dfbba..b366dc0f39 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MTDPARTS_SPREAD CONFIG_CMD_ONENAND CONFIG_CMD_PCA953X CONFIG_CMD_PCA953X_INFO -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 08/42] Convert CONFIG_CMD_PCA953X to Kconfig
This converts the following to Kconfig: CONFIG_CMD_PCA953X Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README | 1 - arch/powerpc/cpu/mpc83xx/Kconfig| 1 + configs/cl-som-am57x_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/ot1200_defconfig| 1 + configs/ot1200_spl_defconfig| 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + drivers/gpio/Kconfig| 9 + include/configs/cl-som-am57x.h | 1 - include/configs/cm_t335.h | 1 - include/configs/ot1200.h| 1 - include/configs/snapper9260.h | 1 - include/configs/strider.h | 1 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt| 1 - 26 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README b/README index 8d635a1aaf..5f916c8d8e 100644 --- a/README +++ b/README @@ -812,7 +812,6 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NETbootp, tftpboot, rarpboot CONFIG_CMD_NFSNFS support - CONFIG_CMD_PCA953X * PCA953x I2C gpio commands CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index b5b26f9b3a..c66d6616a4 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -96,6 +96,7 @@ config TARGET_STRIDER bool "Support strider" select SYS_FSL_ERRATUM_ESDHC111 imply ENV_IS_IN_FLASH + imply CMD_PCA953X endchoice diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index 0d1f614163..e0b7565ac0 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y +CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 7e411a961a..92a53278cc 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 3ae27da0d4..8605111ee1 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DM=y +CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 50be46849e..707eea06c5 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_DM=y +CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 0c78b4717f..2e86f954c8 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index f524a66fa3..e2b58419f2 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -23,6 +23,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index 0ef0ba5341..b58460ae3a 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -45,6
[U-Boot] [PATCH v2 04/42] Kconfig: Sort the device-access commands
These are currently not quite in alphabetical order. Before adding more, sort them. Signed-off-by: Simon GlassSuggested-by: Bin Meng --- Changes in v2: - Add new patch to sort the device-access commands cmd/Kconfig | 244 ++-- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index f18efc1e88..d9a35b81a7 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -483,6 +483,12 @@ endmenu menu "Device access commands" +config CMD_ARMFLASH + #depends on FLASH_CFI_DRIVER + bool "armflash" + help + ARM Ltd reference designs flash partition access + config CMD_CLK bool "clk - Show clock frequencies" help @@ -492,6 +498,25 @@ config CMD_CLK clock values from associated drivers. However currently no command exists for this. +config CMD_DEMO + bool "demo - Demonstration commands for driver model" + depends on DM + help + Provides a 'demo' command which can be used to play around with + driver model. To use this properly you will need to enable one or + both of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE). + Otherwise you will always get an empty list of devices. The demo + devices are defined in the sandbox device tree, so the easiest + option is to use sandbox and pass the -d point to sandbox's + u-boot.dtb file. + +config CMD_DFU + bool "dfu" + select USB_FUNCTION_DFU + help + Enables the command "dfu" which is used to have U-Boot create a DFU + class device via USB. + config CMD_DM bool "dm - Access to driver model information" depends on DM @@ -503,17 +528,80 @@ config CMD_DM can be useful to see the state of driver model for debugging or interest. -config CMD_DEMO - bool "demo - Demonstration commands for driver model" - depends on DM +config CMD_FDC + bool "fdcboot - Boot from floppy device" help - Provides a 'demo' command which can be used to play around with - driver model. To use this properly you will need to enable one or - both of the demo devices (DM_DEMO_SHAPE and DM_DEMO_SIMPLE). - Otherwise you will always get an empty list of devices. The demo - devices are defined in the sandbox device tree, so the easiest - option is to use sandbox and pass the -d point to sandbox's - u-boot.dtb file. + The 'fdtboot' command allows booting an image from a floppy disk. + +config CMD_FLASH + bool "flinfo, erase, protect" + default y + help + NOR flash support. + flinfo - print FLASH memory information + erase - FLASH memory + protect - enable or disable FLASH write protection + +config CMD_FPGA + bool "fpga" + default y + help + FPGA support. + +config CMD_FPGA_LOADBP + bool "fpga loadbp - load partial bitstream (Xilinx only)" + depends on CMD_FPGA + help + Supports loading an FPGA device from a bitstream buffer containing + a partial bitstream. + +config CMD_FPGA_LOADFS + bool "fpga loadfs - load bitstream from FAT filesystem (Xilinx only)" + depends on CMD_FPGA + help + Supports loading an FPGA device from a FAT filesystem. + +config CMD_FPGA_LOADMK + bool "fpga loadmk - load bitstream from image" + depends on CMD_FPGA + help + Supports loading an FPGA device from a image generated by mkimage. + +config CMD_FPGA_LOADP + bool "fpga loadp - load partial bitstream" + depends on CMD_FPGA + help + Supports loading an FPGA device from a bitstream buffer containing + a partial bitstream. + +config CMD_FPGAD + bool "fpgad - dump FPGA registers" + help + (legacy, needs conversion to driver model) + Provides a way to dump FPGA registers by calling the board-specific + fpga_get_reg() function. This functions similarly to the 'md' + command. + +config CMD_FUSE + bool "fuse - support for the fuse subssystem" + help + (deprecated - needs conversion to driver model) + This allows reading, sensing, programming or overriding fuses + which control the behaviour of the device. The command uses the + fuse_...() API. + +config CMD_GPIO + bool "gpio" + help + GPIO support. + +config CMD_GPT + bool "GPT (GUID Partition Table) command" + select PARTITION_UUIDS + select EFI_PARTITION + help + Enable the 'gpt' command to ready and write GPT style partition + tables. config CMD_IDE bool "ide - Support for IDE drivers" @@ -566,6 +654,11 @@ config CMD_IOTRACE might be useful to enhance tracing to only checksum the accesses and
[U-Boot] [PATCH v2 13/42] Convert CONFIG_CMD_PCMCIA to Kconfig
This converts the following to Kconfig: CONFIG_CMD_PCMCIA Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Sort Kconfig options in alphabetical order README | 1 - cmd/Kconfig | 8 configs/ms7720se_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/dbau1x00.h | 5 - include/configs/ms7720se.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index 63dd18ce10..186311bd88 100644 --- a/README +++ b/README @@ -812,7 +812,6 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NETbootp, tftpboot, rarpboot CONFIG_CMD_NFSNFS support - CONFIG_CMD_PCMCIA * PCMCIA support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network host CONFIG_CMD_PORTIO * Port I/O diff --git a/cmd/Kconfig b/cmd/Kconfig index 6654050574..7892b0b03f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -733,6 +733,14 @@ config CMD_PCI peripherals. Sub-commands allow bus enumeration, displaying and changing configuration space and a few other features. +config CMD_PCMCIA + bool "pinit - Set up PCMCIA device" + help + Provides a means to initialise a PCMCIA (Personal Computer Memory + Card International Association) device. This is an old standard from + about 1990. These devices are typically removable memory or network + cards using a standard 68-pin connector. + config CMD_REMOTEPROC bool "remoteproc" depends on REMOTEPROC diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index dd95a236bb..be5e82aeae 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_IDE=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set +CONFIG_CMD_PCMCIA=y # CONFIG_CMD_ECHO is not set # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index b1f699080e..a008bacdd9 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_PCMCIA /* PCMCIA support */ #define CONFIG_CMD_PORTIO /* Port I/O */ #define CONFIG_CMD_REGINFO /* Register dump*/ #define CONFIG_CMD_REISER /* Reiserfs support */ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 970e214e07..cd65ceaee9 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -67,11 +67,6 @@ * Command line configuration. */ -#ifdef CONFIG_DBAU1550 - -#undef CONFIG_CMD_PCMCIA -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 86b93a39bb..112145ce77 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -13,7 +13,6 @@ #define CONFIG_MS7720SE1 #define CONFIG_CMD_SDRAM -#define CONFIG_CMD_PCMCIA #define CONFIG_BOOTARGS"console=ttySC0,115200" #define CONFIG_BOOTFILE"/boot/zImage" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9819f02985..6b7056d6ea 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCMCIA CONFIG_CMD_PORTIO CONFIG_CMD_READ CONFIG_CMD_REGINFO -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 05/42] Convert CONFIG_CMD_MMC_SPI to Kconfig
This converts the following to Kconfig: CONFIG_CMD_MMC_SPI Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: - Sort Kconfig options in alphabetical order README | 1 - cmd/Kconfig | 9 + configs/UCP1020_SPIFLASH_defconfig | 1 + configs/UCP1020_defconfig| 1 + configs/microblaze-generic_defconfig | 1 + include/config_cmd_all.h | 1 - include/configs/UCP1020.h| 1 - include/configs/am335x_shc.h | 1 - include/configs/microblaze-generic.h | 1 - scripts/config_whitelist.txt | 2 -- 10 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README b/README index ad83a81da9..8d635a1aaf 100644 --- a/README +++ b/README @@ -836,7 +836,6 @@ The following options need to be configured: CONFIG_CMD_TIMER* access to the system tick timer CONFIG_CMD_USB * USB support CONFIG_CMD_CDP * Cisco Discover Protocol support - CONFIG_CMD_MFSL * Microblaze FSL support CONFIG_CMD_XIMG Load part of Multi Image CONFIG_CMD_UUID * Generate random UUID or GUID string diff --git a/cmd/Kconfig b/cmd/Kconfig index d9a35b81a7..4b63efe80c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -701,6 +701,15 @@ config CMD_NAND_TORTURE endif # CMD_NAND +config CMD_MMC_SPI + bool "mmc_spi - Set up MMC SPI device" + help + Provides a way to set up an MMC (Multimedia Card) SPI (Serial + Peripheral Interface) device. The device provides a means of + accessing an MMC device via SPI using a single data line, limited + to 20MHz. It is useful since it reduces the amount of protocol code + required. + config CMD_PART bool "part" select PARTITION_UUIDS diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig index 686137dc98..e871d6fdfc 100644 --- a/configs/UCP1020_SPIFLASH_defconfig +++ b/configs/UCP1020_SPIFLASH_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig index be0029673b..13af8626e7 100644 --- a/configs/UCP1020_defconfig +++ b/configs/UCP1020_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC_SPI=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 3d84cf24aa..f97459e6a8 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y +CONFIG_CMD_MFSL=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TFTPPUT=y CONFIG_CMD_DHCP=y diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index e6ebc2f57d..b3c0d0e71f 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -13,7 +13,6 @@ * Alphabetical list of all possible commands. */ -#define CONFIG_CMD_MFSL/* FSL support for Microblaze */ #define CONFIG_CMD_ONENAND /* OneNAND support */ #define CONFIG_CMD_PCI /* pciinfo */ #define CONFIG_CMD_PCMCIA /* PCMCIA support */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 6fd3fa4712..eea518df21 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -437,7 +437,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_MMC_SPI -#define CONFIG_CMD_MMC_SPI #endif /* Misc Extra Settings */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index f3b7767a97..d21240c23c 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -19,7 +19,6 @@ #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #undef CONFIG_CMD_EXT4 #undef CONFIG_CMD_EXT4_WRITE -#undef CONFIG_CMD_MMC_SPI #undef CONFIG_CMD_SPI #define CONFIG_CMD_CACHE diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index aa007e2819..fb0575fa4d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -163,7 +163,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_MFSL #if defined(FLASH) # if !defined(RAMENV) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b5662a9fd6..60d13dfbba 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,8 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MFSL -CONFIG_CMD_MMC_SPI
[U-Boot] [PATCH v2 03/42] Kconfig: Drop CONFIG_CMD_MEM
This is not actually used in U-Boot. Most likely it means CONFIG_CMD_MEMORY so change all occurences to that. Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None README| 4 ++-- include/configs/stm32f429-discovery.h | 2 -- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README b/README index 1edf3dbbd8..ad83a81da9 100644 --- a/README +++ b/README @@ -3698,7 +3698,7 @@ Low Level (hardware related) configuration options: - CONFIG_LOOPW Add the "loopw" memory command. This only takes effect if - the memory commands are activated globally (CONFIG_CMD_MEM). + the memory commands are activated globally (CONFIG_CMD_MEMORY). - CONFIG_MX_CYCLIC Add the "mdc" and "mwc" memory commands. These are cyclic @@ -3712,7 +3712,7 @@ Low Level (hardware related) configuration options: This command will write 12345678 to address 100 all 10 ms. This only takes effect if the memory commands are activated - globally (CONFIG_CMD_MEM). + globally (CONFIG_CMD_MEMORY). - CONFIG_SKIP_LOWLEVEL_INIT [ARM, NDS32, MIPS only] If this variable is defined, then certain diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index c47be514d8..cd97c7cbad 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -82,6 +82,4 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_MEM - #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9bb398c240..b5662a9fd6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MEM CONFIG_CMD_MFSL CONFIG_CMD_MMC_SPI CONFIG_CMD_MTDPARTS_SPREAD -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 00/42] Kconfig: Convert remaining commands to Kconfig
This series converts the remaining commands (starting from M and ending at Z) to Kconfig. This completes the Kconfig conversion of commands. Note that for v2 I dropped my CMD_REGINFO patch and picked up one from Christophe Leroy [1] since it was marked as accepted. [1] http://patchwork.ozlabs.org/patch/787724/ Changes in v2: - Add a note about dropping CMD_UNIVERSE - Add new patch to resync with savedefconfig - Add new patch to sort the device-access commands - Add new patch to sort the memory commands - Drop include/sx151x.h also - Drop mention of this from several other places - Drop patch to convert CONFIG_CMD_MTDPARTS to Kconfig (already done) - Drop unwanted 'CONFIG_CMD_SPL_NAND_OFS=0x0' lines in defconfig - Fix indentation for CMD_PCI - Fix typos in help - Fix up microblaze-generic, gw_ventana, ipam390 - Fixed lots of merge conflicts with my series - Make X86 imply CMD_SF_TEST (except for efi-x86 which fails) - Make this 'default y' and drop defconfig file changes - Move CMD_PORTIO changes in from the CMD_READ patch - Move CMD_PORTIO changes to previous patch - Pull in this patch from http://patchwork.ozlabs.org/patch/787724/ instead - Put Kconfig change in alphabetical order - Remove some now-superfluous /* commands */ comments in header files - Rename the option to include 'zimageboot' - Sort Kconfig options in alphabetical order - Update commit message to explain Makefile change - Update edison also Christophe Leroy (1): Convert CONFIG_CMD_REGINFO to Kconfig Simon Glass (41): configs: Resync with savedefconfig Convert CONFIG_CMD_MAX6957 to Kconfig Kconfig: Drop CONFIG_CMD_MEM Kconfig: Sort the device-access commands Convert CONFIG_CMD_MMC_SPI to Kconfig Convert CONFIG_CMD_MTDPARTS_SPREAD to Kconfig Convert CONFIG_CMD_ONENAND to Kconfig Convert CONFIG_CMD_PCA953X to Kconfig Kconfig: Drop CONFIG_CMD_PCA953X_INFO Convert CONFIG_CMD_PCI to Kconfig Kconfig: Drop CONFIG_CMD_PCI_ENUM Kconfig; Drop CONFIG_IDE_TI_CARDBUS and associated driver Convert CONFIG_CMD_PCMCIA to Kconfig Kconfig: Drop CONFIG_CMD_PORTIO and associated command Kconfig: Convert CMD_READ to Kconfig Convert CONFIG_CMD_REISER to Kconfig Kconfig: sandbox: Drop CONFIG_CMD_SANDBOX option Convert CONFIG_CMD_SAVES to Kconfig Convert CONFIG_CMD_SCSI to Kconfig Convert CONFIG_CMD_SDRAM to Kconfig Convert CONFIG_CMD_SF_TEST to Kconfig Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig Convert CONFIG_CMD_SPL to Kconfig Convert CONFIG_CMD_SPL_NAND_OFS to Kconfig Convert CONFIG_CMD_SPL_WRITE_SIZE to Kconfig Kconfig: Sort the memory commands Convert CONFIG_CMD_STRINGS to Kconfig gpio: Drop sx151x driver Convert CONFIG_CMD_TCA642X to Kconfig Convert CONFIG_CMD_TERMINAL to Kconfig Kconfig: Drop CONFIG_CMD_TFTP Convert CONFIG_CMD_THOR_DOWNLOAD to Kconfig Convert CONFIG_CMD_YAFFS2 to Kconfig Convert CONFIG_CMD_TRACE to Kconfig Convert CONFIG_CMD_TSI148 to Kconfig Convert CONFIG_CMD_UNIVERSE to Kconfig Convert CONFIG_CMD_UUID to Kconfig Convert CONFIG_CMD_ZBOOT to Kconfig Convert CONFIG_CMD_ZFS to Kconfig Drop config_cmd_all.h README: Drop information about commands README | 144 + arch/Kconfig | 3 + arch/arm/Kconfig | 10 + arch/arm/cpu/armv7/ls102xa/Kconfig | 1 + arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 1 + arch/arm/mach-imx/mx6/Kconfig | 1 + arch/arm/mach-omap2/am33xx/Kconfig | 1 + arch/powerpc/Kconfig | 3 + arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 6 + arch/sh/Kconfig| 2 + arch/sh/lib/Kconfig| 6 + board/work-microwave/work_92105/Kconfig| 7 + cmd/Kconfig| 501 - cmd/Makefile | 5 +- cmd/fastboot/Kconfig | 2 + cmd/pci.c | 4 +- cmd/portio.c | 145 - cmd/read.c | 2 +- configs/A10-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig | 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig | 2 +- configs/Bananapi_M2_Ultra_defconfig| 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig| 2 +- configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig | 2 +- configs/Cubietruck_defconfig | 2 +-
[U-Boot] [PATCH v2 02/42] Convert CONFIG_CMD_MAX6957 to Kconfig
This converts the following to Kconfig: CONFIG_CMD_MAX6957 Signed-off-by: Simon GlassReviewed-by: Bin Meng --- Changes in v2: None board/work-microwave/work_92105/Kconfig | 7 +++ configs/work_92105_defconfig| 1 + include/configs/work_92105.h| 1 - scripts/config_whitelist.txt| 1 - 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/board/work-microwave/work_92105/Kconfig b/board/work-microwave/work_92105/Kconfig index 1fde4b29aa..4bc34ed01f 100644 --- a/board/work-microwave/work_92105/Kconfig +++ b/board/work-microwave/work_92105/Kconfig @@ -17,4 +17,11 @@ config CMD_HD44760 help This controls the LCD driver. +config CMD_MAX6957 + bool "Enable 'max6957aax' PMIC command" + help + DEPRECATED: Needs conversion to driver model. + + This allows PMIC registers to be read and written. + endif diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index ba2474c3a9..1765aa565a 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_CMD_HD44760=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_CMD_MAX6957=y CONFIG_BOOTDELAY=3 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 0ac7b85f4b..5c1af5f2a1 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -131,7 +131,6 @@ #define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 10 -#define CONFIG_CMD_MAX6957 /* * Environment */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3b5c17a982..9bb398c240 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_MAX6957 CONFIG_CMD_MEM CONFIG_CMD_MFSL CONFIG_CMD_MMC_SPI -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 01/42] configs: Resync with savedefconfig
Rsync all defconfig files using moveconfig.py Signed-off-by: Simon Glass--- Changes in v2: - Add new patch to resync with savedefconfig configs/A10-OLinuXino-Lime_defconfig| 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- configs/A20-OLinuXino-Lime_defconfig| 2 +- configs/A20-OLinuXino_MICRO_defconfig | 2 +- configs/A20-Olimex-SOM-EVB_defconfig| 2 +- configs/Bananapi_M2_Ultra_defconfig | 2 +- configs/Bananapi_defconfig | 2 +- configs/Bananapro_defconfig | 2 +- configs/Cubieboard2_defconfig | 2 +- configs/Cubieboard_defconfig| 2 +- configs/Cubietruck_defconfig| 2 +- configs/Itead_Ibox_A20_defconfig| 2 +- configs/Lamobo_R1_defconfig | 2 +- configs/Linksprite_pcDuino3_Nano_defconfig | 2 +- configs/Linksprite_pcDuino3_defconfig | 3 --- configs/MPC8544DS_defconfig | 2 +- configs/MPC8610HPCD_defconfig | 2 +- configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000_defconfig| 2 +- configs/Mele_M5_defconfig | 2 +- configs/Orangepi_defconfig | 2 +- configs/Orangepi_mini_defconfig | 2 +- configs/Wits_Pro_A20_DKT_defconfig | 2 +- configs/cm_t54_defconfig| 2 +- configs/controlcenterdc_defconfig | 2 +- configs/db-88f6820-gp_defconfig | 2 +- configs/dra7xx_evm_defconfig| 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/highbank_defconfig | 2 +- configs/ls1012aqds_qspi_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig| 9 + configs/ls1021atwr_nor_defconfig| 9 + configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 9 + configs/ls1021atwr_sdcard_ifc_defconfig | 9 + configs/ls1021atwr_sdcard_qspi_defconfig| 9 + configs/ls1043ardb_SECURE_BOOT_defconfig| 9 + configs/ls1043ardb_defconfig| 9 + configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 9 + configs/ls1043ardb_sdcard_defconfig | 9 + configs/ls1046aqds_SECURE_BOOT_defconfig| 2 +- configs/ls1046aqds_defconfig| 2 +- configs/ls1046aqds_lpuart_defconfig | 2 +- configs/ls1046aqds_nand_defconfig | 2 +- configs/ls1046aqds_qspi_defconfig | 2 +- configs/ls1046aqds_sdcard_ifc_defconfig | 2 +- configs/ls1046aqds_sdcard_qspi_defconfig| 2 +- configs/ls1046ardb_emmc_defconfig | 2 +- configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 10 ++ configs/ls1046ardb_qspi_defconfig | 10 ++ configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 10 ++ configs/ls1046ardb_sdcard_defconfig | 10 ++ configs/ls2080ardb_defconfig| 1 - configs/ls2081ardb_defconfig| 2 +- configs/ls2088ardb_qspi_defconfig | 1 - configs/ms7720se_defconfig | 2 +- configs/omap5_uevm_defconfig| 2 +- configs/r8a7795_salvator-x_defconfig| 4 ++-- configs/r8a7796_salvator-x_defconfig| 4 ++-- configs/xilinx_zynqmp_ep_defconfig | 4 ++-- configs/xilinx_zynqmp_zcu102_revA_defconfig | 4 ++-- configs/xilinx_zynqmp_zcu102_revB_defconfig | 4 ++-- 61 files changed, 67 insertions(+), 159 deletions(-) diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 914302276f..d76ddcf811 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -18,8 +18,8 @@ CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SCSI=y CONFIG_SUN4I_EMAC=y CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index f7b600be5b..e83ff82984 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -20,13 +20,13 @@ CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_SCSI=y CONFIG_DFU_RAM=y CONFIG_ETH_DESIGNWARE=y
Re: [U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
+Tom Hi Philipp, On 4 August 2017 at 16:21, Dr. Philipp Tomsichwrote: > >> On 04 Aug 2017, at 23:48, Simon Glass wrote: >> >> From: Andy Shevchenko >> >> Convert name to show explicitly that we are using milliseconds. For a >> watchdog timer this is precise enough. >> >> No functional change intended. >> >> Signed-off-by: Andy Shevchenko >> Signed-off-by: Simon Glass >> --- >> >> Changes in v2: >> - Use milliseconds since microseconds seems too fine a control >> - Update commit message to suit >> >> drivers/watchdog/wdt-uclass.c | 4 ++-- >> include/wdt.h | 8 >> 2 files changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c >> index bb9ae80866..8a30f024fd 100644 >> --- a/drivers/watchdog/wdt-uclass.c >> +++ b/drivers/watchdog/wdt-uclass.c >> @@ -13,14 +13,14 @@ >> >> DECLARE_GLOBAL_DATA_PTR; >> >> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags) >> +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) >> { >> const struct wdt_ops *ops = device_get_ops(dev); >> >> if (!ops->start) >> return -ENOSYS; >> >> - return ops->start(dev, timeout, flags); >> + return ops->start(dev, timeout_ms, flags); >> } >> >> int wdt_stop(struct udevice *dev) >> diff --git a/include/wdt.h b/include/wdt.h >> index 0b5f05851a..9b90fbeeb3 100644 >> --- a/include/wdt.h >> +++ b/include/wdt.h >> @@ -21,12 +21,12 @@ >> * Start the timer >> * >> * @dev: WDT Device >> - * @timeout: Number of ticks before timer expires >> + * @timeout_ms: Number of ticks (milliseconds) before timer expires > > Should this not just be ‘number of milliseconds’ (as this would > otherwise equate ticks and milliseconds, which don’t necess Iarily > need to be the same)? I believe they are the same. We used to have a setting for it (CONFIG_SYS_HZ I think) but now everything is in milliseconds. See for example get_timer(). > >> * @flags: Driver specific flags. This might be used to specify >> * which action needs to be executed when the timer expires >> * @return: 0 if OK, -ve on error >> */ >> -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); >> +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); >> >> /* >> * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it >> again. >> @@ -67,12 +67,12 @@ struct wdt_ops { >>* Start the timer >>* >>* @dev: WDT Device >> - * @timeout: Number of ticks before the timer expires >> + * @timeout_ms: Number of ticks (milliseconds) before the timer expires > > See above. > >>* @flags: Driver specific flags. This might be used to specify >>* which action needs to be executed when the timer expires >>* @return: 0 if OK, -ve on error >>*/ >> - int (*start)(struct udevice *dev, u64 timeout, ulong flags); >> + int (*start)(struct udevice *dev, u64 timeout_ms, ulong flags); >> /* >>* Stop the timer >>* >> -- >> 2.14.0.rc1.383.gd1ce394fe2-goog >> >> ___ >> U-Boot mailing list >> U-Boot@lists.denx.de >> https://lists.denx.de/listinfo/u-boot > Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
> On 04 Aug 2017, at 23:48, Simon Glasswrote: > > From: Andy Shevchenko > > Convert name to show explicitly that we are using milliseconds. For a > watchdog timer this is precise enough. > > No functional change intended. > > Signed-off-by: Andy Shevchenko > Signed-off-by: Simon Glass > --- > > Changes in v2: > - Use milliseconds since microseconds seems too fine a control > - Update commit message to suit > > drivers/watchdog/wdt-uclass.c | 4 ++-- > include/wdt.h | 8 > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c > index bb9ae80866..8a30f024fd 100644 > --- a/drivers/watchdog/wdt-uclass.c > +++ b/drivers/watchdog/wdt-uclass.c > @@ -13,14 +13,14 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -int wdt_start(struct udevice *dev, u64 timeout, ulong flags) > +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) > { > const struct wdt_ops *ops = device_get_ops(dev); > > if (!ops->start) > return -ENOSYS; > > - return ops->start(dev, timeout, flags); > + return ops->start(dev, timeout_ms, flags); > } > > int wdt_stop(struct udevice *dev) > diff --git a/include/wdt.h b/include/wdt.h > index 0b5f05851a..9b90fbeeb3 100644 > --- a/include/wdt.h > +++ b/include/wdt.h > @@ -21,12 +21,12 @@ > * Start the timer > * > * @dev: WDT Device > - * @timeout: Number of ticks before timer expires > + * @timeout_ms: Number of ticks (milliseconds) before timer expires Should this not just be ‘number of milliseconds’ (as this would otherwise equate ticks and milliseconds, which don’t necessarily need to be the same)? > * @flags: Driver specific flags. This might be used to specify > * which action needs to be executed when the timer expires > * @return: 0 if OK, -ve on error > */ > -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); > +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); > > /* > * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it > again. > @@ -67,12 +67,12 @@ struct wdt_ops { >* Start the timer >* >* @dev: WDT Device > - * @timeout: Number of ticks before the timer expires > + * @timeout_ms: Number of ticks (milliseconds) before the timer expires See above. >* @flags: Driver specific flags. This might be used to specify >* which action needs to be executed when the timer expires >* @return: 0 if OK, -ve on error >*/ > - int (*start)(struct udevice *dev, u64 timeout, ulong flags); > + int (*start)(struct udevice *dev, u64 timeout_ms, ulong flags); > /* >* Stop the timer >* > -- > 2.14.0.rc1.383.gd1ce394fe2-goog > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] common, image-sig: [BUG?] if no valid signature node found, do not boot signed FIT image
Hi Heiko, On 8 June 2017 at 22:52, Heiko Schocherwrote: > Hello Simon, > > Am 09.06.2017 um 05:05 schrieb Simon Glass: >> >> Hi Heiko, >> >> On 8 June 2017 at 03:52, Heiko Schocher wrote: >>> >>> fit_image_verify_required_sigs() must return != 0, on error. >>> >>> When fit_image_verify_required_sigs() does not find a signature >>> node, it returns 0, which leads in booting a signed FIT image. >>> >>> Fix this! >>> >>> Signed-off-by: Heiko Schocher >>> --- >>> >>> Found on an imx28 based board, with key dtb appended to u-boot.bin. >>> >>> Booting signed FIT image without an valid key dtb appended to u-boot.bin >>> shows: > > [...] >>> >>> common/image-sig.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/common/image-sig.c b/common/image-sig.c >>> index 455f2b9..646fb08 100644 >>> --- a/common/image-sig.c >>> +++ b/common/image-sig.c >>> @@ -265,7 +265,7 @@ int fit_image_verify_required_sigs(const void *fit, >>> int image_noffset, >>> if (sig_node < 0) { >>> debug("%s: No signature node found: %s\n", __func__, >>>fdt_strerror(sig_node)); >>> - return 0; >>> + return 1; >> >> >> Thanks for finding/fixing this! I suggest returning -EPERM. > > > Ok, changed. > >> Also note that using image-based security is somewhat insecure since >> people can mix and match them. Configuration signing is preferred if >> you can do it. > > > I do this, here my configurations node from the its file: > > configurations { > default = "conf@1"; > conf@1 { > description = "board config 1"; > kernel = "kernel@1"; > fdt = "fdt@1"; > ramdisk = "ramdisk@1"; > signature@1 { > algo = "sha256,rsa4096"; > key-name-hint = "dev"; > }; > }; > }; > >> As Tom said, can you add a test please? > > > Hmm... tried with current U-Boot, the steps described in > > test/image/test-fit.py > > # make O=sandbox sandbox_config > # make O=sandbox > # ./test/image/test-fit.py -u sandbox/u-boot > > and get: > > pollux:u-boot hs [master] $ ./test/image/test-fit.py -u sandbox/u-boot > FIT Tests > = [...] > Traceback (most recent call last): > File "./test/image/test-fit.py", line 481, in > run_tests() > File "./test/image/test-fit.py", line 470, in run_tests > run_fit_test(mkimage, options.u_boot) > File "./test/image/test-fit.py", line 388, in run_fit_test > fail('Kernel not loaded', stdout) > File "./test/image/test-fit.py", line 306, in fail > raise ValueError("Test '%s' failed: %s" % (test_name, msg)) > ValueError: Test 'Kernel load' failed: Kernel not loaded > pollux:u-boot hs [master] $ > > Can you verify this? > Yes I see that too. I bisected it and sent a patch. Regards, Simon > Thanks! > > bye, > Heiko > >> >>> } >>> >>> fdt_for_each_subnode(noffset, sig_blob, sig_node) { >>> -- >>> 2.7.4 >>> >> >> Regards, >> Simon >> > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] test: Fix FIT test to pass again
A recent change adjusted a test string so that the test no-longer passes. Fix it. Signed-off-by: Simon GlassReported-by: Heiko Schocher Fixes: b28c5fcc (test-fit.py: Minor grammar/spelling/clarification tweaks) --- test/image/test-fit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/image/test-fit.py b/test/image/test-fit.py index b0d0538919..ca38f71a15 100755 --- a/test/image/test-fit.py +++ b/test/image/test-fit.py @@ -392,7 +392,7 @@ def run_fit_test(mkimage, u_boot): fail('Ramdisk loaded but should not be', stdout) # Find out the offset in the FIT where U-Boot has found the FDT -line = find_matching(stdout, 'Booting using the FDT blob at ') +line = find_matching(stdout, 'Booting using the fdt blob at ') fit_offset = int(line, 16) - params['fit_addr'] fdt_magic = struct.pack('>L', 0xd00dfeed) data = read_file(fit) -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2] wdt: Update uclass to make clear that the timeout is in ms
From: Andy ShevchenkoConvert name to show explicitly that we are using milliseconds. For a watchdog timer this is precise enough. No functional change intended. Signed-off-by: Andy Shevchenko Signed-off-by: Simon Glass --- Changes in v2: - Use milliseconds since microseconds seems too fine a control - Update commit message to suit drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index bb9ae80866..8a30f024fd 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -13,14 +13,14 @@ DECLARE_GLOBAL_DATA_PTR; -int wdt_start(struct udevice *dev, u64 timeout, ulong flags) +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) { const struct wdt_ops *ops = device_get_ops(dev); if (!ops->start) return -ENOSYS; - return ops->start(dev, timeout, flags); + return ops->start(dev, timeout_ms, flags); } int wdt_stop(struct udevice *dev) diff --git a/include/wdt.h b/include/wdt.h index 0b5f05851a..9b90fbeeb3 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -21,12 +21,12 @@ * Start the timer * * @dev: WDT Device - * @timeout: Number of ticks before timer expires + * @timeout_ms: Number of ticks (milliseconds) before timer expires * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); +int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); /* * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again. @@ -67,12 +67,12 @@ struct wdt_ops { * Start the timer * * @dev: WDT Device -* @timeout: Number of ticks before the timer expires +* @timeout_ms: Number of ticks (milliseconds) before the timer expires * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ - int (*start)(struct udevice *dev, u64 timeout, ulong flags); + int (*start)(struct udevice *dev, u64 timeout_ms, ulong flags); /* * Stop the timer * -- 2.14.0.rc1.383.gd1ce394fe2-goog ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 16/41] Convert CONFIG_CMD_REGINFO to Kconfig
Hi Bin, On 22 July 2017 at 10:34, LEROY Christophewrote: > Simon Glass a écrit : > > >> This converts the following to Kconfig: >>CONFIG_CMD_REGINFO >> >> Signed-off-by: Simon Glass >> --- >> I found another patch that was apparently applied by Tom, or not quite, so I've patched that into the v2 series. I fixed the CMD_PCI problem though. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 10/41] Convert CONFIG_CMD_PCI to Kconfig
Hi Bin, On 22 July 2017 at 09:18, Bin Mengwrote: > Hi Simon, > > On Sat, Jul 22, 2017 at 7:11 AM, Simon Glass wrote: >> This converts the following to Kconfig: >>CONFIG_CMD_PCI >> >> Signed-off-by: Simon Glass >> --- >> [..] >> diff --git a/README b/README >> index 43691cc167..fe63a7090b 100644 >> --- a/README >> +++ b/README >> @@ -813,7 +813,6 @@ The following options need to be configured: >> CONFIG_CMD_NAND * NAND support >> CONFIG_CMD_NETbootp, tftpboot, rarpboot >> CONFIG_CMD_NFSNFS support >> - CONFIG_CMD_PCI * pciinfo >> CONFIG_CMD_PCMCIA * PCMCIA support >> CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network >> host >> diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig >> b/arch/arm/cpu/armv7/ls102xa/Kconfig >> index 6a013b2183..fadfce4f05 100644 >> --- a/arch/arm/cpu/armv7/ls102xa/Kconfig >> +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig >> @@ -15,6 +15,7 @@ config ARCH_LS1021A >> select SYS_FSL_SEC_COMPAT_5 >> select SYS_FSL_SEC_LE >> imply SCSI >> + imply CMD_PCI > > I assume this was converted by moveconfig. It seems some of the > Kconfig files are updated to "imply CMD_PCI", but some are not (eg: > all x86 boards defconfig files are updated instead). What's the logic > for when to use "imply" vs. updating board defconfig file? If there are 5 or more boards which could benefit from an imply, then it adds one. I sometimes change this (e.g. to 4 boards) but I think figuring out exactly what each arch / board should imply is the job of the maintainer. It is a lot of work to create these conversion series, and I don't think we should strive for 100% perfection. That is the job of board maintainers. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot