diff --git a/cfg/printer_defconfig b/cfg/printer_defconfig index d0c7e1d..51de9e9 100644 --- a/cfg/printer_defconfig +++ b/cfg/printer_defconfig @@ -678,3 +678,6 @@ CONFIG_BCMA_HOST_PCI=n CONFIG_RFKILL=y CONFIG_RFKILL_GPIO=y + +#typeC +#CONFIG_TYPEC=y diff --git a/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.bin b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.bin new file mode 120000 index 0000000..a8909e1 --- /dev/null +++ b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.bin @@ -0,0 +1 @@ +brcmfmac43456-sdio.bin \ No newline at end of file diff --git a/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.txt b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.txt new file mode 120000 index 0000000..94cd555 --- /dev/null +++ b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bigtreetech,pi2.txt @@ -0,0 +1 @@ +brcmfmac43456-sdio.txt \ No newline at end of file diff --git a/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bin b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bin new file mode 100644 index 0000000..cd91afc Binary files /dev/null and b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.bin differ diff --git a/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob new file mode 100644 index 0000000..36b8652 Binary files /dev/null and b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob differ diff --git a/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.txt b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.txt new file mode 100644 index 0000000..0916af5 --- /dev/null +++ b/files/firmware/usr/lib/firmware/brcm/brcmfmac43456-sdio.txt @@ -0,0 +1,99 @@ +#AP6256_NVRAM_V1.1_08252017 +# Cloned from bcm94345wlpagb_p2xx.txt +NVRAMRev=$Rev: 498373 $ +sromrev=11 +vendid=0x14e4 +devid=0x43ab +manfid=0x2d0 +prodid=0x06e4 +macaddr=00:90:4c:c5:12:38 +nocrc=1 +boardtype=0x6e4 +boardrev=0x1304 +xtalfreq=37400 +#boardflags: 5GHz eTR switch by default +# 2.4GHz eTR switch by default +# bit1 for btcoex +boardflags=0x00480201 +boardflags2=0x40800000 +boardflags3=0x48200100 +#phycal_tempdelta=15 +rxchain=1 +txchain=1 +aa2g=1 +aa5g=1 +tssipos5g=1 +tssipos2g=1 +femctrl=0 +AvVmid_c0=0,157,1,126,1,126,1,126,1,126 +pa2ga0=-164,5427,-623 +pa2ga1=-165,3699,-515 +#pa5ga0=-146,5304,-612,-140,5341,-613,-166,5326,-633,-154,5272,-621 +#pa5ga0=-134,5385,-609,-132,5359,-605,-154,5360,-621,-140,5288,-604 +pa5ga0=-127,5380,-603,-130,5395,-608,-148,5369,-622,-147,5222,-608 +pa5ga1=-161,3544,-499,-166,3543,-497,-169,3569,-497,-171,3598,-498 +itrsw=1 +pdoffset2g40ma0=10 +pdoffset40ma0=0xaaaa +pdoffset80ma0=0xaaaa +extpagain5g=2 +extpagain2g=2 +tworangetssi2g=0 +tworangetssi5g=0 +# LTECX flags +# WCI2 +ltecxmux=0 +ltecxpadnum=0x0504 +ltecxfnsel=0x22 +ltecxgcigpio=0x32 + +pacalshift5g=0,0,3 + +maxp2ga0=70 +cckbw202gpo=0x1000 +cckbw20ul2gpo=0x1000 +ofdmlrbw202gpo=0x0033 +dot11agofdmhrbw202gpo=0x2222 +mcsbw202gpo=0x99333322 + +cckdigfilttype=5 + +#maxp5ga0=82,82,82,82 +#mcsbw205glpo=0x99555000 +#mcsbw205gmpo=0x99555000 +#mcsbw205ghpo=0x99555000 +#mcsbw405glpo=0x99555000 +#mcsbw405gmpo=0x99555000 +#mcsbw405ghpo=0x99555000 +#mcsbw805glpo=0x99555000 +#mcsbw805gmpo=0x99555000 +#mcsbw805ghpo=0x99555000 + +maxp5ga0=73,74,73,73 +mcsbw205glpo=0x8a875444 +mcsbw205gmpo=0x8a875444 +mcsbw205ghpo=0x8a875444 + +mcsbw405glpo=0xda844333 +mcsbw405gmpo=0xdb844333 +mcsbw405ghpo=0xda844333 + +mcsbw805glpo=0xdb555444 +mcsbw805gmpo=0xda555444 +mcsbw805ghpo=0xda555444 + + +swctrlmap_2g=0x00040004,0x00020002,0x00040004,0x010a02,0x1ff +swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010a02,0x2f4 +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 + +vcodivmode=1 +deadman_to=481500000 +ed_thresh2g=-54 +ed_thresh5g=-54 +eu_edthresh2g=-54 +eu_edthresh5g=-54 + + +muxenab=0x10 diff --git a/scripts/os.py b/scripts/os.py index a9a38f9..e974d21 100644 --- a/scripts/os.py +++ b/scripts/os.py @@ -110,9 +110,6 @@ class OS: self.__sudo(["chown", user + ":" + user, to_file]) def __remove_bdeps(self, temp_dir): - # pack full system via tar - arch_full_path = self.pack() - self.__extract_tar(arch_full_path, temp_dir) # remove unneccessarry packages list_to_rm = " virtual/perl-JSON-PP virtual/perl-podlators" list_to_rm += " virtual/perl-Getopt-Long virtual/perl-Parse-CPAN-Meta" @@ -128,10 +125,10 @@ class OS: list_to_rm += " dev-util/gdbus-codegen media-fonts/font-util" list_to_rm += " dev-libs/libxslt" list_to_rm += " dev-build/gtk-doc-am sys-apps/help2man" - list_to_rm += " app-text/docbook-xsl-ns-stylesheets" - list_to_rm += " app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2" + list_to_rm += " app-text/docbook-xml-dtd:4.1.2" list_to_rm += " app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3" list_to_rm += " app-text/docbook-xml-dtd:4.4 app-text/docbook-xml-dtd:4.5" + list_to_rm += " app-text/docbook-xsl-ns-stylesheets app-text/docbook-xsl-stylesheets" list_to_rm += " app-text/build-docbook-catalog app-text/xmlto" list_to_rm += " app-text/asciidoc app-text/sgml-common" list_to_rm += " dev-lang/rust-common dev-lang/rust" @@ -144,12 +141,28 @@ class OS: self.__chroot(f"emerge -aC {list_to_rm} && ldconfig", temp_dir) self.__do_archive("excl_min", "FULL_min_bdeps", temp_dir) + def __finalize(self, dir): + Logger.os(f"Finalize system installation...") + # enable network services + services = "systemctl enable NetworkManager ntpdate sshd" + self.__chroot(services, dir) + journal_min = "sed -i -E 's/^#(\\S+MaxUse)=$/\\1=10M/' /etc/systemd/journald.conf &&" + journal_min += "sed -i -E 's/^#(\\S+MaxFileSize)=$/\\1=10M/' /etc/systemd/journald.conf" + self.__chroot(journal_min, dir) + self.__sudo(["cp", "-r", f"{ROOT_DIR}/files/firmware/usr", f"{dir}/"]) + def sqh(self): self.__fix_xorg() date = datetime.datetime.today().strftime('%Y_%m_%d') temp_dir = f"{ROOT_DIR}/build/tmp" + # pack full system via tar + arch_full_path = self.pack() self.__tmp_clean(temp_dir) + self.__extract_tar(arch_full_path, temp_dir) + # remove unnecessary packages self.__remove_bdeps(temp_dir) + # prepare system + self.__finalize(temp_dir) # pack a minimal archive arch_path = self.__do_archive("excl", "OS", temp_dir) # remove temp directory