Some cleanup

cfg/kernel_v6.14-rc7

@@ -2018,7 +2018,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
-CONFIG_TOUCHSCREEN_GOODIX=m
+# CONFIG_TOUCHSCREEN_GOODIX is not set
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
@@ -2048,25 +2048,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_TSC2004 is not set

patch/kernel/printer_defconfig_0_common.patch

@@ -3,7 +3,7 @@ new file mode 100644
 index 000000000000..51de9e95b7d2
 --- /dev/null
 +++ b/arch/arm64/configs/printer_defconfig
-@@ -0,0 +1,506 @@
+@@ -0,0 +1,507 @@
 +CONFIG_DEFAULT_HOSTNAME="Printer"
 +CONFIG_LOCALVERSION="-arm64"
 +CONFIG_LOCALVERSION_AUTO=n
@@ -450,6 +450,7 @@ index 000000000000..51de9e95b7d2
 +CONFIG_DEVFREQ_GOV_POWERSAVE=y
 +CONFIG_DEVFREQ_GOV_USERSPACE=y
 +CONFIG_DEVFREQ_GOV_PASSIVE=y
++CONFIG_HW_RANDOM=y
 +#systemd
 +CONFIG_BPF_SYSCALL=y
 +CONFIG_CGROUP_BPF=y

patch/kernel/printer_defconfig_1_plat.patch

@@ -3,22 +3,24 @@ new file mode 100644
 index 000000000000..51de9e95b7d2
 --- a/arch/arm64/configs/printer_defconfig
 +++ b/arch/arm64/configs/printer_defconfig
-@@ -0,4 +198,202 @@
+@@ -0,4 +200,204 @@
  CONFIG_MTD_BLKDEVS=y
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_SPI_NOR=y
  ##########
++#Both
++CONFIG_NET_VENDOR_STMICRO=y
++CONFIG_STMMAC_ETH=y
++CONFIG_DRM_PANFROST=y
++CONFIG_STMMAC_PLATFORM=y
++
 +#H616, SoC-specific
-+CONFIG_CLK_PX30=n
-+CONFIG_CLK_RK3576=n
 +CONFIG_SUN50I_A64_CCU=n
 +CONFIG_SUN50I_A100_CCU=n
 +CONFIG_SUN50I_A100_R_CCU=n
 +CONFIG_SUN50I_H6_CCU=n
 +CONFIG_SUN8I_H3_CCU=n
 +CONFIG_ARCH_SUNXI=y
-+CONFIG_NET_VENDOR_STMICRO=y
-+CONFIG_STMMAC_ETH=y
 +CONFIG_DWMAC_DWC_QOS_ETH=y
 +CONFIG_SUNXI_CCU=y
 +CONFIG_NET_VENDOR_ALLWINNER=y
@@ -48,9 +50,8 @@ index 000000000000..51de9e95b7d2
 +CONFIG_DRM_SUN8I_DW_HDMI=y
 +CONFIG_I2C_MV64XXX=y
 +CONFIG_SUN50I_IOMMU=y
-+#CONFIG_IR_SUNXI=y
++##CONFIG_IR_SUNXI=y
 +CONFIG_KEYBOARD_SUN4I_LRADC=y
-+CONFIG_DRM_PANFROST=y
 +CONFIG_USB_MUSB_SUNXI=y
 +CONFIG_SUNXI_NMI_INTC=y
 +CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y
@@ -74,9 +75,8 @@ index 000000000000..51de9e95b7d2
 +CONFIG_DRM_SUN8I_TCON_TOP=y
 +CONFIG_SUNXI_ADDR_MGT=y
 +CONFIG_SUNXI_GMAC=y
-+#CONFIG_CAN_MCP251X=y
++##CONFIG_CAN_MCP251X=y
-+#CONFIG_FB_TFT_ST7796S=y
++##CONFIG_FB_TFT_ST7796S=y
-+CONFIG_STMMAC_PLATFORM=y
 +CONFIG_REGULATOR_FAN53555=y
 +CONFIG_MFD_AXP20X_I2C=y
 +CONFIG_REGULATOR_AXP20X=y
@@ -94,6 +94,8 @@ index 000000000000..51de9e95b7d2
 +CONFIG_SND_SOC_SUNXI_AHUB_DAM=y
 +
 +#rk3566/3568, SoC-specific
