diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index c289d54be2..64bc55bd6d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -124,6 +124,8 @@ dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-al01-c1.dtb \ ipq9574-al02-c17.dtb \ ipq9574-al02-c18.dtb \ ipq9574-al02-c19.dtb \ + ipq9574-al05.dtb \ + ipq9574-al06.dtb \ ipq9574-db-al01-c1.dtb \ ipq9574-db-al01-c2.dtb \ ipq9574-db-al01-c3.dtb \ diff --git a/arch/arm/dts/ipq9574-al05.dts b/arch/arm/dts/ipq9574-al05.dts new file mode 100644 index 0000000000..2aa1d64171 --- /dev/null +++ b/arch/arm/dts/ipq9574-al05.dts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "ipq9574-al02-c4.dts" +/ { + machid = <0x8050003>; + config_name = "config@al05"; +}; diff --git a/arch/arm/dts/ipq9574-al06.dts b/arch/arm/dts/ipq9574-al06.dts new file mode 100644 index 0000000000..31eb5cd478 --- /dev/null +++ b/arch/arm/dts/ipq9574-al06.dts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "ipq9574-al02-c4.dts" +/ { + machid = <0x8050004>; + config_name = "config@al06"; +}; diff --git a/tools/pack.py b/tools/pack.py index ebae72195b..848bf961ab 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -2262,7 +2262,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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || 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) if ret == 0: return 0 #Issue in packing al+wkk single-image @@ -2288,7 +2288,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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || 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) if ret == 0: return 0 #Issue in packing al+wkk single-image