ayufan: dev: rework all boards config to group them by chips

configs/pinebook-pro-rk3399_defconfig

@@ -116,3 +116,4 @@ CONFIG_VIDEO_ROCKCHIP=y
 CONFIG_DISPLAY_ROCKCHIP_EDP=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200

configs/rock-pi-4-rk3399_defconfig

@@ -11,10 +11,13 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a"
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_DM_RESET=y
 CONFIG_ROCKCHIP_RK3399=y
+CONFIG_ROCKCHIP_SPI_IMAGE=y
 CONFIG_TARGET_EVB_RK3399=y
 CONFIG_SPL_STACK=0x400000
 CONFIG_DEBUG_UART_BASE=0xFF1A0000
 CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_PCI=y
 CONFIG_DEBUG_UART=y
@@ -33,8 +36,10 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
-CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_NVEDIT_EFI=y

configs/rock5b-rk3588_defconfig

@@ -21,7 +21,6 @@ CONFIG_TARGET_ROCK5B_RK3588=y
 CONFIG_SPL_STACK=0x400000
 CONFIG_DEBUG_UART_BASE=0xFEB50000
 CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0xc00800
@@ -45,8 +44,9 @@ 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_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_SPL_SPI_LOAD=y
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
 CONFIG_SPL_ATF=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y

configs/rock64-rk3328_defconfig

@@ -11,25 +11,22 @@ CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64"
 CONFIG_DM_RESET=y
-CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3328=y
 CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
+CONFIG_ROCKCHIP_SPI_IMAGE=y
 CONFIG_TPL_LIBCOMMON_SUPPORT=y
 CONFIG_TPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC=y
-CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_TARGET_ROCK64_RK3328=y
 CONFIG_SPL_STACK_R_ADDR=0x600000
 CONFIG_SPL_STACK=0x400000
 CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
 CONFIG_DEBUG_UART_BASE=0xFF130000
 CONFIG_DEBUG_UART_CLOCK=24000000
-CONFIG_SYS_LOAD_ADDR=0x800800
-CONFIG_SMBIOS_PRODUCT_NAME="rock64_rk3328"
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_SPI=y
+CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_DEBUG_UART=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -47,12 +44,11 @@ CONFIG_SPL_BOARD_INIT=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
 CONFIG_SPL_STACK_R=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_POWER_SUPPORT=y
-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_SPL_SPI_LOAD=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
 CONFIG_SPL_ATF=y
 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 CONFIG_TPL_SYS_MALLOC_SIMPLE=y
@@ -86,14 +82,13 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_LED=y
 CONFIG_MISC=y
 CONFIG_ROCKCHIP_EFUSE=y
-CONFIG_LED=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y

configs/rockpro64-rk3399_defconfig

@@ -7,8 +7,6 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
 CONFIG_ENV_SIZE=0x8000
-CONFIG_SPL_DM_SPI=y
-CONFIG_ROCKCHIP_RK3399=y
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64"
 CONFIG_DM_RESET=y
@@ -23,13 +21,12 @@ CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_PCI=y
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_BOOTSTAGE=y
 CONFIG_BOOTSTAGE_REPORT=y
 CONFIG_USE_PREBOOT=y
-CONFIG_AHCI=y
-# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_MISC_INIT_R=y
@@ -64,16 +61,13 @@ CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_SCSI_AHCI=y
-CONFIG_AHCI_PCI=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SATA=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_SATA_SIL=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
-CONFIG_DM_KEYBOARD=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_MISC=y
@@ -86,14 +80,11 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
 CONFIG_NVME_PCI=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
-CONFIG_DM_PCI=y
-CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
@@ -116,29 +107,21 @@ 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_DWC2=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_ROCKCHIP_USB2_PHY=y
 CONFIG_USB_KEYBOARD=y
-CONFIG_USB_KEYBOARD_FN_KEYS=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_GADGET=y
 CONFIG_VIDEO=y
-CONFIG_DM_VIDEO=y
-CONFIG_VIDEO_BPP16=y
-CONFIG_VIDEO_BPP32=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_ROCKCHIP=y
-CONFIG_VIDEO_ROCKCHIP_MAX_XRES=3840
-CONFIG_VIDEO_ROCKCHIP_MAX_YRES=2160
 CONFIG_DISPLAY_ROCKCHIP_HDMI=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y

dev-ayufan/blobs/pinebookpro/board.mk