++CONFIG_CLK_PX30=n
++CONFIG_CLK_RK3576=n
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_ARM_RK3328_DMC_DEVFREQ=y
 +CONFIG_ROCKCHIP_IOMMU=y
@@ -157,8 +159,8 @@ index 000000000000..51de9e95b7d2
 +CONFIG_CLK_RK3676=n
 +CONFIG_CLK_RK3588=n
 +CONFIG_NET_VENDOR_ARC=n
-+#CONFIG_ARC_EMAC_CORE=y
++CONFIG_ARC_EMAC_CORE=y
-+#CONFIG_EMAC_ROCKCHIP=y
++CONFIG_EMAC_ROCKCHIP=y
 +CONFIG_INPUT_MISC=y
 +CONFIG_INPUT_RK805_PWRKEY=y
 +CONFIG_REGULATOR_RK808=y
@@ -202,7 +204,7 @@ index 000000000000..51de9e95b7d2
 +#typeC
 +#CONFIG_TYPEC=y
 +#touchscreens
-+CONFIG_TOUCHSCREEN_GOODIX=m
++#CONFIG_TOUCHSCREEN_GOODIX=m
 +#CONFIG_TOUCHSCREEN_TSC2007=y
 +CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
++#CONFIG_TOUCHSCREEN_USB_COMPOSITE=m

scripts/size_tree.py

@@ -12,6 +12,7 @@ class Tree:
     def __init__(self):
         self.childs = []
         self.size = 0
+        self.size_self = 0
         self.name = ""
 
     def add(self, fn, size):
@@ -21,6 +22,7 @@ class Tree:
             ch.name = path[0]
             ch.size = size
             self.size += size
+            self.size_self  += size
             self.childs.append(ch)
             return
         for ch in self.childs:
@@ -39,8 +41,9 @@ class Tree:
         if (level > level_max) or (self.size == 0) or (self.size < minsz):
             return
         s = "\t" * level
-        sz = sizeof_fmt(self.size)
+        sz = sizeof_fmt(self.size - self.size_self)
-        s += f"+[{sz}] {self.name}"
+        sz_self = sizeof_fmt(self.size_self)
+        s += f"+{self.name} [ch={sz}:self={sz_self}]"
         print(s)
         for ch in self.childs:
             ch.print(level + 1, level_max, minsz)

tmp/all.sh

