Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

software/bios: rename commands to cmds and update with libs' names.

This commit is contained in:
Florent Kermarrec 2020-05-18 23:26:51 +02:00
parent 33f6ce7431
commit 21e2a34c3f
9 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litex/soc/software/bios/Makefile
View File

@ -85,7 +85,7 @@ endif
%.o: $(BIOS_DIRECTORY)/%.c %.o: $(BIOS_DIRECTORY)/%.c
$(compile) $(compile)
%.o: $(BIOS_DIRECTORY)/commands/%.c %.o: $(BIOS_DIRECTORY)/cmds/%.c
$(compile) $(compile)
%.o: $(BIOS_DIRECTORY)/%.S %.o: $(BIOS_DIRECTORY)/%.S

0
litex/soc/software/bios/commands/cmd_bios.c → litex/soc/software/bios/cmds/cmd_bios.c
View File

0
litex/soc/software/bios/commands/cmd_boot.c → litex/soc/software/bios/cmds/cmd_boot.c
View File

24
litex/soc/software/bios/commands/cmd_litedram.c → litex/soc/software/bios/cmds/cmd_litedram.c
View File

@ -36,7 +36,7 @@ static void sdrrow_handler(int nb_params, char **params)
sdrrow(row); sdrrow(row);
printf("Activated row %d", row); printf("Activated row %d", row);
} }
define_command(sdrrow, sdrrow_handler, "Precharge/Activate row", DRAM_CMDS); define_command(sdrrow, sdrrow_handler, "Precharge/Activate row", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -46,7 +46,7 @@ define_command(sdrrow, sdrrow_handler, "Precharge/Activate row", DRAM_CMDS);
* *
*/ */
#ifdef CSR_SDRAM_BASE #ifdef CSR_SDRAM_BASE
define_command(sdrsw, sdrsw, "Gives SDRAM control to SW", DRAM_CMDS); define_command(sdrsw, sdrsw, "Gives SDRAM control to SW", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -56,7 +56,7 @@ define_command(sdrsw, sdrsw, "Gives SDRAM control to SW", DRAM_CMDS);
* *
*/ */
#ifdef CSR_SDRAM_BASE #ifdef CSR_SDRAM_BASE
define_command(sdrhw, sdrhw, "Gives SDRAM control to HW", DRAM_CMDS); define_command(sdrhw, sdrhw, "Gives SDRAM control to HW", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -71,7 +71,7 @@ static void sdrrdbuf_handler(int nb_params, char **params)
sdrrdbuf(-1); sdrrdbuf(-1);
} }
define_command(sdrrdbuf, sdrrdbuf_handler, "Dump SDRAM read buffer", DRAM_CMDS); define_command(sdrrdbuf, sdrrdbuf_handler, "Dump SDRAM read buffer", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -111,7 +111,7 @@ static void sdrrd_handler(int nb_params, char **params)
sdrrd(addr, dq); sdrrd(addr, dq);
} }
define_command(sdrrd, sdrrd_handler, "Read SDRAM data", DRAM_CMDS); define_command(sdrrd, sdrrd_handler, "Read SDRAM data", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -140,7 +140,7 @@ static void sdrrderr_handler(int nb_params, char **params)
sdrrderr(count); sdrrderr(count);
} }
define_command(sdrrderr, sdrrderr_handler, "Print SDRAM read errors", DRAM_CMDS); define_command(sdrrderr, sdrrderr_handler, "Print SDRAM read errors", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -169,7 +169,7 @@ static void sdrwr_handler(int nb_params, char **params)
sdrwr(addr); sdrwr(addr);
} }
define_command(sdrwr, sdrwr_handler, "Write SDRAM test data", DRAM_CMDS); define_command(sdrwr, sdrwr_handler, "Write SDRAM test data", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -179,7 +179,7 @@ define_command(sdrwr, sdrwr_handler, "Write SDRAM test data", DRAM_CMDS);
* *
*/ */
#if defined(CSR_SDRAM_BASE) && defined(CSR_DDRPHY_BASE) #if defined(CSR_SDRAM_BASE) && defined(CSR_DDRPHY_BASE)
define_command(sdrinit, sdrinit, "Start SDRAM initialisation", DRAM_CMDS); define_command(sdrinit, sdrinit, "Start SDRAM initialisation", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -189,7 +189,7 @@ define_command(sdrinit, sdrinit, "Start SDRAM initialisation", DRAM_CMDS);
* *
*/ */
#if defined(CSR_DDRPHY_BASE) && defined(SDRAM_PHY_WRITE_LEVELING_CAPABLE) && defined(CSR_SDRAM_BASE) #if defined(CSR_DDRPHY_BASE) && defined(SDRAM_PHY_WRITE_LEVELING_CAPABLE) && defined(CSR_SDRAM_BASE)
define_command(sdrwlon, sdrwlon, "Enable write leveling", DRAM_CMDS); define_command(sdrwlon, sdrwlon, "Enable write leveling", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -199,7 +199,7 @@ define_command(sdrwlon, sdrwlon, "Enable write leveling", DRAM_CMDS);
* *
*/ */
#if defined(CSR_DDRPHY_BASE) && defined(SDRAM_PHY_WRITE_LEVELING_CAPABLE) && defined(CSR_SDRAM_BASE) #if defined(CSR_DDRPHY_BASE) && defined(SDRAM_PHY_WRITE_LEVELING_CAPABLE) && defined(CSR_SDRAM_BASE)
define_command(sdrwloff, sdrwloff, "Disable write leveling", DRAM_CMDS); define_command(sdrwloff, sdrwloff, "Disable write leveling", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -209,7 +209,7 @@ define_command(sdrwloff, sdrwloff, "Disable write leveling", DRAM_CMDS);
* *
*/ */
#if defined(CSR_DDRPHY_BASE) && defined(CSR_SDRAM_BASE) #if defined(CSR_DDRPHY_BASE) && defined(CSR_SDRAM_BASE)
define_command(sdrlevel, sdrlevel, "Perform read/write leveling", DRAM_CMDS); define_command(sdrlevel, sdrlevel, "Perform read/write leveling", LITEDRAM_CMDS);
#endif #endif
/** /**
@ -219,5 +219,5 @@ define_command(sdrlevel, sdrlevel, "Perform read/write leveling", DRAM_CMDS);
* *
*/ */
#ifdef CSR_SDRAM_BASE #ifdef CSR_SDRAM_BASE
define_command(memtest, memtest, "Run a memory test", DRAM_CMDS); define_command(memtest, memtest, "Run a memory test", LITEDRAM_CMDS);
#endif #endif

6
litex/soc/software/bios/commands/cmd_liteeth.c → litex/soc/software/bios/cmds/cmd_liteeth.c
View File

@ -50,7 +50,7 @@ static void mdiow(int nb_params, char **params)
mdio_write(phyadr2, reg2, val2); mdio_write(phyadr2, reg2, val2);
} }
define_command(mdiow, mdiow, "Write MDIO register", MDIO_CMDS); define_command(mdiow, mdiow, "Write MDIO register", LITEETH_CMDS);
#endif #endif
/** /**
@ -88,7 +88,7 @@ static void mdior(int nb_params, char **params)
printf("Reg %d: 0x%04x", reg2, val); printf("Reg %d: 0x%04x", reg2, val);
} }
define_command(mdior, mdior, "Read MDIO register", MDIO_CMDS); define_command(mdior, mdior, "Read MDIO register", LITEETH_CMDS);
#endif #endif
/** /**
@ -130,5 +130,5 @@ static void mdiod(int nb_params, char **params)
} }
} }
define_command(mdiod, mdiod, "Dump MDIO registers", MDIO_CMDS); define_command(mdiod, mdiod, "Dump MDIO registers", LITEETH_CMDS);
#endif #endif

10
litex/soc/software/bios/commands/cmd_litesdcard.c → litex/soc/software/bios/cmds/cmd_litesdcard.c
View File

@ -43,7 +43,7 @@ struct command_struct cmd_sdclk =
.help = "SDCard set clk frequency (Mhz)", .help = "SDCard set clk frequency (Mhz)",
}; };
define_command(sdclk, sdclk, "SDCard set clk frequency (Mhz)", SD_CMDS); define_command(sdclk, sdclk, "SDCard set clk frequency (Mhz)", LITESDCARD_CMDS);
#endif #endif
/** /**
@ -53,7 +53,7 @@ define_command(sdclk, sdclk, "SDCard set clk frequency (Mhz)", SD_CMDS);
* *
*/ */
#ifdef CSR_SDCORE_BASE #ifdef CSR_SDCORE_BASE
define_command(sdinit, sdcard_init, "SDCard initialization", SD_CMDS); define_command(sdinit, sdcard_init, "SDCard initialization", LITESDCARD_CMDS);
#endif #endif
/** /**
@ -82,7 +82,7 @@ static void sdtest(int nb_params, char **params)
sdcard_test(blocks); sdcard_test(blocks);
} }
define_command(sdtest, sdtest, "SDCard test", SD_CMDS); define_command(sdtest, sdtest, "SDCard test", LITESDCARD_CMDS);
#endif #endif
/** /**
@ -111,7 +111,7 @@ static void sdtestread(int nb_params, char **params)
sdcard_test_read(block); sdcard_test_read(block);
} }
define_command(sdtestread, sdtestread, "SDCard test read", SD_CMDS); define_command(sdtestread, sdtestread, "SDCard test read", LITESDCARD_CMDS);
#endif #endif
/** /**
@ -140,5 +140,5 @@ static void sdtestwrite(int nb_params, char **params)
sdcard_test_write(block, params[1]); sdcard_test_write(block, params[1]);
} }
define_command(sdtestwrite, sdtestwrite, "SDCard test write", SD_CMDS); define_command(sdtestwrite, sdtestwrite, "SDCard test write", LITESDCARD_CMDS);
#endif #endif

0
litex/soc/software/bios/commands/cmd_mem.c → litex/soc/software/bios/cmds/cmd_mem.c
View File

0
litex/soc/software/bios/commands/cmd_spiflash.c → litex/soc/software/bios/cmds/cmd_spiflash.c
View File

21
litex/soc/software/bios/command.h
View File

@ -9,17 +9,16 @@
#define HIST_DEPTH 10 /* Used in string list, complete.c */ #define HIST_DEPTH 10 /* Used in string list, complete.c */
#define MISC_CMDS 0 #define MISC_CMDS 0
#define SYSTEM_CMDS 1 #define SYSTEM_CMDS 1
#define CACHE_CMDS 2 #define CACHE_CMDS 2
#define BOOT_CMDS 3 #define MEM_CMDS 3
#define DRAM_CMDS 4 #define BOOT_CMDS 3
#define MDIO_CMDS 5 #define SPIFLASH_CMDS 4
#define MEM_CMDS 6 #define LITEDRAM_CMDS 4
#define SD_CMDS 7 #define LITEETH_CMDS 5
#define SPIFLASH_CMDS 8 #define LITESDCARD_CMDS 7
#define DDR_CMDS 9 #define NB_OF_GROUPS 8
#define NB_OF_GROUPS 10
typedef void (*cmd_handler)(int nb_params, char **params); typedef void (*cmd_handler)(int nb_params, char **params);