Skip to content

Commit 27973e0

Browse files
Mic92Mic92
authored
Merge pull request #1671 from leifhelm/mnt-reform
Fix and update kernel. Update uboot
2 parents 52113c4 + 238316c commit 27973e0

File tree

12 files changed

+221
-64
lines changed

12 files changed

+221
-64
lines changed

‎mnt/reform/kernel.nix‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@
77
...
88
}:
99
let
10-
modDirVersion = "6.16.5";
11-
reformDebianPackages = fetchFromGitLab {
12-
domain = "source.mnt.re";
13-
owner = "reform";
14-
repo = "reform-debian-packages";
15-
rev = "830c94db42beef876dc58ea56711659ae7bd415d";
16-
hash = "sha256-mdORgTOM7RJnEjY5G/iWMHf69wQkql11yRpQ/DrQKb4=";
17-
};
10+
sources = lib.importJSON ./sources.json;
11+
modDirVersion = sources.modDirVersion;
12+
reformDebianPackages = fetchFromGitLab sources.reformDebianPackages;
1813
linuxPkg =
1914
{
2015
lib,
@@ -31,26 +26,23 @@ let
3126

3227
src = fetchzip {
3328
url = "mirror://kernel/linux/kernel/v${lib.versions.major modDirVersion}.x/linux-${modDirVersion}.tar.xz";
34-
hash = "sha256-XiTuH40b3VJqzwygZzU0FcvMDj41Rq6IsMbm+3+QxDY=";
29+
hash = "sha256-sE+AfJwaQueiL1caWWfGQ1nf0qsDvEJOe3ZaVHTwelA=";
3530
};
3631

37-
# Use postPatch to apply patches from a directory without IFD
38-
postPatch = ''
39-
for patch in ${reformDebianPackages}/linux/patches${lib.versions.majorMinor modDirVersion}/*/*.patch; do
40-
echo "Applying patch: $patch"
41-
patch -p1 < "$patch"
42-
done
43-
'';
44-
45-
kernelPatches = [
46-
{
47-
name = "reform-dts";
48-
patch = callPackage ./dtsPatch.nix {
49-
inherit reformDebianPackages;
50-
kernelSource = src;
51-
};
52-
}
53-
];
32+
kernelPatches =
33+
(map (patch: {
34+
name = patch;
35+
patch = "${reformDebianPackages}/${patch}";
36+
}) (import ./kernelPatches.nix))
37+
++ [
38+
{
39+
name = "reform-dts";
40+
patch = callPackage ./dtsPatch.nix {
41+
inherit reformDebianPackages;
42+
kernelSource = src;
43+
};
44+
}
45+
];
5446

5547
structuredExtraConfig = with lib.kernel; {
5648
# configuration options from https://source.mnt.re/reform/reform-debian-packages/-/blob/7f31ba3a6742d60d8d502c1d86e63ef5df3916bf/linux/config
@@ -82,7 +74,7 @@ let
8274
JOYSTICK_XPAD_LEDS = yes;
8375

8476
INTERCONNECT_IMX8MP = yes;
85-
SND_SOC_FSL_ASRC = yes;
77+
SND_SOC_FSL_ASRC = module; # From the documentation: This option is only useful for out-of-tree drivers since in-tree drivers select it automatically.
8678
DRM_IMX_LCDIF = yes;
8779
DRM_IMX8MP_DW_HDMI_BRIDGE = yes;
8880
DRM_IMX8MP_HDMI_PVI = yes;
@@ -135,15 +127,15 @@ let
135127
SPI_ROCKCHIP = yes;
136128
SPI_ROCKCHIP_SFC = module;
137129
ARM_SCMI_CPUFREQ = module;
138-
VIDEO_ROCKCHIP_VDEC2 = module;
130+
# VIDEO_ROCKCHIP_VDEC2 = module; # no rkvdec2 patch included any more
139131
ROCKCHIP_DW_HDMI_QP = yes;
140132
ROCKCHIP_DW_MIPI_DSI2 = yes;
141133
PHY_ROCKCHIP_SAMSUNG_DCPHY = yes;
142134
REGULATOR_FIXED_VOLTAGE = yes;
143135
GPIO_ROCKCHIP = yes;
144136
PL330_DMA = yes;
145137

146-
DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW = no; # patches for 6.16 break this driver
138+
DRM_ZYNQMP_DPSUB = no; # patches for 6.17 break this driver
147139
};
148140
}
149141
// (args.argsOverride or { })

‎mnt/reform/kernelPatches.nix‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[
2+
"linux/patches6.17/imx8mp-mnt-pocket-reform/2ghz/0001-imx8mp-2ghz-clk.patch"
3+
"linux/patches6.17/imx8mp-mnt-pocket-reform/2ghz/0002-imx8mp-2ghz-opp.patch"
4+
"linux/patches6.17/imx8mp-mnt-pocket-reform/audio/0000-revert-crashy-audiomix-pm-support.patch"
5+
"linux/patches6.17/imx8mp-mnt-pocket-reform/mmc-sdio/0001-sdhci-add-no-sd-uhs-sdr104-devicetree-property.patch"
6+
"linux/patches6.17/imx8mp-mnt-pocket-reform/mmc-sdio/0002-During-the-card-init-the-host-side-sometimes-may-nee.patch"
7+
"linux/patches6.17/imx8mp-mnt-pocket-reform/mmc-sdio/0003-USDHC-IP-has-one-limitation-the-tuning-circuit-can-t.patch"
8+
"linux/patches6.17/imx8mp-mnt-pocket-reform/pocket-panel/0001-v5-add-multi-display-panel-driver.patch"
9+
"linux/patches6.17/imx8mp-mnt-pocket-reform/pocket-panel/0002-pocket-panel-fix-sleep-add-orientation.patch"
10+
"linux/patches6.17/imx8mp-mnt-reform2/0001-sn65dsi86-use-hs-clock-of-samsung-dsim-host-directly.patch"
11+
"linux/patches6.17/imx8mp-mnt-reform2/0002-lcdif-dont-exceed-desired-pixel-clock.patch"
12+
"linux/patches6.17/imx8mq-mnt-reform2/0001-drm-etnaviv-Fix-flush-sequence-logic.patch"
13+
"linux/patches6.17/imx8mq-mnt-reform2/0001-imx8mq-mnt-reform2.dts-multiple-fixes-for-display-wi.patch"
14+
"linux/patches6.17/imx8mq-mnt-reform2/0001-nwl-dsi-fixup-mode-only-for-LCDIF-input-not-DCSS.patch"
15+
"linux/patches6.17/imx8mq-mnt-reform2/0002-Revert-drm-bridge-nwl-dsi-Use-vsync-hsync-polarity-f.patch"
16+
"linux/patches6.17/imx8mq-mnt-reform2/0003-lcdif-fix-pcie-interference.patch"
17+
"linux/patches6.17/imx8mq-mnt-reform2/0004-mnt4002-imx-gpcv2-wake-smccc.patch.patch"
18+
"linux/patches6.17/imx8mq-mnt-reform2/0005-pci-imx6-add-support-for-internal-refclk-imx8mq.patch"
19+
"linux/patches6.17/imx8mq-mnt-reform2/0006-imx8mq-import-HDMI-driver-and-make-DCSS-compatible-w.patch"
20+
"linux/patches6.17/ls1028a-mnt-reform2/0000-dtsi-add-hdptx.patch"
21+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-pocket-reform/0001-a311d-viu-fifo-lines-config.patch"
22+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-pocket-reform/0002-a311d-viu-fifo-lines-config-header.patch"
23+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-pocket-reform/0003-tlv320aic31xx-add-1228800hz-support.patch"
24+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0001-Revert-drm-bridge-synopsys-dw-mipi-dsi-enable-EoTp-b.patch"
25+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0001-meson-g12b-bananapi-cm4-mnt-reform2.dts-fix-audio-an.patch"
26+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0011-dw-mipi-dsi-phy-stop-wait-time.patch"
27+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0012-innolux-n125hce-gn1-timing-tweaks.patch"
28+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0013-meson-viu-hold-fifo-lines.patch"
29+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0014-meson-venc-sync.patch.patch"
30+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0015-meson-dw-mipi-dsi-sync-invert.patch"
31+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0016-sn65dsi86-burst-mode-support.patch"
32+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0018-sn65dsi86-never-turn-off.patch"
33+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0020-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch"
34+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0021-HACK-of-partial-revert-of-fdt.c-changes.patch"
35+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0022-add-bt-and-eth-resets.patch"
36+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0023-sdio-pullups.patch"
37+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0024-sdio-improve-wifi-speed.patch"
38+
"linux/patches6.17/meson-g12b-bananapi-cm4-mnt-reform2/0030-WORKAROUND-meson-plane-disable-afbc-32x8.patch"
39+
"linux/patches6.17/rk3588-mnt-reform2/0001-MERGED-drm-bridge-Pass-down-connector-to-drm-bridge-.patch"
40+
"linux/patches6.17/rk3588-mnt-reform2/0010-MERGED-arm64-dts-rockchip-add-pd_npu-label-for-RK358.patch"
41+
"linux/patches6.17/rk3588-mnt-reform2/0011-MERGED-arm64-dts-rockchip-Add-nodes-for-NPU-and-its-.patch"
42+
"linux/patches6.17/rk3588-mnt-reform2/0024-math.h-add-DIV_ROUND_UP_NO_OVERFLOW.patch"
43+
"linux/patches6.17/rk3588-mnt-reform2/0025-clk-divider-Fix-divisor-masking-on-64-bit-platforms.patch"
44+
"linux/patches6.17/rk3588-mnt-reform2/0026-clk-composite-replace-open-coded-abs_diff.patch"
45+
"linux/patches6.17/rk3588-mnt-reform2/0030-mfd-rk8xx-Fix-shutdown-handler.patch"
46+
"linux/patches6.17/rk3588-mnt-reform2/0033-arm64-dts-rockchip-Add-VOP-clock-resets-for-rk3588s.patch"
47+
"linux/patches6.17/rk3588-mnt-reform2/0035-drm-rockchip-vop2-Add-core-reset-support.patch"
48+
"linux/patches6.17/rk3588-mnt-reform2/0037-drm-bridge-synopsys-Add-DW-DPTX-Controller-support-l.patch"
49+
"linux/patches6.17/rk3588-mnt-reform2/0038-drm-rockchip-Add-RK3588-DPTX-output-support.patch"
50+
"linux/patches6.17/rk3588-mnt-reform2/0041-drm-birdge-simple-bridge-Add-support-for-radxa-ra620.patch"
51+
"linux/patches6.17/rk3588-mnt-reform2/0042-arm64-dts-rockchip-Add-DP0-for-rk3588.patch"
52+
"linux/patches6.17/rk3588-mnt-reform2/0043-arm64-dts-rockchip-Add-DP1-for-rk3588.patch"
53+
"linux/patches6.17/rk3588-mnt-reform2/0046-arm64-defconfig-Enable-Rockchip-RK3588-DisplayPort-C.patch"
54+
"linux/patches6.17/rk3588-mnt-reform2/0048-arm64-dts-rockchip-Fix-USB-C-description-for-RK3588-.patch"
55+
"linux/patches6.17/rk3588-mnt-reform2/0068-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch"
56+
"linux/patches6.17/rk3588-mnt-reform2/0069-drm-bridge-dw-hdmi-qp-Fixup-timer-base-setup.patch"
57+
"linux/patches6.17/rk3588-mnt-reform2/0070-drm-rockchip-dw_hdmi_qp-Improve-error-handling-with-.patch"
58+
"linux/patches6.17/rk3588-mnt-reform2/0071-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-in-dw_hdmi_q.patch"
59+
"linux/patches6.17/rk3588-mnt-reform2/0072-drm-rockchip-dw_hdmi_qp-Provide-ref-clock-rate-in-dw.patch"
60+
"linux/patches6.17/rk3588-mnt-reform2/0075-phy-hdmi-Add-HDMI-2.1-FRL-configuration-options.patch"
61+
"linux/patches6.17/rk3588-mnt-reform2/0076-phy-rockchip-samsung-hdptx-Fix-reported-clock-rate-i.patch"
62+
"linux/patches6.17/rk3588-mnt-reform2/0077-phy-rockchip-samsung-hdptx-Reduce-ROPLL-loop-bandwid.patch"
63+
"linux/patches6.17/rk3588-mnt-reform2/0078-phy-rockchip-samsung-hdptx-Prevent-Inter-Pair-Skew-f.patch"
64+
"linux/patches6.17/rk3588-mnt-reform2/0079-phy-rockchip-samsung-hdptx-Use-usleep_range-instead-.patch"
65+
"linux/patches6.17/rk3588-mnt-reform2/0080-phy-rockchip-samsung-hdptx-Fix-coding-style-alignmen.patch"
66+
"linux/patches6.17/rk3588-mnt-reform2/0081-phy-rockchip-samsung-hdptx-Consistently-use-rk_-hdpt.patch"
67+
"linux/patches6.17/rk3588-mnt-reform2/0082-phy-rockchip-samsung-hdptx-Enable-lane-output-in-com.patch"
68+
"linux/patches6.17/rk3588-mnt-reform2/0083-phy-rockchip-samsung-hdptx-Cleanup-_cmn_init_seq-lis.patch"
69+
"linux/patches6.17/rk3588-mnt-reform2/0084-phy-rockchip-samsung-hdptx-Compute-clk-rate-from-PLL.patch"
70+
"linux/patches6.17/rk3588-mnt-reform2/0085-phy-rockchip-samsung-hdptx-Drop-hw_rate-driver-data.patch"
71+
"linux/patches6.17/rk3588-mnt-reform2/0086-phy-rockchip-samsung-hdptx-Switch-to-driver-specific.patch"
72+
"linux/patches6.17/rk3588-mnt-reform2/0087-phy-rockchip-samsung-hdptx-Extend-rk_hdptx_phy_verif.patch"
73+
"linux/patches6.17/rk3588-mnt-reform2/0088-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-FRL-support.patch"
74+
"linux/patches6.17/rk3588-mnt-reform2/0089-drm-rockchip-vop2-Check-bpc-before-switching-DCLK-so.patch"
75+
"linux/patches6.17/rk3588-mnt-reform2/0091-drm-rockchip-dw_hdmi_qp-Switch-to-phy_configure.patch"
76+
"linux/patches6.17/rk3588-mnt-reform2/0114-media-dt-bindings-video-interfaces-add-defines-for-s.patch"
77+
"linux/patches6.17/rk3588-mnt-reform2/0123-phy-rockchip-phy-rockchip-inno-csidphy-allow-writes-.patch"
78+
"linux/patches6.17/rk3588-mnt-reform2/0126-arm64-defconfig-enable-rockchip-camera-interface-and.patch"
79+
"linux/patches6.17/rk3588-mnt-reform2/0127-arm64-dts-rockchip-add-the-vip-node-to-px30.patch"
80+
"linux/patches6.17/rk3588-mnt-reform2/0131-arm64-dts-rockchip-add-mipi-csi-2-dphy-nodes-to-rk35.patch"
81+
"linux/patches6.17/rk3588-mnt-reform2/0142-drm-bridge-dw-hdmi-qp-Fix-spurious-IRQ-on-resume.patch"
82+
"linux/patches6.17/rk3588-mnt-reform2/2001-drm-bridge-dw-hdmi-qp-Return-0-in-audio-prepare-when.patch"
83+
"linux/patches6.17/rk3588-mnt-reform2/2003-drm-bridge-synopsys-Do-not-warn-about-audio-params-c.patch"
84+
"linux/patches6.17/rk3588-mnt-reform2/5200-drm-rockchip-Set-dma-mask-to-64-bit.patch"
85+
]

‎mnt/reform/lpc.nix‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
1414
domain = "source.mnt.re";
1515
owner = "reform";
1616
repo = "reform-tools";
17-
rev = "45f930403492aa2156522bfe30edb02e33494b69";
18-
hash = "sha256-no33CsV69nu1TR0cqxQDd1bFXqhjqOW9IUDxds0fyxE=";
17+
rev = "95fff02ea84386e4e9815ee650032b1a5bd6107c";
18+
hash = "sha256-bFiVvpLTboxhA5SmMcf60iazEsgFehabsdqZMZ3APuI=";
1919
};
2020

2121
sourceRoot = "source/lpc";
@@ -26,7 +26,9 @@ stdenv.mkDerivation rec {
2626
nativeBuildInputs = kernel.moduleBuildDependencies;
2727

2828
installPhase = ''
29+
runHook preInstall
2930
make -C "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" M="$(pwd)" INSTALL_MOD_PATH=$out modules_install $makeFlags
31+
runHook postInstall
3032
'';
3133

3234
makeFlags = kernelModuleMakeFlags ++ [

‎mnt/reform/pkgs/default.nix‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
lib,
3+
callPackage,
4+
}:
5+
rec {
6+
reform-flash-uboot =
7+
lib.mapAttrs (_name: config: callPackage ./reform-flash-uboot.nix { inherit config; })
8+
{
9+
reform2-rk3588-dsi = {
10+
warn = true;
11+
mmc = "mmcblk0";
12+
mmcBoot0 = false;
13+
ubootOffset = 32768;
14+
flashbinOffset = 0;
15+
image = "${ubootImage.reform2-rk3588-dsi}/rk3588-mnt-reform2-dsi-flash.bin";
16+
};
17+
};
18+
19+
uboot.reform2-rk3588-dsi = callPackage ../rk3588/uboot.nix { };
20+
ubootImage.reform2-rk3588-dsi = callPackage ../rk3588/uboot-image.nix {
21+
uboot = uboot.reform2-rk3588-dsi;
22+
};
23+
}

‎mnt/reform/pkgs/reform-flash-uboot.nix‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
lib,
3+
writeShellApplication,
4+
config,
5+
}:
6+
let
7+
dev = "/dev/" + config.mmc + lib.optionalString config.mmcBoot0 "boot0";
8+
in
9+
writeShellApplication {
10+
name = "reform-flash-uboot";
11+
text = ''
12+
if [ "$(id -u)" -ne 0 ]; then
13+
echo "reform-flash-uboot has to be run as root / using sudo."
14+
exit 1
15+
fi
16+
''
17+
+ lib.optionalString config.warn ''
18+
echo "W: Flashing u-boot to eMMC on $(cat /proc/device-tree/model) is not without risk." >&2
19+
echo "W: If you flash the wrong u-boot or if the flashing process goes wrong, it is" >&2
20+
echo "W: possible to soft-brick your board. Restoring it might need some extra hardware." >&2
21+
echo "W: Please only proceed if you are sure that the benefits outweigh the risks for you." >&2
22+
printf "Are you sure you want to proceed? [y/N] "
23+
read -r response
24+
25+
if [ "$response" != "y" ]; then
26+
echo "Exiting."
27+
exit
28+
fi
29+
''
30+
+ ''
31+
echo "Writing ${config.image} to ${dev}" >&2
32+
''
33+
+ lib.optionalString config.mmcBoot0 ''
34+
echo 0 >"/sys/class/block/${config.mmc}boot0/force_ro"
35+
''
36+
+ ''
37+
dd if='${config.image}' of='${dev}' bs=512 seek='${
38+
builtins.toString (config.ubootOffset / 512)
39+
}' skip='${builtins.toString (config.flashbinOffset / 512)}'
40+
''
41+
+ lib.optionalString config.mmcBoot0 ''
42+
echo 1 >"/sys/class/block/${config.mmc}boot0/force_ro"
43+
'';
44+
}

‎mnt/reform/rk3588/firmware.nix‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎mnt/reform/rk3588/installer.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
storeContents = config.installerImage.storeContents;
4545
comp = config.installerImage.squashfsCompression;
4646
};
47-
uboot = pkgs.callPackage ./uboot.nix { };
48-
firmware = pkgs.callPackage ./firmware.nix { inherit uboot; };
47+
packages = pkgs.callPackage ../pkgs { };
48+
ubootImage = packages.ubootImage.reform2-rk3588-dsi;
4949
content = pkgs.callPackage (
5050
{
5151
stdenv,
@@ -215,7 +215,7 @@
215215
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
216216
dd conv=notrunc if=${content} of=$img seek=$START count=$SECTORS
217217
218-
dd conv=notrunc if=${firmware}/mnt-reform2-rk3588-dsi-flash.bin of=$img seek=64
218+
dd conv=notrunc if=${ubootImage}/rk3588-mnt-reform2-dsi-flash.bin of=$img seek=64
219219
220220
if test -n "$compressImage"; then
221221
zstd -T$NIX_BUILD_CORES --rm $img

‎mnt/reform/rk3588/uboot-image.nix‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
runCommand,
3+
uboot,
4+
fetchFromGitHub,
5+
}:
6+
# script from https://source.mnt.re/reform/reform-rk3588-uboot/-/blob/28289e36cd1cb90b302780e83b014250c880c4ec/build.sh
7+
runCommand "mnt-reform-uboot-image-rk3855${uboot.variant}" { } ''
8+
mkdir $out
9+
cp ${uboot}/idbloader.img $out/rk3588-mnt-reform2${uboot.variant}-flash.bin
10+
dd if=${uboot}/u-boot.itb of=$out/rk3588-mnt-reform${uboot.variant}-flash.bin seek=16320
11+
''

‎mnt/reform/rk3588/uboot.nix‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ let
1010
domain = "source.mnt.re";
1111
owner = "reform";
1212
repo = "reform-rk3588-uboot";
13-
rev = "55bca0174e7bb449e96028d64ad8348f5af35977";
14-
hash = "sha256-A3u1afGK65cGOwENQtu8Hh+fLsSDNxc3rEebkd3QOic=";
13+
rev = "28289e36cd1cb90b302780e83b014250c880c4ec";
14+
hash = "sha256-fWGyC+rlfL0NYYRFLvdF7EiO3s9GfFkfhAbTEM5ECAM=";
1515
};
1616
rkbin = fetchFromGitHub {
1717
owner = "rockchip-linux";
1818
repo = "rkbin";
19-
rev = "f43a462e7a1429a9d407ae52b4745033034a6cf9";
20-
hash = "sha256-geESfZP8ynpUz/i/thpaimYo3kzqkBX95gQhMBzNbmk=";
19+
rev = "272136301989d493000425935bd4ead0ef04d06b";
20+
hash = "sha256-qXnuZyFNc6gYTkAtPg1t9WHwj8OiTxOLvsHUuvolK/w=";
2121
};
2222
in
2323
buildUBoot rec {
@@ -32,6 +32,7 @@ buildUBoot rec {
3232
patches = [
3333
"${mntPatches}/0001-ini-ddrbin-bump.patch"
3434
"${mntPatches}/0002-add-target-init-mnt-reform-series.patch"
35+
"${mntPatches}/0003-scripts-dtc-pylibfdt-libfdt-i_shipped-Use-SWIG_AppendOutp.patch"
3536
];
3637
prePatch = ''
3738
cp ${mntPatches}/*.dts arch/arm/dts/
@@ -45,7 +46,7 @@ buildUBoot rec {
4546
"spl/u-boot-spl.bin"
4647
];
4748
variant = "-dsi";
48-
defconfig = "mnt-reform2-rk3588${variant}_defconfig";
49+
defconfig = "rk3588-mnt-reform2${variant}_defconfig";
4950
extraMakeFlags = [
5051
"BL31=${armTrustedFirmwareRK3588}/bl31.elf"
5152
"ROCKCHIP_TPL=${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin"

‎mnt/reform/sources.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"modDirVersion": "6.17.2",
3+
"reformDebianPackages": {
4+
"domain": "source.mnt.re",
5+
"owner": "reform",
6+
"repo": "reform-debian-packages",
7+
"rev": "5716c458627142bcce54caf39e4018e58b16e3ac",
8+
"hash": "sha256-aZMzlt8DwlFLMnG0PvF80nlb8eCvgbVy9CHkPA1gU7c="
9+
}
10+
}

0 commit comments

Comments
 (0)