Skip to content

Commit 43b5597

Browse files
paralinparalin
committed
pine64: use skiff-init-squashfs and update all targets
Switch to skiff-init-squashfs based boot (not backwards compatible) Use newer u-boot and arm-trusted-firmware. Signed-off-by: Christian Stewart <[email protected]>
1 parent 6b46238 commit 43b5597

File tree

35 files changed

+108
-180
lines changed

35 files changed

+108
-180
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ Here are the boards/systems currently supported:
172172
| [Pi 3] + 1, 2 | [pi/3] | N/A | ✔ rpi-5.15.33 | ✔ Tested |
173173
| [Pi 4] | [pi/4] | N/A | ✔ rpi-5.15.33 | ✔ Tested |
174174
| [Pi 4] (32bit mode) | [pi/4x32] | N/A | ✔ rpi-5.15.33 | ✔ Tested |
175-
| [Pine64 H64] | [pine64/h64] | ✔ U-Boot | ✔ megi-5.17.5 | |
175+
| [Pine64 H64] | [pine64/h64] | ✔ U-Boot 2022.04 | ✔ megi-5.17.5 | |
176176
| [PineBook Pro] | [pine64/book] | ✔ U-Boot (bin) | ✔ megi-5.17.5 | ✔ Tested |
177177
| [PinePhone] | [pine64/phone] | ✔ U-Boot (bin) | ✔ megi-5.17.5 | ✔ Tested |
178-
| [Rock64] rk3328 | [pine64/rock64] | ✔ U-Boot | ✔ megi-5.17.5 | ✔ Tested |
178+
| [Rock64] rk3328 | [pine64/rock64] | ✔ U-Boot 2022.04 | ✔ megi-5.17.5 | ✔ Tested |
179179
| [RockPro64] | [pine64/rockpro64] | ✔ U-Boot (bin) | ✔ sk-5.15.32 | ✔ Tested |
180180
| [USBArmory Mk2] | [usbarmory/mk2] | ✔ U-Boot 2020.10 | ✔ 5.17.4 | ✔ Tested |
181181

‎configs/allwinner/nezha/root_overlay/opt/skiff/scripts/mount-all.pre.d/00skiff-squashfs-mounts.sh

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export PERSIST_DEVICE="/dev/mmcblk0p1"
2-
export PERSIST_RESIZE_DEVICE="/dev/mmcblk0p1"
31
export ROOTFS_DEVICE="/mnt/persist/rootfs"
42
export ROOTFS_MNT_FLAGS="--rbind"
53
export BOOT_DEVICE="/mnt/persist/boot"

‎configs/freescale/wandboard/root_overlay/opt/skiff/scripts/mount-all.pre.d/00skiff-squashfs-mounts.sh

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export PERSIST_DEVICE="/dev/mmcblk0p1"
2-
export PERSIST_RESIZE_DEVICE="/dev/mmcblk0p1"
31
export ROOTFS_DEVICE="/mnt/persist/rootfs"
42
export ROOTFS_MNT_FLAGS="--rbind"
53
export BOOT_DEVICE="/mnt/persist/boot"

‎configs/jetson/tx2/root_overlay/opt/skiff/scripts/mount-all.pre.d/00nvidia-mounts.sh

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export PERSIST_DEVICE="/dev/mmcblk0p1"
2-
export PERSIST_RESIZE_DEVICE="/dev/mmcblk0p1"
31
export ROOTFS_DEVICE="/mnt/persist/rootfs"
42
export ROOTFS_DEVICE_MKDIR="true"
53
export ROOTFS_MNT_FLAGS="--rbind"

‎configs/pine64/book/buildroot/kernel

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# 5.13.0-1150-ayufan
2-
# BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/ayufan-rock64/linux-mainline-kernel/archive/7a7e95f6664887f189de280fff4e3e3f80fa02e9/linux-rock64-5.13.0-1150-ayufan.tar.gz"
3-
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y
4-
# BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux"
5-
61
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
72
BR2_LINUX_KERNEL_DEFCONFIG="pinebook_pro"
83
BR2_LINUX_KERNEL_DTS_SUPPORT=y

