mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq5018: Add MP05.1 RDP support"

Browse source
This commit is contained in:
Linux Build Service Account 2022-01-20 21:08:13 -08:00 • committed by Gerrit - the friendly Code Review server
commit 04eaf393b1
4 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/include/asm/mach-types.h
View file

@ -1146,6 +1146,8 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_IPQ6018_AP_CP01_C4 0x8030003 #define MACH_TYPE_IPQ6018_AP_CP01_C4 0x8030003
#define MACH_TYPE_IPQ6018_AP_CP01_C5 0x8030004 #define MACH_TYPE_IPQ6018_AP_CP01_C5 0x8030004
#define MACH_TYPE_IPQ5018_AP_MP02_1 0x8040000 #define MACH_TYPE_IPQ5018_AP_MP02_1 0x8040000
#define MACH_TYPE_IPQ5018_AP_MP03_1 0x8040001
#define MACH_TYPE_IPQ5018_AP_MP05_1 0x8040006
#define MACH_TYPE_IPQ5018_DB_MP02_1 0X1040003 #define MACH_TYPE_IPQ5018_DB_MP02_1 0X1040003
#define MACH_TYPE_IPQ807x_AP_HK01_C1 0x8010000 #define MACH_TYPE_IPQ807x_AP_HK01_C1 0x8010000
#define MACH_TYPE_IPQ807x_AP_HK01_C3 0x8010200 #define MACH_TYPE_IPQ807x_AP_HK01_C3 0x8010200

33
board/qca/arm/ipq5018/ipq5018.c
View file

@ -2228,6 +2228,39 @@ int bring_sec_core_up(unsigned int cpuid, unsigned int entry, unsigned int arg)
} }
#endif #endif
unsigned int get_dts_machid(unsigned int machid)
{
switch (machid)
{
case MACH_TYPE_IPQ5018_AP_MP05_1:
return MACH_TYPE_IPQ5018_AP_MP03_1;
default:
return machid;
}
}
void ipq_uboot_fdt_fixup(void)
{
int ret, len;
const char *config = "config@mp05.1";
len = fdt_totalsize(gd->fdt_blob) + strlen(config) + 1;
if (gd->bd->bi_arch_number == MACH_TYPE_IPQ5018_AP_MP05_1)
{
/*
* Open in place with a new length.
*/
ret = fdt_open_into(gd->fdt_blob, (void *)gd->fdt_blob, len);
if (ret)
printf("uboot-fdt-fixup: Cannot expand FDT: %s\n", fdt_strerror(ret));
ret = fdt_setprop((void *)gd->fdt_blob, 0, "config_name",
config, (strlen(config)+1));
if (ret)
printf("uboot-fdt-fixup: unable to set config_name(%d)\n", ret);
}
return;
}
int get_soc_hw_version(void) int get_soc_hw_version(void)
{ {
return readl(TCSR_SOC_HW_VERSION_REG); return readl(TCSR_SOC_HW_VERSION_REG);

1
configs/ipq5018_defconfig
View file

@ -134,6 +134,7 @@ CONFIG_SUPPORT_OF_CONTROL=y
# Device Tree Control # Device Tree Control
# #
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_BOARD_FIXUP=y
CONFIG_OF_SEPARATE=y CONFIG_OF_SEPARATE=y
# CONFIG_OF_EMBED is not set # CONFIG_OF_EMBED is not set
CONFIG_NET=y CONFIG_NET=y

1
configs/ipq5018_tiny_defconfig
View file

@ -128,6 +128,7 @@ CONFIG_SUPPORT_OF_CONTROL=y
# Device Tree Control # Device Tree Control
# #
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_BOARD_FIXUP=y
CONFIG_OF_SEPARATE=y CONFIG_OF_SEPARATE=y
# CONFIG_OF_EMBED is not set # CONFIG_OF_EMBED is not set
CONFIG_NET=y CONFIG_NET=y