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 "ipq9574: Add support for RDP467"

Browse source
This commit is contained in:
Linux Build Service Account 2023-07-27 13:41:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit da8430c5fb
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1173,6 +1173,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_IPQ9574_AP_AL02_C16 0x8050F01 #define MACH_TYPE_IPQ9574_AP_AL02_C16 0x8050F01
#define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002 #define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002
#define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102 #define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102
#define MACH_TYPE_IPQ9574_RDP467 0x8051301
#define MACH_TYPE_IPQ5332_EMULATION 0xF060000 #define MACH_TYPE_IPQ5332_EMULATION 0xF060000
#define MACH_TYPE_IPQ5332_AP_MI01_3 0x8060002 #define MACH_TYPE_IPQ5332_AP_MI01_3 0x8060002
#define MACH_TYPE_IPQ5332_AP_MI01_3_C2 0x8060102 #define MACH_TYPE_IPQ5332_AP_MI01_3_C2 0x8060102

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

@ -1393,6 +1393,8 @@ unsigned int get_dts_machid(unsigned int machid)
return MACH_TYPE_IPQ9574_AP_AL02_C13; return MACH_TYPE_IPQ9574_AP_AL02_C13;
case MACH_TYPE_IPQ9574_AP_AL03_C2: case MACH_TYPE_IPQ9574_AP_AL03_C2:
return MACH_TYPE_IPQ9574_AP_AL03_C1; return MACH_TYPE_IPQ9574_AP_AL03_C1;
case MACH_TYPE_IPQ9574_RDP467:
return MACH_TYPE_IPQ9574_AP_AL02_C13;
default: default:
return machid; return machid;
} }
@ -1419,8 +1421,8 @@ void ipq_uboot_fdt_fixup(void)
break; break;
case MACH_TYPE_IPQ9574_AP_AL02_C11: case MACH_TYPE_IPQ9574_AP_AL02_C11:
config_list[config_nos++] = "config@al02-c11"; config_list[config_nos++] = "config@al02-c11";
config_list[config_nos++] = "config@rdp467"; config_list[config_nos++] = "config@rdp455";
config_list[config_nos++] = "config-rdp467"; config_list[config_nos++] = "config-rdp455";
break; break;
case MACH_TYPE_IPQ9574_AP_AL02_C12: case MACH_TYPE_IPQ9574_AP_AL02_C12:
config_list[config_nos++] = "config@al02-c12"; config_list[config_nos++] = "config@al02-c12";
@ -1445,6 +1447,11 @@ void ipq_uboot_fdt_fixup(void)
config_list[config_nos++] = "config@rdp458"; config_list[config_nos++] = "config@rdp458";
config_list[config_nos++] = "config-rdp458"; config_list[config_nos++] = "config-rdp458";
break; break;
case MACH_TYPE_IPQ9574_RDP467:
config_list[config_nos++] = "config@rdp467";
config_list[config_nos++] = "config@rdp467";
config_list[config_nos++] = "config-rdp467";
break;
} }
if (config_nos) if (config_nos)

4
tools/pack.py
View file

@ -2095,7 +2095,7 @@ class Pack(object):
flinfo.chipsize, blocksize, chipsize, root_part) flinfo.chipsize, blocksize, chipsize, root_part)
self.partitions = mibib_qcn9224.get_parts() 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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8051301" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; then\n', fatal=False)
ret = self.__gen_flash_script(script, flinfo, root, True) ret = self.__gen_flash_script(script, flinfo, root, True)
if ret == 0: if ret == 0:
return 0 #Issue in packing al+wkk single-image return 0 #Issue in packing al+wkk single-image
@ -2121,7 +2121,7 @@ class Pack(object):
gpt = GPT(part_fname_qcn9224, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize) gpt = GPT(part_fname_qcn9224, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize)
self.partitions = gpt.get_parts() 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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8051301" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; then\n', fatal=False)
ret = self.__gen_flash_script(script, flinfo, root, True) ret = self.__gen_flash_script(script, flinfo, root, True)
if ret == 0: if ret == 0:
return 0 #Issue in packing al+wkk single-image return 0 #Issue in packing al+wkk single-image