‎configs/pine64/book/buildroot/serial

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
BR2_TARGET_GENERIC_GETTY_PORT="ttyS2"
1+
BR2_TARGET_GENERIC_GETTY=y
2+
BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
3+
BR2_TARGET_GENERIC_GETTY_PORT="ttyS2"

‎configs/pine64/book/buildroot/uboot

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# Disabled due to compiler incompatibility:
2-
# (requires 32 bit arm compiler)
1+
# SkiffOS: To support crust firmware, we need a arm32 cross-compiler.
2+
# Buildroot can only use 1 toolchain at a time (as of early 2022).
3+
# Workaround: pre-build crust, u-boot with crust-meta and store blobs:
4+
# see https://github.com/skiffos/pinephone-crust-blobs
5+
BR2_PACKAGE_PINEPHONE_CRUST_BLOBS=y
6+
7+
# BR2_TARGET_UBOOT is not set
38
# BR2_TARGET_UBOOT_USE_DEFCONFIG=y
49
# BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pinebook-pro-rk3399"
5-
6-
BR2_TARGET_UBOOT=n

‎configs/pine64/book/metadata/dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
skiff/moduleimg,pine64/common
1+
pine64/common

‎configs/pine64/book/resources/boot-scripts/extlinux.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
LABEL SkiffOS
2-
KERNEL /Image
3-
FDT /rk3399-pinebook-pro.dtb
4-
APPEND initrd=/rootfs.cpio.uboot root=/dev/ram0 ro console=tty3 console=ttyS2,1500000
2+
KERNEL /boot/Image
3+
FDT /boot/rk3399-pinebook-pro.dtb
4+
APPEND rw init=/boot/skiff-init/skiff-init-squashfs console=ttyS2,115200n8 fsck.repair=yes net.ifnames=0

‎configs/pine64/common/buildroot/target

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# use skiff-init-squashfs
2+
BR2_PACKAGE_SKIFF_INIT_SQUASHFS=y
3+
BR2_PACKAGE_SKIFF_INIT_RESIZE2FS=y
4+
5+
# BR2_TARGET_ROOTFS_CPIO is not set
6+
BR2_TARGET_ROOTFS_SQUASHFS=y
7+
BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y

‎configs/pine64/common/buildroot_ext/package/pinephone-crust-blobs/pinephone-crust-blobs.hash

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Locally computed
2-
sha256 4b5167ba4bfd6432adbb866e439e40229ead769c83135b34ae4981b1332c1e30 pinephone-crust-blobs-crust-20211124.tar.gz
2+
sha256 a649dda6dcfeeb8bc8c335759d523726fa65b86ffc9068c105e0bf68a7b71590 pinephone-crust-blobs-crust-20220504.tar.gz

‎configs/pine64/common/buildroot_ext/package/pinephone-crust-blobs/pinephone-crust-blobs.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
#
55
################################################################################
66

7-
PINEPHONE_CRUST_BLOBS_VERSION = crust-20211124
7+
PINEPHONE_CRUST_BLOBS_VERSION = crust-20220504
88
PINEPHONE_CRUST_BLOBS_SITE = $(call github,skiffos,pinephone-crust-blobs,$(PINEPHONE_CRUST_BLOBS_VERSION))
99
PINEPHONE_CRUST_BLOBS_LICENSE = BSD-3-Clause, GPL-2.0+
10-
PINEPHONE_CRUST_BLOBS_LICENSE_FILES = LICENSE.md
1110

1211
PINEPHONE_CRUST_BLOBS_INSTALL_TARGET = NO
1312
PINEPHONE_CRUST_BLOBS_INSTALL_HOST = NO

