February 2018 - U-Boot

[U-Boot] [PATCH] Move most CONFIG_HAVE_BLOCK_DEVICE to Kconfig
by Adam Ford 09 Feb '18

09 Feb '18

config_fallbacks.h has some logic that sets HAVE_BLOCK_DEVICE based on a list of enabled options. Moving HAVE_BLOCK_DEIVCE to Kconfig allows us to drastically shrink the logic in config_fallbacks.h Signed-off-by: Adam Ford <aford173(a)gmail.com> --- arch/Kconfig | 1 + cmd/Kconfig | 3 +++ drivers/ata/Kconfig | 1 + drivers/block/Kconfig | 6 ++++++ drivers/mmc/Kconfig | 1 + drivers/nvme/Kconfig | 1 + drivers/scsi/Kconfig | 1 + include/config_fallbacks.h | 10 +--------- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 5d57d6d..3079f0d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -74,6 +74,7 @@ config SANDBOX select DM_SPI select DM_GPIO select DM_MMC + select CONFIG_SANDBOX select LZO imply CMD_GETTIME imply CMD_HASH diff --git a/cmd/Kconfig b/cmd/Kconfig index 4d9ef87..26de43f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -672,6 +672,7 @@ config CMD_GPT bool "GPT (GUID Partition Table) command" select PARTITION_UUIDS select EFI_PARTITION + select CONFIG_HAVE_BLOCK_DEVICE imply RANDOM_UUID help Enable the 'gpt' command to ready and write GPT style partition @@ -819,6 +820,7 @@ config CMD_ONENAND config CMD_PART bool "part" select PARTITION_UUIDS + select CONFIG_HAVE_BLOCK_DEVICE help Read and display information about the partition table on various media. @@ -911,6 +913,7 @@ config CMD_UNIVERSE config CMD_USB bool "usb" + select CONFIG_HAVE_BLOCK_DEVICE help USB support. diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 990de72..86ec628 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -9,6 +9,7 @@ config AHCI config SATA bool "Support SATA controllers" + select HAVE_BLOCK_DEVICE help This enables support for SATA (Serial Advanced Technology Attachment), a serial bus standard for connecting to hard drives and diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 2676089..81a4085 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -10,6 +10,11 @@ config BLK be partitioned into several areas, called 'partitions' in U-Boot. A filesystem can be placed in each partition. +config HAVE_BLOCK_DEVICE + bool "Enable Legacy Block Device" + help + Some devices require block support whether or not DM is enabled + config SPL_BLK bool "Support block devices in SPL" depends on SPL_DM && BLK @@ -33,6 +38,7 @@ config BLOCK_CACHE config IDE bool "Support IDE controllers" + select HAVE_BLOCK_DEVICE help Enables support for IDE (Integrated Drive Electronics) hard drives. This allows access to raw blocks and filesystems on an IDE drive diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index a1b21fd..d12a166 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -3,6 +3,7 @@ menu "MMC Host controller Support" config MMC bool "MMC/SD/SDIO card support" default ARM || PPC || SANDBOX + select CONFIG_HAVE_BLOCK_DEVICE help This selects MultiMediaCard, Secure Digital and Secure Digital I/O support. diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig index cad8dbc..67d9171 100644 --- a/drivers/nvme/Kconfig +++ b/drivers/nvme/Kconfig @@ -7,6 +7,7 @@ config NVME bool "NVM Express device support" depends on BLK && PCI + select CONFIG_HAVE_BLOCK_DEVICE help This option enables support for NVM Express devices. It supports basic functions of NVMe (read/write). diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index db1606e..c061620 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1,5 +1,6 @@ config SCSI bool "Support SCSI controllers" + select CONFIG_HAVE_BLOCK_DEVICE help This enables support for SCSI (Small Computer System Interface), a parallel interface widely used with storage peripherals such as diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index c0f23e0..99b50d1 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -30,15 +30,7 @@ #endif /* Rather than repeat this expression each time, add a define for it */ -#if defined(CONFIG_IDE) || \ - defined(CONFIG_SATA) || \ - defined(CONFIG_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_CMD_PART) || \ - defined(CONFIG_CMD_GPT) || \ - defined(CONFIG_MMC) || \ - defined(CONFIG_NVME) || \ - defined(CONFIG_SYSTEMACE) || \ +#if defined(CONFIG_SYSTEMACE) || \ (defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)) || \ defined(CONFIG_SANDBOX) #define CONFIG_HAVE_BLOCK_DEVICE -- 2.7.4

