From 568536a0eb4c606a033682b7fef7c597ebde006a Mon Sep 17 00:00:00 2001 From: chainsx Date: Wed, 19 Jun 2024 16:59:00 +0800 Subject: [PATCH] station-m2: use mainline u-boot --- config/boards/station-m2.csc | 23 +-- .../board_station-m2-rk3566_defconfig.patch | 142 ++++++++++++++++++ 2 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 patch/u-boot/u-boot-radxa-latest/board_station-m2-rk3566_defconfig.patch diff --git a/config/boards/station-m2.csc b/config/boards/station-m2.csc index f202f1019d87..3d7cc48a08ce 100644 --- a/config/boards/station-m2.csc +++ b/config/boards/station-m2.csc @@ -2,29 +2,34 @@ BOARD_NAME="Station M2" BOARDFAMILY="rk35xx" BOARD_MAINTAINER="" -BOOTCONFIG="firefly-m2-rk3568_defconfig" +BOOTCONFIG="station-m2-rk3566_defconfig" KERNEL_TARGET="legacy,vendor,current,edge" FULL_DESKTOP="yes" BOOT_LOGO="desktop" BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb" -SRC_EXTLINUX="yes" -SRC_CMDLINE="console=ttyS02,1500000 console=tty0" +BOOT_SCENARIO="spl-blobs" ASOUND_STATE="asound.state.station-m2" IMAGE_PARTITION_TABLE="gpt" function post_family_tweaks__station_m2() { display_alert "$BOARD" "Installing board tweaks" "info" - cp -R $SRC/packages/blobs/rtl8723bt_fw/* $SDCARD/lib/firmware/rtl_bt/ cp -R $SRC/packages/blobs/station/firmware/* $SDCARD/lib/firmware/ return 0 } # Override family config for this board; let's avoid conditionals in family config. -function post_family_config__stationm2_use_vendor_uboot() { - BOOTSOURCE='https://github.com/150balbes/u-boot-rk' - BOOTBRANCH='branch:rk356x' - BOOTDIR="u-boot-${BOARD}" - BOOTPATCHDIR="u-boot-station-p2" +function post_family_config__stationm2_use_radxa_vendor_uboot() { + BOOTSOURCE='https://github.com/radxa/u-boot.git' + BOOTBRANCH='branch:rk35xx-2024.01' + BOOTPATCHDIR="u-boot-radxa-latest" + + UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin" + + unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd + + function write_uboot_platform() { + dd if=$1/u-boot-rockchip.bin of=$2 seek=64 conv=notrunc status=none + } } diff --git a/patch/u-boot/u-boot-radxa-latest/board_station-m2-rk3566_defconfig.patch b/patch/u-boot/u-boot-radxa-latest/board_station-m2-rk3566_defconfig.patch new file mode 100644 index 000000000000..4b5fd3342e8a --- /dev/null +++ b/patch/u-boot/u-boot-radxa-latest/board_station-m2-rk3566_defconfig.patch @@ -0,0 +1,142 @@ +diff -Nuar a/configs/station-m2-rk3566_defconfig b/configs/station-m2-rk3566_defconfig +--- a/configs/station-m2-rk3566_defconfig ++++ b/configs/station-m2-rk3566_defconfig +@@ -0,0 +1,138 @@ ++CONFIG_ARM=y ++CONFIG_SKIP_LOWLEVEL_INIT=y ++CONFIG_COUNTER_FREQUENCY=24000000 ++CONFIG_ARCH_ROCKCHIP=y ++CONFIG_TEXT_BASE=0x00a00000 ++CONFIG_SPL_LIBCOMMON_SUPPORT=y ++CONFIG_SPL_LIBGENERIC_SUPPORT=y ++CONFIG_NR_DRAM_BANKS=2 ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000 ++CONFIG_SF_DEFAULT_SPEED=24000000 ++CONFIG_SF_DEFAULT_MODE=0x2000 ++CONFIG_DEFAULT_DEVICE_TREE="rk3566-radxa-zero3" ++CONFIG_ROCKCHIP_RK3568=y ++CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y ++CONFIG_ROCKCHIP_SPI_IMAGE=y ++CONFIG_SPL_SERIAL=y ++CONFIG_SPL_STACK_R_ADDR=0x600000 ++CONFIG_SPL_STACK=0x400000 ++CONFIG_DEBUG_UART_BASE=0xFE660000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_SPL_SPI_FLASH_SUPPORT=y ++CONFIG_SPL_SPI=y ++CONFIG_SYS_LOAD_ADDR=0xc00800 ++CONFIG_PCI=y ++CONFIG_DEBUG_UART=y ++CONFIG_FIT=y ++CONFIG_FIT_VERBOSE=y ++CONFIG_SPL_FIT_SIGNATURE=y ++CONFIG_SPL_LOAD_FIT=y ++CONFIG_LEGACY_IMAGE_FORMAT=y ++CONFIG_SPI_BOOT=y ++CONFIG_BOOTDELAY=0 ++CONFIG_AUTOBOOT_KEYED=y ++CONFIG_AUTOBOOT_PROMPT="Hit CtrlC key in %d seconds to stop autoboot...\n" ++CONFIG_AUTOBOOT_STOP_STR="\x03" ++CONFIG_AUTOBOOT_KEYED_CTRLC=y ++CONFIG_BOOTCOMMAND="bootflow scan; run distro_bootcmd; echo Boot failed. Reset in 3 seconds...; sleep 3; reset;" ++CONFIG_USE_PREBOOT=y ++CONFIG_PREBOOT="usb start; pci enum" ++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-zero3.dtb" ++# CONFIG_SYS_DEVICE_NULLDEV is not set ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_DISPLAY_BOARDINFO_LATE=y ++CONFIG_ID_EEPROM=y ++CONFIG_SPL_MAX_SIZE=0x40000 ++CONFIG_SPL_PAD_TO=0x7f8000 ++CONFIG_SPL_HAS_BSS_LINKER_SECTION=y ++CONFIG_SPL_BSS_START_ADDR=0x4000000 ++CONFIG_SPL_BSS_MAX_SIZE=0x4000 ++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set ++# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set ++CONFIG_SPL_STACK_R=y ++CONFIG_SPL_SPI_LOAD=y ++CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 ++CONFIG_SPL_ATF=y ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_GPIO_READ=y ++CONFIG_CMD_PWM=y ++CONFIG_CMD_GPT=y ++CONFIG_CMD_I2C=y ++CONFIG_CMD_MBR=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_POWEROFF=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_PMIC=y ++CONFIG_CMD_REGULATOR=y ++# CONFIG_SPL_DOS_PARTITION is not set ++CONFIG_SPL_OF_CONTROL=y ++CONFIG_OF_LIVE=y ++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_SPL_DM_SEQ_ALIAS=y ++CONFIG_SPL_REGMAP=y ++CONFIG_SPL_SYSCON=y ++CONFIG_SATA=y ++CONFIG_SCSI_AHCI=y ++CONFIG_AHCI_PCI=y ++CONFIG_SATA_SIL=y ++CONFIG_SPL_CLK=y ++CONFIG_FASTBOOT_BUF_ADDR=0x13000000 ++CONFIG_FASTBOOT_FLASH_MMC_DEV=2 ++CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y ++CONFIG_FASTBOOT_MMC_USER_SUPPORT=y ++CONFIG_ROCKCHIP_GPIO=y ++CONFIG_SYS_I2C_ROCKCHIP=y ++CONFIG_LED=y ++CONFIG_LED_GPIO=y ++CONFIG_MISC=y ++CONFIG_SUPPORT_EMMC_RPMB=y ++CONFIG_MMC_HS200_SUPPORT=y ++CONFIG_MMC_DW=y ++CONFIG_MMC_DW_ROCKCHIP=y ++CONFIG_MMC_SDHCI=y ++CONFIG_MMC_SDHCI_SDMA=y ++CONFIG_MMC_SDHCI_ROCKCHIP=y ++CONFIG_SF_DEFAULT_BUS=4 ++CONFIG_SPI_FLASH_SFDP_SUPPORT=y ++CONFIG_SPI_FLASH_GIGADEVICE=y ++CONFIG_SPI_FLASH_MACRONIX=y ++CONFIG_SPI_FLASH_WINBOND=y ++CONFIG_SPI_FLASH_XTX=y ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_GMAC_ROCKCHIP=y ++CONFIG_NVME_PCI=y ++CONFIG_PCIE_DW_ROCKCHIP=y ++CONFIG_PHY_ROCKCHIP_INNO_USB2=y ++CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y ++CONFIG_SPL_PINCTRL=y ++CONFIG_DM_PMIC=y ++CONFIG_DM_PMIC_FAN53555=y ++CONFIG_PMIC_RK8XX=y ++CONFIG_REGULATOR_RK8XX=y ++CONFIG_PWM_ROCKCHIP=y ++CONFIG_SPL_RAM=y ++CONFIG_SCSI=y ++CONFIG_DM_SCSI=y ++CONFIG_BAUDRATE=1500000 ++CONFIG_DEBUG_UART_SHIFT=2 ++CONFIG_SYS_NS16550_MEM32=y ++CONFIG_ROCKCHIP_SFC=y ++CONFIG_ROCKCHIP_SPI=y ++CONFIG_SYSRESET=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_OHCI_HCD=y ++CONFIG_USB_OHCI_GENERIC=y ++CONFIG_USB_DWC3=y ++CONFIG_USB_DWC3_GENERIC=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_PRODUCT_NUM=0x2200 ++CONFIG_ERRNO_STR=y