Skip to content

Commit 0a3ab3b

Browse files
committed
ayufan: dev: rework all boards config to group them by chips
1 parent 4001d07 commit 0a3ab3b

36 files changed

+147
-266
lines changed

configs/pinebook-pro-rk3399_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,4 @@ CONFIG_VIDEO_ROCKCHIP=y
116116
CONFIG_DISPLAY_ROCKCHIP_EDP=y
117117
CONFIG_SPL_TINY_MEMSET=y
118118
CONFIG_ERRNO_STR=y
119+
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200

configs/rock-pi-4-rk3399_defconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a"
1111
CONFIG_OF_LIBFDT_OVERLAY=y
1212
CONFIG_DM_RESET=y
1313
CONFIG_ROCKCHIP_RK3399=y
14+
CONFIG_ROCKCHIP_SPI_IMAGE=y
1415
CONFIG_TARGET_EVB_RK3399=y
1516
CONFIG_SPL_STACK=0x400000
1617
CONFIG_DEBUG_UART_BASE=0xFF1A0000
1718
CONFIG_DEBUG_UART_CLOCK=24000000
19+
CONFIG_SPL_SPI_FLASH_SUPPORT=y
20+
CONFIG_SPL_SPI=y
1821
CONFIG_SYS_LOAD_ADDR=0x800800
1922
CONFIG_PCI=y
2023
CONFIG_DEBUG_UART=y
@@ -33,8 +36,10 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000
3336
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
3437
CONFIG_SPL_STACK_R=y
3538
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
36-
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
3739
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
40+
CONFIG_SPL_SPI_LOAD=y
41+
CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
42+
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
3843
CONFIG_TPL=y
3944
CONFIG_CMD_BOOTZ=y
4045
CONFIG_CMD_NVEDIT_EFI=y

configs/rock5b-rk3588_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CONFIG_TARGET_ROCK5B_RK3588=y
2121
CONFIG_SPL_STACK=0x400000
2222
CONFIG_DEBUG_UART_BASE=0xFEB50000
2323
CONFIG_DEBUG_UART_CLOCK=24000000
24-
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
2524
CONFIG_SPL_SPI_FLASH_SUPPORT=y
2625
CONFIG_SPL_SPI=y
2726
CONFIG_SYS_LOAD_ADDR=0xc00800
@@ -45,8 +44,9 @@ CONFIG_SPL_BSS_MAX_SIZE=0x4000
4544
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
4645
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
4746
CONFIG_SPL_STACK_R=y
47+
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
4848
CONFIG_SPL_SPI_LOAD=y
49-
CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
49+
CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
5050
CONFIG_SPL_ATF=y
5151
CONFIG_CMD_GPIO=y
5252
CONFIG_CMD_GPT=y

configs/rock64-rk3328_defconfig

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,22 @@ CONFIG_SF_DEFAULT_SPEED=20000000
1111
CONFIG_ENV_OFFSET=0x3F8000
1212
CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock64"
1313
CONFIG_DM_RESET=y
14-
CONFIG_SPL_DM_SPI=y
1514
CONFIG_ROCKCHIP_RK3328=y
1615
CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
16+
CONFIG_ROCKCHIP_SPI_IMAGE=y
1717
CONFIG_TPL_LIBCOMMON_SUPPORT=y
1818
CONFIG_TPL_LIBGENERIC_SUPPORT=y
1919
CONFIG_SPL_DRIVERS_MISC=y
20-
CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
2120
CONFIG_TARGET_ROCK64_RK3328=y
2221
CONFIG_SPL_STACK_R_ADDR=0x600000
2322
CONFIG_SPL_STACK=0x400000
2423
CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
2524
CONFIG_DEBUG_UART_BASE=0xFF130000
2625
CONFIG_DEBUG_UART_CLOCK=24000000
27-
CONFIG_SYS_LOAD_ADDR=0x800800
28-
CONFIG_SMBIOS_PRODUCT_NAME="rock64_rk3328"
2926
CONFIG_SPL_SPI_FLASH_SUPPORT=y
30-
CONFIG_SPL_SPI_SUPPORT=y
27+
CONFIG_SPL_SPI=y
28+
CONFIG_SYS_LOAD_ADDR=0x800800
3129
CONFIG_DEBUG_UART=y
32-
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
3330
# CONFIG_ANDROID_BOOT_IMAGE is not set
3431
CONFIG_FIT=y
3532
CONFIG_FIT_VERBOSE=y
@@ -47,12 +44,11 @@ CONFIG_SPL_BOARD_INIT=y
4744
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
4845
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
4946
CONFIG_SPL_STACK_R=y
47+
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
5048
CONFIG_SPL_I2C=y
5149
CONFIG_SPL_POWER=y
52-
CONFIG_SPL_I2C_SUPPORT=y
53-
CONFIG_SPL_POWER_SUPPORT=y
54-
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
5550
CONFIG_SPL_SPI_LOAD=y
51+
CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
5652
CONFIG_SPL_ATF=y
5753
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
5854
CONFIG_TPL_SYS_MALLOC_SIMPLE=y
@@ -86,14 +82,13 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800
8682
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
8783
CONFIG_ROCKCHIP_GPIO=y
8884
CONFIG_SYS_I2C_ROCKCHIP=y
85+
CONFIG_LED=y
8986
CONFIG_MISC=y
9087
CONFIG_ROCKCHIP_EFUSE=y
91-
CONFIG_LED=y
9288
CONFIG_MMC_DW=y
9389
CONFIG_MMC_DW_ROCKCHIP=y
9490
CONFIG_SPI_FLASH_GIGADEVICE=y
9591
CONFIG_SPI_FLASH_WINBOND=y
96-
CONFIG_DM_ETH=y
9792
CONFIG_ETH_DESIGNWARE=y
9893
CONFIG_GMAC_ROCKCHIP=y
9994
CONFIG_PHY_ROCKCHIP_INNO_USB2=y

