GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'ti-v2021.07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ti

Browse source 
- Fix reset for AM64 platforms
- Enable networking PHY driver for AM64
- Fix default R5F cluster setting in J7
This commit is contained in:
Tom Rini 2021-05-27 07:42:49 -04:00
commit aab8b17e94
7 changed files with 22 additions and 2 deletions

4
arch/arm/dts/k3-am642-evm-u-boot.dtsi
View file

@ -60,6 +60,10 @@
&dmsc {
u-boot,dm-spl;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
u-boot,dm-spl;
};
};
&k3_pds {

4
arch/arm/dts/k3-am642-sk-u-boot.dtsi
View file

@ -60,6 +60,10 @@
&dmsc {
u-boot,dm-spl;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
u-boot,dm-spl;
};
};
&k3_pds {

8
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
View file

@ -193,3 +193,11 @@
&mcu_fss0_ospi1_pins_default {
u-boot,dm-spl;
};
&main_r5fss0 {
ti,cluster-mode = <0>;
};
&main_r5fss1 {
ti,cluster-mode = <0>;
};

1
configs/am64x_evm_a53_defconfig
View file

@ -75,6 +75,7 @@ CONFIG_SF_DEFAULT_MODE=0
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHY_TI=y
CONFIG_PHY_TI_DP83867=y
CONFIG_PHY_FIXED=y
CONFIG_DM_ETH=y
CONFIG_TI_AM65_CPSW_NUSS=y

1
drivers/firmware/ti_sci.c
View file

@ -1588,6 +1588,7 @@ static int ti_sci_cmd_core_reboot(const struct ti_sci_handle *handle)
dev_err(info->dev, "Message alloc failed(%d)\n", ret);
return ret;
}
req.domain = 0;
ret = ti_sci_do_xfer(info, xfer);
if (ret) {

2
drivers/firmware/ti_sci.h
View file

@ -137,12 +137,14 @@ struct ti_sci_msg_resp_version {
/**
* struct ti_sci_msg_req_reboot - Reboot the SoC
* @hdr: Generic Header
* @domain: Domain to be reset, 0 for full SoC reboot.
*
* Request type is TI_SCI_MSG_SYS_RESET, responded with a generic
* ACK/NACK message.
*/
struct ti_sci_msg_req_reboot {
struct ti_sci_msg_hdr hdr;
u8 domain;
} __packed;
/**

4
include/environment/ti/dfu.h
View file

@ -13,7 +13,7 @@
"boot part 0 1;" \
"rootfs part 0 2;" \
"MLO fat 0 1;" \
"MLO.raw raw 0x100 0x100;" \
"MLO.raw raw 0x100 0x200;" \
"u-boot.img.raw raw 0x300 0x1000;" \
"u-env.raw raw 0x1300 0x200;" \
"spl-os-args.raw raw 0x1500 0x200;" \
@ -29,7 +29,7 @@
"boot part 1 1;" \
"rootfs part 1 2;" \
"MLO fat 1 1;" \
"MLO.raw raw 0x100 0x100;" \
"MLO.raw raw 0x100 0x200;" \
"u-boot.img.raw raw 0x300 0x1000;" \
"u-env.raw raw 0x1300 0x200;" \
"spl-os-args.raw raw 0x1500 0x200;" \