diff --git a/APB_DEVICES/apb_devices_list.txt b/APB_DEVICES/apb_devices_list.txt --- a/APB_DEVICES/apb_devices_list.txt +++ b/APB_DEVICES/apb_devices_list.txt @@ -1,27 +1,29 @@ -vendor VENDOR_LPP 19 - -device ROCKET_TM 1 -device otherCore 2 -device LPP_SIMPLE_DIODE 3 -device LPP_MULTI_DIODE 4 -device LPP_LCD_CTRLR 5 -device LPP_UART 6 -device LPP_CNA 7 -device LPP_APB_ADC 8 -device LPP_CHENILLARD 9 -device LPP_IIR_CEL_FILTER 10 -device LPP_FIFO_PID 11 -device LPP_FFT 12 -device LPP_MATRIX 13 -device LPP_DELAY 14 -device LPP_USB 15 -device LPP_BALISE 16 -device LPP_DMA_TYPE 17 -device LPP_BOOTLOADER_TYPE 18 -device LPP_LFR 19 -device LPP_CLKSETTING 20 -device LPP_LFR_HK_DEVICE 21 -device LPP_LFR_MANAGEMENT 22 -device LPP_DEBUG_DMA A0 -device LPP_DEBUG_LFR A1 -device LPP_DEBUG_LFR_ID A2 +vendor VENDOR_LPP 19 + +device ROCKET_TM 1 +device otherCore 2 +device LPP_SIMPLE_DIODE 3 +device LPP_MULTI_DIODE 4 +device LPP_LCD_CTRLR 5 +device LPP_UART 6 +device LPP_CNA 7 +device LPP_APB_ADC 8 +device LPP_CHENILLARD 9 +device LPP_IIR_CEL_FILTER 10 +device LPP_FIFO_PID 11 +device LPP_FFT 12 +device LPP_MATRIX 13 +device LPP_DELAY 14 +device LPP_USB 15 +device LPP_BALISE 16 +device LPP_DMA_TYPE 17 +device LPP_BOOTLOADER_TYPE 18 +device LPP_LFR 19 +device LPP_CLKSETTING 20 +device LPP_LFR_HK_DEVICE 21 +device LPP_LFR_MANAGEMENT 22 +device LPP_DEBUG_DMA A0 +device LPP_DEBUG_LFR A1 +device LPP_DEBUG_LFR_ID A2 +device APB_ADC_READER F1 + diff --git a/designs/LFR-EQM-WFP_MS/LFR-EQM.vhd b/designs/LFR-EQM-WFP_MS/LFR-EQM.vhd --- a/designs/LFR-EQM-WFP_MS/LFR-EQM.vhd +++ b/designs/LFR-EQM-WFP_MS/LFR-EQM.vhd @@ -201,8 +201,8 @@ BEGIN -- beh -- leon3_soc_1 : leon3_soc GENERIC MAP ( - fabtech => apa3l, - memtech => apa3l, + fabtech => apa3e, + memtech => apa3e, padtech => inferred, clktech => inferred, disas => 0, diff --git a/designs/LFR-EQM-WFP_MS/Makefile b/designs/LFR-EQM-WFP_MS/Makefile --- a/designs/LFR-EQM-WFP_MS/Makefile +++ b/designs/LFR-EQM-WFP_MS/Makefile @@ -23,7 +23,7 @@ SDC=$(VHDLIB)/boards/$(BOARD)/LFR_EQM_pl BITGEN=$(VHDLIB)/boards/$(BOARD)/default.ut CLEAN=soft-clean -TECHLIBS = proasic3l +TECHLIBS = proasic3e LIBSKIP = core1553bbc core1553brm core1553brt gr1553 corePCIF \ tmtc openchip hynix ihp gleichmann micron usbhc diff --git a/lib/lpp/lpp_amba/apb_devices_list.vhd b/lib/lpp/lpp_amba/apb_devices_list.vhd --- a/lib/lpp/lpp_amba/apb_devices_list.vhd +++ b/lib/lpp/lpp_amba/apb_devices_list.vhd @@ -1,48 +1,49 @@ - ---================================================================================= ---THIS FILE IS GENERATED BY A SCRIPT, DON'T TRY TO EDIT --- ---TAKE A LOOK AT VHD_LIB/APB_DEVICES FOLDER TO ADD A DEVICE ID OR VENDOR ID ---================================================================================= - - -LIBRARY ieee; -USE ieee.std_logic_1164.ALL; -LIBRARY grlib; -USE grlib.amba.ALL; -USE std.textio.ALL; - - -PACKAGE apb_devices_list IS - - - CONSTANT VENDOR_LPP : amba_vendor_type := 16#19#; - - CONSTANT ROCKET_TM : amba_device_type := 16#1#; - CONSTANT otherCore : amba_device_type := 16#2#; - CONSTANT LPP_SIMPLE_DIODE : amba_device_type := 16#3#; - CONSTANT LPP_MULTI_DIODE : amba_device_type := 16#4#; - CONSTANT LPP_LCD_CTRLR : amba_device_type := 16#5#; - CONSTANT LPP_UART : amba_device_type := 16#6#; - CONSTANT LPP_CNA : amba_device_type := 16#7#; - CONSTANT LPP_APB_ADC : amba_device_type := 16#8#; - CONSTANT LPP_CHENILLARD : amba_device_type := 16#9#; - CONSTANT LPP_IIR_CEL_FILTER : amba_device_type := 16#10#; - CONSTANT LPP_FIFO_PID : amba_device_type := 16#11#; - CONSTANT LPP_FFT : amba_device_type := 16#12#; - CONSTANT LPP_MATRIX : amba_device_type := 16#13#; - CONSTANT LPP_DELAY : amba_device_type := 16#14#; - CONSTANT LPP_USB : amba_device_type := 16#15#; - CONSTANT LPP_BALISE : amba_device_type := 16#16#; - CONSTANT LPP_DMA_TYPE : amba_device_type := 16#17#; - CONSTANT LPP_BOOTLOADER_TYPE : amba_device_type := 16#18#; - CONSTANT LPP_LFR : amba_device_type := 16#19#; - CONSTANT LPP_CLKSETTING : amba_device_type := 16#20#; - CONSTANT LPP_LFR_HK_DEVICE : amba_device_type := 16#21#; - CONSTANT LPP_LFR_MANAGEMENT : amba_device_type := 16#22#; - CONSTANT LPP_DEBUG_DMA : amba_device_type := 16#A0#; - CONSTANT LPP_DEBUG_LFR : amba_device_type := 16#A1#; - - CONSTANT LPP_DEBUG_LFR_ID : amba_device_type := 16#A2#; - -END; + +--================================================================================= +--THIS FILE IS GENERATED BY A SCRIPT, DON'T TRY TO EDIT +-- +--TAKE A LOOK AT VHD_LIB/APB_DEVICES FOLDER TO ADD A DEVICE ID OR VENDOR ID +--================================================================================= + + +library ieee; +use ieee.std_logic_1164.all; +library grlib; +use grlib.amba.all; +use std.textio.all; + + +package apb_devices_list is + + +constant VENDOR_LPP : amba_vendor_type := 16#19#; + +constant ROCKET_TM : amba_device_type := 16#1#; +constant otherCore : amba_device_type := 16#2#; +constant LPP_SIMPLE_DIODE : amba_device_type := 16#3#; +constant LPP_MULTI_DIODE : amba_device_type := 16#4#; +constant LPP_LCD_CTRLR : amba_device_type := 16#5#; +constant LPP_UART : amba_device_type := 16#6#; +constant LPP_CNA : amba_device_type := 16#7#; +constant LPP_APB_ADC : amba_device_type := 16#8#; +constant LPP_CHENILLARD : amba_device_type := 16#9#; +constant LPP_IIR_CEL_FILTER : amba_device_type := 16#10#; +constant LPP_FIFO_PID : amba_device_type := 16#11#; +constant LPP_FFT : amba_device_type := 16#12#; +constant LPP_MATRIX : amba_device_type := 16#13#; +constant LPP_DELAY : amba_device_type := 16#14#; +constant LPP_USB : amba_device_type := 16#15#; +constant LPP_BALISE : amba_device_type := 16#16#; +constant LPP_DMA_TYPE : amba_device_type := 16#17#; +constant LPP_BOOTLOADER_TYPE : amba_device_type := 16#18#; +constant LPP_LFR : amba_device_type := 16#19#; +constant LPP_CLKSETTING : amba_device_type := 16#20#; +constant LPP_LFR_HK_DEVICE : amba_device_type := 16#21#; +constant LPP_LFR_MANAGEMENT : amba_device_type := 16#22#; +constant LPP_DEBUG_DMA : amba_device_type := 16#A0#; +constant LPP_DEBUG_LFR : amba_device_type := 16#A1#; +constant LPP_DEBUG_LFR_ID : amba_device_type := 16#A2#; +constant APB_ADC_READER : amba_device_type := 16#F1#; + + +end; \ No newline at end of file