‎configs/pine64/common/buildroot_ext/package/rk3399-firmware-blobs/Config.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ config BR2_PACKAGE_RK3399_FIRMWARE_BLOBS
33
help
44
Binary blobs for rk3399 bl31
55

6-
https://gitlab.com/skiffos/rk3399-firmware-blobs
6+
https://github.com/skiffos/rk3399-firmware-blobs
77

88
if BR2_PACKAGE_RK3399_FIRMWARE_BLOBS
99

1010
config BR2_PACKAGE_RK3399_FIRMWARE_BLOBS_VARIANT
1111
string "board variant"
12-
default "pinebook-pro" # or rockpro64
12+
default "pinebook-pro"
1313

1414
endif # BR2_PACKAGE_RK3399_FIRMWARE_BLOBS

‎configs/pine64/common/buildroot_ext/package/rk3399-firmware-blobs/rk3399-firmware-blobs.hash

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Locally computed
2-
sha256 ba9d2c069151efe97e3e09e5f7caef21ab3897cea58e0f48b8d69baa2c5bc99a rk3399-firmware-blobs-a252d265f94d37287123a08812b27186e1fa3e0a.tar.gz
2+
sha256 3f6bd558672d34a1778979b9983b9bf64d10d6828cfea86e5372894ad755e119 rk3399-firmware-blobs-c4108cf2e4a2bb62066333c21796cd35e7c354ad.tar.gz
3+

‎configs/pine64/common/buildroot_ext/package/rk3399-firmware-blobs/rk3399-firmware-blobs.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
RK3399_FIRMWARE_BLOBS_VERSION = a252d265f94d37287123a08812b27186e1fa3e0a
7+
RK3399_FIRMWARE_BLOBS_VERSION = c4108cf2e4a2bb62066333c21796cd35e7c354ad
88
RK3399_FIRMWARE_BLOBS_SITE = $(call github,skiffos,rk3399-firmware-blobs,$(RK3399_FIRMWARE_BLOBS_VERSION))
99
RK3399_FIRMWARE_BLOBS_LICENSE = BSD-3-Clause
1010
RK3399_FIRMWARE_BLOBS_LICENSE_FILES = LICENSE

‎configs/pine64/common/extensions/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ format:
33

44
install:
55
@$(SKIFF_CURRENT_CONF_DIR)/scripts/install_sd.sh
6-

‎configs/pine64/common/metadata/dependencies

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
skiff/moduleimg

‎configs/pine64/common/root_overlay/opt/skiff/scripts/mount-all.pre.d/00skiff-squashfs-mounts.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export ROOTFS_DEVICE="/mnt/persist/rootfs"
2+
export ROOTFS_MNT_FLAGS="--rbind"
3+
export BOOT_DEVICE="/mnt/persist/boot"
4+
export BOOT_MNT_FLAGS="--rbind"

‎configs/pine64/common/scripts/format_sd.sh

+6-20
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if [ ! -f "$ubootimg" ]; then
3535
fi
3636

3737
rk3399fw="$BUILDROOT_DIR/output/images/rk3399-firmware-blobs"
38-
if [ -d $rk3399fw ]; then
38+
if [ ! -f "$ubootimg" ] && [ -d $rk3399fw ]; then
3939
ubootimg=$rk3399fw/u-boot.itb
4040
idbloader=$rk3399fw/idbloader.img
4141
fi
@@ -67,22 +67,15 @@ set -x
6767
set -e
6868

6969
echo "Formatting device..."
70-
sudo dd if=/dev/zero of=$PINE64_SD bs=8k count=13 oflag=dsync
70+
dd if=/dev/zero of=$PINE64_SD bs=8k count=13 oflag=dsync
7171

7272
echo "Creating partitions..."
7373
sudo partprobe ${PINE64_SD} || true
74-
# sudo parted $PINE64_SD mklabel gpt
7574
sudo parted $PINE64_SD mklabel msdos
75+
sudo partprobe ${PINE64_SD} || true
7676

