From f25707012fe987a14aa39077b35adf5eb3f05186 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 14 May 2019 11:44:15 +0200 Subject: [PATCH] software/bios/boot: remove specific linux commands (not needed with device tree) --- litex/soc/software/bios/boot.c | 28 +--------------------------- litex/soc/software/bios/sfl.h | 5 ----- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/litex/soc/software/bios/boot.c b/litex/soc/software/bios/boot.c index 39b8e02ec..822bfb807 100644 --- a/litex/soc/software/bios/boot.c +++ b/litex/soc/software/bios/boot.c @@ -84,7 +84,6 @@ int serialboot(void) { struct sfl_frame frame; int failed; - unsigned long cmdline_adr, initrdstart_adr, initrdend_adr; static const char str[SFL_MAGIC_LEN+1] = SFL_MAGIC_REQ; const char *c; int ack_status; @@ -109,7 +108,6 @@ int serialboot(void) /* assume ACK_OK */ failed = 0; - cmdline_adr = initrdstart_adr = initrdend_adr = 0; while(1) { int i; int actualcrc; @@ -165,33 +163,9 @@ int serialboot(void) |((unsigned long)frame.payload[2] << 8) |((unsigned long)frame.payload[3] << 0); uart_write(SFL_ACK_SUCCESS); - boot(cmdline_adr, initrdstart_adr, initrdend_adr, addr); + boot(0, 0, 0, addr); break; } - case SFL_CMD_CMDLINE: - failed = 0; - cmdline_adr = ((unsigned long)frame.payload[0] << 24) - |((unsigned long)frame.payload[1] << 16) - |((unsigned long)frame.payload[2] << 8) - |((unsigned long)frame.payload[3] << 0); - uart_write(SFL_ACK_SUCCESS); - break; - case SFL_CMD_INITRDSTART: - failed = 0; - initrdstart_adr = ((unsigned long)frame.payload[0] << 24) - |((unsigned long)frame.payload[1] << 16) - |((unsigned long)frame.payload[2] << 8) - |((unsigned long)frame.payload[3] << 0); - uart_write(SFL_ACK_SUCCESS); - break; - case SFL_CMD_INITRDEND: - failed = 0; - initrdend_adr = ((unsigned long)frame.payload[0] << 24) - |((unsigned long)frame.payload[1] << 16) - |((unsigned long)frame.payload[2] << 8) - |((unsigned long)frame.payload[3] << 0); - uart_write(SFL_ACK_SUCCESS); - break; default: failed++; if(failed == MAX_FAILED) { diff --git a/litex/soc/software/bios/sfl.h b/litex/soc/software/bios/sfl.h index c496aed3a..ac1aa9f75 100644 --- a/litex/soc/software/bios/sfl.h +++ b/litex/soc/software/bios/sfl.h @@ -17,11 +17,6 @@ struct sfl_frame { #define SFL_CMD_LOAD 0x01 #define SFL_CMD_JUMP 0x02 -/* Linux-specific commands */ -#define SFL_CMD_CMDLINE 0x03 -#define SFL_CMD_INITRDSTART 0x04 -#define SFL_CMD_INITRDEND 0x05 - /* Replies */ #define SFL_ACK_SUCCESS 'K' #define SFL_ACK_CRCERROR 'C'