OpenSystemsDevelopment / usbboot

Commit a490517d0b1fca5b369080c3d9ca43d3f59786c9

Authored by Tim Gover
1 parent f12d9fca

Replace duplicated bootcode4.bin with links to bootcode4.bin / recovery.bin 

This also resolve a startup issue CM4-S
Inline Side-by-side
Showing 19 changed files with 25 additions and 10 deletions
mass-storage-gadget/bootcode4.bin renamed to bootcode4.bin
View file @a490517
No preview for this file type
debian/rpiboot.install
  View file @a490517
1 rpiboot usr/bin 1 rpiboot usr/bin
2 -eeprom-erase/*.txt usr/share/rpiboot/eeprom-erase  
3 -eeprom-erase/*.md usr/share/rpiboot/eeprom-erase  
4 -eeprom-erase/*.bin usr/share/rpiboot/eeprom-erase  
5 msd/*.elf usr/share/rpiboot/msd/ 2 msd/*.elf usr/share/rpiboot/msd/
6 msd/*.bin usr/share/rpiboot/msd/ 3 msd/*.bin usr/share/rpiboot/msd/
7 recovery usr/share/rpiboot/ 4 recovery usr/share/rpiboot/
  5 +eeprom-erase usr/share/rpiboot
8 rpi-imager-embedded usr/share/rpiboot/ 6 rpi-imager-embedded usr/share/rpiboot/
9 mass-storage-gadget usr/share/rpiboot/ 7 mass-storage-gadget usr/share/rpiboot/
10 secure-boot-recovery usr/share/rpiboot/ 8 secure-boot-recovery usr/share/rpiboot/
@@ -12,3 +10,5 @@ secure-boot-msd usr/share/rpiboot/ @@ -12,3 +10,5 @@ secure-boot-msd usr/share/rpiboot/
12 secure-boot-example usr/share/rpiboot/ 10 secure-boot-example usr/share/rpiboot/
13 tools usr/share/rpiboot/ 11 tools usr/share/rpiboot/
14 debian/70-rpiboot.rules /lib/udev/rules.d 12 debian/70-rpiboot.rules /lib/udev/rules.d
  13 +recovery.bin
  14 +bootcode4.bin
eeprom-erase/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../recovery.bin
0 \ No newline at end of file 2 \ No newline at end of file
mass-storage-gadget/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../bootcode4.bin
0 \ No newline at end of file 2 \ No newline at end of file
msd/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../bootcode4.bin
0 \ No newline at end of file 2 \ No newline at end of file
msd/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/msd/bootcode4.bin and /dev/null differ 1 Binary files a/msd/bootcode4.bin and /dev/null differ
eeprom-erase/bootcode4.bin renamed to recovery.bin
View file @a490517
No preview for this file type
recovery/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../recovery.bin
0 \ No newline at end of file 2 \ No newline at end of file
recovery/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/recovery/bootcode4.bin and /dev/null differ 1 Binary files a/recovery/bootcode4.bin and /dev/null differ
rpi-imager-embedded/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../bootcode4.bin
0 \ No newline at end of file 2 \ No newline at end of file
rpi-imager-embedded/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/rpi-imager-embedded/bootcode4.bin and /dev/null differ 1 Binary files a/rpi-imager-embedded/bootcode4.bin and /dev/null differ
secure-boot-example/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../bootcode4.bin
0 \ No newline at end of file 2 \ No newline at end of file
secure-boot-example/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/secure-boot-example/bootcode4.bin and /dev/null differ 1 Binary files a/secure-boot-example/bootcode4.bin and /dev/null differ
secure-boot-msd/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../bootcode4.bin
0 \ No newline at end of file 2 \ No newline at end of file
secure-boot-msd/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/secure-boot-msd/bootcode4.bin and /dev/null differ 1 Binary files a/secure-boot-msd/bootcode4.bin and /dev/null differ
secure-boot-recovery/bootcode4.bin 0 → 120000
  View file @a490517
  1 +../recovery.bin
0 \ No newline at end of file 2 \ No newline at end of file
secure-boot-recovery/bootcode4.bin deleted
View file @f12d9fc
1 Binary files a/secure-boot-recovery/bootcode4.bin and /dev/null differ 1 Binary files a/secure-boot-recovery/bootcode4.bin and /dev/null differ
win32/install_script.nsi
  View file @a490517
@@ -95,25 +95,32 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot @@ -95,25 +95,32 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot
95 File /r redist 95 File /r redist
96 96
97 SetOutPath "$INSTDIR\msd" 97 SetOutPath "$INSTDIR\msd"
98 - File /r ..\msd\*.* 98 + File /r /x bootcode4.bin ..\msd\*.*
  99 + File ..\bootcode4.bin
99 100
100 SetOutPath "$INSTDIR\recovery" 101 SetOutPath "$INSTDIR\recovery"
101 - File /r ..\recovery\*.* 102 + File /r /x bootcode4.bin ..\recovery\*.*
  103 + File /oname=bootcode4.bin ..\recovery.bin
102 104
103 SetOutPath "$INSTDIR\mass-storage-gadget" 105 SetOutPath "$INSTDIR\mass-storage-gadget"
104 - File /r ..\mass-storage-gadget\*.* 106 + File /r /x bootcode4.bin ..\mass-storage-gadget\*.*
  107 + File ..\bootcode4.bin
105 108
106 SetOutPath "$INSTDIR\rpi-imager-embedded" 109 SetOutPath "$INSTDIR\rpi-imager-embedded"
107 - File /r ..\rpi-imager-embedded\*.* 110 + File /r /x bootcode4.bin ..\rpi-imager-embedded\*.*
  111 + File ..\bootcode4.bin
108 112
109 SetOutPath "$INSTDIR\secure-boot-example" 113 SetOutPath "$INSTDIR\secure-boot-example"
110 - File /r ..\secure-boot-example\*.* 114 + File /r /x bootcode4.bin ..\secure-boot-example\*.*
  115 + File ..\bootcode4.bin
111 116
112 SetOutPath "$INSTDIR\secure-boot-msd" 117 SetOutPath "$INSTDIR\secure-boot-msd"
113 - File /r ..\secure-boot-msd\*.* 118 + File /r /x bootcode4.bin ..\secure-boot-msd\*.*
  119 + File ..\bootcode4.bin
114 120
115 SetOutPath "$INSTDIR\secure-boot-recovery" 121 SetOutPath "$INSTDIR\secure-boot-recovery"
116 - File /r ..\secure-boot-recovery\*.* 122 + File /r /x bootcode4.bin ..\secure-boot-recovery\*.*
  123 + File /oname=bootcode4.bin ..\recovery.bin
117 124
118 SetOutPath "$INSTDIR\tools" 125 SetOutPath "$INSTDIR\tools"
119 File /r ..\tools\*.* 126 File /r ..\tools\*.*
win32/rpiboot_setup.exe
View file @a490517
No preview for this file type