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-05 08:51:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "arm64: dts: ipq9574: Add AL02-C15 & AL02-C16 RDP support"

Browse source
This commit is contained in:
Linux Build Service Account 2022-07-13 00:01:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit bd605848ab
3 changed files with 15 additions and 2 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

@ -1168,7 +1168,10 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_IPQ9574_AP_AL02_C10 0x8050901
#define MACH_TYPE_IPQ9574_AP_AL02_C11 0x8050A01
#define MACH_TYPE_IPQ9574_AP_AL02_C12 0x8050B01
#define MACH_TYPE_IPQ9574_AP_AL02_C13 0x8050C01
#define MACH_TYPE_IPQ9574_AP_AL02_C14 0x8050D01
#define MACH_TYPE_IPQ9574_AP_AL02_C15 0x8050E01
#define MACH_TYPE_IPQ9574_AP_AL02_C16 0x8050F01
#define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002
#define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102

10
board/qca/arm/ipq9574/ipq9574.c
View file

@ -1386,6 +1386,10 @@ unsigned int get_dts_machid(unsigned int machid)
return MACH_TYPE_IPQ9574_AP_AL02_C4;
case MACH_TYPE_IPQ9574_AP_AL02_C14:
return MACH_TYPE_IPQ9574_AP_AL02_C8;
case MACH_TYPE_IPQ9574_AP_AL02_C15:
return MACH_TYPE_IPQ9574_AP_AL02_C1;
case MACH_TYPE_IPQ9574_AP_AL02_C16:
return MACH_TYPE_IPQ9574_AP_AL02_C13;
case MACH_TYPE_IPQ9574_AP_AL03_C2:
return MACH_TYPE_IPQ9574_AP_AL03_C1;
default:
@ -1421,6 +1425,12 @@ void ipq_uboot_fdt_fixup(void)
case MACH_TYPE_IPQ9574_AP_AL02_C14:
config = "config@al02-c14";
break;
case MACH_TYPE_IPQ9574_AP_AL02_C15:
config = "config@al02-c15";
break;
case MACH_TYPE_IPQ9574_AP_AL02_C16:
config = "config@al02-c16";
break;
case MACH_TYPE_IPQ9574_AP_AL03_C2:
config = "config@al03-c2";
break;

4
tools/pack.py
View file

@ -2076,7 +2076,7 @@ class Pack(object):
flinfo.chipsize, blocksize, chipsize, root_part)
self.partitions = mibib_qcn9224.get_parts()
script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False)
script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False)
ret = self.__gen_flash_script(script, flinfo, root, True)
if ret == 0:
return 0 #Issue in packing al+wkk single-image
@ -2102,7 +2102,7 @@ class Pack(object):
gpt = GPT(part_fname_qcn9224, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize)
self.partitions = gpt.get_parts()
script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False)
script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False)
ret = self.__gen_flash_script(script, flinfo, root, True)
if ret == 0:
return 0 #Issue in packing al+wkk single-image