From 7de5c01b6a47724a653df3c0041c23f721d879d9 Mon Sep 17 00:00:00 2001
From: Markus Klein <masmiseim@gmx.de>
Date: Wed, 12 Jul 2023 22:44:55 +0200
Subject: [PATCH] make pack generation work again

---
 ARM.CMSIS.pdsc                       | 2 +-
 CMSIS/CoreValidation/Project/avh.yml | 2 --
 README.md                            | 3 +--
 gen_pack.sh                          | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index ecaff074d..6fb0efecc 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -427,7 +427,7 @@
     <api Cclass="Device" Cgroup="IRQ Controller" Capiversion="1.0.0" exclusive="1">
       <description>Device interrupt controller interface</description>
       <files>
-        <file category="header" name="CMSIS/Core_A/Include/irq_ctrl.h"/>
+        <file category="header" name="CMSIS/Core/Include/irq_ctrl.h"/>
       </files>
     </api>
     <api Cclass="Device" Cgroup="OS Tick" Capiversion="1.0.1" exclusive="1">
diff --git a/CMSIS/CoreValidation/Project/avh.yml b/CMSIS/CoreValidation/Project/avh.yml
index 7a7754574..5d1f011c4 100644
--- a/CMSIS/CoreValidation/Project/avh.yml
+++ b/CMSIS/CoreValidation/Project/avh.yml
@@ -7,8 +7,6 @@ backend:
 upload:
   - ARM.CMSIS.pdsc
   - CMSIS/Core/**/*
-  - CMSIS/Core_M/**/*
-  - CMSIS/Core_A/**/*
   - CMSIS/CoreValidation/**/*
   - -:CMSIS/CoreValidation/Project/Core_Validation-*.zip
   - -:CMSIS/CoreValidation/Project/Core_Validation-*.junit
diff --git a/README.md b/README.md
index 24f4cec11..973b114c8 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,7 @@ For a list of all CMSIS components refer to [**Introduction - CMSIS Components**
 
 Directory            | Content
 :------------------- |:---------------------------------------------------------
-CMSIS/Core           | CMSIS-Core(M) related files (for release)
-CMSIS/Core_A         | CMSIS-Core(A) related files (for release)
+CMSIS/Core           | CMSIS-Core(A/R/M) related files (for release)
 CMSIS/CoreValidation | Validation for Core(M) and Core(A) (NOT part of release)  
 CMSIS/Driver         | CMSIS-Driver API headers and template files
 CMSIS/RTOS2          | RTOS v2 related files (for Cortex-M & Armv8-M)
diff --git a/gen_pack.sh b/gen_pack.sh
index 6e491be74..e2ef35316 100755
--- a/gen_pack.sh
+++ b/gen_pack.sh
@@ -30,7 +30,6 @@ DEFAULT_ARGS=(-c "v")
 #
 PACK_DIRS="
   CMSIS/Core
-  CMSIS/Core_A
   CMSIS/Documentation
   CMSIS/Driver
   CMSIS/RTOS2