@@ -1,8 +1,3 @@
+include dev-ayufan/chips/rk3399/board.mk
+
 UBOOT_DEFCONFIG ?= pinebook-pro-rk3399_defconfig
-BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
-BOARD_CHIP ?= rk3399
-LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-IMAGES ?= flash-spi erase-spi
-LOADERS ?= rksd_loader rkspi_loader

dev-ayufan/blobs/quartz64a/board.mk

@@ -1,11 +1,3 @@
+include dev-ayufan/chips/rk3566/board.mk
+
 UBOOT_DEFCONFIG ?= quartz64-a-rk3566_defconfig
-BL31 ?= tmp/rkbin/bin/rk35/rk3568_bl31_v1.43.elf
-BOARD_CHIP ?= rk3568
-UBOOT_TPL =
-ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-IMAGES ?= flash-spi erase-spi
-LOADERS ?= rksd_loader rkspi_loader
-RKSD_LOADER ?= idbloader.img
-RKSPI_LOADER ?= idbloader-spi.img

dev-ayufan/blobs/quartz64b/board.mk

@@ -1,11 +1,3 @@
+include dev-ayufan/chips/rk3566/board.mk
+
 UBOOT_DEFCONFIG ?= quartz64-b-rk3566_defconfig
-BL31 ?= tmp/rkbin/bin/rk35/rk3568_bl31_v1.43.elf
-BOARD_CHIP ?= rk3568
-UBOOT_TPL =
-ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-IMAGES ?= flash-spi erase-spi
-LOADERS ?= rksd_loader rkspi_loader
-RKSD_LOADER ?= idbloader.img
-RKSPI_LOADER ?= idbloader-spi.img

dev-ayufan/blobs/rock5b/board.mk

@@ -1,11 +1,3 @@
+include dev-ayufan/chips/rk3588/board.mk
+
 UBOOT_DEFCONFIG ?= rock5b-rk3588_defconfig
-BL31 ?= tmp/rkbin/bin/rk35/rk3588_bl31_v1.40.elf
-BOARD_CHIP ?= rk3588
-UBOOT_TPL =
-ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin
-LOADER_BIN ?= tmp/rkbin/loaders/rk3588_spl_loader_v1.12.112.bin
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-IMAGES ?= flash-spi erase-spi
-LOADERS ?= rksd_loader
-RKSD_LOADER ?= idbloader.img

dev-ayufan/blobs/rock64/board.mk

@@ -1,13 +1,3 @@
+include dev-ayufan/chips/rk3328/board.mk
+
 UBOOT_DEFCONFIG ?= rock64-rk3328_defconfig
-BL31 ?= tmp/rkbin/bin/rk33/rk322xh_bl31_v1.49.elf
-BOARD_CHIP ?= rk3328
-ifneq (,$(FLASH_SPI))
-LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.08.244_for_spi_nor_build_Aug_7_2017.bin
-else
-LOADER_BIN ?= tmp/rkbin/loaders/rk3328_loader_v1.19.250.bin
-endif
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-IMAGES ?= flash-spi erase-spi
-FLASH_LOADER ?= rksd_loader
-LOADERS ?= rksd_loader

dev-ayufan/blobs/rockpi4b/board.mk

@@ -1,7 +1,3 @@
+include dev-ayufan/chips/rk3399/board.mk
+
 UBOOT_DEFCONFIG ?= rock-pi-4-rk3399_defconfig
-BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
-BOARD_CHIP ?= rk3399
-LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
-IMAGES ?= flash-spi erase-spi
-FLASH_LOADER ?= rksd_loader
-LOADERS ?= rksd_loader rkspi_loader

dev-ayufan/blobs/rockpro64/board.mk

@@ -1,14 +1,3 @@
+include dev-ayufan/chips/rk3399/board.mk
+
 UBOOT_DEFCONFIG ?= rockpro64-rk3399_defconfig
-BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
-BOARD_CHIP ?= rk3399
-ifneq (,$(FLASH_SPI))
-LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_spinor_v1.30.114.bin
-LOADER_OFFSET ?= 0
-LOADER_FLASH ?= rkspi_loader
-else
-LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
-LOADER_OFFSET ?= 64
-LOADER_FLASH ?= rksd_loader
-endif
-IMAGES ?= flash-spi erase-spi
-LOADERS ?= rksd_loader rkspi_loader