From f9dd35330bf279365104cf3ecd146a5ea08d55a3 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Fri, 31 Jan 2020 15:23:57 +0530 Subject: arm: dts: am437x-gp-evm: Add some nodes to u-boot.dtsi Add scm_conf syscon node and its parents as well as the ethernet phy node to u-boot.dtsi. This enables ethernet boot. Signed-off-by: Faiz Abbas Signed-off-by: Lokesh Vutla --- arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi index d950d32..b55aa8e 100644 --- a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi +++ b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi @@ -42,3 +42,19 @@ &i2c0 { u-boot,dm-spl; }; + +&l4_wkup { + u-boot,dm-spl; +}; + +&scm { + u-boot,dm-spl; +}; + +&scm_conf { + u-boot,dm-spl; +}; + +ðphy0 { + u-boot,dm-spl; +}; -- cgit v1.1 From 10662ff7a01a446a00d4f078e39d4a293fb769f3 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Fri, 31 Jan 2020 15:23:58 +0530 Subject: configs: am43xx_evm: Enable SPL_ETH_SUPPORT Enable CONFIG_SPL_ETH_SUPPORT to fix ethernet boot support. Signed-off-by: Faiz Abbas Signed-off-by: Lokesh Vutla --- configs/am43xx_evm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 2e64879..075c09b 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set CONFIG_VERSION_VARIABLE=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" -- cgit v1.1 From fde109dc75686cf3d49970ea838d76ec840f4347 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Mon, 3 Feb 2020 19:16:53 +0530 Subject: arm: dts: k3-j721e-r5-common-proc-board: Disable power-domains for mcu uart mcu uart will be used during uart boot for loading sysfw.itb. Since sysfw is not yet available during uart load, power-domain cannot be enabled. We need to rely on ROM for doing that, so disable power-domains and clocks for mcu uart. Also fix the mcu uart frequency. Signed-off-by: Lokesh Vutla --- arch/arm/dts/k3-j721e-r5-common-proc-board.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts index 1f14d71..eb577cd 100644 --- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts @@ -157,9 +157,13 @@ }; &mcu_uart0 { + /delete-property/ power-domains; + /delete-property/ clocks; + /delete-property/ clock-names; pinctrl-names = "default"; pinctrl-0 = <&mcu_uart0_pins_default>; status = "okay"; + clock-frequency = <48000000>; }; &main_uart0 { -- cgit v1.1 From 783e0b12f11e1efeedb8efc916e997d80859a394 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Mon, 3 Feb 2020 19:16:54 +0530 Subject: configs: j721e_evm_r5: Enable early cons Early cons will be used in uart boot. Enable the same for j721e_r5 Signed-off-by: Lokesh Vutla --- configs/j721e_evm_r5_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/j721e_evm_r5_defconfig b/configs/j721e_evm_r5_defconfig index 19fbd45..b449d9b 100644 --- a/configs/j721e_evm_r5_defconfig +++ b/configs/j721e_evm_r5_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x70000 CONFIG_SOC_K3_J721E=y +CONFIG_K3_EARLY_CONS=y CONFIG_TARGET_J721E_R5_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 -- cgit v1.1 From b44e6406259ab432b7cb8d5bc4f1216b6c0f6fd6 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Thu, 6 Feb 2020 15:22:38 +0530 Subject: configs: am43xx_evm_usbhost: Add configs for USB Host boot mode Enable configs to fix USB Host boot mode. Signed-off-by: Faiz Abbas Signed-off-by: Lokesh Vutla --- configs/am43xx_evm_usbhost_boot_defconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 4eed4f5..75bf843 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -17,6 +17,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y CONFIG_CMD_SPL=y @@ -44,9 +45,14 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y +CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y @@ -56,6 +62,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_PHY=y +CONFIG_SPL_PHY=y +CONFIG_OMAP_USB2_PHY=y CONFIG_DM_SERIAL=y CONFIG_SPI=y CONFIG_TI_QSPI=y @@ -67,6 +76,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_OMAP=y +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_OMAP_USB_PHY=y CONFIG_USB_GADGET=y -- cgit v1.1 From 766d1781c76714ad8c9854ab59816b8e54a8e0c4 Mon Sep 17 00:00:00 2001 From: Faiz Abbas Date: Thu, 6 Feb 2020 15:22:39 +0530 Subject: configs: am43xx_evm_usbhost_boot: Add device for environment Add mmc device partition 0 as the seat of the environment. Signed-off-by: Faiz Abbas Signed-off-by: Lokesh Vutla --- configs/am43xx_evm_usbhost_boot_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 75bf843..21de522 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -42,6 +42,8 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y -- cgit v1.1 From b9c268c90e32ac5a31fec71527ec365f14ac9c52 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Mon, 10 Feb 2020 10:39:17 +0530 Subject: arm: mach-k3: Fix nomenclature on Silicon Revisions Data manual mentions the new silicon revisions as SR instead of PG. Use the same nomenclature inside U-Boot as well. Signed-off-by: Lokesh Vutla --- arch/arm/mach-k3/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 2f82edb..7af60a7 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -218,7 +218,7 @@ int print_cpuinfo(void) name = "Unknown Silicon"; }; - printf("%s PG ", name); + printf("%s SR ", name); switch (rev) { case REV_PG1_0: name = "1.0"; -- cgit v1.1 From 4d26dc64d28fee87359d1324f4db8986c5c97f82 Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Mon, 10 Feb 2020 11:59:24 +0200 Subject: board: ti: am57xx-idk: Prevent boot for invalid configuation On am571x-idk there can be following configurations based on Jumper J51 and LCD panel detected. 1) J51 removed (6port): 6 port Ethernet. Disable LCD panel. 2) J51 placed (LCD) + Panel detected: 4 port Ethernet with appropriate LCD. 3) J51 placed (LCD) + Panel not detected/not supported. Configuration 3 is considered invalid as we can't use display nor ICSS1 ethernet ports due to hardware muxing. Alert the user to fix the configuration and prevent boot. Alternative was to allow boot and limit to 4 port Ethernet with no display but this involved introduction of another DTB for the kernel and was considered not worth the hassle. Signed-off-by: Roger Quadros Acked-by: Suman Anna Signed-off-by: Lokesh Vutla --- board/ti/am57xx/board.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 7528de3..34ca3ec 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "../common/board_detect.h" #include "mux_data.h" @@ -707,6 +708,18 @@ void am57x_idk_lcd_detect(void) } out: env_set("idk_lcd", idk_lcd); + + /* + * On AM571x_IDK, no Display with J51 set to LCD is considered as an + * invalid configuration and we prevent boot to get user attention. + */ + if (board_is_am571x_idk() && am571x_idk_needs_lcd() && + !strncmp(idk_lcd, "no", 2)) { + printf("%s: Invalid HW configuration: display not detected/supported but J51 is set. Remove J51 to boot without display.\n", + __func__); + hang(); + } + return; } -- cgit v1.1 From e8d0d530404e5d0546c37992cfeb9d3d3187dd94 Mon Sep 17 00:00:00 2001 From: Tero Kristo Date: Tue, 11 Feb 2020 09:25:52 +0530 Subject: ARM: keystone2: enable initrd fixup for LPAE addressing Keystone2 u-boot loads the initrd image into non-LPAE addressed memory but linux kernel is running in LPAE. This causes a conflict as kernel detects that non-memory address is passed and kernel ignores initrd. There is an existing fixup logic to modify the address in the proper configuration, but this is disabled at the moment. Enable the fixup by setting the env variable for this so that initrd can be used properly. Signed-off-by: Tero Kristo Signed-off-by: Lokesh Vutla --- include/configs/ti_armv7_keystone2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ba12428..1b014c1 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -213,6 +213,7 @@ "tftp_root=/\0" \ "nfs_root=/export\0" \ "mem_lpae=1\0" \ + "uinitrd_fixup=1\0" \ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ "name_kern=zImage\0" \ -- cgit v1.1 From a06df8f339a5b79e4a258bb802b1cebb58c0019d Mon Sep 17 00:00:00 2001 From: Andreas Dannenberg Date: Thu, 27 Jun 2019 20:03:21 -0500 Subject: arm: K3: j721e: Fix boot parameter table index memory address The boot parameter table index memory address for J721E was configured to an incorrect value which prevented the use of this definition to determine which boot parameter table is active which is needed to be able to distinguish between primary and backup boot modes. Fix this issue by updating the value to the correct one also in alignment with the J721E Technical Reference Manual (TRM). Signed-off-by: Andreas Dannenberg Signed-off-by: Lokesh Vutla --- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 2e111bb..8f42722 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -50,7 +50,7 @@ config SYS_K3_MCU_SCRATCHPAD_SIZE config SYS_K3_BOOT_PARAM_TABLE_INDEX hex default 0x41c7fbfc if SOC_K3_AM6 - default 0x41cffc00 if SOC_K3_J721E + default 0x41cffbfc if SOC_K3_J721E help Address at which ROM stores the value which determines if SPL is booted up by primary boot media or secondary boot media. -- cgit v1.1 From 96dd223c2933a9190411f52ab0654f50feca3005 Mon Sep 17 00:00:00 2001 From: Andreas Dannenberg Date: Tue, 4 Dec 2018 22:29:47 -0600 Subject: armV7R: K3: am654: Activate early console functionality Activate early console functionality on AM65x devices to allow for early diagnostic messages until the main console is ready to get activated. Signed-off-by: Andreas Dannenberg Signed-off-by: Lokesh Vutla --- arch/arm/mach-k3/am6_init.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c index 8d107b8..63cd7e0 100644 --- a/arch/arm/mach-k3/am6_init.c +++ b/arch/arm/mach-k3/am6_init.c @@ -109,6 +109,16 @@ void board_init_f(ulong dummy) /* Init DM early in-order to invoke system controller */ spl_early_init(); +#ifdef CONFIG_K3_EARLY_CONS + /* + * Allow establishing an early console as required for example when + * doing a UART-based boot. Note that this console may not "survive" + * through a SYSFW PM-init step and will need a re-init in some way + * due to changing module clock frequencies. + */ + early_console_init(); +#endif + #ifdef CONFIG_K3_LOAD_SYSFW /* * Process pinctrl for the serial0 a.k.a. WKUP_UART0 module and continue -- cgit v1.1