77-
# boot
78-
sudo parted -a optimal $PINE64_SD mkpart primary fat32 128MiB 510MiB
79-
sudo parted $PINE64_SD set 1 boot on
80-
81-
# rootfs
82-
sudo parted -a optimal $PINE64_SD mkpart primary ext4 510MiB 1024MiB
83-
84-
# persist
85-
sudo parted -a optimal $PINE64_SD -- mkpart primary ext4 1024MiB "100%"
77+
echo "Making persist partition..."
78+
sudo parted -a optimal $PINE64_SD -- mkpart primary ext4 128MiB "100%"
8679

8780
echo "Waiting for partprobe..."
8881
sync && sync
@@ -99,15 +92,8 @@ if [ ! -b ${PINE64_SD_SFX}1 ]; then
9992
echo "Warning: it appears your kernel has not created partition files at ${PINE64_SD_SFX}."
10093
fi
10194

102-
echo "Formatting boot partition..."
103-
mkfs.vfat -F 32 ${PINE64_SD_SFX}1
104-
fatlabel ${PINE64_SD_SFX}1 boot
105-
106-
echo "Formatting rootfs partition..."
107-
$MKEXT4 -L "rootfs" ${PINE64_SD_SFX}2
108-
10995
echo "Formatting persist partition..."
110-
$MKEXT4 -L "persist" ${PINE64_SD_SFX}3
96+
mkfs.ext4 -F -L "persist" ${PINE64_SD_SFX}1
11197

11298
sync && sync
11399

‎configs/pine64/common/scripts/install_sd.sh

+48-57
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ if [ ! -b "$PINE64_SD" ]; then
1818
fi
1919

2020
resources_path="${SKIFF_CURRENT_CONF_DIR}/resources"
21-
outp_path="${BUILDROOT_DIR}/output"
22-
images_path="${outp_path}/images"
21+
IMAGES_DIR=${BUILDROOT_DIR}/images
2322

24-
img_path="${images_path}/Image"
25-
zimg_path="${images_path}/zImage"
26-
uinit_path="${images_path}/rootfs.cpio.uboot"
27-
dtb_path=$(find ${images_path}/ -name '*.dtb' -print -quit)
23+
img_path="${IMAGES_DIR}/Image"
24+
zimg_path="${IMAGES_DIR}/zImage"
25+
uinit_path="${IMAGES_DIR}/rootfs.cpio.uboot"
26+
dtb_path=$(find ${IMAGES_DIR}/ -name '*.dtb' -print -quit)
2827

2928
source ${SKIFF_CURRENT_CONF_DIR}/scripts/determine_config.sh
3029

@@ -58,71 +57,63 @@ fi
5857
}
5958
trap cleanup EXIT
6059

61-
boot_dir="${WORK_DIR}/boot"
62-
rootfs_dir="${WORK_DIR}/rootfs"
63-
persist_dir="${WORK_DIR}/persist"
64-
6560
PINE64_SD_SFX=$PINE64_SD
6661
if [ -b ${PINE64_SD}p1 ]; then
67-
PINE64_SD_SFX=${PINE64_SD}p
62+
PINE64_SD_SFX=${PINE64_SD}p
6863
fi
6964

