August 2017 - U-Boot

[U-Boot] [PATCH 0/3] console: Tidy up console_dev_is_serial()
by Simon Glass 01 Aug '17

01 Aug '17

With driver model this function does not work correctly and when CONFIG_DISPLAY_BOARDINFO_LATE is enabled we end up announcing U-Boot twice on the serial port. This causes the pytest framework to fail as it looks like a reset. This series includes an interim patch to fix the test framework. However the correct fix is to avoid displaying the banner twice. This happens with driver model if the serial console device is not called "serial". Two patches enhance the check to use the uclass instead of the device name. This is a more reliable test. We should not need to apply all three patches, but they are included in this series to allow the immediate test breakage to be fixed with a pytest change, while the other two patches are reviewed. Simon Glass (3): test/py: Handle the banner being printed after relocation console: Unify the check for a serial console dm: console: Check for serial devices properly common/console.c | 28 ++++++++++++++++++++++++++-- drivers/serial/serial-uclass.c | 2 +- include/stdio_dev.h | 1 + test/py/u_boot_console_base.py | 21 ++++++++++++++++++++- 4 files changed, 48 insertions(+), 4 deletions(-) -- 2.14.0.rc0.400.g1c36432dff-goog

3 8

[U-Boot] [PATCH] env: Migrate CONFIG_ENV_IS_IN_FAT options to Kconfig
by Tom Rini 01 Aug '17

01 Aug '17