@@ -1,192 +0,0 @@
-#!/bin/sh
-set -e          # Any subsequent(*) commands which fail will cause the shell script to exit immediately
-set -o errtrace # trace ERR through - enabled
-set -o errexit  ## set -e : exit the script if any statement returns a non-true return value - enabled
-
-invalid_param()
-{
-    echo "Invalid parameters!"
-    exit 1
-}
-
-if [ "$#" -lt 2 ]; then
-    invalid_param
-fi
-
-ROOT_DIR="$(realpath $(dirname "$0"))"
-GIT_BARE_ROOT="${ROOT_DIR}/git_bare"
-DONE_MARKER=".done_marker"
-
-source ${ROOT_DIR}/scripts/boards/${1}.sh
-source ${ROOT_DIR}/scripts/host/binfmt.sh
-source ${ROOT_DIR}/scripts/host/chroot.sh
-source ${ROOT_DIR}/scripts/host/sources.sh
-
-now=$(date +"%Y_%m_%d")
-BACK_FN="back_os_${TARGET}_${now}.tar.xz"
-SQH_FS="root_${TARGET}.sqh"
-TMP_DIR="${ROOT_DIR}/tmp"
-CFG_DIR="${ROOT_DIR}/cfg/${TARGET}"
-OUT_DIR="${ROOT_DIR}/out/${TARGET}"
-OS_DIR_DEF="${ROOT_DIR}/root"
-CROSS_COMP=aarch64-unknown-linux-gnu-
-
-MOD_1_NAME="klipper"
-MOD_1_GIT="https://github.com/Klipper3d/klipper.git"
-MOD_2_NAME="klipper_katapult"
-MOD_2_GIT="https://github.com/Arksine/katapult.git"
-
-INST_DEV=/dev/sdc
-
-mkdir -p ${OUT_DIR}
-mkdir -p ${CFG_DIR}
-
-uboot_prepare()
-{
-    source_prepare git "${UBOOT_GIT_URL}" "${UBOOT_GIT_DIR}" "${UBOOT_DIR}" "${UBOOT_TAG}" "${UBOOT_PATCH_DIR}"
-}
-
-uboot_config()
-{
-    uboot_prepare
-    if [ -f "${CFG_DIR}/${CFG_UBOOT}" ]
-    then
-        cp "${CFG_DIR}/${CFG_UBOOT}" "${UBOOT_DIR}/.config"
-    fi
-    cd ${UBOOT_DIR} &&
-        make CROSS_COMPILE=${CROSS_COMP} ${UBOOT_ARGS} -j menuconfig &&
-        cp "${UBOOT_DIR}/.config" "${CFG_DIR}/${CFG_UBOOT}"
-}
-
-uboot_build()
-{
-    uboot_extras_build
-    uboot_prepare
-    echo "Build U-Boot..."
-    if [ -f "${CFG_DIR}/${CFG_UBOOT}" ]
-    then
-        cp "${CFG_DIR}/${CFG_UBOOT}" "${UBOOT_DIR}/.config"
-    fi
-    cd ${UBOOT_DIR} &&
-        make CROSS_COMPILE=${CROSS_COMP} ${UBOOT_ARGS} clean &&
-        make CROSS_COMPILE=${CROSS_COMP} ${UBOOT_ARGS} -j
-    for str in ${UBOOT_FILES[@]}; do
-        cp "${UBOOT_DIR}/${str}" "${OUT_DIR}/${str}"
-    done
-}
-
-kernel_prepare()
-{
-    source_prepare git "${KERNEL_GIT_URL}" "${KERNEL_GIT_DIR}" "${KERNEL_DIR}" "${KERNEL_TAG}" "${KERNEL_PATCH_DIR}"
-}
-
-kernel_config()
-{
-    kernel_prepare
-    if [ -f "${CFG_DIR}/${CFG_KERNEL}" ]
-    then
-        cp "${CFG_DIR}/${CFG_KERNEL}" "${KERNEL_SDIR}/.config"
-    fi
-    cd ${KERNEL_SDIR} &&
-        make ${KERNEL_PARAMS} menuconfig &&
-        cp "${KERNEL_SDIR}/.config" "${CFG_DIR}/${CFG_KERNEL}"
-}
-
-kernel_build()
-{
-    kernel_prepare
-    if [ -f "${CFG_DIR}/${CFG_KERNEL}" ]
-    then
-        cp "${CFG_DIR}/${CFG_KERNEL}" "${KERNEL_SDIR}/.config"
-    fi
-    cd ${KERNEL_SDIR} &&
-        make ${KERNEL_PARAMS} Image dtbs -j8 &&
-        cp "${KERNEL_SDIR}/arch/${KARCH}/boot/Image" "${OUT_DIR}/Image" &&
-        cp "${KERNEL_SDIR}/arch/${KARCH}/boot/dts/${KERNEL_DT_DIR}/${KERNEL_DT_NAME}.dtb" "${OUT_DIR}/${KERNEL_DT_NAME}.dtb"
-}
-
-sqh_root()
-{
-    if [ -e "${TMP_DIR}" ]
-    then
-        rm -rf "${TMP_DIR}"
-    fi
-    mkdir -p "${TMP_DIR}"
-    chmod u+s ${ROOT_DIR}/root/usr/bin/Xorg
-    cd ${ROOT_DIR}/root && "${ROOT_DIR}/scripts/back.sh" && cd ${ROOT_DIR}
-    cd "${TMP_DIR}" && tar xf "${ROOT_DIR}/${BACK_FN}" && cd ${ROOT_DIR}
-    #${ROOT_DIR}/root/chroot.sh ${TMP_DIR} 'emerge -ac --with-bdeps=n && exit'
-    if [ -f "${OUT_DIR}/${SQH_FS}" ]
-    then
-        mv "${OUT_DIR}/${SQH_FS}" "${OUT_DIR}/${SQH_FS}".old
-    fi
-    mksquashfs "${TMP_DIR}" "${OUT_DIR}/${SQH_FS}" -comp xz
-}
-
-source_sync()
-{
-    prepare_uboot
-    prepare_kernel
-}
-
-case "$2" in
-    bundle)
-        bundle
-        ;;
-    sync)
-        source_sync
-        ;;
-    chroot)
-        do_chroot $3
-        ;;
-    uboot_config)
-        uboot_config
-        ;;
-    uboot)
-        uboot_build
-        ;;
-    kernel_config)
-        kernel_config
-        ;;
-    kernel)
-        kernel_build
-        ;;
-    ramdisk)
-        mkramdisk
-        ;;
-    sqh_root)
-        sqh_root
-        ;;
-    cleanup)
-        rm -rf "${GIT_BARE_ROOT}"
-        ;;
-    *)
-        invalid_param
-        ;;
-esac
-
-#diff -Naur linux-6.8.9-gentoo_or linux-6.8.9-gentoo --exclude=*.conf* --exclude=*generated* --exclude=*scripts* > 1.patch
-#make -C /lib/modules/5.16.17/build M=/usr/src/w1-gpio-cl modules V=1
-#install -m644 w1-gpio-cl.ko /lib/modules/5.16.17/kernel/drivers/w1/masters
-#--depclean --with-bdeps=n
-
-# RAM-disk image
-#
-
-
-
-#if [ -e "${TMP_DIR}" ]; then
-#    rm -rf "${TMP_DIR}"
-#fi
-#for i in $(seq 1 20); do
-#    MOD_NAME="MOD_${i}_NAME"
-#    MOD_GIT="MOD_${i}_GIT"
-#    if [ -n "${!MOD_NAME}" ]; then
-#	mod_tmp="${TMP_DIR}/home/biqu/${!MOD_NAME}"
-#	mkdir -p "${mod_tmp}"
-#	git clone "${!MOD_GIT}" "${mod_tmp}" --depth=1
-#	mksquashfs "${TMP_DIR}" "./${!MOD_NAME}.lzm" -comp xz -force-uid 1000 -force-gid 1000
-#	rm -rf "${TMP_DIR}"
-#    fi
-#done
-