2 1

[U-Boot] [PATCH] Convert LIB_UUID to Kconfig
by Adam Ford 09 Feb '18

09 Feb '18

config_fallback.h has some logic that checks a variety of options and selects LIB_UUID if it hasn't already been selected. This will all LIB_UUID in Kconfig and select this option for the list of options to allow us to remove the logic from fallbacks Signed-off-by: Adam Ford <aford173(a)gmail.com> --- Based on [PATCH V2 1/2] Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig cmd/Kconfig | 2 ++ disk/Kconfig | 2 ++ include/config_fallbacks.h | 10 ---------- lib/Kconfig | 3 +++ lib/efi_loader/Kconfig | 1 + net/Kconfig | 1 + 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 790c404..4d9ef87 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -679,6 +679,7 @@ config CMD_GPT config RANDOM_UUID bool "GPT Random UUID generation" + select LIB_UUID help Enable the generation of partitions with random UUIDs if none are provided. @@ -1180,6 +1181,7 @@ config CMD_TERMINAL config CMD_UUID bool "uuid, guid - generation of unique IDs" + select LIB_UUID help This enables two commands: diff --git a/disk/Kconfig b/disk/Kconfig index 0446bb6..f3050cf 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -72,6 +72,7 @@ config EFI_PARTITION depends on PARTITIONS default y if DISTRO_DEFAULTS default y if TEGRA + select LIB_UUID help Say Y here if you would like to use device under U-Boot which were partitioned using EFI GPT. @@ -115,6 +116,7 @@ config PARTITION_UUIDS depends on PARTITIONS default y if DISTRO_DEFAULTS default y if EFI_PARTITION + select LIB_UUID help Activate the configuration of UUID for partition diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index c11abe6..70013fe 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -44,16 +44,6 @@ #define HAVE_BLOCK_DEVICE #endif -#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \ - CONFIG_IS_ENABLED(EFI_PARTITION) || \ - CONFIG_IS_ENABLED(EFI_LOADER) || \ - defined(CONFIG_RANDOM_UUID) || \ - defined(CONFIG_CMD_UUID) || \ - defined(CONFIG_BOOTP_PXE)) && \ - !defined(CONFIG_LIB_UUID) -#define CONFIG_LIB_UUID -#endif - /* Console I/O Buffer Size */ #ifndef CONFIG_SYS_CBSIZE #if defined(CONFIG_CMD_KGDB) diff --git a/lib/Kconfig b/lib/Kconfig index 8b8d5b8..625692c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -18,6 +18,9 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED config HAVE_PRIVATE_LIBGCC bool +config LIB_UUID + bool + config USE_PRIVATE_LIBGCC bool "Use private libgcc" depends on HAVE_PRIVATE_LIBGCC diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 827c267..5461833 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -6,6 +6,7 @@ config EFI_LOADER # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT default y + select LIB_UUID help Select this option if you want to run EFI applications (like grub2) on top of U-Boot. If this option is enabled, U-Boot will expose EFI diff --git a/net/Kconfig b/net/Kconfig index f05c0f9..94536fc 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -51,6 +51,7 @@ config BOOTP_HOSTNAME config BOOTP_PXE bool "Enable BOOTP PXE" default y + select LIB_UUID config BOOTP_SUBNETMASK bool "Enable BOOTP subnetmask" -- 2.7.4

2 1

