Skip to content

2711: msd: Remove support for legacy VPU MSD driver #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timg236 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

2711: msd: Remove support for legacy VPU MSD driver #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ else
DEFAULT_MSG_DIR ?= $(INSTALL_PREFIX)/share/rpiboot/mass-storage-gadget64/
endif

rpiboot: main.c bootfiles.c decode_duid.c fmemopen.c msd/bootcode.h msd/start.h msd/bootcode4.h
rpiboot: main.c bootfiles.c decode_duid.c fmemopen.c msd/bootcode.h msd/start.h
$(CC) -Wall -Wextra -g $(CPPFLAGS) $(CFLAGS) -o $@ main.c bootfiles.c decode_duid.c `pkg-config --cflags --libs libusb-1.0` -DGIT_VER="\"$(GIT_VER)\"" -DPKG_VER="\"$(PKG_VER)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DDEFAULT_MSG_DIR=\"$(DEFAULT_MSG_DIR)\" $(LDFLAGS)

ifeq ($(HAVE_XXD),y)
Expand Down Expand Up @@ -39,7 +39,6 @@ install: rpiboot
install -d $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/msd
install -d $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/mass-storage-gadget64
install -m 644 msd/bootcode.bin $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/msd
install -m 644 msd/bootcode4.bin $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/msd
install -m 644 msd/start.elf $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/msd
install -m 644 mass-storage-gadget64/boot.img $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/mass-storage-gadget64
install -m 644 mass-storage-gadget64/config.txt $(DESTDIR)$(INSTALL_PREFIX)/share/rpiboot/mass-storage-gadget64
Expand Down
19 changes: 4 additions & 15 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "decode_duid.h"
#include "msd/bootcode.h"
#include "msd/start.h"
#include "msd/bootcode4.h"
// 2712 doesn't use start5.elf

/*
Expand Down Expand Up @@ -748,20 +747,10 @@ FILE * check_file(const char * dir, const char *fname, int use_fmem)
// is being used to check if a file exists.
if(fp == NULL && use_fmem)
{
if (bcm2711)
{
if(strcmp(fname, "bootcode4.bin") == 0)
fp = fmemopen(msd_bootcode4_bin, msd_bootcode4_bin_len, "rb");
else if(strcmp(fname, "start4.elf") == 0)
fp = fmemopen(msd_start_elf, msd_start_elf_len, "rb");
}
else
{
if(strcmp(fname, "bootcode.bin") == 0)
fp = fmemopen(msd_bootcode_bin, msd_bootcode_bin_len, "rb");
else if(strcmp(fname, "start.elf") == 0)
fp = fmemopen(msd_start_elf, msd_start_elf_len, "rb");
}
if(strcmp(fname, "bootcode.bin") == 0)
fp = fmemopen(msd_bootcode_bin, msd_bootcode_bin_len, "rb");
else if(strcmp(fname, "start.elf") == 0)
fp = fmemopen(msd_start_elf, msd_start_elf_len, "rb");
if (fp)
printf("Loading embedded: %s\n", fname);
}
Expand Down
1 change: 0 additions & 1 deletion msd/bootcode4.bin
View file
Open in desktop

This file was deleted.

Loading