From b12e6945e98422ed8e30a387e9ad9646ad6fccc9 Mon Sep 17 00:00:00 2001 From: Ramon Fried Date: Sat, 12 Jan 2019 11:48:27 +0200 Subject: [PATCH 01/26] dts: db410: fix indentation Signed-off-by: Ramon Fried --- arch/arm/dts/dragonboard410c-uboot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi b/arch/arm/dts/dragonboard410c-uboot.dtsi index a07c97e811..9c1be2566f 100644 --- a/arch/arm/dts/dragonboard410c-uboot.dtsi +++ b/arch/arm/dts/dragonboard410c-uboot.dtsi @@ -28,8 +28,8 @@ serial@78b0000 { u-boot,dm-pre-reloc; - }; }; + }; }; From 8d24a4776a59c96e83a95c7cc5b3f3fa294c2c70 Mon Sep 17 00:00:00 2001 From: Ramon Fried Date: Sat, 12 Jan 2019 11:48:28 +0200 Subject: [PATCH 02/26] mach-snapdragon: db410: pinctrl: fix pin count Pin count in APQ8016 was wrong, fix that. Fixes: ad97051b7ff6 ("mach-snapdragon: Introduce pinctrl driver") Signed-off-by: Ramon Fried --- arch/arm/mach-snapdragon/pinctrl-apq8016.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c index bdb755d0e4..1042b564c3 100644 --- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c +++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c @@ -39,11 +39,11 @@ static const char *apq8016_get_function_name(struct udevice *dev, static const char *apq8016_get_pin_name(struct udevice *dev, unsigned int selector) { - if (selector < 130) { + if (selector < 122) { snprintf(pin_name, MAX_PIN_NAME_LEN, "GPIO_%u", selector); return pin_name; } else { - return msm_pinctrl_pins[selector - 130]; + return msm_pinctrl_pins[selector - 122]; } } @@ -53,7 +53,7 @@ static unsigned int apq8016_get_function_mux(unsigned int selector) } struct msm_pinctrl_data apq8016_data = { - .pin_count = 140, + .pin_count = 133, .functions_count = ARRAY_SIZE(msm_pinctrl_functions), .get_function_name = apq8016_get_function_name, .get_function_mux = apq8016_get_function_mux, From 7de24b27d2833b1dbc017289b4b262e96b42837a Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 12 Jan 2019 11:25:25 +0100 Subject: [PATCH 03/26] disk: efi: GUIDs should be const Make system_guid const. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index d6bb53e6b5..239455b816 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -66,7 +66,7 @@ static char *print_efiname(gpt_entry *pte) return name; } -static efi_guid_t system_guid = PARTITION_SYSTEM_GUID; +static const efi_guid_t system_guid = PARTITION_SYSTEM_GUID; static inline int is_bootable(gpt_entry *p) { From 3aeb771cbcbe105710859663b0ebf6cccc683e2e Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:19 +1300 Subject: [PATCH 04/26] Kconfig: fix spelling Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index aff7b2e00a..a078f7b1b6 100644 --- a/Kconfig +++ b/Kconfig @@ -213,7 +213,7 @@ config PHYS_64BIT help Say Y here to support 64bit physical memory address. This can be used not only for 64bit SoCs, but also for - large physical address extention on 32bit SoCs. + large physical address extension on 32bit SoCs. config BUILD_ROM bool "Build U-Boot as BIOS replacement" From 2dcfa05852cd8d645e42dc8e3992a820f4fe9379 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:20 +1300 Subject: [PATCH 05/26] common: spl: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- common/spl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 37ecbc6b1c..d175bb6cff 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -608,7 +608,7 @@ config SPL_PAYLOAD default "tpl/u-boot-with-tpl.bin" if TPL default "u-boot.bin" help - Payload for SPL boot. For backward compability, default to + Payload for SPL boot. For backward compatibility, default to u-boot.bin, i.e. RAW image without any header. In case of TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to use u-boot.img. From d7cf868f88a3fa88080f87c966381726a69332ea Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:21 +1300 Subject: [PATCH 06/26] arm: Kconfig: spelling fixes Signed-off-by: Chris Packham --- arch/arm/mach-bcm283x/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 821caedbf7..3eb5a9a897 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -41,7 +41,7 @@ config TARGET_RPI support BCM2836/BCM2837-based Raspberry Pis such as the RPi 2 and RPi 3 due to different peripheral address maps. - This option creates a build targetting the ARM1176 ISA. + This option creates a build targeting the ARM1176 ISA. select BCM2835 config TARGET_RPI_0_W @@ -57,7 +57,7 @@ config TARGET_RPI_0_W This is required for U-Boot to operate correctly, even if you only care about the HDMI/usbkbd console. - This option creates a build targetting the ARMv7/AArch32 ISA. + This option creates a build targeting the ARMv7/AArch32 ISA. select BCM2835 config TARGET_RPI_2 @@ -80,7 +80,7 @@ config TARGET_RPI_2 arm_loader: emmc clock depends on core clock See: https://github.com/raspberrypi/firmware/issues/572". - This option creates a build targetting the ARMv7/AArch32 ISA. + This option creates a build targeting the ARMv7/AArch32 ISA. select BCM2836 config TARGET_RPI_3_32B @@ -96,7 +96,7 @@ config TARGET_RPI_3_32B required for U-Boot to operate correctly, even if you only care about the HDMI/usbkbd console. - This option creates a build targetting the ARMv7/AArch32 ISA. + This option creates a build targeting the ARMv7/AArch32 ISA. select BCM2837_32B config TARGET_RPI_3 @@ -124,7 +124,7 @@ config TARGET_RPI_3 duplicated here. The VC FW enhancement is tracked in https://github.com/raspberrypi/firmware/issues/579. - This option creates a build targetting the ARMv8/AArch64 ISA. + This option creates a build targeting the ARMv8/AArch64 ISA. select BCM2837_64B endchoice From 9259c92386de823f51cb8528a6808d8a2c827a5c Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:22 +1300 Subject: [PATCH 07/26] x86: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- arch/x86/cpu/qemu/Kconfig | 2 +- arch/x86/cpu/quark/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index fdf558d660..f8f2f64730 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -28,7 +28,7 @@ config ACPI_PM1_BASE hex default 0xe400 help - ACPI Power Managment 1 (PM1) i/o-mapped base address. + ACPI Power Management 1 (PM1) i/o-mapped base address. This device is defined in ACPI specification, with 16 bytes in size. endif diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig index 3a18cb0dfc..430cce184d 100644 --- a/arch/x86/cpu/quark/Kconfig +++ b/arch/x86/cpu/quark/Kconfig @@ -84,7 +84,7 @@ config ACPI_PM1_BASE hex default 0x1000 help - ACPI Power Managment 1 (PM1) i/o-mapped base address. + ACPI Power Management 1 (PM1) i/o-mapped base address. This device is defined in ACPI specification, with 16 bytes in size. config ACPI_PBLK_BASE From d7a4af45c51c63071e11b4f7dc33f0bd38247c19 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:23 +1300 Subject: [PATCH 08/26] work_92105: Kconfig: spelling fixes Signed-off-by: Chris Packham --- board/work-microwave/work_92105/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/work-microwave/work_92105/Kconfig b/board/work-microwave/work_92105/Kconfig index 32632f5ab5..380e2dfc24 100644 --- a/board/work-microwave/work_92105/Kconfig +++ b/board/work-microwave/work_92105/Kconfig @@ -10,7 +10,7 @@ config SYS_CONFIG_NAME default "work_92105" config CMD_HD44760 - bool "Enable 'hd44780' LCD-control comand" + bool "Enable 'hd44780' LCD-control command" help This controls the LCD driver. From 83e7a4d597d1a65c1bc93d8afcd412556fb918af Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:24 +1300 Subject: [PATCH 09/26] drivers: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- drivers/core/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 046b87a333..ddf2fb3fb8 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -232,7 +232,7 @@ config OF_ISA_BUS Is this option is enabled then support for the ISA bus will be included for addresses read from DT. This is something that should be known to be required or not based upon the board - being targetted, and whether or not it makes use of an ISA bus. + being targeted, and whether or not it makes use of an ISA bus. The bus is matched based upon its node name equalling "isa". The busses #address-cells should equal 2, with the first cell being From 7475145449e7520b4217804dfa1d4f2d519a23c5 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:25 +1300 Subject: [PATCH 10/26] i2c: Kconfig: spelling fixes Signed-off-by: Chris Packham --- drivers/i2c/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 7579eb8755..d83afe4dc6 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -157,9 +157,9 @@ config SYS_I2C_MESON config SYS_I2C_MXC bool "NXP MXC I2C driver" help - Add support for the NXP I2C driver. This supports upto for bus - channels and operating on standard mode upto 100 kbits/s and fast - mode upto 400 kbits/s. + Add support for the NXP I2C driver. This supports up to four bus + channels and operating on standard mode up to 100 kbits/s and fast + mode up to 400 kbits/s. if SYS_I2C_MXC config SYS_I2C_MXC_I2C1 @@ -363,7 +363,7 @@ config SYS_I2C_ROCKCHIP help Add support for the Rockchip I2C driver. This is used with various Rockchip parts such as RK3126, RK3128, RK3036 and RK3288. All chips - have several I2C ports and all are provided, controled by the + have several I2C ports and all are provided, controlled by the device tree. config SYS_I2C_SANDBOX From cb4d1bbe51ceddeff1a4e1479783311888e2c0cc Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:26 +1300 Subject: [PATCH 11/26] pinctrl: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- drivers/pinctrl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 30a6aa6ee8..fb441b3bf1 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -146,7 +146,7 @@ config PINCTRL_PIC32 Supports individual pin selection and configuration for each remappable peripheral available on Microchip PIC32 SoCs. This driver is controlled by a device tree node which - contains both GPIO defintion and pin control functions. + contains both GPIO definition and pin control functions. config PINCTRL_QCA953X bool "QCA/Athores qca953x pin control driver" From 8e34c1d34ac07a50bed1a88ab066b74bc2434816 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:27 +1300 Subject: [PATCH 12/26] video: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Anatolij Gustschin Reviewed-by: Philipp Tomsich --- drivers/video/rockchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig index b1d7c62fca..10182d0b66 100644 --- a/drivers/video/rockchip/Kconfig +++ b/drivers/video/rockchip/Kconfig @@ -65,6 +65,6 @@ config DISPLAY_ROCKCHIP_MIPI help This enables Mobile Industry Processor Interface(MIPI) display support. The mipi controller and dphy on rk3288& rk3399 support - 16,18, 24 bits per pixel with upto 2k resolution ratio. + 16,18, 24 bits per pixel with up to 2k resolution ratio. endif From 6e7051144f60018df12fda9f4dcb7eee8d6f62ac Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Sun, 13 Jan 2019 22:13:28 +1300 Subject: [PATCH 13/26] lib: Kconfig: spelling fixes Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- lib/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig b/lib/Kconfig index 0333ab172f..366d164cd7 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -147,7 +147,7 @@ config SPL_TINY_MEMSET The faster memset() is the arch-specific one (if available) enabled by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get better performance by writing a word at a time. But in very - size-constrained envrionments even this may be too big. Enable this + size-constrained environments even this may be too big. Enable this option to reduce code size slightly at the cost of some speed. config TPL_TINY_MEMSET @@ -156,7 +156,7 @@ config TPL_TINY_MEMSET The faster memset() is the arch-specific one (if available) enabled by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get better performance by writing a word at a time. But in very - size-constrained envrionments even this may be too big. Enable this + size-constrained environments even this may be too big. Enable this option to reduce code size slightly at the cost of some speed. config RBTREE From 5d94158aa9af94542a2bb35f6aaa8a2d786fc6c2 Mon Sep 17 00:00:00 2001 From: Patrick Wildt Date: Tue, 15 Jan 2019 16:34:19 +0100 Subject: [PATCH 14/26] mkimage: fixup CONFIG_FIT_EXTERNAL_OFFSET The last parameter is expected to be the imagefile. Since -E is a flag having the output name before -p will make mkimage ignore the external offset option. Signed-off-by: Patrick Wildt --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3be9fc5c34..cf7b2b10bc 100644 --- a/Makefile +++ b/Makefile @@ -893,7 +893,7 @@ cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT)) quiet_cmd_mkfitimage = MKIMAGE $@ -cmd_mkfitimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -f $(U_BOOT_ITS) -E $@ -p $(CONFIG_FIT_EXTERNAL_OFFSET)\ +cmd_mkfitimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -f $(U_BOOT_ITS) -E -p $(CONFIG_FIT_EXTERNAL_OFFSET) $@\ >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT)) quiet_cmd_cat = CAT $@ From f3af98eca5e2d02e7a428b40ff91b0e608d482e2 Mon Sep 17 00:00:00 2001 From: Frank Wunderlich Date: Tue, 15 Jan 2019 18:49:06 +0100 Subject: [PATCH 15/26] adding saveenv-command for bananapi r2 bananapi r2 can be booted from sd-card and emmc saving the environment have to choose the storage from which the device has booted also the offset is set to 1MB to make sure env is written to block "user data area" between uboot and first partition https://www.fw-web.de/dokuwiki/lib/exe/fetch.php?cache=&media=bpi-r2:boot-structure.png Signed-off-by: Frank Wunderlich --- board/mediatek/mt7623/mt7623_rfb.c | 19 +++++++++++++++++++ configs/mt7623n_bpir2_defconfig | 1 + include/configs/mt7623.h | 3 +++ 3 files changed, 23 insertions(+) diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c index 08468b50ea..4ec2764976 100644 --- a/board/mediatek/mt7623/mt7623_rfb.c +++ b/board/mediatek/mt7623/mt7623_rfb.c @@ -14,3 +14,22 @@ int board_init(void) return 0; } + +int mmc_get_boot_dev(void) +{ + int g_mmc_devid = -1; + char *uflag = (char *)0x81DFFFF0; + if (strncmp(uflag,"eMMC",4)==0) { + g_mmc_devid = 0; + printf("Boot From Emmc(id:%d)\n\n", g_mmc_devid); + } else { + g_mmc_devid = 1; + printf("Boot From SD(id:%d)\n\n", g_mmc_devid); + } + return g_mmc_devid; +} + +int mmc_get_env_dev(void) +{ + return mmc_get_boot_dev(); +} diff --git a/configs/mt7623n_bpir2_defconfig b/configs/mt7623n_bpir2_defconfig index 8cb4907326..70fb5a15a2 100644 --- a/configs/mt7623n_bpir2_defconfig +++ b/configs/mt7623n_bpir2_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_SEPARATE=y CONFIG_DEFAULT_DEVICE_TREE="mt7623n-bananapi-bpi-r2" CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_ENV_IS_IN_MMC=y CONFIG_REGMAP=y CONFIG_SYSCON=y # CONFIG_BLOCK_CACHE is not set diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 5129c83da8..e449364ad4 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -58,4 +58,7 @@ #define CONFIG_IPADDR 192.168.1.1 #define CONFIG_SERVERIP 192.168.1.2 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OFFSET 0x100000 + #endif From 4a1e5f92f71c8775d01bf5e77a84d24619157e17 Mon Sep 17 00:00:00 2001 From: Vignesh R Date: Wed, 16 Jan 2019 12:16:11 +0530 Subject: [PATCH 16/26] configs: am335x_evm: Enable DM_SPI and DM_SPI_FLASH Enable DM_SPI and DM_SPI_FLASH for actively used defconfigs for am335x_evm. Signed-off-by: Vignesh R --- configs/am335x_evm_defconfig | 2 ++ configs/am335x_hs_evm_defconfig | 2 ++ configs/am335x_hs_evm_uart_defconfig | 2 ++ 3 files changed, 6 insertions(+) diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 0931c1e97f..21c5bdb83e 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -37,6 +37,7 @@ CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y @@ -44,6 +45,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 1a7c5cfb17..b158fd1a27 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -43,6 +43,7 @@ CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y @@ -50,6 +51,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index 147da80f0d..e5f54a0e2b 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y @@ -52,6 +53,7 @@ CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y From 311e658ef395bec2380c4592c8b995458b016181 Mon Sep 17 00:00:00 2001 From: Vignesh R Date: Wed, 16 Jan 2019 14:38:04 +0530 Subject: [PATCH 17/26] configs: Remove unused am335x_evm defconfigs These defconfigs don't seem be actively used any more, and have not been moved to adapt DM or DT. Therefore delete them. Signed-off-by: Vignesh R Reviewed-by: Tom Rini --- board/ti/am335x/MAINTAINERS | 3 -- configs/am335x_evm_nor_defconfig | 52 ---------------------------- configs/am335x_evm_norboot_defconfig | 49 -------------------------- configs/am335x_evm_spiboot_defconfig | 47 ------------------------- 4 files changed, 151 deletions(-) delete mode 100644 configs/am335x_evm_nor_defconfig delete mode 100644 configs/am335x_evm_norboot_defconfig delete mode 100644 configs/am335x_evm_spiboot_defconfig diff --git a/board/ti/am335x/MAINTAINERS b/board/ti/am335x/MAINTAINERS index c99e06dc10..565f7055cd 100644 --- a/board/ti/am335x/MAINTAINERS +++ b/board/ti/am335x/MAINTAINERS @@ -6,7 +6,4 @@ F: include/configs/am335x_evm.h F: configs/am335x_boneblack_defconfig F: configs/am335x_boneblack_vboot_defconfig F: configs/am335x_evm_defconfig -F: configs/am335x_evm_nor_defconfig -F: configs/am335x_evm_norboot_defconfig -F: configs/am335x_evm_spiboot_defconfig F: configs/am335x_evm_usbspl_defconfig diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig deleted file mode 100644 index e08234e9f8..0000000000 --- a/configs/am335x_evm_nor_defconfig +++ /dev/null @@ -1,52 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_AM33XX=y -CONFIG_NOR=y -CONFIG_SPL=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_ARCH_MISC_INIT=y -CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_OS_BOOT=y -CONFIG_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x00080000 -CONFIG_CMD_NAND=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_DFU_MMC=y -CONFIG_DFU_NAND=y -CONFIG_DFU_RAM=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_MMC_OMAP_HS=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_NAND=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_MII=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0451 -CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 -CONFIG_USB_ETHER=y -CONFIG_LZO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig deleted file mode 100644 index 040384f3c7..0000000000 --- a/configs/am335x_evm_norboot_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -CONFIG_ARM=y -# CONFIG_SYS_THUMB_BUILD is not set -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SYS_TEXT_BASE=0x08000000 -CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_AM33XX=y -CONFIG_NOR=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_NOR_BOOT=y -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_ARCH_MISC_INIT=y -CONFIG_BOARD_EARLY_INIT_F=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.0:512k(u-boot),128k(u-boot-env1),128k(u-boot-env2),4m(kernel),-(rootfs)" -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_MMC_OMAP_HS=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_DEVICE=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_MII=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0451 -CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 -CONFIG_USB_ETHER=y -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_LZO=y -CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig deleted file mode 100644 index 1f430ad416..0000000000 --- a/configs/am335x_evm_spiboot_defconfig +++ /dev/null @@ -1,47 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_AM33XX=y -CONFIG_SPL=y -CONFIG_SPL_SPI_FLASH_SUPPORT=y -CONFIG_SPL_SPI_SUPPORT=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="SPI_BOOT" -CONFIG_SPI_BOOT=y -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_ARCH_MISC_INIT=y -CONFIG_SPL_MUSB_NEW_SUPPORT=y -# CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_SPI_LOAD=y -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=m25p80-flash.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=m25p80-flash.0:128k(SPL),512k(u-boot),128k(u-boot-env1),128k(u-boot-env2),3464k(kernel),-(rootfs)" -CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_MMC_OMAP_HS=y -CONFIG_MTD_DEVICE=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_MII=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0451 -CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 -CONFIG_USB_ETHER=y -CONFIG_LZO=y -CONFIG_OF_LIBFDT=y From cec96b83a0c66d7a736ac7eabb8efae131b89156 Mon Sep 17 00:00:00 2001 From: Vignesh R Date: Wed, 16 Jan 2019 14:54:36 +0530 Subject: [PATCH 18/26] configs: Remove am43xx_evm_ethboot_defconfig am43xx_evm_ethboot_defconfig is not being actively used and has not been moved to DM or DT. Also, ethboot cannot be tested on AM43xx EVM as such due EVM limitations. Therefore delete it. Signed-off-by: Vignesh R Reviewed-by: Tom Rini --- board/ti/am43xx/MAINTAINERS | 1 - configs/am43xx_evm_ethboot_defconfig | 64 ---------------------------- 2 files changed, 65 deletions(-) delete mode 100644 configs/am43xx_evm_ethboot_defconfig diff --git a/board/ti/am43xx/MAINTAINERS b/board/ti/am43xx/MAINTAINERS index bf098064bd..ab9da22c64 100644 --- a/board/ti/am43xx/MAINTAINERS +++ b/board/ti/am43xx/MAINTAINERS @@ -4,7 +4,6 @@ S: Maintained F: board/ti/am43xx/ F: include/configs/am43xx_evm.h F: configs/am43xx_evm_defconfig -F: configs/am43xx_evm_ethboot_defconfig F: configs/am43xx_evm_qspiboot_defconfig F: configs/am43xx_evm_usbhost_boot_defconfig F: configs/am43xx_evm_rtconly_defconfig diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig deleted file mode 100644 index c1b32be190..0000000000 --- a/configs/am43xx_evm_ethboot_defconfig +++ /dev/null @@ -1,64 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_AM43XX=y -CONFIG_SPL=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" -# CONFIG_USE_BOOTCOMMAND is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_MISC_INIT_R is not set -CONFIG_VERSION_VARIABLE=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_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x00100000 -CONFIG_CMD_SPL_WRITE_SIZE=0x40000 -CONFIG_CMD_ASKENV=y -CONFIG_CMD_EEPROM=y -CONFIG_CMD_DFU=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:256k(NAND.SPL),256k(NAND.SPL.backup1),256k(NAND.SPL.backup2),256k(NAND.SPL.backup3),512k(NAND.u-boot-spl-os),1m(NAND.u-boot),256k(NAND.u-boot-env),256k(NAND.u-boot-env.backup1),7m(NAND.kernel),-(NAND.file-system)" -CONFIG_ENV_IS_IN_FAT=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_DFU_SF=y -CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_MII=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_SYS_NS16550=y -CONFIG_SPI=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_OMAP_USB_PHY=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0403 -CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00 -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_OF_LIBFDT=y From aa13261215e3d36cd8e512d951ab9b0b5f3802e3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Jan 2019 07:19:26 -0500 Subject: [PATCH 19/26] travis: Break up the NXP Layerscape jobs more The single job for all Layerscape 10xx platforms is close to, and sometimes exceeds the time limit for a single job configuration. Break this down into jobs for LS101x, LS104x and LS108x instead. While in here, in the name portion of these jobs, refer to them as NXP for ARM and not Freescale as they've been NXP for quite some time. Signed-off-by: Tom Rini --- .travis.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc4d5a1d5c..bb7f3c078b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,7 +157,7 @@ matrix: - name: "buildman arm11 arm7 arm920t arm946es" env: - BUILDMAN="arm11 arm7 arm920t arm946es" - - name: "buildman arm926ejs (non-freescale,siemens,atmel,kirkwood,spear)" + - name: "buildman arm926ejs (non-NXP,siemens,atmel,kirkwood,spear)" env: - JOB="arm926ejs" BUILDMAN="arm926ejs -x freescale,siemens,atmel,kirkwood,spear" @@ -167,19 +167,25 @@ matrix: - name: "buildman boundary engicam toradex" env: - BUILDMAN="boundary engicam toradex" - - name: "buildman Freescale ARM32" + - name: "buildman NXP ARM32" env: - BUILDMAN="freescale -x powerpc,m68k,aarch64" - - name: "buildman Freescale AArch64 LS10xx" + - name: "buildman NXP AArch64 LS101x" env: - - BUILDMAN="freescale&aarch64&&ls1" - - name: "buildman Freescale AArch64 LS20xx" + - BUILDMAN="freescale&aarch64&ls101" + - name: "buildman NXP AArch64 LS104x" env: - - BUILDMAN="freescale&aarch64&&ls2" - - name: "buildman i.MX6 (non-Freescale)" + - BUILDMAN="freescale&aarch64&ls104" + - name: "buildman NXP AArch64 LS108x" + env: + - BUILDMAN="freescale&aarch64&ls108" + - name: "buildman NXP AArch64 LS20xx" + env: + - BUILDMAN="freescale&aarch64&&ls20" + - name: "buildman i.MX6 (non-NXP)" env: - BUILDMAN="mx6 -x freescale,toradex,boundary,engicam" - - name: "buildman i.MX (non-Freescale,i.MX6,toradex)" + - name: "buildman i.MX (non-NXP,i.MX6,toradex)" env: - BUILDMAN="mx -x freescale,mx6,toradex" - name: "buildman k2" From 984a1feb7137f284cdcfd7adbe674cdc1ddd495f Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 16 Jan 2019 15:18:43 +0100 Subject: [PATCH 20/26] travis: Setup QEMU_VERSION as variable This change enables setting up specific Qemu version or sha1 for new targets which are added after (current) v3.0.0 version. This changes is preparation step for adding new Xilinx Versal Virt platform which was merge after v3.0.0. Signed-off-by: Michal Simek Reviewed-by: Bin Meng Reviewed-by: Tom Rini --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb7f3c078b..70af7a4bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,6 +63,7 @@ env: - BUILD_DIR=build - HOSTCC="cc" - HOSTCXX="c++" + - QEMU_VERSION="v3.0.0" before_script: # install toolchains based on TOOLCHAIN} variable @@ -97,7 +98,7 @@ before_script: git clone git://git.qemu.org/qemu.git /tmp/qemu; pushd /tmp/qemu; git submodule update --init dtc && - git checkout v3.0.0 && + git checkout ${QEMU_VERSION} && ./configure --prefix=/tmp/qemu-install --target-list=${QEMU_TARGET} && make -j4 all install; popd; From facdc5fb8346967fac04e64727eeb29c62968635 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 16 Jan 2019 15:18:44 +0100 Subject: [PATCH 21/26] travis: Switch QEMU to 3.1.0 version Vexpress ca15_tc2 is failing with 3.1.0 because of QEMU issue. When this patch is applied https://patchwork.kernel.org/patch/10754401/ Vexpress can be also turn to newer QEMU version. Signed-off-by: Michal Simek Reviewed-by: Tom Rini --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70af7a4bba..8dfe4cfb15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ env: - BUILD_DIR=build - HOSTCC="cc" - HOSTCXX="c++" - - QEMU_VERSION="v3.0.0" + - QEMU_VERSION="v3.1.0" before_script: # install toolchains based on TOOLCHAIN} variable @@ -369,6 +369,7 @@ matrix: - TEST_PY_BD="vexpress_ca15_tc2" TEST_PY_ID="--id qemu" QEMU_TARGET="arm-softmmu" + QEMU_VERSION="v3.0.0" BUILDMAN="^vexpress_ca15_tc2$" - name: "test/py vexpress_ca9x4" env: From a645831ca0962532660e4db3155a8be85e5ca312 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 17 Jan 2019 10:18:47 +0100 Subject: [PATCH 22/26] cmd: mtd: fix compilation warning for help when SYS_LONGHELP=n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmd/mtd.c:447:13: warning: ‘mtd_help_text’ defined but not used [-Wunused-variable] static char mtd_help_text[] = ^~~~~~~~~~~~~ When SYS_LONGHELP is not defined. After looking at how other commands work, we should surround the whole help text (even its declaration) with an #ifdef CONFIG_SYS_LONGHELP, since it's compiled out when calling _CMD_HELP[1] on the help text variable argument to U_BOOT_CMD. [1] https://elixir.bootlin.com/u-boot/latest/source/include/command.h#L181 Signed-off-by: Quentin Schulz Reviewed-by: Miquel Raynal --- cmd/mtd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/mtd.c b/cmd/mtd.c index cda702d18b..1b6b8dda2b 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -519,8 +519,8 @@ static int mtd_name_complete(int argc, char * const argv[], char last_char, } #endif /* CONFIG_AUTO_COMPLETE */ -static char mtd_help_text[] = #ifdef CONFIG_SYS_LONGHELP +static char mtd_help_text[] = "- generic operations on memory technology devices\n\n" "mtd list\n" "mtd read[.raw][.oob] [ []]\n" @@ -541,9 +541,8 @@ static char mtd_help_text[] = "\t\t* must be a multiple of a block for erase\n" "\t\t* must be a multiple of a page otherwise (special case: default is a page with dump)\n" "\n" - "The .dontskipff option forces writing empty pages, don't use it if unsure.\n" + "The .dontskipff option forces writing empty pages, don't use it if unsure.\n"; #endif - ""; U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils", mtd_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 1, do_mtd_list), From 8f0d44cb3edc75963fa33e9fcda552325b1ac1cc Mon Sep 17 00:00:00 2001 From: Felix Brack Date: Thu, 17 Jan 2019 10:40:42 +0100 Subject: [PATCH 23/26] arm: am335x-pdu001: Remove SPI support On this board SPI is only used to configure the SoC driving the LC TFT display which is not used in U-Boot. Hence remove SPI support. Signed-off-by: Felix Brack --- configs/am335x_pdu001_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index e93c411766..2a8d318e57 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -50,6 +50,5 @@ CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_TPS65910=y CONFIG_CONS_INDEX=4 -CONFIG_SPI=y # CONFIG_USE_TINY_PRINTF is not set # CONFIG_EFI_LOADER is not set From 8fa7f65dd02c176ee6021eaf40114560b8954ba2 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Thu, 17 Jan 2019 15:44:06 +0530 Subject: [PATCH 24/26] configs: Remove am335x_boneblack_defconfig The am335x_evm_defconfig supports all am335x_boneblack variants. Remove the redundant am335x_boneblack_defconfig. Signed-off-by: Faiz Abbas Reviewed-by: Tom Rini --- configs/am335x_boneblack_defconfig | 50 ------------------------------ 1 file changed, 50 deletions(-) delete mode 100644 configs/am335x_boneblack_defconfig diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig deleted file mode 100644 index 439d0cba05..0000000000 --- a/configs/am335x_boneblack_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_TI_COMMON_CMD_OPTIONS=y -CONFIG_AM33XX=y -CONFIG_SPL=y -CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" -CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -CONFIG_ARCH_MISC_INIT=y -CONFIG_SPL_MUSB_NEW_SUPPORT=y -# CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_OS_BOOT=y -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -CONFIG_AUTOBOOT_DELAY_STR="d" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_CMD_SPL=y -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_ENV_IS_IN_MMC=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_DFU_TFTP=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y -CONFIG_MMC_OMAP_HS=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_MII=y -CONFIG_DRIVER_TI_CPSW=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" -CONFIG_USB_GADGET_VENDOR_NUM=0x0451 -CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 -CONFIG_USB_ETHER=y -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_LZO=y -CONFIG_OF_LIBFDT=y From 2c3ec20fcc326fe6ab22d7c6763d557622aebfaf Mon Sep 17 00:00:00 2001 From: Felix Brack Date: Thu, 17 Jan 2019 11:51:09 +0100 Subject: [PATCH 25/26] arm: dts: am335x-pdu001: Sync with Linux 5.0-rc2 This patch synchronizes the PDU001 board DTS file with the one used by Linux 5.0-rc2. Signed-off-by: Felix Brack --- arch/arm/dts/am335x-pdu001.dts | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/am335x-pdu001.dts b/arch/arm/dts/am335x-pdu001.dts index 3a5e952663..ae43d61f4e 100644 --- a/arch/arm/dts/am335x-pdu001.dts +++ b/arch/arm/dts/am335x-pdu001.dts @@ -1,4 +1,3 @@ -// SPDX-License-Identifier: GPL-2.0+ /* * pdu001.dts * @@ -7,6 +6,8 @@ * Copyright (C) 2018 EETS GmbH - http://www.eets.ch/ * * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; @@ -17,7 +18,7 @@ / { model = "EETS,PDU001"; - compatible = "eets,pdu001", "ti,am33xx"; + compatible = "ti,am33xx"; chosen { stdout-path = &uart3; @@ -303,12 +304,12 @@ clock-frequency = <100000>; board_24aa025e48: board_24aa025e48@50 { - compatible = "microchip,24aa025e48"; + compatible = "atmel,24c02"; reg = <0x50>; }; backplane_24aa025e48: backplane_24aa025e48@53 { - compatible = "microchip,24aa025e48"; + compatible = "atmel,24c02"; reg = <0x53>; }; @@ -372,8 +373,8 @@ ti,pindir-d0-out-d1-in; status = "okay"; - cfaf240320a032t { - compatible = "orise,otm3225a"; + display-controller@0 { + compatible = "orisetech,otm3225a"; reg = <0>; spi-max-frequency = <1000000>; // SPI mode 3 @@ -532,16 +533,24 @@ pinctrl-names = "default"; pinctrl-0 = <&davinci_mdio_default>; status = "okay"; + + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + + ethphy1: ethernet-phy@1 { + reg = <1>; + }; }; &cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; + phy-handle = <ðphy0>; phy-mode = "mii"; dual_emac_res_vlan = <1>; }; &cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; + phy-handle = <ðphy1>; phy-mode = "mii"; dual_emac_res_vlan = <2>; }; From 3d5931e5986a49c44cdab845c6751d845812e8d8 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Fri, 18 Jan 2019 10:45:56 +0100 Subject: [PATCH 26/26] env: sf: fix environment in SPI NOR commit 9a9d66f5eff0 ("env: add spi_flash_read_env function") breaks Environment functionality, as it reads only until 2 \0 are found, but fills the buffer with 0x0 instead 0xff which leads in an incorrect crc sum. Fix: init the read buffer with 0xff instead 0x00 Signed-off-by: Heiko Schocher --- env/sf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/sf.c b/env/sf.c index b3dec82c35..31dd003575 100644 --- a/env/sf.c +++ b/env/sf.c @@ -98,7 +98,7 @@ static int spi_flash_read_env(struct spi_flash *flash, u32 offset, size_t len, u32 addr = 0; u32 page_size = flash->page_size; - memset(buf, 0x0, len); + memset(buf, 0xff, len); for (int i = 0; i < len / page_size; ++i) { int ret = spi_flash_read(flash, offset, page_size, &((char *)buf)[addr]);