70-
mkdir -p $boot_dir
71-
echo "Mounting ${PINE64_SD_SFX}1 to $boot_dir..."
72-
mounts+=("$boot_dir")
73-
mount ${PINE64_SD_SFX}1 $boot_dir
74-
75-
echo "Mounting ${PINE64_SD_SFX}2 to $rootfs_dir..."
76-
mkdir -p $rootfs_dir
77-
mounts+=("$rootfs_dir")
78-
mount ${PINE64_SD_SFX}2 $rootfs_dir
79-
80-
echo "Mounting ${PINE64_SD_SFX}3 to $persist_dir..."
81-
mkdir -p $persist_dir
82-
mounts+=("$persist_dir")
83-
mount ${PINE64_SD_SFX}3 $persist_dir
84-
85-
echo "Copying kernel image..."
86-
sync
87-
rsync -rav --no-perms --no-owner --no-group $img_path $boot_dir/
88-
sync
89-
90-
echo "Copying uInitrd..."
91-
rsync -rav --no-perms --no-owner --no-group $uinit_path $boot_dir/rootfs.cpio.uboot
92-
sync
93-
94-
if [ -d "$outp_path/images/rootfs_part" ]; then
95-
echo "Copying rootfs_part..."
96-
rsync -rav --no-perms --no-owner --no-group $outp_path/images/rootfs_part/ $rootfs_dir/
97-
sync
98-
fi
65+
mount_persist_dir="${WORK_DIR}/persist"
66+
BOOT_DIR=${mount_persist_dir}/boot
67+
ROOTFS_DIR=${mount_persist_dir}/rootfs
68+
PERSIST_DIR=${mount_persist_dir}/
69+
70+
echo "Mounting ${PINE64_SD_SFX}1 to $mount_persist_dir..."
71+
mkdir -p $mount_persist_dir
72+
mounts+=("$mount_persist_dir")
73+
sudo mount ${PINE64_SD_SFX}1 $mount_persist_dir
9974

