From e9aae6d127a5f856086efc05b9b5128210ec7d49 Mon Sep 17 00:00:00 2001 From: Gokul Sriram Palanisamy Date: Wed, 17 Jun 2020 17:46:44 +0530 Subject: [PATCH] ipq807x: Added golden PINE RDP support Signed-off-by: Gokul Sriram Palanisamy Change-Id: If910fe9f6f221b39833156d0226435785173fbc8 --- arch/arm/include/asm/mach-types.h | 3 +++ board/qca/arm/ipq807x/ipq807x.c | 9 +++++++++ tools/pack.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 388b77757a..c92b76b1ab 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -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 diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c index eb776d35af..c5162b68e3 100644 --- a/board/qca/arm/ipq807x/ipq807x.c +++ b/board/qca/arm/ipq807x/ipq807x.c @@ -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; diff --git a/tools/pack.py b/tools/pack.py index 69ea313810..e9a7e00b01 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -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