From e06600dfe7f01d0f3a3842f190f8a89cd1d50458 Mon Sep 17 00:00:00 2001
From: Henrik Wahlqvist <henrik.wahlqvist@volvocars.com>
Date: Thu, 7 Nov 2024 17:09:23 +0100
Subject: [PATCH] Need to generate ZC NVM structs in order to compile

Change-Id: Ia4e4a06d9b5fb0f1b82cb62282fb87e679295e31
---
 NOTICE                      | 25 ++-----------------------
 powertrain_build/nvm_def.py |  6 ------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/NOTICE b/NOTICE
index b793f70..bc3efc8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -20,7 +20,6 @@ GitPython 3.1.43: https://github.com/gitpython-developers/GitPython : BSD 3-clau
 idna 3.10: https://github.com/kjd/idna : BSD 3-clause "New" or "Revised" License
 mccabe 0.7.0: http://pypi.python.org/pypi/mccabe : Expat License
 NumPy 1.24.4: https://numpy.org/ : BSD 3-clause "New" or "Revised" License
-Packaging 24.1: https://github.com/pypa/packaging : (Apache License 2.0 AND BSD 3-clause "New" or "Revised" License)
 pbr 6.1.0: http://openstack.org : Apache License 2.0
 powertrain-build 1.0.0: https://opendev.org/volvocars/powertrain-build : Apache License 2.0
 psf-requests 2.32.3: http://docs.python-requests.org : Apache License 2.0
@@ -2560,26 +2559,6 @@ modification, are permitted provided that the following conditions are met:
 
   $HEADER$
 
-Packaging 24.1 pypi:packaging/24.1: https://github.com/pypa/packaging
-	Copyright (c) Donald Stufft and individual contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-
-	copyright = ABOUT
-
-# -- Options for HTML output --------------------------------------------------
-# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
-
 pbr 6.1.0 pypi:pbr/6.1.0: http://openstack.org
 	Copyright (c) 2011 OpenStack Foundation
 
@@ -13371,7 +13350,7 @@ modification, are permitted provided that the following conditions are met:
 Licenses: 
 
 Apache License 2.0
-(Coverage 7.6.4, Packaging 24.1, pbr 6.1.0, powertrain-build 1.0.0, psf-requests 2.32.3)
+(Coverage 7.6.4, pbr 6.1.0, powertrain-build 1.0.0, psf-requests 2.32.3)
 
 Apache License
 Version 2.0, January 2004
@@ -13558,7 +13537,7 @@ third-party archives.
 ---
 
 BSD 3-clause "New" or "Revised" License
-(gitdb 4.0.11, GitPython 3.1.43, idna 3.10, NumPy 1.24.4, Packaging 24.1, SciPy 1.9.1, smmap 5.0.1, voluptuous 0.15.2)
+(gitdb 4.0.11, GitPython 3.1.43, idna 3.10, NumPy 1.24.4, SciPy 1.9.1, smmap 5.0.1, voluptuous 0.15.2)
 
 Copyright (c) <YEAR>, <OWNER>
 All rights reserved.
diff --git a/powertrain_build/nvm_def.py b/powertrain_build/nvm_def.py
index 919e026..103bc65 100644
--- a/powertrain_build/nvm_def.py
+++ b/powertrain_build/nvm_def.py
@@ -666,13 +666,7 @@ class ZCNVMDef(NVMDef):
             return
 
         self._update_header_and_footer()
-        old_nvm_memory_areas = self._nvm_memory_areas
-        prefix = self._project_config.get_scheduler_prefix()
-        self._nvm_memory_areas = tuple(area.replace(f"{prefix}", "") for area in self.valid_nvm_definitions.keys())
-
         self._generate_nvm_structs_updated()
         self._generate_nvm_config_headers()
         self._generate_nvm_config_source()
         self._append_nvm_rte_function_calls()
-
-        self._nvm_memory_areas = old_nvm_memory_areas