diff --git a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-tweaks.patch b/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-tweaks.patch deleted file mode 100644 index 963c94d5ca92..000000000000 --- a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-tweaks.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JohnTheCoolingFan -Date: Mon, 21 Oct 2024 16:24:49 +0000 -Subject: Patching u-boot rockchip64 files - configs/bigtreetech-cb2-rk3566_defconfig - -Signed-off-by: JohnTheCoolingFan ---- - configs/bigtreetech-cb2-rk3566_defconfig | 11 ++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configs/bigtreetech-cb2-rk3566_defconfig b/configs/bigtreetech-cb2-rk3566_defconfig -index fa8553fd874..2f427107089 100644 ---- a/configs/bigtreetech-cb2-rk3566_defconfig -+++ b/configs/bigtreetech-cb2-rk3566_defconfig -@@ -53,17 +53,21 @@ CONFIG_CMD_TFTPPUT=y - CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 - CONFIG_SPL_OF_CONTROL=y - CONFIG_OF_LIVE=y - # CONFIG_OF_UPSTREAM is not set - CONFIG_OF_SPL_REMOVE_PROPS="" -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_SPL_REGMAP=y - CONFIG_SPL_SYSCON=y - CONFIG_SPL_CLK=y - CONFIG_FASTBOOT_BUF_ADDR=0xc00800 - CONFIG_FASTBOOT_BUF_SIZE=0x04000000 - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_LED=y -+CONFIG_LED_GPIO=y - CONFIG_MISC=y - CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_SDMA=y -@@ -72,28 +76,28 @@ CONFIG_SPI_FLASH_EON=y - CONFIG_SPI_FLASH_GIGADEVICE=y - CONFIG_SPI_FLASH_MACRONIX=y - CONFIG_SPI_FLASH_WINBOND=y - CONFIG_SPI_FLASH_XMC=y - CONFIG_SPI_FLASH_MTD=y -+CONFIG_PHY_MOTORCOMM=y - CONFIG_DM_ETH_PHY=y -+CONFIG_PHY_GIGE=y - CONFIG_DWC_ETH_QOS=y - CONFIG_NVME=y - CONFIG_DM_PCI_COMPAT=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_PMIC_RK8XX=y --CONFIG_REGULATOR_PWM=y --CONFIG_DM_REGULATOR_GPIO=y - CONFIG_REGULATOR_RK8XX=y --CONFIG_PWM_ROCKCHIP=y - CONFIG_SPL_RAM=y - CONFIG_ROCKCHIP_SDRAM_COMMON=y - CONFIG_BAUDRATE=1500000 - CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYS_NS16550_MEM32=y - CONFIG_ROCKCHIP_SFC=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y - CONFIG_USB_XHCI_DWC3=y -@@ -103,9 +107,8 @@ 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_GADGET=y --CONFIG_SPL_TINY_MEMSET=y - CONFIG_SHA512=y - CONFIG_SPL_GZIP=y - CONFIG_ERRNO_STR=y --- -Created with Armbian build tools https://github.com/armbian/build - diff --git a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-and-dts.patch b/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-and-defconfig.patch similarity index 93% rename from patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-and-dts.patch rename to patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-and-defconfig.patch index aee2910b4d04..f958ba70b0e8 100644 --- a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-defconfig-and-dts.patch +++ b/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-and-defconfig.patch @@ -1,20 +1,30 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan -Date: Sun, 20 Oct 2024 14:09:02 +0000 -Subject: BigTreeTech CB2 defconfig and dts +Date: Thu, 24 Oct 2024 14:24:10 +0000 +Subject: BigTreeTech CB2 device tree and defconfig Signed-off-by: JohnTheCoolingFan --- - arch/arm/dts/rk3566-bigtreetech-cb2.dts | 499 ++++++++++ - configs/bigtreetech-cb2-rk3566_defconfig | 111 +++ - 2 files changed, 610 insertions(+) + arch/arm/dts/rk3566-bigtreetech-cb2-u-boot.dtsi | 3 + + arch/arm/dts/rk3566-bigtreetech-cb2.dts | 497 ++++++++++ + configs/bigtreetech-cb2-rk3566_defconfig | 114 +++ + 3 files changed, 614 insertions(+) +diff --git a/arch/arm/dts/rk3566-bigtreetech-cb2-u-boot.dtsi b/arch/arm/dts/rk3566-bigtreetech-cb2-u-boot.dtsi +new file mode 100644 +index 00000000000..2e2341667f6 +--- /dev/null ++++ b/arch/arm/dts/rk3566-bigtreetech-cb2-u-boot.dtsi +@@ -0,0 +1,3 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++ ++#include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-bigtreetech-cb2.dts b/arch/arm/dts/rk3566-bigtreetech-cb2.dts new file mode 100644 -index 00000000000..acb99ef8c9a +index 00000000000..314cc125dc2 --- /dev/null +++ b/arch/arm/dts/rk3566-bigtreetech-cb2.dts -@@ -0,0 +1,499 @@ +@@ -0,0 +1,497 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + * @@ -22,13 +32,10 @@ index 00000000000..acb99ef8c9a + */ + +/dts-v1/; -+#include "rk3568.dtsi" -+#include "rk3568-u-boot.dtsi" ++#include "rk356x.dtsi" ++#include "rk3566-bigtreetech-cb2-u-boot.dtsi" +#include +#include -+#include -+#include -+#include + +/ { + model = "BigTreeTech CB2"; @@ -157,12 +164,13 @@ index 00000000000..acb99ef8c9a + +&pmu_io_domains { + status = "okay"; -+ pmuio2-supply = <&vcca1v8_pmu>; ++ pmuio1-supply = <&vcc3v3_pmu>; ++ pmuio2-supply = <&vcc3v3_pmu>; + vccio1-supply = <&vccio_acodec>; + vccio3-supply = <&vccio_sd>; + vccio4-supply = <&vcc_1v8>; + vccio5-supply = <&vcc_3v3>; -+ vccio6-supply = <&vcc_3v3>; ++ vccio6-supply = <&vcc_1v8>; + vccio7-supply = <&vcc_3v3>; +}; + @@ -516,10 +524,10 @@ index 00000000000..acb99ef8c9a +}; diff --git a/configs/bigtreetech-cb2-rk3566_defconfig b/configs/bigtreetech-cb2-rk3566_defconfig new file mode 100644 -index 00000000000..fa8553fd874 +index 00000000000..2f427107089 --- /dev/null +++ b/configs/bigtreetech-cb2-rk3566_defconfig -@@ -0,0 +1,111 @@ +@@ -0,0 +1,114 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_MALLOC_F_LEN=0x80000 @@ -577,6 +585,8 @@ index 00000000000..fa8553fd874 +CONFIG_OF_LIVE=y +# CONFIG_OF_UPSTREAM is not set +CONFIG_OF_SPL_REMOVE_PROPS="" ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SPL_CLK=y @@ -584,6 +594,8 @@ index 00000000000..fa8553fd874 +CONFIG_FASTBOOT_BUF_SIZE=0x04000000 +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y ++CONFIG_LED=y ++CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y @@ -596,7 +608,9 @@ index 00000000000..fa8553fd874 +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_SPI_FLASH_MTD=y ++CONFIG_PHY_MOTORCOMM=y +CONFIG_DM_ETH_PHY=y ++CONFIG_PHY_GIGE=y +CONFIG_DWC_ETH_QOS=y +CONFIG_NVME=y +CONFIG_DM_PCI_COMPAT=y @@ -606,14 +620,12 @@ index 00000000000..fa8553fd874 +CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_DM_REGULATOR_GPIO=y +CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_ROCKCHIP_SDRAM_COMMON=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 ++CONFIG_SYS_NS16550_MEM32=y +CONFIG_ROCKCHIP_SFC=y +CONFIG_SYSRESET=y +CONFIG_USB=y @@ -627,7 +639,6 @@ index 00000000000..fa8553fd874 +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_GADGET=y -+CONFIG_SPL_TINY_MEMSET=y +CONFIG_SHA512=y +CONFIG_SPL_GZIP=y +CONFIG_ERRNO_STR=y diff --git a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-pmu-io-domains.patch b/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-pmu-io-domains.patch deleted file mode 100644 index 65cf14897c19..000000000000 --- a/patch/u-boot/v2024.10/board_bigtreetech-cb2/bigtreetech-cb2-dts-pmu-io-domains.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JohnTheCoolingFan -Date: Mon, 21 Oct 2024 14:31:37 +0000 -Subject: Patching u-boot rockchip64 files - arch/arm/dts/rk3566-bigtreetech-cb2.dts - -Signed-off-by: JohnTheCoolingFan ---- - arch/arm/dts/rk3566-bigtreetech-cb2.dts | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/dts/rk3566-bigtreetech-cb2.dts b/arch/arm/dts/rk3566-bigtreetech-cb2.dts -index acb99ef8c9a..601618241d0 100644 ---- a/arch/arm/dts/rk3566-bigtreetech-cb2.dts -+++ b/arch/arm/dts/rk3566-bigtreetech-cb2.dts -@@ -138,16 +138,17 @@ - status = "okay"; - }; - - &pmu_io_domains { - status = "okay"; -- pmuio2-supply = <&vcca1v8_pmu>; -+ pmuio1-supply = <&vcc3v3_pmu>; -+ pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; - vccio4-supply = <&vcc_1v8>; - vccio5-supply = <&vcc_3v3>; -- vccio6-supply = <&vcc_3v3>; -+ vccio6-supply = <&vcc_1v8>; - vccio7-supply = <&vcc_3v3>; - }; - - &gpio0 { - }; --- -Created with Armbian build tools https://github.com/armbian/build -