100-
if [ -d "$outp_path/images/persist_part" ]; then
101-
echo "Copying persist_part..."
102-
rsync -rav --no-perms --no-owner --no-group $outp_path/images/persist_part/ $persist_dir/
103-
sync
75+
echo "Copying files..."
76+
77+
cd ${IMAGES_DIR}
78+
mkdir -p ${BOOT_DIR}/skiff-init ${ROOTFS_DIR}/
79+
if [ -d ${IMAGES_DIR}/rootfs_part/ ]; then
80+
rsync -rav ${IMAGES_DIR}/rootfs_part/ ${ROOTFS_DIR}/
81+
fi
82+
if [ -d ${IMAGES_DIR}/persist_part/ ]; then
83+
rsync -rav ${IMAGES_DIR}/persist_part/ ${PERSIST_DIR}/
84+
fi
85+
if [ -f ${SKIFF_CURRENT_CONF_DIR}/resources/resize2fs.conf ]; then
86+
cp -v ${SKIFF_CURRENT_CONF_DIR}/resources/resize2fs.conf ./skiff-init/resize2fs.conf
87+
fi
88+
rsync -rv ./skiff-init/ ${BOOT_DIR}/skiff-init/
89+
rsync -rv \
90+
./*.dtb ./Image \
91+
./skiff-release ./rootfs.squashfs \
92+
${BOOT_DIR}/
93+
94+
if [ -z "$DISABLE_CREATE_SWAPFILE" ]; then
95+
PERSIST_SWAP=${PERSIST_DIR}/primary.swap
96+
if [ ! -f ${PERSIST_SWAP} ]; then
97+
echo "Pre-allocating 2GB swapfile with zeros (ignoring errors)..."
98+
dd if=/dev/zero of=${PERSIST_SWAP} bs=1M count=2000 || true
99+
else
100+
echo "Swapfile already exists, skipping allocation step."
101+
fi
104102
fi
105103

106104
enable_silent() {
107-
if [ -f "$images_path/.disable-serial-console" ]; then
105+
if [ -f "$IMAGES_DIR/.disable-serial-console" ]; then
108106
echo "Disabling serial console and enabling silent mode..."
109107
sed -i -e "/^setenv condev/s/^/# /" -e "s/# setenv silent/setenv silent/" $1
110108
fi
111109
}
112110

113111
if [ -n "$boot_conf_extlinux" ]; then
114-
mkdir -p $boot_dir/boot/extlinux/
115-
cp $boot_conf_extlinux $boot_dir/boot/extlinux/extlinux.conf
112+
mkdir -p $BOOT_DIR/boot/extlinux/
113+
cp -v $boot_conf_extlinux $BOOT_DIR/boot/extlinux/extlinux.conf
116114
else
117115
echo "Compiling boot.txt..."
118-
cp $boot_conf $boot_dir/boot.txt
119-
enable_silent $boot_dir/boot.txt
120-
mkimage -A arm -C none -T script -n 'SkiffOS' -d $boot_dir/boot.txt $boot_dir/boot.scr
116+
cp $boot_conf $BOOT_DIR/boot.txt
117+
enable_silent $BOOT_DIR/boot.txt
118+
mkimage -A arm -C none -T script -n 'SkiffOS' -d $BOOT_DIR/boot.txt $BOOT_DIR/boot.scr
121119
fi
122-
sync
123-
124-
echo "Copying device tree..."
125-
rsync -rav --no-perms --no-owner --no-group ${images_path}/*.dtb $boot_dir/
126-
sync
127-
128-
cleanup

‎configs/pine64/h64/buildroot/dts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-pine-h64-model-b"

‎configs/pine64/h64/buildroot/firmware

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
44
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
55
BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y
66
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
7-
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.3"
7+
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"

‎configs/pine64/h64/buildroot/kernel

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
2-
BR2_LINUX_KERNEL_DTS_SUPPORT=y
3-
BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h6-pine-h64-model-b"

‎configs/pine64/h64/buildroot/uboot

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
# uses ATF in ./firmware
21
BR2_TARGET_UBOOT_USE_DEFCONFIG=y
32
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine_h64"
3+
44
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
55
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
6-
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
6+
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04"
7+
78
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
89
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
910
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
10-
# BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
11+
1112
BR2_TARGET_UBOOT_SPL=y
1213
BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"

‎configs/pine64/h64/kernel/base

-9
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
# CONFIG_XEN_NETDEV_FRONTEND is not set
113113
# CONFIG_XEN_SYS_HYPERVISOR is not set
114114
# CONFIG_KEYBOARD_ATKBD is not set
115-
CONFIG_9P_FS=y
116115
CONFIG_ARM_CPUIDLE=y
117116
CONFIG_ASHMEM=y
118117
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -153,9 +152,6 @@ CONFIG_DRM_SUN8I_DW_HDMI=y
153152
CONFIG_DRM_SUN8I_MIXER=y
154153
CONFIG_DRM_UDL=m
155154
CONFIG_ENERGY_MODEL=y
156-
CONFIG_EXFAT_FS=m
157-
CONFIG_EXT3_FS=y
158-
CONFIG_EXT4_FS=y
159155
CONFIG_FB_SIMPLE=y
160156
CONFIG_FB_UDL=m
161157
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
@@ -180,7 +176,6 @@ CONFIG_MEDIA_SUPPORT=y
180176
CONFIG_NOP_USB_XCEIV=y
181177
CONFIG_NVMEM_SUNXI_SID=y
182178
CONFIG_OF_CONFIGFS=y
183-
CONFIG_OVERLAY_FS=y
184179
CONFIG_PHYLIB=y
185180
CONFIG_PM_AUTOSLEEP=y
186181
CONFIG_PM_WAKELOCKS=y
@@ -191,10 +186,6 @@ CONFIG_RTL8XXXU=n
191186
CONFIG_RTL_CARDS=m
192187
CONFIG_SCSI=y
193188
CONFIG_SCSI_SAS_LIBSAS=y
194-
CONFIG_SQUASHFS=y
195-
CONFIG_SQUASHFS_LZ4=y
196-
CONFIG_SQUASHFS_XATTR=y
197-
CONFIG_SQUASHFS_XZ=y
198189
CONFIG_STAGING_MEDIA=y
199190
CONFIG_TARGET_CORE=m
200191
CONFIG_TASKSTATS=y

‎configs/pine64/h64/kernel/dtc

-2
This file was deleted.

‎configs/pine64/h64/metadata/description

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Configuration for the Pine64 PinePhone device.
1+
Configuration for the Pine64 H64 device.

0 commit comments

Comments
 (0)