Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: Pass device part number and rev as args. #6

Merged
merged 1 commit into from
Mar 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion toolkit/app-write-mram.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ def main():
parser.add_argument(
"-V", "--version", help="Display Version Number", action="store_true"
)
parser.add_argument("--cfg-part", type=str, help="Part Number")
parser.add_argument("--cfg-rev", type=str, help="Part Revision", default="B4")
parser.add_argument("--cfg-jtag", type=str, help="JTAG Interface", default="J-Link")
parser.add_argument("--cfg-mram", type=str, help="MRAM Interface", default="isp")
parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")

args = parser.parse_args()
Expand All @@ -204,7 +208,7 @@ def main():
sys.exit()

# memory defines for Alif/OEM MRAM Addresses and Sizes
load_global_config()
load_global_config(args.cfg_part, args.cfg_rev, args.cfg_jtag, args.cfg_mram)
DEVICE_PART_NUMBER = utils.config.DEVICE_PART_NUMBER
DEVICE_REVISION = utils.config.DEVICE_REVISION
DEVICE_REV_BAUD_RATE = utils.config.DEVICE_REV_BAUD_RATE
Expand Down
6 changes: 5 additions & 1 deletion toolkit/maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,14 +742,18 @@ def main():
parser.add_argument(
"-V", "--version", help="Display Version Number", action="store_true"
)
parser.add_argument("--cfg-part", type=str, help="Part Number")
parser.add_argument("--cfg-rev", type=str, help="Part Revision", default="B4")
parser.add_argument("--cfg-jtag", type=str, help="JTAG Interface", default="J-Link")
parser.add_argument("--cfg-mram", type=str, help="MRAM Interface", default="isp")
parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")
args = parser.parse_args()
if args.version:
print(TOOL_VERSION)
sys.exit()

# memory defines for Alif/OEM MRAM Addresses and Sizes
load_global_config()
load_global_config(args.cfg_part, args.cfg_rev, args.cfg_jtag, args.cfg_mram)
ALIF_BASE_ADDRESS = utils.config.ALIF_BASE_ADDRESS
OEM_BASE_ADDRESS = utils.config.APP_BASE_ADDRESS
OEM_MRAM_SIZE = utils.config.APP_MRAM_SIZE
Expand Down
6 changes: 5 additions & 1 deletion toolkit/updateSystemPackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,18 @@ def main():
parser.add_argument(
"-V", "--version", help="Display Version Number", action="store_true"
)
parser.add_argument("--cfg-part", type=str, help="Part Number")
parser.add_argument("--cfg-rev", type=str, help="Part Revision", default="B4")
parser.add_argument("--cfg-jtag", type=str, help="JTAG Interface", default="J-Link")
parser.add_argument("--cfg-mram", type=str, help="MRAM Interface", default="isp")
parser.add_argument("-v", "--verbose", help="verbosity mode", action="store_true")
args = parser.parse_args()
if args.version:
print(TOOL_VERSION)
sys.exit()

# retrieve initial params based on user selection (toold-config)
load_global_config()
load_global_config(args.cfg_part, args.cfg_rev, args.cfg_jtag, args.cfg_mram)
DEVICE_PART_NUMBER = utils.config.DEVICE_PART_NUMBER
DEVICE_REVISION = utils.config.DEVICE_REVISION
DEVICE_REV_BAUD_RATE = utils.config.DEVICE_REV_BAUD_RATE
Expand Down
11 changes: 10 additions & 1 deletion toolkit/utils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,22 @@ def load_device_config(devDescription, devRevision):
APP_MRAM_SIZE = app_size


def load_global_config():
def load_global_config(part_num=None, part_rev=None, jtag_iface=None, mram_iface=None):
global DEVICE_PART_NUMBER
global DEVICE_REVISION
global MRAM_BURN_INTERFACE
global JTAG_ADAPTER
global HASHES_DB

if part_num is not None:
DEVICE_PART_NUMBER = getPartDescription(part_num)
DEVICE_REVISION = part_rev
JTAG_ADAPTER = jtag_iface
MRAM_BURN_INTERFACE = mram_iface
HASHES_DB = read_global_config(HASHES_DB_FILE)
load_device_config(DEVICE_PART_NUMBER, DEVICE_REVISION)
return

cfg = read_global_config(CONFIG_FILE)

# validate configuration parameters
Expand Down