We rename the various FAT_ENV_xxx options to CONFIG_ENV_FAT_xxx so that they can be modified via Kconfig. Migrate all existing users to the new values. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- common/Kconfig | 61 +++++++++++++++++++++------------- common/env_fat.c | 20 +++++------ configs/am335x_evm_nor_defconfig | 2 +- configs/at91sam9m10g45ek_mmc_defconfig | 1 - configs/at91sam9n12ek_mmc_defconfig | 1 - configs/at91sam9rlek_mmc_defconfig | 1 - configs/at91sam9x5ek_mmc_defconfig | 1 - configs/axs101_defconfig | 2 ++ configs/axs103_defconfig | 2 ++ configs/hikey_defconfig | 3 +- configs/hsdk_defconfig | 2 ++ configs/omap4_panda_defconfig | 3 +- configs/picosam9g45_defconfig | 1 - configs/rpi_2_defconfig | 2 ++ configs/rpi_3_32b_defconfig | 2 ++ configs/rpi_3_defconfig | 2 ++ configs/rpi_defconfig | 2 ++ configs/sama5d2_xplained_mmc_defconfig | 1 - configs/sama5d36ek_cmp_mmc_defconfig | 1 - configs/sama5d3_xplained_mmc_defconfig | 1 - configs/sama5d3xek_mmc_defconfig | 1 - configs/sama5d4_xplained_mmc_defconfig | 1 - configs/sama5d4ek_mmc_defconfig | 1 - include/config_fallbacks.h | 4 --- include/configs/am335x_evm.h | 5 --- include/configs/am43xx_evm.h | 4 --- include/configs/at91-sama5_common.h | 3 -- include/configs/at91sam9m10g45ek.h | 8 ----- include/configs/at91sam9n12ek.h | 3 -- include/configs/at91sam9rlek.h | 3 -- include/configs/at91sam9x5ek.h | 3 -- include/configs/axs10x.h | 4 --- include/configs/hikey.h | 3 -- include/configs/hsdk.h | 4 --- include/configs/k2g_evm.h | 3 -- include/configs/omap4_panda.h | 3 -- include/configs/picosam9g45.h | 8 ----- include/configs/rpi.h | 3 -- include/configs/sama5d2_xplained.h | 2 -- include/configs/xilinx_zynqmp.h | 3 -- 40 files changed, 66 insertions(+), 114 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 8c8d2e483242..746dd84f05be 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -255,33 +255,10 @@ config ENV_IS_IN_EEPROM config ENV_IS_IN_FAT bool "Environment is in a FAT filesystem" depends on !CHAIN_OF_TRUST + select FAT_WRITE help Define this if you want to use the FAT file system for the environment. - - FAT_ENV_INTERFACE: - - Define this to a string that is the name of the block device. - - - FAT_ENV_DEVICE_AND_PART: - - Define this to a string to specify the partition of the device. It can - be as following: - - "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1) - - "D:P": device D partition P. Error occurs if device D has no - partition table. - - "D:0": device D. - - "D" or "D:": device D partition 1 if device D has partition - table, or the whole device D if has no partition - table. - - "D:auto": first partition in device D with bootable flag set. - If none, first valid partition in device D. If no - partition table then means device D. - - - FAT_ENV_FILE: - - It's a string of the FAT file name. This file use to store the - environment. - CONFIG_FAT_WRITE: This must be enabled. Otherwise it cannot save the environment file. @@ -570,6 +547,42 @@ config ENV_IS_NOWHERE Define this if you don't want to or can't have an environment stored on a storage medium +config ENV_FAT_INTERFACE + string "Name of the block device for the environment" + depends on ENV_IS_IN_FAT + default "mmc" if TI_COMMON_CMD_OPTIONS || ARCH_ZYNQMP || ARCH_AT91 + help + Define this to a string that is the name of the block device. + +config ENV_FAT_DEVICE_AND_PART + string "Device and partition for where to store the environemt in FAT" + depends on ENV_IS_IN_FAT + default "0:1" if TI_COMMON_CMD_OPTIONS + default "0:auto" if ARCH_ZYNQMP + default "0" if ARCH_AT91 + help + Define this to a string to specify the partition of the device. It can + be as following: + + "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1) + - "D:P": device D partition P. Error occurs if device D has no + partition table. + - "D:0": device D. + - "D" or "D:": device D partition 1 if device D has partition + table, or the whole device D if has no partition + table. + - "D:auto": first partition in device D with bootable flag set. + If none, first valid partition in device D. If no + partition table then means device D. + +config ENV_FAT_FILE + string "Name of the FAT file to use for the environemnt" + depends on ENV_IS_IN_FAT + default "uboot.env" + help + It's a string of the FAT file name. This file use to store the + environment. + if ARCH_SUNXI config ENV_OFFSET diff --git a/common/env_fat.c b/common/env_fat.c index 75616d4c5b5c..b51c920cd45f 100644 --- a/common/env_fat.c +++ b/common/env_fat.c @@ -48,8 +48,8 @@ int saveenv(void) if (err) return err; - part = blk_get_device_part_str(FAT_ENV_INTERFACE, - FAT_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, + CONFIG_ENV_FAT_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) return 1; @@ -57,15 +57,15 @@ int saveenv(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for saveenv **\n", - FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } - err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, 0, sizeof(env_t), + err = file_fat_write(CONFIG_ENV_FAT_FILE, (void *)&env_new, 0, sizeof(env_t), &size); if (err == -1) { printf("\n** Unable to write \"%s\" from %s%d:%d **\n", - FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); return 1; } @@ -82,8 +82,8 @@ void env_relocate_spec(void) int dev, part; int err; - part = blk_get_device_part_str(FAT_ENV_INTERFACE, - FAT_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, + CONFIG_ENV_FAT_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) goto err_env_relocate; @@ -91,14 +91,14 @@ void env_relocate_spec(void) dev = dev_desc->devnum; if (fat_set_blk_dev(dev_desc, &info) != 0) { printf("\n** Unable to use %s %d:%d for loading the env **\n", - FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } - err = file_fat_read(FAT_ENV_FILE, buf, CONFIG_ENV_SIZE); + err = file_fat_read(CONFIG_ENV_FAT_FILE, buf, CONFIG_ENV_SIZE); if (err == -1) { printf("\n** Unable to read \"%s\" from %s%d:%d **\n", - FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); + CONFIG_ENV_FAT_FILE, CONFIG_ENV_FAT_INTERFACE, dev, part); goto err_env_relocate; } diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 49040a695cf1..17b9f42f9abb 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_AM33XX=y CONFIG_NOR=y CONFIG_SPL_STACK_R_ADDR=0x82000000 @@ -50,7 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_FAT_WRITE=y CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index ed9e9c20b9a7..144a344d7473 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -50,4 +50,3 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 16e9c4cec28e..6e05cf1f8fc3 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -50,4 +50,3 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 69ff8e62364a..6171f1d80cc3 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -43,4 +43,3 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 1b7612793480..c4b4541c22f0 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -55,4 +55,3 @@ CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index 4e5f2e5fc88e..f85c14238839 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -4,6 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_SYS_CLK_FREQ=750000000 CONFIG_DEFAULT_DEVICE_TREE="axs101" CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="AXS# " diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index ff0bf19303d4..68301ef5f702 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -4,6 +4,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_SYS_CLK_FREQ=100000000 CONFIG_DEFAULT_DEVICE_TREE="axs103" CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="AXS# " diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig index 6df04de281da..be6ff3d54946 100644 --- a/configs/hikey_defconfig +++ b/configs/hikey_defconfig @@ -4,6 +4,8 @@ CONFIG_IDENT_STRING="hikey" CONFIG_DEFAULT_DEVICE_TREE="hi6220-hikey" CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y @@ -18,5 +20,4 @@ CONFIG_MMC_DW_K3=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y -CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/hsdk_defconfig b/configs/hsdk_defconfig index eb3dfbd5706e..57c34f828115 100644 --- a/configs/hsdk_defconfig +++ b/configs/hsdk_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_TEXT_BASE=0x81000000 CONFIG_SYS_CLK_FREQ=1000000000 CONFIG_DEFAULT_DEVICE_TREE="hsdk" CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_PROMPT="hsdk# " # CONFIG_CMD_IMLS is not set diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 22fe337ba2fe..b9503440d48f 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -5,6 +5,8 @@ CONFIG_TARGET_OMAP4_PANDA=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y @@ -28,5 +30,4 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 326158d50672..28872ac5da6e 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -36,5 +36,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index a6f3cd79658c..e0bf3e14e075 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_RPI_2=y CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 1cbbb2c35756..0b7be9e17eeb 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index 80e6681332f7..dd7dc56ff426 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -5,6 +5,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 5d344fdc8702..8f23158899c9 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -4,6 +4,8 @@ CONFIG_TARGET_RPI=y CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index e9a65ccb9d2e..f69cb565749d 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -75,4 +75,3 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_FAT_WRITE=y diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig index d99baad0f681..9264108a7dce 100644 --- a/configs/sama5d36ek_cmp_mmc_defconfig +++ b/configs/sama5d36ek_cmp_mmc_defconfig @@ -50,4 +50,3 @@ CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index acd74994c4b8..a7f5768e2c64 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -66,4 +66,3 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_FAT_WRITE=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 1836e5392f38..8b442d579efb 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -75,4 +75,3 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 094e5e1c2d53..0d2fe89abdde 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -69,4 +69,3 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_FAT_WRITE=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index a3909a063971..a1d13e6aeba4 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -73,4 +73,3 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_LCD=y -CONFIG_FAT_WRITE=y diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index d1411f055083..961a83d75812 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -33,10 +33,6 @@ #define CONFIG_FS_FAT #endif -#if defined(CONFIG_ENV_IS_IN_FAT) && !defined(CONFIG_FAT_WRITE) -#define CONFIG_FAT_WRITE -#endif - #if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \ !defined(CONFIG_FS_EXT4) #define CONFIG_FS_EXT4 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index c7329cce9c37..2a2e2ba0a943 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -351,11 +351,6 @@ #define CONFIG_ENV_OFFSET 0x001c0000 #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE -#elif !defined(CONFIG_ENV_IS_NOWHERE) -/* Not NAND, SPI, NOR or eMMC env, so put ENV in a file on FAT */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" #endif /* SPI flash. */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index a91b7df3477e..3836ea8f8c4c 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -71,10 +71,6 @@ /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" - #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" /* SPL USB Support */ diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index b4135235d419..95df724fa370 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -53,9 +53,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #else /* u-boot env in sd/mmc card */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000 #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 8b00370cddca..45a6a9a13446 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -105,14 +105,6 @@ "root=/dev/mtdblock7 rw rootfstype=jffs2" #elif CONFIG_SYS_USE_MMC /* bootstrap + u-boot + env + linux in mmc */ -#define FAT_ENV_INTERFACE "mmc" -/* - * We don't specify the part number, if device 0 has partition table, it means - * the first partition; it no partition table, then take whole device as a - * FAT file system. - */ -#define FAT_ENV_DEVICE_AND_PART "0" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index e4ff01996722..975cfd9ed6d1 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -156,9 +156,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #else /* Use file in FAT file to save environment */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_FILE "uboot.env" -#define FAT_ENV_DEVICE_AND_PART "0" #define CONFIG_ENV_SIZE 0x4000 #endif diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 6132076e823e..1192e8bb7823 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -124,9 +124,6 @@ #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_FILE "uboot.env" -#define FAT_ENV_DEVICE_AND_PART "0" #define CONFIG_ENV_SIZE 0x4000 #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91sam9rlek.dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 7e8a9e921adc..14575fac030b 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -139,9 +139,6 @@ "bootm 0x22000000" #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_FILE "uboot.env" -#define FAT_ENV_DEVICE_AND_PART "0" #define CONFIG_ENV_SIZE 0x4000 #endif diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index b583267b3ed3..b3ec64a5bc42 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -76,10 +76,6 @@ * Environment settings */ #define CONFIG_ENV_SIZE SZ_16K -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" -#define CONFIG_FAT_WRITE /* * Environment configuration diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 8b2d01230953..093badb88bba 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -106,9 +106,6 @@ /* Preserve environment on sd card */ #define CONFIG_ENV_SIZE 0x1000 -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "1:1" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Monitor Command Prompt */ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 68900ac980d1..32f649dd3413 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -60,10 +60,6 @@ * Environment settings */ #define CONFIG_ENV_SIZE SZ_16K -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" -#define CONFIG_FAT_WRITE /* * Environment configuration diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 1117e5e5dd0f..7a201b036148 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -88,9 +88,6 @@ #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ #define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index a973ce6a62b7..f2b38595dc27 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -35,9 +35,6 @@ /* ENV related config options */ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_OVERWRITE #endif /* __CONFIG_PANDA_H */ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 88f841dfd88e..8d432d8d7f9f 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -107,14 +107,6 @@ #ifdef CONFIG_SYS_USE_MMC /* bootstrap + u-boot + env + linux in mmc */ -#define FAT_ENV_INTERFACE "mmc" -/* - * We don't specify the part number, if device 0 has partition table, it means - * the first partition; it no partition table, then take whole device as a - * FAT file system. - */ -#define FAT_ENV_DEVICE_AND_PART "0" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000 #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c545f998380a..8ae4019d52f8 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -92,9 +92,6 @@ /* Environment */ #define CONFIG_ENV_SIZE SZ_16K -#define FAT_ENV_INTERFACE "mmc" -#define FAT_ENV_DEVICE_AND_PART "0:1" -#define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_PREBOOT "usb start" diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 42fb1e11d0a7..e4fb0fbef23e 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -57,10 +57,8 @@ #ifdef CONFIG_SYS_USE_MMC /* bootstrap + u-boot + env in sd card */ -#undef FAT_ENV_DEVICE_AND_PART #undef CONFIG_BOOTCOMMAND -#define FAT_ENV_DEVICE_AND_PART "1" #define CONFIG_BOOTCOMMAND "fatload mmc 1:1 0x21000000 at91-sama5d2_xplained.dtb; " \ "fatload mmc 1:1 0x22000000 zImage; " \ "bootz 0x22000000 - 0x21000000" diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c30e37cccadb..689fe72c0c3b 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -73,9 +73,6 @@ # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 # endif -# define FAT_ENV_DEVICE_AND_PART "0:auto" -# define FAT_ENV_FILE "uboot.env" -# define FAT_ENV_INTERFACE "mmc" #endif #ifdef CONFIG_NAND_ARASAN -- 1.9.1

