From 07bbe53490d96b07ff0e16eedba2c8143b181b03 Mon Sep 17 00:00:00 2001 From: Xavier Brown Date: Sun, 22 Sep 2024 23:00:08 -0500 Subject: [PATCH] AGHHH --- baseconfig | 86 ++++++++++++++++++ config/boards/orangepi5.conf | 1 + config/sources/families/rk35xx.conf | 2 +- newconfig | 91 +++++++++++++++++++ .../defconfig/orangepi-5-rk3588s_defconfig | 3 +- test.patch | 13 +++ userpatches/customize-image.sh | 6 ++ .../u-boot/legacy/0015-persist-env.patch | 13 +++ .../u-boot/v2024.01/0015-persist-env.patch | 13 +++ .../board_orangepi5/0015-persist-env.patch | 13 --- 10 files changed, 226 insertions(+), 15 deletions(-) create mode 100644 baseconfig create mode 100644 newconfig create mode 100644 test.patch create mode 100644 userpatches/u-boot/legacy/0015-persist-env.patch create mode 100644 userpatches/u-boot/v2024.01/0015-persist-env.patch delete mode 100644 userpatches/u-boot/v2024.01/board_orangepi5/0015-persist-env.patch diff --git a/baseconfig b/baseconfig new file mode 100644 index 000000000000..33529d4cac31 --- /dev/null +++ b/baseconfig @@ -0,0 +1,86 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SF_DEFAULT_SPEED=24000000 +CONFIG_SF_DEFAULT_MODE=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-orangepi-5" +CONFIG_ROCKCHIP_RK3588=y +CONFIG_ROCKCHIP_SPI_IMAGE=y +CONFIG_SPL_SERIAL=y +CONFIG_TARGET_EVB_RK3588=y +CONFIG_DEBUG_UART_BASE=0xFEB50000 +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_AHCI=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +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_AHCI_PCI=y +CONFIG_DWC_AHCI=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=5 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_PHY_MOTORCOMM=y +CONFIG_DWC_ETH_QOS=y +CONFIG_DWC_ETH_QOS_ROCKCHIP=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_USBDP=y +CONFIG_SPL_PINCTRL=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_SCSI=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_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_ERRNO_STR=y diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf index c96c41cb1086..739278146348 100644 --- a/config/boards/orangepi5.conf +++ b/config/boards/orangepi5.conf @@ -16,6 +16,7 @@ BOOT_SPI_RKSPI_LOADER="yes" IMAGE_PARTITION_TABLE="gpt" KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1" declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension +BOOTPATCHDIR="v2024.01/board_${BOARD}" # @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin' diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 9eb411907dd1..d834ae927c86 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/radxa/u-boot.git' BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir -BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx" +BOOTPATCHDIR="v2024.01/board_${BOARD}" OVERLAY_PREFIX='rk35xx' case $BRANCH in diff --git a/newconfig b/newconfig new file mode 100644 index 000000000000..43528a279976 --- /dev/null +++ b/newconfig @@ -0,0 +1,91 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SF_DEFAULT_SPEED=24000000 +CONFIG_SF_DEFAULT_MODE=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-orangepi-5" +CONFIG_ROCKCHIP_RK3588=y +CONFIG_ROCKCHIP_SPI_IMAGE=y +CONFIG_SPL_SERIAL=y +CONFIG_TARGET_EVB_RK3588=y +CONFIG_DEBUG_UART_BASE=0xFEB50000 +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_AHCI=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +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_AHCI_PCI=y +CONFIG_DWC_AHCI=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=5 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_PHY_MOTORCOMM=y +CONFIG_DWC_ETH_QOS=y +CONFIG_DWC_ETH_QOS_ROCKCHIP=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_USBDP=y +CONFIG_SPL_PINCTRL=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_SPL_RAM=y +CONFIG_SCSI=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_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_ERRNO_STR=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_ENV_FAT_FILE="uboot.env" +CONFIG_FAT_WRITE=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig index 4c717abea0c6..05e44c68a212 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig @@ -256,4 +256,5 @@ CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_FAT_FILE="uboot.env" -CONFIG_FAT_WRITE=y \ No newline at end of file +CONFIG_FAT_WRITE=y +CONFIG_ENV_IS_NOWHERE=n \ No newline at end of file diff --git a/test.patch b/test.patch new file mode 100644 index 000000000000..ef5902a2e088 --- /dev/null +++ b/test.patch @@ -0,0 +1,13 @@ +diff --git a/baseconfig b/newconfig +index 33529d4ca..43528a279 100644 +--- a/baseconfig ++++ b/newconfig +@@ -84,3 +84,8 @@ CONFIG_USB_OHCI_GENERIC=y + CONFIG_USB_DWC3=y + CONFIG_USB_DWC3_GENERIC=y + CONFIG_ERRNO_STR=y ++CONFIG_ENV_IS_IN_FAT=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_FAT_FILE="uboot.env" ++CONFIG_FAT_WRITE=y diff --git a/userpatches/customize-image.sh b/userpatches/customize-image.sh index 0c7e60112085..83bac2fba83f 100644 --- a/userpatches/customize-image.sh +++ b/userpatches/customize-image.sh @@ -10,8 +10,14 @@ Main() { echo "dmbpro" > /etc/hostname # Update and install necessary packages. + export DEBIAN_FRONTEND="noninteractive" + export APT_LISTCHANGES_FRONTEND="none" + add-apt-repository -y ppa:jjriek/panfork-mesa + add-apt-repository -y ppa:liujianfeng1994/rockchip-multimedia apt-get update -y apt-get install -y systemd-repart libubootenv-tool chromium-browser vim rauc + apt-get install -y mali-g610-firmware rockchip-multimedia-config + apt-get dist-upgrade -y # Copy overlay files. cp -r /tmp/overlay/rootfs/* / diff --git a/userpatches/u-boot/legacy/0015-persist-env.patch b/userpatches/u-boot/legacy/0015-persist-env.patch new file mode 100644 index 000000000000..b9d72707e241 --- /dev/null +++ b/userpatches/u-boot/legacy/0015-persist-env.patch @@ -0,0 +1,13 @@ +diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig +index 33529d4ca..43528a279 100644 +--- a/configs/orangepi-5-rk3588s_defconfig ++++ b/configs/orangepi-5-rk3588s_defconfig +@@ -84,3 +84,8 @@ CONFIG_USB_OHCI_GENERIC=y + CONFIG_USB_DWC3=y + CONFIG_USB_DWC3_GENERIC=y + CONFIG_ERRNO_STR=y ++CONFIG_ENV_IS_IN_FAT=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_FAT_FILE="uboot.env" ++CONFIG_FAT_WRITE=y diff --git a/userpatches/u-boot/v2024.01/0015-persist-env.patch b/userpatches/u-boot/v2024.01/0015-persist-env.patch new file mode 100644 index 000000000000..b9d72707e241 --- /dev/null +++ b/userpatches/u-boot/v2024.01/0015-persist-env.patch @@ -0,0 +1,13 @@ +diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig +index 33529d4ca..43528a279 100644 +--- a/configs/orangepi-5-rk3588s_defconfig ++++ b/configs/orangepi-5-rk3588s_defconfig +@@ -84,3 +84,8 @@ CONFIG_USB_OHCI_GENERIC=y + CONFIG_USB_DWC3=y + CONFIG_USB_DWC3_GENERIC=y + CONFIG_ERRNO_STR=y ++CONFIG_ENV_IS_IN_FAT=y ++CONFIG_ENV_FAT_INTERFACE="mmc" ++CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" ++CONFIG_ENV_FAT_FILE="uboot.env" ++CONFIG_FAT_WRITE=y diff --git a/userpatches/u-boot/v2024.01/board_orangepi5/0015-persist-env.patch b/userpatches/u-boot/v2024.01/board_orangepi5/0015-persist-env.patch deleted file mode 100644 index edd8428d5bb5..000000000000 --- a/userpatches/u-boot/v2024.01/board_orangepi5/0015-persist-env.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configs/orangepi_5_defconfig b/configs/orangepi_5_defconfig -index 2e289992b..c4f76ddec 100644 ---- a/configs/orangepi_5_defconfig -+++ b/configs/orangepi_5_defconfig -@@ -254,3 +254,8 @@ CONFIG_SCSI_AHCI=y - CONFIG_SCSI=y - CONFIG_USING_KERNEL_DTB_V2=y - CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -+CONFIG_ENV_IS_IN_FAT=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_ENV_FAT_FILE="uboot.env" -+CONFIG_FAT_WRITE=y \ No newline at end of file