Re: [U-Boot] TCP & Overrrun
by dh＠synoia.com 08 Feb '18

08 Feb '18

On Thu, 8 Feb 2018 22:15:44 +0000 (UTC) Duncan Hare <dh(a)synoia.com> wrote: > Duncan Hare > > 714 931 7952 > > > ----- Forwarded Message ----- > From: Joe Hershberger <joe.hershberger(a)ni.com> > To: Duncan Hare <dh(a)synoia.com> > Cc: u-boot <u-boot(a)lists.denx.de>; Joe Hershberger > <joe.hershberger(a)ni.com> Sent: Thursday, February 8, 2018 11:40 AM > Subject: Re: [U-Boot] TCP & Overrrun > > Hi Duncan, > > On Wed, Feb 7, 2018 at 8:40 PM, Duncan Hare <dh(a)synoia.com> wrote: > > I'm gettin overrun on the raspberry pi. > > > > Which ethernet drived does it use? > > You didn't specify which one you are talking about, but here's how to > find out... > > Assuming rpi3, find the config first... > > configs/rpi_3_defconfig says: > CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" > arch/arm/dts/bcm2837-rpi-3-b.dts says: #include > "bcm283x-rpi-smsc9514.dtsi" arch/arm/dts/bcm283x-rpi-smsc9514.dtsi > says: ethernet: usbether@1 { > compatible = "usb424,ec00"; grep -rn ec00 drivers/ says: > drivers/usb/eth/smsc95xx.c > > Cheers, > -Joe > > > I need to determine if it > > uses CONFIG_SYS_RX_ETH_BUFFER" from net.h and the "net_rx_packets" > > buffer pool defined in net/net.c > > > > Thanks > > > > Duncan Hare > > _______________________________________________ > > U-Boot mailing list > > U-Boot(a)lists.denx.de > > https://lists.denx.de/listinfo/u-boot > Joe Thanks It's is more push down stack buffer management than circular. Small change to fix. No more starting at zero. I like buffer pools with a size of power of 2. Easy to make circular with an & of the power of 2-1 on the index. Duncan

1 0

[U-Boot] [PATCH] video: ivybridge: FIx defined but not used warning
by Tom Rini 08 Feb '18

08 Feb '18

