mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-09 18:58:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.4752

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAl7sKLcACgkQoUgPZYCpAfE7wACgyp4xj0EHZmMZN/Yd+xAINHa5
 pO8AoN20SuABuEbIlXzOGlZO1vG6+K9p
 =OkPy
 -----END PGP SIGNATURE-----

Merge AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.4752 on remote branch

Change-Id: Ib055524dfd652edce8f591257d644d5d4d77ed32
Signed-off-by: Linux Build Service Account <lnxbuild@localhost>
This commit is contained in:
Linux Build Service Account 2020-06-19 01:41:01 -06:00
commit 314d02741b
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1151,6 +1151,9 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_IPQ807x_AP_AC01 0x8010009
#define MACH_TYPE_IPQ807x_AP_AC02 0x801000A
#define MACH_TYPE_IPQ807x_AP_OAK03 0x801000D
#define MACH_TYPE_IPQ807x_AP_HK01_C6 0x8010500
#define MACH_TYPE_IPQ807x_AP_HK12_C1 0x8010013
#define MACH_TYPE_IPQ807x_AP_HK10_C2 0x801010E
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type

9
board/qca/arm/ipq807x/ipq807x.c
View file

@ -1267,10 +1267,13 @@ unsigned int get_dts_machid(unsigned int machid)
switch (machid)
{
case MACH_TYPE_IPQ807x_AP_HK01_C3:
case MACH_TYPE_IPQ807x_AP_HK01_C6:
case MACH_TYPE_IPQ807x_AP_OAK03:
return MACH_TYPE_IPQ807x_AP_HK01_C1;
case MACH_TYPE_IPQ807x_AP_AC02:
return MACH_TYPE_IPQ807x_AP_AC01;
case MACH_TYPE_IPQ807x_AP_HK12_C1:
return MACH_TYPE_IPQ807x_AP_HK10_C2;
default:
return machid;
}
@ -1286,6 +1289,12 @@ void ipq_uboot_fdt_fixup(void)
case MACH_TYPE_IPQ807x_AP_HK01_C3:
config = "config@hk01.c3";
break;
case MACH_TYPE_IPQ807x_AP_HK01_C6:
config = "config@hk01.c6";
break;
case MACH_TYPE_IPQ807x_AP_HK12_C1:
config = "config@hk12";
break;
case MACH_TYPE_IPQ807x_AP_AC02:
config = "config@ac02";
break;

2
tools/pack.py
View file

@ -1445,7 +1445,7 @@ class Pack(object):
flinfo.chipsize, blocksize, chipsize, root_part)
self.partitions = mibib_qcn9000.get_parts()
script.append('if test "$machid" = "801000e" || test "$machid" = "801010e" || test "$machid" = "8010012"; then\n', fatal=False)
script.append('if test "$machid" = "801000e" || test "$machid" = "801010e" || test "$machid" = "8010012" || test "$machid" = "8010013" || test "$machid" = "8010500"; then\n', fatal=False)
ret = self.__gen_flash_script(script, flinfo, root)
if ret == 0:
return 0 #Issue in packing hk+pine single-image