1 1

[U-Boot] [PATCH] arm: mach-omap2: Align image address before cache operations
by Andrew F. Davis 01 Aug '17

01 Aug '17

The image address passed to secure_boot_verify_image() may not be cacheline aligned, round the address down to the nearest cacheline. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- arch/arm/mach-omap2/sec-common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 030b36f332..2d54a3165e 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -112,8 +112,8 @@ int secure_boot_verify_image(void **image, size_t *size) /* Perform cache writeback on input buffer */ flush_dcache_range( - (u32)*image, - (u32)*image + roundup(*size, ARCH_DMA_MINALIGN)); + rounddown((u32)*image, ARCH_DMA_MINALIGN), + roundup((u32)*image + *size, ARCH_DMA_MINALIGN)); cert_addr = (uint32_t)*image; sig_addr = find_sig_start((char *)*image, *size); @@ -151,8 +151,8 @@ int secure_boot_verify_image(void **image, size_t *size) /* Perform cache writeback on output buffer */ flush_dcache_range( - (u32)*image, - (u32)*image + roundup(*size, ARCH_DMA_MINALIGN)); + rounddown((u32)*image, ARCH_DMA_MINALIGN), + roundup((u32)*image + *size, ARCH_DMA_MINALIGN)); auth_exit: if (result != 0) { -- 2.13.0

3 2

[U-Boot] [PATCH 1/3] am43xx: Remove ethboot / usbhost_boot variants
by Tom Rini 01 Aug '17

01 Aug '17

The intention of having aaa_evm_xxx_defconfig variants is to allow building for useful but non-default cases that cannot be easily done with the standard aaa_evm_defconfig file. In this case, we get rid of usbhost_boot as SPL_TEXT has been in OCMC RAM for a while now, so this can be included in the default. We get rid of ethboot as it's fine to have the environment in someplace that's not available and the default will be used. Further, now that environment location is in Kconfig it's reasonable to expect a user of this feature to optimize their use-case if needed. Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/am43xx_evm_defconfig | 7 +++ configs/am43xx_evm_ethboot_defconfig | 63 -------------------------- configs/am43xx_evm_usbhost_boot_defconfig | 75 ------------------------------- 3 files changed, 7 insertions(+), 138 deletions(-) delete mode 100644 configs/am43xx_evm_ethboot_defconfig delete mode 100644 configs/am43xx_evm_usbhost_boot_defconfig diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 7a7a0b0ea0ac..ae2ae1ae516a 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -12,8 +12,15 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USBETH_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig deleted file mode 100644 index 9892653d27c3..000000000000 --- a/configs/am43xx_evm_ethboot_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_AM43XX=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" -CONFIG_ENV_IS_IN_FAT=y -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_SPL=y -# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set -CONFIG_SPL_ETH_SUPPORT=y -CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y -CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" -CONFIG_SPL_OS_BOOT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -CONFIG_CMD_EEPROM=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPT=y -CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_MTDPARTS=y -CONFIG_ISO_PARTITION=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_DFU_SF=y -CONFIG_MMC_OMAP_HS=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SYS_NS16550=y -CONFIG_TI_QSPI=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_GADGET=y -CONFIG_USB_DWC3_OMAP=y -CONFIG_USB_DWC3_PHY_OMAP=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0403 -CONFIG_G_DNL_PRODUCT_NUM=0xbd00 -CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig deleted file mode 100644 index f4c0f8442a17..000000000000 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_AM43XX=y -CONFIG_ISW_ENTRY_ADDR=0x40300350 -CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" -CONFIG_SPL_LOAD_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND" -CONFIG_ENV_IS_IN_FAT=y -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_SPL=y -CONFIG_SPL_STACK_R=y -CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_OS_BOOT=y -CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -CONFIG_CMD_EEPROM=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPT=y -CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_MTDPARTS=y -CONFIG_ISO_PARTITION=y -CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" -CONFIG_DM=y -# CONFIG_BLK is not set -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_DFU_SF=y -CONFIG_DM_GPIO=y -CONFIG_DM_MMC=y -CONFIG_MMC_OMAP_HS=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -CONFIG_TI_QSPI=y -CONFIG_TIMER=y -CONFIG_OMAP_TIMER=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_GADGET=y -CONFIG_USB_DWC3_OMAP=y -CONFIG_USB_DWC3_PHY_OMAP=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0403 -CONFIG_G_DNL_PRODUCT_NUM=0xbd00 -CONFIG_FAT_WRITE=y -- 1.9.1

4 11

[U-Boot] [PATCH] Remove unused CONFIG_TWL4030_PWM
by Adam Ford 01 Aug '17

01 Aug '17

CONFIG_TWL4030_PWM is not being used by any source, so let's remove the #define and the whitelist entry Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 60d1f88..51187c6 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -71,7 +71,6 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000 /* TWL4030 */ -#define CONFIG_TWL4030_PWM #define CONFIG_TWL4030_USB /* Board NAND Info. */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9d24a1f..9b145b2 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5015,7 +5015,6 @@ CONFIG_TUXX1 CONFIG_TWL4030_INPUT CONFIG_TWL4030_KEYPAD CONFIG_TWL4030_LED -CONFIG_TWL4030_PWM CONFIG_TWL4030_USB CONFIG_TWL6030_INPUT CONFIG_TWL6030_POWER -- 2.7.4

2 2

[U-Boot] [PATCH 1/1] serial: stm32x7: Convert CONFIG_STM32X7_SERIAL to Kconfig
by patrice.chotard＠st.com 01 Aug '17

01 Aug '17

From: Patrice Chotard <patrice.chotard(a)st.com> Add CONFIG_STM32X7_SERIAL as a Kconfig option. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- configs/stm32f746-disco_defconfig | 1 + drivers/serial/Kconfig | 7 +++++++ include/configs/stm32f746-disco.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index f76d3c5..08c4a06 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -42,6 +42,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_STM32=y CONFIG_RAM=y CONFIG_STM32_SDRAM=y +CONFIG_STM32X7_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b7dd2ac..2a767f9 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -491,6 +491,13 @@ config STI_ASC_SERIAL on STiH410 SoC. This is a basic implementation, it supports following baudrate 9600, 19200, 38400, 57600 and 115200. +config STM32X7_SERIAL + bool "STMicroelectronics STM32 SoCs on-chip UART" + depends on DM_SERIAL && STM32F7 + help + If you have a machine based on a STM32 F7 you can enable its + onboard serial ports, say Y to this option. If unsure, say N. + config MPC8XX_CONS bool "Console driver for MPC8XX" depends on 8xx diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 4e0edcb..daf3235 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -32,7 +32,6 @@ #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_STM32_FLASH -#define CONFIG_STM32X7_SERIAL #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) #define CONFIG_DW_ALTDESCRIPTOR diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 54eee53..c92ac7b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2352,7 +2352,6 @@ CONFIG_STATIC_BOARD_REV CONFIG_STATIC_RELA CONFIG_STD_DEVICES_SETTINGS CONFIG_STM32F4DISCOVERY -CONFIG_STM32X7_SERIAL CONFIG_STM32_FLASH CONFIG_STM32_GPIO CONFIG_STM32_HSE_HZ -- 1.9.1

3 2

[U-Boot] [PATCH] dm: Kconfig: fix typo in help for SPL_PINCTRL
by Philipp Tomsich 01 Aug '17

01 Aug '17

Changes 'controlloers' to 'controllers' in the help-text for SPL_PINCTRL. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/pinctrl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 4ab0b3a..bcbe4a1 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -60,7 +60,7 @@ config PINCONF framework. config SPL_PINCTRL - bool "Support pin controlloers in SPL" + bool "Support pin controllers in SPL" depends on SPL && SPL_DM help This option is an SPL-variant of the PINCTRL option. -- 2.1.4

2 1