diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000000..524e0c57c1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: PartialVolume diff --git a/README.md b/README.md index 6cd790e49b..b17bdc8478 100644 --- a/README.md +++ b/README.md @@ -537,6 +537,18 @@ $ ls output/images/shredos*.img $ cd output/images $ dd if=shredos-20200412.img of=/dev/sdx (20200412 will be the day you compiled, sdx is the USB flash drive) ``` +### Issues that you may get when building ShredOS +- **Error: "Internal Size Too Big"** If you are compiling the vanilla version of ShredOS and have made no alterations or additions but it fails to build the .img with the error "Internal error: size too big" then you may have a version of mtools that has a version of mcopy which has a bug whenever the -b option is used. This bug is known to exist in mcopy version 4.0.32 and maybe others but is fixed in v4.0.42. The solution is to upgrade your copy of mtools to a later version. However, if you have altered ShredOS by adding more packages you may need to update the size of the fat32 partition. You can do this by increasing the 'size' in ../board/shredos/genimage.cfg. Depending on how much extra software you have added increase the size by 10MB or more. Currently as of March 2023 the current size is `size = 130000000`, this is in bytes, so adding 10MB will mean you need to edit this value so that it reads `size = 140000000`. After the edit, just run `make` which will result in a quicker build. You don't need to run `make clean` first as that would result in a full rebuild which is not neccessary when all you are doing is increasing the final image size. If your repository does not supply a later version of mtools, then you can obtain mtools packages for various distros from [here](https://www.gnu.org/software/mtools/#downloads) + +>INFO: vfat(boot.vfat): cmd: "MTOOLS_SKIP_CHECK=1 mcopy -bsp -i '/home/shredos/Downloads/shredos/mcopybug/shredos.x86_64/output/images/boot.vfat' '/home/shredos/Downloads/shredos/mcopybug/shredos.x86_64/output/images/grub.cfg' '::boot/grub/grub.cfg'" (stderr): +***Internal error, size too big*** +Streamcache allocation problem:: 5 +INFO: vfat(boot.vfat): cmd: "rm -f "/home/shredos/Downloads/shredos/mcopybug/shredos.x86_64/output/images/boot.vfat"" (stderr): +***ERROR: vfat(boot.vfat): failed to generate boot.vfat*** +make[1]: [Makefile:823: target-post-image] Error 1 +make: [Makefile:84: _all] Error 2 + + ### Commands to configure buildroot, you will only need to use these if you are making changes to ShredOS #### Change buildroot configuration, select the architecture, install software packages then save the buildroot config changes to shredos_defconfig, the location if which is defined in the buildroot config within `make menuconfig` ALWAYS RUN `make savedefconfig` AFTER CHANGES are made in menuconfig. diff --git a/board/shredos/fsoverlay/usr/bin/tmux2 b/board/shredos/fsoverlay/usr/bin/tmux2 new file mode 100755 index 0000000000..1640911dce --- /dev/null +++ b/board/shredos/fsoverlay/usr/bin/tmux2 @@ -0,0 +1,2 @@ +tmux new-session \; split-window -d + diff --git a/board/shredos/fsoverlay/usr/bin/tmux4 b/board/shredos/fsoverlay/usr/bin/tmux4 new file mode 100755 index 0000000000..dd50fd0320 --- /dev/null +++ b/board/shredos/fsoverlay/usr/bin/tmux4 @@ -0,0 +1,2 @@ +tmux new-session \; split-window -h \; split-window -d \; split-window -t0 -d + diff --git a/board/shredos/fsoverlay/usr/bin/tmux6 b/board/shredos/fsoverlay/usr/bin/tmux6 new file mode 100755 index 0000000000..d855273371 --- /dev/null +++ b/board/shredos/fsoverlay/usr/bin/tmux6 @@ -0,0 +1,2 @@ +tmux new-session \; splitw -p 33 \; splitw -t 0 -d \; splitw -h \; splitw -t 1 -h \; splitw -t 0 -h + diff --git a/board/shredos/fsoverlay/usr/bin/tmux8 b/board/shredos/fsoverlay/usr/bin/tmux8 new file mode 100755 index 0000000000..e82e4de6e3 --- /dev/null +++ b/board/shredos/fsoverlay/usr/bin/tmux8 @@ -0,0 +1,2 @@ +tmux new-session \; splitw -p 50 \; splitw -t 0 -d \; splitw -t 2 -d \; splitw -t 0 -h \; splitw -t 2 -h \; splitw -t 4 -h \; splitw -t 6 -h + diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw deleted file mode 100644 index 0ff4f5ad1f..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-4.6.16.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw deleted file mode 100644 index 6804b82654..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw deleted file mode 100644 index 637c8bbc77..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw deleted file mode 100644 index 012c972b33..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.0.15.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw deleted file mode 100644 index 3c17b89b70..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.1.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.3.fw deleted file mode 100644 index 7e9e54b61a..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-06-6.2.3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw deleted file mode 100644 index 2736b4a820..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-4.6.17.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw deleted file mode 100644 index 7f69b5b57a..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw deleted file mode 100644 index 6c9898825e..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw deleted file mode 100644 index 21ab10a32c..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw deleted file mode 100644 index 1349994d81..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.0.17.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw deleted file mode 100644 index bd78e3fced..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw deleted file mode 100644 index 99ac571d1e..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1a.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw deleted file mode 100644 index 8bd1e7992f..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw deleted file mode 100644 index bea33c3218..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-4.6.16.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw deleted file mode 100644 index 1f805a1963..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw deleted file mode 100644 index 4d756e1e5c..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-06-6.0.15.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw deleted file mode 100644 index bdb5d10480..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-4.6.15.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw deleted file mode 100644 index 2acc5ff831..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw deleted file mode 100644 index 82a5de2c55..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw deleted file mode 100644 index 66932993c1..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09-6.0.17.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw deleted file mode 100644 index 0e390ec711..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw deleted file mode 100644 index 834c479f1a..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw and /dev/null differ diff --git a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw b/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw deleted file mode 100644 index e5738ce982..0000000000 Binary files a/board/shredos/fsoverlay/usr/lib/firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw and /dev/null differ diff --git a/configs/shredos_defconfig b/configs/shredos_defconfig index 553f56b76a..ea94ac0873 100644 --- a/configs/shredos_defconfig +++ b/configs/shredos_defconfig @@ -55,6 +55,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_QCOM_VENUS=y BR2_PACKAGE_LINUX_FIRMWARE_QCOM_ADRENO=y BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3=y +BR2_PACKAGE_LINUX_FIRMWARE_BNX2=y BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4376d44bda..20664d264f 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -408,8 +408,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BROADCOM_TIGON3 Firmware files for Broadcom Tigon3 ethernet cards (tigon) -config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2 bool "Broadcom NetXtremeII" + help + Firmware files for Broadcom NetXtreme ethernet cards (bnx2) + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X + bool "Broadcom NetXtremeII 10Gb" help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index f29d9cf65d..409b9a6649 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -497,6 +497,12 @@ LINUX_FIRMWARE_FILES += tigon/* # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2),y) +LINUX_FIRMWARE_FILES += bnx2/* +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) LINUX_FIRMWARE_FILES += bnx2x/* # No license file; the license is in the file WHENCE