The struct ivb_pm_gt2 is defined but never used, only the _17w and _35w variants. Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Bin Meng <bmeng.cn(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- The code that uses ivb_pm_gt2_17w/ivb_pm_gt2_35w/ivb_pm_gt2_35w maybe is supposed to use this instead at one point? Or maybe it's a bring-up artifact, I'm not sure. --- drivers/video/ivybridge_igd.c | 56 ------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index d8af2e169635..7c00c4021c4a 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -128,62 +128,6 @@ static const struct gt_powermeter ivb_pm_gt1[] = { { 0 } }; -static const struct gt_powermeter ivb_pm_gt2[] = { - { 0xa800, 0x10000000 }, - { 0xa804, 0x00033800 }, - { 0xa808, 0x00000902 }, - { 0xa80c, 0x0c002f00 }, - { 0xa810, 0x12000400 }, - { 0xa814, 0x00000000 }, - { 0xa818, 0x00d20800 }, - { 0xa81c, 0x00000002 }, - { 0xa820, 0x03004b02 }, - { 0xa824, 0x00000600 }, - { 0xa828, 0x07000773 }, - { 0xa82c, 0x00000000 }, - { 0xa830, 0x00010032 }, - { 0xa834, 0x1520040d }, - { 0xa838, 0x00020105 }, - { 0xa83c, 0x00083700 }, - { 0xa840, 0x0000151d }, - { 0xa844, 0x00000000 }, - { 0xa848, 0x20001b00 }, - { 0xa84c, 0x0a000010 }, - { 0xa850, 0x00000000 }, - { 0xa854, 0x00000008 }, - { 0xa858, 0x00000008 }, - { 0xa85c, 0x00000000 }, - { 0xa860, 0x00020000 }, - { 0xa248, 0x0000221e }, - { 0xa900, 0x00000000 }, - { 0xa904, 0x00003500 }, - { 0xa908, 0x00000000 }, - { 0xa90c, 0x0c000000 }, - { 0xa910, 0x12000500 }, - { 0xa914, 0x00000000 }, - { 0xa918, 0x00b20000 }, - { 0xa91c, 0x00000000 }, - { 0xa920, 0x08004b02 }, - { 0xa924, 0x00000200 }, - { 0xa928, 0x07000820 }, - { 0xa92c, 0x00000000 }, - { 0xa930, 0x00030000 }, - { 0xa934, 0x050f020d }, - { 0xa938, 0x00020300 }, - { 0xa93c, 0x00903900 }, - { 0xa940, 0x00000000 }, - { 0xa944, 0x00000000 }, - { 0xa948, 0x20001b00 }, - { 0xa94c, 0x0a000010 }, - { 0xa950, 0x00000000 }, - { 0xa954, 0x00000008 }, - { 0xa960, 0x00110000 }, - { 0xaa3c, 0x00003900 }, - { 0xaa54, 0x00000008 }, - { 0xaa60, 0x00110000 }, - { 0 } -}; - static const struct gt_powermeter ivb_pm_gt2_17w[] = { { 0xa800, 0x20000000 }, { 0xa804, 0x000e3800 }, -- 2.7.4

1 0

[U-Boot] efi_loader: patches for v2018.03-rc2
by Heinrich Schuchardt 08 Feb '18

08 Feb '18

Hello Alex, could you, please, review the following patches and select them for your pull request for v2018.03-rc2. https://github.com/xypron2/u-boot.git, branch v2018.03-rc2 up to commit 55e90f0e97a846113518eab71757740051cd9d4b. Travis ran without errors: https://travis-ci.org/xypron2/u-boot/builds/338861562 Best regards Heinrich Heinrich Schuchardt (8): efi_loader: fix building crt0 on arm efi_loader: fix the online help for bootefi bootmgr efi_selftest: use correct compiler flags for miniapps efi_loader: add missing runtime services stubs efi_loader: create stub for CreateEventEx efi_driver: return type of efi_driver_init() efi_loader: split README.efi into two separate documents efi_loader: rewrite README.efi MAINTAINERS | 3 + arch/arm/lib/crt0_aarch64_efi.S | 4 +- arch/arm/lib/crt0_arm_efi.S | 4 +- cmd/bootefi.c | 2 +- doc/README.efi | 537 +++++++++++++++++--------------------- doc/README.u-boot_on_efi | 259 ++++++++++++++++++ include/asm-generic/pe.h | 21 ++ include/efi_api.h | 37 ++- include/efi_loader.h | 2 +- include/pe.h | 8 +- lib/efi_driver/efi_uclass.c | 6 +- lib/efi_loader/efi_boottime.c | 33 +++ lib/efi_loader/efi_image_loader.c | 2 +- lib/efi_loader/efi_runtime.c | 29 ++ lib/efi_selftest/Makefile | 6 +- 15 files changed, 642 insertions(+), 311 deletions(-) create mode 100644 doc/README.u-boot_on_efi create mode 100644 include/asm-generic/pe.h -- 2.14.2

1 0

[U-Boot] TCP & Overrrun
by Duncan Hare 08 Feb '18

08 Feb '18

I'm gettin overrun on the raspberry pi. Which ethernet drived does it use? I need to determine if it uses CONFIG_SYS_RX_ETH_BUFFER" from net.h and the "net_rx_packets" buffer pool defined in net/net.c grep suggests it is not using net_rx_packets. Here's a list of a grep of the u-boot source directory rch/mips/mach-au1x00/au1x00_eth.c arch/powerpc/cpu/mpc85xx/ether_fcc.c net/net.c drivers/usb/gadget/ether.c drivers/net/ep93xx_eth.c drivers/net/cs8900.c drivers/net/ftgmac100.c drivers/net/ks8851_mll.c drivers/net/dc2114x.c drivers/net/dm9000x.c drivers/net/xilinx_ll_temac_fifo.c drivers/net/ax88180.c drivers/net/tsec.c drivers/net/mcffec.c drivers/net/dnet.c drivers/net/ftmac100.c drivers/net/xilinx_ll_temac_sdma.c drivers/net/sandbox-raw.c drivers/net/cpsw.c drivers/net/sandbox.c drivers/net/smc911x.c drivers/net/lan91c96.c drivers/net/uli526x.c drivers/net/tsi108_eth.c drivers/net/mpc8xx_fec.c drivers/net/at91_emac.c drivers/net/ethoc.c drivers/net/fsl_mcdmafec.c drivers/net/bcm-sf2-eth.c drivers/net/enc28j60.c drivers/net/smc91111.c drivers/net/macb.c drivers/net/pic32_eth.c Thanks Duncan Hare

2 1

[U-Boot] [PATCH] omap4: sdp4430: Enable CONFIG_NET for this platform
by Michal Simek 08 Feb '18

08 Feb '18

Distro default configuration contains also dhcp and pxe setting which can't working without enabling CONFIG_NET. EFI is not required that's why it is not enabled. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/omap4_sdp4430_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index ac495710633c..59526fd1dc35 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -23,7 +23,10 @@ CONFIG_CMD_SPI=y # CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y +# CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_NET=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y @@ -31,4 +34,6 @@ CONFIG_USB=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_FAT_WRITE=y +# CONFIG_REGEX is not set CONFIG_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set -- 1.9.1

2 1

[U-Boot] [PATCH] configs: imx6q_logic: Move CONFIG_MXC_UART to Kconfig
by Adam Ford 08 Feb '18

08 Feb '18

Since CONFIG_MXC_UART is already in Kconfig, move this from the header to imx6q_logic_defconfig Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig index ec34047..23eff91 100644 --- a/configs/imx6q_logic_defconfig +++ b/configs/imx6q_logic_defconfig @@ -42,3 +42,4 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_MXC_UART=y diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 8b91a53..d45709e 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -18,8 +18,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) -#define CONFIG_MXC_UART - /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -- 2.7.4

3 2

[U-Boot] [PATCH] Convert CONFIG LIB_HW_RAND to Kconfig
by Adam Ford 08 Feb '18

08 Feb '18

config_fallbacks.h had some logic to automatically select LIB_RAND if RANDOM_UUID or CMD_UUID were set if LIB_HW_RAND wasn't already selected. By migrating LIB_HW_RAND to Kconfig, we can remove this check from config_fallbacks.h and put it into Kconfig Signed-off-by: Adam Ford <aford173(a)gmail.com> --- configs/ds414_defconfig | 1 + configs/odroid_defconfig | 2 ++ configs/trats2_defconfig | 2 ++ configs/trats_defconfig | 2 ++ include/config_fallbacks.h | 7 ------- include/configs/ds414.h | 1 - include/configs/odroid.h | 1 - include/configs/thunderx_88xx.h | 1 - include/configs/trats.h | 1 - include/configs/trats2.h | 1 - lib/Kconfig | 8 +++++++- scripts/config_whitelist.txt | 1 - 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index eb3fe75..47d0377 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -48,3 +48,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_LIB_RAND=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 30889c0..14e9283 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -62,4 +62,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_LIB_RAND=y +CONFIG_LIB_HW_RAND=y CONFIG_ERRNO_STR=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index e28cad5..2cc7c9b 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -54,3 +54,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +CONFIG_LIB_RAND=y +CONFIG_LIB_HW_RAND=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 6ae39c1..f26e8ef 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -53,3 +53,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +CONFIG_LIB_RAND=y +CONFIG_LIB_HW_RAND=y diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 9695ee7..c11abe6 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -54,13 +54,6 @@ #define CONFIG_LIB_UUID #endif -#if (defined(CONFIG_RANDOM_UUID) || \ - defined(CONFIG_CMD_UUID)) && \ - (!defined(CONFIG_LIB_RAND) && \ - !defined(CONFIG_LIB_HW_RAND)) -#define CONFIG_LIB_RAND -#endif - /* Console I/O Buffer Size */ #ifndef CONFIG_SYS_CBSIZE #if defined(CONFIG_CMD_KGDB) diff --git a/include/configs/ds414.h b/include/configs/ds414.h index c840c93..b795189 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -113,7 +113,6 @@ #define CONFIG_DDR_32BIT /* Use random ethernet address if not configured */ -#define CONFIG_LIB_RAND #define CONFIG_NET_RANDOM_ETHADDR /* Default Environment */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 60ed013..697e798 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -177,7 +177,6 @@ /* Security subsystem - enable hw_rand() */ #define CONFIG_EXYNOS_ACE_SHA -#define CONFIG_LIB_HW_RAND /* USB */ #define CONFIG_USB_EHCI_EXYNOS diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 34940ef..1f0b9d4 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -77,7 +77,6 @@ #define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_MAXARGS 64 /* max command args */ #define CONFIG_NO_RELOCATION 1 -#define CONFIG_LIB_RAND #define PLL_REF_CLK 50000000 /* 50 MHz */ #define NS_PER_REF_CLK_TICK (1000000000/PLL_REF_CLK) diff --git a/include/configs/trats.h b/include/configs/trats.h index b97efc2..465eed0 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -171,7 +171,6 @@ /* Security subsystem - enable hw_rand() */ #define CONFIG_EXYNOS_ACE_SHA -#define CONFIG_LIB_HW_RAND /* Common misc for Samsung */ #define CONFIG_MISC_COMMON diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 871accf..b9bf918 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -153,7 +153,6 @@ /* Security subsystem - enable hw_rand() */ #define CONFIG_EXYNOS_ACE_SHA -#define CONFIG_LIB_HW_RAND /* Common misc for Samsung */ #define CONFIG_MISC_COMMON diff --git a/lib/Kconfig b/lib/Kconfig index 710deb7..8b8d5b8 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -66,10 +66,16 @@ config REGEX "setexpr". config LIB_RAND - bool "Pseudo-random library support " + bool "Pseudo-random library support" + default y if (RANDOM_UUID || CMD_UUID) && !LIB_HW_RAND help This library provides pseudo-random number generator functions. +config LIB_HW_RAND + bool "HW Engine for random libray support" + help + Select this if hardware engine is available for random library support + config SPL_TINY_MEMSET bool "Use a very small memset() in SPL" help diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 33ef985..4cde67c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1217,7 +1217,6 @@ CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LG4573 CONFIG_LG4573_BUS CONFIG_LG4573_CS -CONFIG_LIB_HW_RAND CONFIG_LIB_UUID CONFIG_LINUX CONFIG_LINUX_RESET_VEC -- 2.7.4

3 2

[U-Boot] [PATCH V3] Convert CONFIG_APBH_DMA et al to Kconfig
by Adam Ford 08 Feb '18

08 Feb '18

This converts the following to Kconfig: CONFIG_APBH_DMA CONFIG_APBH_DMA_BURST CONFIG_APBH_DMA_BURST8 Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V3: Rebased on "arm: imx: convert MX23/28 and MXS NAND to Kconfig" Make APBH_DMA depend on NAND_MXS since it appears to be the only driver using DMA. This keeps the defconfig files from changing V2: Rebase on [U-Boot,v2,1/6] Convert CONFIG_NAND_MXS to Kconfig Make the NAND controller in MX6 MX7 autoselect the DMA options drivers/dma/Kconfig | 15 +++++++++++++++ drivers/mtd/nand/Kconfig | 3 +++ include/configs/aristainetos-common.h | 3 --- include/configs/cm_fx6.h | 3 --- include/configs/colibri_imx7.h | 3 --- include/configs/gw_ventana.h | 3 --- include/configs/imx6-engicam.h | 4 ---- include/configs/imx6_logic.h | 3 --- include/configs/mx6sabreauto.h | 3 --- include/configs/mx6sxsabreauto.h | 3 --- include/configs/mx7dsabresd.h | 3 --- include/configs/mxs.h | 1 - include/configs/pcm058.h | 3 --- include/configs/pfla02.h | 3 --- include/configs/platinum.h | 3 --- include/configs/titanium.h | 3 --- scripts/config_whitelist.txt | 3 --- 17 files changed, 18 insertions(+), 44 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 1b92c77..4b96bda 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -19,4 +19,19 @@ config TI_EDMA3 This driver support data transfer between memory regions. +config APBH_DMA + bool "Support APBH DMA" + depends on NAND_MXS + help + Enable APBH DMA driver. + +if APBH_DMA +config APBH_DMA_BURST + bool "Enable DMA BURST" + +config APBH_DMA_BURST8 + bool "Enable DMA BURST8" + +endif + endmenu # menu "DMA Support" diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 57d2757..a820af6 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -142,6 +142,9 @@ config NAND_MXS bool "MXS NAND support" depends on MX23 || MX28 || MX6 || MX7 imply CMD_NAND + select APBH_DMA + select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7 + select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7 help This enables NAND driver for the NAND flash controller on the MXS processors. diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 9b1a39d..69de44a 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -182,9 +182,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* RTC */ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 90cf024..39d166a 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -184,9 +184,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION /* APBH DMA is required for NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 #endif /* Ethernet */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index d4aaff6..5d9b212 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -170,9 +170,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 517ad08..6e994b5 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -73,9 +73,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_BURST - #define CONFIG_APBH_DMA_BURST8 #endif #endif /* CONFIG_SPI_FLASH */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 5f43dfb..246a636 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -161,10 +161,6 @@ /* MTD device */ # define CONFIG_MTD_DEVICE # define CONFIG_MTD_PARTITIONS - -# define CONFIG_APBH_DMA -# define CONFIG_APBH_DMA_BURST -# define CONFIG_APBH_DMA_BURST8 #endif /* Ethernet */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index f0ff5b2..8b91a53 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -156,9 +156,6 @@ # define CONFIG_MTD_PARTITIONS /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* EEPROM contains serial no, MAC addr and other Logic PD info */ #define CONFIG_I2C_EEPROM diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 9982685..bba15a7 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -72,9 +72,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* PMIC */ #define CONFIG_POWER diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 02d6acf..06e416b 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -125,9 +125,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Network */ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index fd39f22..3a9eaf9 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -197,9 +197,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 #endif #define CONFIG_ENV_OFFSET (12 * SZ_64K) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 21e51fc..c3e3f59 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -99,7 +99,6 @@ */ /* APBH DMA */ -#define CONFIG_APBH_DMA /* GPIO */ #define CONFIG_MXS_GPIO diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 6c0902a..ec74ed7 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -65,9 +65,6 @@ #endif /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Filesystem support */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index 83198a1..2001d5d 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -64,9 +64,6 @@ #endif /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Filesystem support */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 24c8de9..339ff91 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -75,9 +75,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA config, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ #define CONFIG_ENV_OFFSET (16 << 20) diff --git a/include/configs/titanium.h b/include/configs/titanium.h index ea18cb6..0fe40ee 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -148,9 +148,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ #define CONFIG_ENV_OFFSET (16 << 20) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ccc5ebd..33ef985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -31,9 +31,6 @@ CONFIG_AM335X_USB1_MODE CONFIG_AM437X_USB2PHY2_HOST CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE -CONFIG_APBH_DMA -CONFIG_APBH_DMA_BURST -CONFIG_APBH_DMA_BURST8 CONFIG_APER_0_BASE CONFIG_APER_1_BASE CONFIG_APER_SIZE -- 2.7.4

3 2