configs/rockpro64-rk3399_defconfig

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ CONFIG_NR_DRAM_BANKS=1
77
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
88
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
99
CONFIG_ENV_SIZE=0x8000
10-
CONFIG_SPL_DM_SPI=y
11-
CONFIG_ROCKCHIP_RK3399=y
1210
CONFIG_ENV_OFFSET=0x3F8000
1311
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rockpro64"
1412
CONFIG_DM_RESET=y
@@ -23,13 +21,12 @@ CONFIG_SPL_SPI=y
2321
CONFIG_SYS_LOAD_ADDR=0x800800
2422
CONFIG_PCI=y
2523
CONFIG_DEBUG_UART=y
24+
# CONFIG_ANDROID_BOOT_IMAGE is not set
2625
CONFIG_SPL_FIT_SIGNATURE=y
2726
CONFIG_LEGACY_IMAGE_FORMAT=y
2827
CONFIG_BOOTSTAGE=y
2928
CONFIG_BOOTSTAGE_REPORT=y
3029
CONFIG_USE_PREBOOT=y
31-
CONFIG_AHCI=y
32-
# CONFIG_ANDROID_BOOT_IMAGE is not set
3330
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rockpro64.dtb"
3431
CONFIG_DISPLAY_BOARDINFO_LATE=y
3532
CONFIG_MISC_INIT_R=y
@@ -64,16 +61,13 @@ CONFIG_SPL_OF_CONTROL=y
6461
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
6562
CONFIG_ENV_IS_IN_SPI_FLASH=y
6663
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
67-
CONFIG_SCSI_AHCI=y
68-
CONFIG_AHCI_PCI=y
6964
CONFIG_SPL_DM_SEQ_ALIAS=y
7065
CONFIG_SATA=y
7166
CONFIG_SCSI_AHCI=y
7267
CONFIG_AHCI_PCI=y
7368
CONFIG_SATA_SIL=y
7469
CONFIG_ROCKCHIP_GPIO=y
7570
CONFIG_SYS_I2C_ROCKCHIP=y
76-
CONFIG_DM_KEYBOARD=y
7771
CONFIG_LED=y
7872
CONFIG_LED_GPIO=y
7973
CONFIG_MISC=y
@@ -86,14 +80,11 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
8680
CONFIG_SF_DEFAULT_BUS=1
8781
CONFIG_SPI_FLASH_GIGADEVICE=y
8882
CONFIG_SPI_FLASH_WINBOND=y
89-
CONFIG_DM_ETH=y
9083
CONFIG_ETH_DESIGNWARE=y
9184
CONFIG_GMAC_ROCKCHIP=y
9285
CONFIG_NVME_PCI=y
9386
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
9487
CONFIG_PHY_ROCKCHIP_TYPEC=y
95-
CONFIG_DM_PCI=y
96-
CONFIG_PCIE_ROCKCHIP=y
9788
CONFIG_PMIC_RK8XX=y
9889
CONFIG_REGULATOR_PWM=y
9990
CONFIG_REGULATOR_RK8XX=y
@@ -116,29 +107,21 @@ CONFIG_USB_EHCI_HCD=y
116107
CONFIG_USB_EHCI_GENERIC=y
117108
CONFIG_USB_OHCI_HCD=y
118109
CONFIG_USB_OHCI_GENERIC=y
119-
CONFIG_USB_DWC3=y
120-
CONFIG_USB_DWC3_GENERIC=y
121-
CONFIG_USB_KEYBOARD=y
122110
CONFIG_USB_DWC2=y
123111
CONFIG_USB_DWC3=y
112+
CONFIG_USB_DWC3_GENERIC=y
124113
CONFIG_ROCKCHIP_USB2_PHY=y
125114
CONFIG_USB_KEYBOARD=y
126-
CONFIG_USB_KEYBOARD_FN_KEYS=y
127-
CONFIG_USB_GADGET=y
128115
CONFIG_USB_HOST_ETHER=y
129116
CONFIG_USB_ETHER_ASIX=y
130117
CONFIG_USB_ETHER_ASIX88179=y
131118
CONFIG_USB_ETHER_MCS7830=y
132119
CONFIG_USB_ETHER_RTL8152=y
133120
CONFIG_USB_ETHER_SMSC95XX=y
121+
CONFIG_USB_GADGET=y
134122
CONFIG_VIDEO=y
135-
CONFIG_DM_VIDEO=y
136-
CONFIG_VIDEO_BPP16=y
137-
CONFIG_VIDEO_BPP32=y
138123
CONFIG_DISPLAY=y
139124
CONFIG_VIDEO_ROCKCHIP=y
140-
CONFIG_VIDEO_ROCKCHIP_MAX_XRES=3840
141-
CONFIG_VIDEO_ROCKCHIP_MAX_YRES=2160
142125
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
143126
CONFIG_SPL_TINY_MEMSET=y
144127
CONFIG_ERRNO_STR=y
Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1+
include dev-ayufan/chips/rk3399/board.mk
2+
13
UBOOT_DEFCONFIG ?= pinebook-pro-rk3399_defconfig
2-
BL31 ?= tmp/rkbin/bin/rk33/rk3399_bl31_v1.36.elf
3-
BOARD_CHIP ?= rk3399
4-
LOADER_BIN ?= tmp/rkbin/loaders/rk3399_loader_v1.30.130.bin
5-
LOADER_OFFSET ?= 64
6-
LOADER_FLASH ?= rksd_loader
7-
IMAGES ?= flash-spi erase-spi
8-
LOADERS ?= rksd_loader rkspi_loader
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1+
include dev-ayufan/chips/rk3566/board.mk
2+
13
UBOOT_DEFCONFIG ?= quartz64-a-rk3566_defconfig
2-
BL31 ?= tmp/rkbin/bin/rk35/rk3568_bl31_v1.43.elf
3-
BOARD_CHIP ?= rk3568
4-
UBOOT_TPL =
5-
ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin
6-
LOADER_OFFSET ?= 64
7-
LOADER_FLASH ?= rksd_loader
8-
IMAGES ?= flash-spi erase-spi
9-
LOADERS ?= rksd_loader rkspi_loader
10-
RKSD_LOADER ?= idbloader.img
11-
RKSPI_LOADER ?= idbloader-spi.img
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1+
include dev-ayufan/chips/rk3566/board.mk
2+
13
UBOOT_DEFCONFIG ?= quartz64-b-rk3566_defconfig
2-
BL31 ?= tmp/rkbin/bin/rk35/rk3568_bl31_v1.43.elf
3-
BOARD_CHIP ?= rk3568
4-
UBOOT_TPL =
5-
ROCKCHIP_TPL ?= tmp/rkbin/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin
6-
LOADER_OFFSET ?= 64
7-
LOADER_FLASH ?= rksd_loader
8-
IMAGES ?= flash-spi erase-spi
9-
LOADERS ?= rksd_loader rkspi_loader
10-
RKSD_LOADER ?= idbloader.img
11-
RKSPI_LOADER ?= idbloader-spi.img

dev-ayufan/blobs/quartz64b/erase-spi.cmd

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

dev-ayufan/blobs/quartz64b/flash-spi.cmd

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

0 commit comments

Comments
 (0)