tmp/chroot.sh

@@ -1,55 +0,0 @@
-#!/bin/sh
-
-do_chroot()
-{
-    if [ -z "$1" ]
-    then
-        DDIR=${OS_DIR_DEF}
-    else
-        DDIR=$(realpath "$1")
-        mkdir -p ${DDIR}/var/db/pkg
-        mkdir -p ${DDIR}/var/db/repos
-        #mount --bind /media/1/H616/root/var/db/pkg ${DDIR}/var/db/pkg
-        #cp -r ${OS_DIR_DEF}/var/db/pkg/* ${DDIR}/var/db/pkg
-        mount --bind ${OS_DIR_DEF}/var/cache ${DDIR}/var/cache
-        mount --bind ${OS_DIR_DEF}/usr/portage ${DDIR}/usr/portage
-    fi
-    mkdir -p ${DDIR}/usr/src/linux-5.16-CB1
-
-    if [ -z "${DDIR}" ]
-    then
-        echo "No directory specified!"
-        exit 1
-    fi
-
-    mount --bind /dev ${DDIR}/dev
-    mount --bind /dev/shm ${DDIR}/dev/shm
-    mount --bind /dev/pts ${DDIR}/dev/pts
-    mount --bind /sys ${DDIR}/sys
-    mount --bind /proc ${DDIR}/proc
-    mount --bind /var/db/repos ${DDIR}/var/db/repos
-    mount --bind ${DDIR}/../CB1-Kernel/kernel ${DDIR}/usr/src/linux-5.16-CB1
-    mount -t tmpfs tmpfs ${DDIR}/var/tmp/
-    cp -v "${ROOT_DIR}/scripts/qemu-aarch64" "${DDIR}/bin/"
-    if [ -z "$2" ]
-    then
-        chroot ${DDIR}/ /bin/bash
-    else
-        chroot ${DDIR}/ /bin/bash -c "$2"
-    fi
-    umount ${DDIR}/var/tmp
-    umount ${DDIR}/usr/src/linux-5.16-CB1
-    umount ${DDIR}/var/db/repos
-    umount ${DDIR}/proc
-    umount ${DDIR}/sys
-    umount ${DDIR}/dev/pts
-    umount ${DDIR}/dev/shm
-    umount ${DDIR}/dev
-    if [ -n "$1" ]
-    then
-        umount ${DDIR}/usr/portage
-        umount ${DDIR}/var/cache
-        #umount ${DDIR}/var/db/pkg
-        rm -rf ${DDIR}/var/db/pkg
-    fi
-}