Skip to content

Commit 227c756

Browse files
ColorfulRhinorpardini
authored andcommitted
firefly-itx: Don't use abandoned media U-Boot
The board config file was likely copy-pasted from a former `media` board and thus includes some stuff that is not needed, like the abandoned U-Boot repo which is basically an old fork from Raxda's vendor U-Boot. - Switch to default rk3588 vendor U-Boot (using a generic rk3588 defconfig) - Cleanup board config file
1 parent 744eca2 commit 227c756

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

config/boards/firefly-itx-3588j.csc

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
# Rockchip RK3588j Octa core 4GB-32GB eMMC GBE HDMI HDMI-IN PCIe SATA USB3 WiFi 4G 5G
22
BOARD_NAME="Firefly ITX-3588J"
33
BOARDFAMILY="rockchip-rk3588"
4+
BOOT_SOC="rk3588"
45
BOARD_MAINTAINER=""
56
KERNEL_TARGET="vendor"
6-
FULL_DESKTOP="yes"
7-
BOOT_LOGO="desktop"
7+
BOOTCONFIG="rk3588_defconfig"
88
BOOT_FDT_FILE="rockchip/rk3588-firefly-itx-3588j.dtb"
9-
SRC_EXTLINUX="yes"
10-
SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
11-
BOOT_SOC="rk3588"
9+
BOOT_LOGO="desktop"
10+
FULL_DESKTOP="yes"
1211
IMAGE_PARTITION_TABLE="gpt"
1312

14-
function post_family_config__firefly-itx-3588j_use_vendor_uboot() {
15-
BOOTCONFIG="rk3588_defconfig"
16-
BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
17-
BOOTBRANCH='branch:rk3588'
18-
BOOTDIR="u-boot-${BOARD}"
19-
BOOTPATCHDIR="u-boot-firefly-itx-3588j"
20-
}
21-
22-
function post_family_tweaks_bsp__firefly-itx-3588j() {
13+
function post_family_tweaks_bsp__firefly_itx_3588j() {
2314
display_alert "$BOARD" "Installing rk3588-bluetooth.service" "info"
2415

2516
# Bluetooth on this board is handled by a Broadcom (AP6275PR3) chip and requires
@@ -33,7 +24,7 @@ function post_family_tweaks_bsp__firefly-itx-3588j() {
3324
return 0
3425
}
3526

36-
function post_family_tweaks__firefly-itx-3588j_enable_services() {
27+
function post_family_tweaks__firefly_itx_3588j_enable_services() {
3728
display_alert "$BOARD" "Enabling rk3588-bluetooth.service" "info"
3829
chroot_sdcard systemctl enable rk3588-bluetooth.service
3930
return 0

0 commit comments

Comments
 (0)