From 3012cf75fe9c63fc4fba9a89df7fbf3be03082d8 Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Sat, 14 Dec 2019 00:19:20 +0000 Subject: [PATCH 1/2] partner/aller, nereid, tagus: Use updated csr APIs litex commit 8be5824e258b84df240d34636aaa539124b92c65 simplified the handling of csr regions and constants. --- litex_boards/partner/targets/aller.py | 4 ++-- litex_boards/partner/targets/nereid.py | 4 ++-- litex_boards/partner/targets/tagus.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/litex_boards/partner/targets/aller.py b/litex_boards/partner/targets/aller.py index 8646a8b3..724b23d2 100755 --- a/litex_boards/partner/targets/aller.py +++ b/litex_boards/partner/targets/aller.py @@ -179,8 +179,8 @@ class AllerSoC(SoCSDRAM): ] def generate_software_header(self, filename): - csr_header = get_csr_header(self.get_csr_regions(), - self.get_constants(), + csr_header = get_csr_header(self.csr_regions, + self.constants, with_access_functions=False, with_shadow_base=False) tools.write_to_file(filename, csr_header) diff --git a/litex_boards/partner/targets/nereid.py b/litex_boards/partner/targets/nereid.py index 13c8b1ae..0711b41b 100755 --- a/litex_boards/partner/targets/nereid.py +++ b/litex_boards/partner/targets/nereid.py @@ -176,8 +176,8 @@ class NereidSoC(SoCSDRAM): ] def generate_software_header(self, filename): - csr_header = get_csr_header(self.get_csr_regions(), - self.get_constants(), + csr_header = get_csr_header(self.csr_regions, + self.constants, with_access_functions=False, with_shadow_base=False) tools.write_to_file(filename, csr_header) diff --git a/litex_boards/partner/targets/tagus.py b/litex_boards/partner/targets/tagus.py index d34ac0a7..48bb2d0e 100755 --- a/litex_boards/partner/targets/tagus.py +++ b/litex_boards/partner/targets/tagus.py @@ -177,8 +177,8 @@ class TagusSoC(SoCSDRAM): ] def generate_software_header(self, filename): - csr_header = get_csr_header(self.get_csr_regions(), - self.get_constants(), + csr_header = get_csr_header(self.csr_regions, + self.constants, with_access_functions=False, with_shadow_base=False) tools.write_to_file(filename, csr_header) From 4334ba952709519788d48b69a5b45ecae1535147 Mon Sep 17 00:00:00 2001 From: Derek Kozel Date: Sat, 14 Dec 2019 01:04:28 +0000 Subject: [PATCH 2/2] partner/aller, nereid, tagus: Remove deprecated param get_csr_header parameter with_shadow_base removed/deprecated in litex 2a8d8c8f. New default behavior matches the desired behavior in these targets. --- litex_boards/partner/targets/aller.py | 3 +-- litex_boards/partner/targets/nereid.py | 3 +-- litex_boards/partner/targets/tagus.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/litex_boards/partner/targets/aller.py b/litex_boards/partner/targets/aller.py index 724b23d2..0197e922 100755 --- a/litex_boards/partner/targets/aller.py +++ b/litex_boards/partner/targets/aller.py @@ -181,8 +181,7 @@ class AllerSoC(SoCSDRAM): def generate_software_header(self, filename): csr_header = get_csr_header(self.csr_regions, self.constants, - with_access_functions=False, - with_shadow_base=False) + with_access_functions=False) tools.write_to_file(filename, csr_header) diff --git a/litex_boards/partner/targets/nereid.py b/litex_boards/partner/targets/nereid.py index 0711b41b..f67a2c61 100755 --- a/litex_boards/partner/targets/nereid.py +++ b/litex_boards/partner/targets/nereid.py @@ -178,8 +178,7 @@ class NereidSoC(SoCSDRAM): def generate_software_header(self, filename): csr_header = get_csr_header(self.csr_regions, self.constants, - with_access_functions=False, - with_shadow_base=False) + with_access_functions=False) tools.write_to_file(filename, csr_header) diff --git a/litex_boards/partner/targets/tagus.py b/litex_boards/partner/targets/tagus.py index 48bb2d0e..c77aa082 100755 --- a/litex_boards/partner/targets/tagus.py +++ b/litex_boards/partner/targets/tagus.py @@ -179,8 +179,7 @@ class TagusSoC(SoCSDRAM): def generate_software_header(self, filename): csr_header = get_csr_header(self.csr_regions, self.constants, - with_access_functions=False, - with_shadow_base=False) + with_access_functions=False) tools.write_to_file(filename, csr_header)