From: michael Date: Fri, 4 May 2007 12:05:57 +0000 (+0000) Subject: replace microblaze 4.0 with new microblaze 6.0 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/raggedstone/commitdiff_plain/4a1b2ca010ec8ab4629a7016801c447bad150245?ds=sidebyside replace microblaze 4.0 with new microblaze 6.0 --- diff --git a/xps/etc/download.cmd b/xps/etc/download.cmd index d87ac67..c052adc 100644 --- a/xps/etc/download.cmd +++ b/xps/etc/download.cmd @@ -1,5 +1,6 @@ setMode -bscan setCable -p auto +setPreference -pref UseHighz:TRUE identify assignfile -p 3 -file implementation/download.bit program -p 3 diff --git a/xps/raggedstone.mhs b/xps/raggedstone.mhs index fe6d836..6e8a2a1 100644 --- a/xps/raggedstone.mhs +++ b/xps/raggedstone.mhs @@ -32,27 +32,6 @@ PORT DBG_FLASH_ADDR = FLASH_ADDR_split, DIR = O, VEC = [0:31] -BEGIN microblaze - PARAMETER INSTANCE = microblaze_0 - PARAMETER HW_VER = 4.00.b - PARAMETER C_USE_FPU = 0 - PARAMETER C_DEBUG_ENABLED = 1 - PARAMETER C_NUMBER_OF_PC_BRK = 2 - PARAMETER C_FSL_DATA_SIZE = 32 - PARAMETER C_NUMBER_OF_RD_ADDR_BRK = 0 - PARAMETER C_NUMBER_OF_WR_ADDR_BRK = 0 - BUS_INTERFACE DLMB = dlmb - BUS_INTERFACE ILMB = ilmb - BUS_INTERFACE DOPB = mb_opb - BUS_INTERFACE IOPB = mb_opb - PORT DBG_CAPTURE = DBG_CAPTURE_s - PORT DBG_CLK = DBG_CLK_s - PORT DBG_REG_EN = DBG_REG_EN_s - PORT DBG_TDI = DBG_TDI_s - PORT DBG_TDO = DBG_TDO_s - PORT DBG_UPDATE = DBG_UPDATE_s -END - BEGIN opb_v20 PARAMETER INSTANCE = mb_opb PARAMETER HW_VER = 1.10.c @@ -69,12 +48,6 @@ BEGIN opb_mdm PARAMETER C_BASEADDR = 0x41400000 PARAMETER C_HIGHADDR = 0x4140ffff BUS_INTERFACE SOPB = mb_opb - PORT DBG_CAPTURE_0 = DBG_CAPTURE_s - PORT DBG_CLK_0 = DBG_CLK_s - PORT DBG_REG_EN_0 = DBG_REG_EN_s - PORT DBG_TDI_0 = DBG_TDI_s - PORT DBG_TDO_0 = DBG_TDO_s - PORT DBG_UPDATE_0 = DBG_UPDATE_s END BEGIN lmb_v10 @@ -93,29 +66,11 @@ BEGIN lmb_v10 PORT LMB_Clk = sys_clk_s END -BEGIN lmb_bram_if_cntlr - PARAMETER INSTANCE = dlmb_cntlr - PARAMETER HW_VER = 1.00.b - PARAMETER C_BASEADDR = 0x00000000 - PARAMETER C_HIGHADDR = 0x00007FFF - BUS_INTERFACE SLMB = dlmb - BUS_INTERFACE BRAM_PORT = dlmb_port -END - -BEGIN lmb_bram_if_cntlr - PARAMETER INSTANCE = ilmb_cntlr - PARAMETER HW_VER = 1.00.b - PARAMETER C_BASEADDR = 0x00000000 - PARAMETER C_HIGHADDR = 0x00007FFF - BUS_INTERFACE SLMB = ilmb - BUS_INTERFACE BRAM_PORT = ilmb_port -END - BEGIN bram_block PARAMETER INSTANCE = lmb_bram PARAMETER HW_VER = 1.00.a - BUS_INTERFACE PORTA = ilmb_port - BUS_INTERFACE PORTB = dlmb_port + BUS_INTERFACE PORTA = dlmb_cntlr_BRAM_PORT + BUS_INTERFACE PORTB = ilmb_cntlr_BRAM_PORT END BEGIN opb_uartlite @@ -223,3 +178,32 @@ BEGIN util_bus_split PORT Out2 = FLASH_ADDR END +BEGIN microblaze + PARAMETER INSTANCE = microblaze_0 + PARAMETER HW_VER = 6.00.b + PARAMETER C_DEBUG_ENABLED = 1 + PARAMETER C_NUMBER_OF_PC_BRK = 2 + BUS_INTERFACE DOPB = mb_opb + BUS_INTERFACE IOPB = mb_opb + BUS_INTERFACE ILMB = ilmb + BUS_INTERFACE DLMB = dlmb +END + +BEGIN lmb_bram_if_cntlr + PARAMETER INSTANCE = dlmb_cntlr + PARAMETER HW_VER = 2.00.a + PARAMETER C_BASEADDR = 0x00000000 + PARAMETER C_HIGHADDR = 0x00007FFF + BUS_INTERFACE SLMB = dlmb + BUS_INTERFACE BRAM_PORT = dlmb_cntlr_BRAM_PORT +END + +BEGIN lmb_bram_if_cntlr + PARAMETER INSTANCE = ilmb_cntlr + PARAMETER HW_VER = 2.00.a + PARAMETER C_BASEADDR = 0x00000000 + PARAMETER C_HIGHADDR = 0x00007FFF + BUS_INTERFACE SLMB = ilmb + BUS_INTERFACE BRAM_PORT = ilmb_cntlr_BRAM_PORT +END + diff --git a/xps/raggedstone.mss b/xps/raggedstone.mss index e68bbbd..d0963a7 100644 --- a/xps/raggedstone.mss +++ b/xps/raggedstone.mss @@ -15,9 +15,7 @@ BEGIN PROCESSOR PARAMETER DRIVER_NAME = cpu PARAMETER DRIVER_VER = 1.01.a PARAMETER HW_INSTANCE = microblaze_0 - PARAMETER COMPILER = mb-gcc - PARAMETER ARCHIVER = mb-ar - PARAMETER XMDSTUB_PERIPHERAL = debug_module + PARAMETER xmdstub_peripheral = debug_module END @@ -33,18 +31,6 @@ BEGIN DRIVER PARAMETER HW_INSTANCE = debug_module END -BEGIN DRIVER - PARAMETER DRIVER_NAME = bram - PARAMETER DRIVER_VER = 1.00.a - PARAMETER HW_INSTANCE = dlmb_cntlr -END - -BEGIN DRIVER - PARAMETER DRIVER_NAME = bram - PARAMETER DRIVER_VER = 1.00.a - PARAMETER HW_INSTANCE = ilmb_cntlr -END - BEGIN DRIVER PARAMETER DRIVER_NAME = uartlite PARAMETER DRIVER_VER = 1.02.a @@ -81,4 +67,16 @@ BEGIN DRIVER PARAMETER HW_INSTANCE = chipscope_ila_0 END +BEGIN DRIVER + PARAMETER DRIVER_NAME = bram + PARAMETER DRIVER_VER = 1.00.a + PARAMETER HW_INSTANCE = dlmb_cntlr +END + +BEGIN DRIVER + PARAMETER DRIVER_NAME = bram + PARAMETER DRIVER_VER = 1.00.a + PARAMETER HW_INSTANCE = ilmb_cntlr +END + diff --git a/xps/raggedstone.xmp b/xps/raggedstone.xmp index 8b2302f..77b14e2 100644 --- a/xps/raggedstone.xmp +++ b/xps/raggedstone.xmp @@ -10,8 +10,8 @@ Device: xc3s1500 Package: fg456 SpeedGrade: -4 UseProjNav: 0 -PNImportBitFile: -PNImportBmmFile: +PNImportBitFile: projnav/raggedstone.bit +PNImportBmmFile: implementation/raggedstone_bd.bmm UserCmd1: UserCmd1Type: 0 UserCmd2: