diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-07-05 10:29:31 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-07-05 10:29:31 +0300 |
| commit | f8b44974365eaf3e1580005a43929ee2e0129863 (patch) | |
| tree | 8cffa44562bbde3f9e661b2a34f49cbb4120c76d | |
| parent | 52bd39cac42951c4c7c9e30c93c503602565c92d (diff) | |
| parent | e122acacd5c28e22cc3d1044f7885b901b0902e8 (diff) | |
| download | u-boot-f8b44974365eaf3e1580005a43929ee2e0129863.tar.xz | |
Merge branch 'CR_12375_amp_misc_minda' into 'jh7110-master'
CR_12375 board: AMP: Add chip type and board type to share ram
See merge request sdk/u-boot!86
| -rw-r--r-- | arch/riscv/dts/starfive_jh7110-amp.dts | 4 | ||||
| -rw-r--r-- | board/starfive/devkits/starfive_devkits.c | 2 | ||||
| -rw-r--r-- | board/starfive/visionfive2/starfive_visionfive2.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/arch/riscv/dts/starfive_jh7110-amp.dts b/arch/riscv/dts/starfive_jh7110-amp.dts index 2f284e7bce..2e5f3aaf6d 100644 --- a/arch/riscv/dts/starfive_jh7110-amp.dts +++ b/arch/riscv/dts/starfive_jh7110-amp.dts @@ -99,3 +99,7 @@ &gmac1 { status = "disabled"; }; + +&pcie1 { + status = "disabled"; +}; diff --git a/board/starfive/devkits/starfive_devkits.c b/board/starfive/devkits/starfive_devkits.c index df8ad6982f..58b5b227c7 100644 --- a/board/starfive/devkits/starfive_devkits.c +++ b/board/starfive/devkits/starfive_devkits.c @@ -425,6 +425,8 @@ int board_late_init(void) eth_env_get_enetaddr("eth1addr", mac1); memcpy((void *)share_ram_addr, mac0, 6); memcpy((void *)(share_ram_addr + 8), mac1, 6); + *((u8 *)(share_ram_addr + 16)) = 1; /* chip version B */ + *((u8 *)(share_ram_addr + 17)) = 0; /* board type */ } } diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 6b3fe62f94..25f939ba18 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -458,6 +458,8 @@ int board_late_init(void) eth_env_get_enetaddr("eth1addr", mac1); memcpy((void *)share_ram_addr, mac0, 6); memcpy((void *)(share_ram_addr + 8), mac1, 6); + *((u8 *)(share_ram_addr + 16)) = get_chip_type(); + *((u8 *)(share_ram_addr + 17)) = get_board_type(); } } |