From 2435365331b254a1ec87122c7b9b8bf1e436e6f7 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Tue, 19 Mar 2024 12:39:19 +0530 Subject: [PATCH] chore: drop u-boot patches Drop the u-boot patches which allowed building u-boot flashable to SPI. The board wiki already has links to flashing their own u-boot to SPI. It's a pain to update u-boot for us due to patches. The installation docs for the board will be updated to point to the board wiki for flashing u-boot for SPI. This also reduces our maintenance work and makes it easier to update u-boot. Signed-off-by: Noel Georgi --- Pkgfile | 8 +- artifacts/nanopi-r4s/u-boot/pkg.yaml | 6 +- artifacts/rock64/u-boot/pkg.yaml | 6 +- .../board-rock-pi-4-enable-spi-flash.patch | 153 ------------------ .../patches/enable-boot-from-spi-flash.patch | 26 --- .../general-add-xtx-spi-nor-chips.patch | 14 -- artifacts/rockpi4/u-boot/pkg.yaml | 22 +-- .../board-rock-pi-4-enable-spi-flash.patch | 153 ------------------ .../patches/enable-boot-from-spi-flash.patch | 26 --- .../general-add-xtx-spi-nor-chips.patch | 14 -- artifacts/rockpi4c/u-boot/pkg.yaml | 19 +-- 11 files changed, 23 insertions(+), 424 deletions(-) delete mode 100644 artifacts/rockpi4/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch delete mode 100644 artifacts/rockpi4/u-boot/patches/enable-boot-from-spi-flash.patch delete mode 100644 artifacts/rockpi4/u-boot/patches/general-add-xtx-spi-nor-chips.patch delete mode 100644 artifacts/rockpi4c/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch delete mode 100644 artifacts/rockpi4c/u-boot/patches/enable-boot-from-spi-flash.patch delete mode 100644 artifacts/rockpi4c/u-boot/patches/general-add-xtx-spi-nor-chips.patch diff --git a/Pkgfile b/Pkgfile index 64953ee..82c7dcd 100644 --- a/Pkgfile +++ b/Pkgfile @@ -9,8 +9,8 @@ vars: arm_trusted_firmware_sha512: 958cf8f9e258638e59d0fbd8b053fce7d8a9ea2fc922686c9d20ea16f79f55219ac18a12ab240c528ee98e49c2e0eef4c963fdb255cc14b92437a5b3cffc8640 # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=u-boot/u-boot - uboot_version: 2023.01 - uboot_sha256: 69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f - uboot_sha512: 417a28267eb7875820d08fafc7316f164663609378637539e71648b0b9b7d28796b6c381717f31b0ab6472805fefd32628ef7d1b2e7b9f3c51c8ad122993f679 + uboot_version: 2024.01 + uboot_sha256: b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 + uboot_sha512: 45bd093ba3bda23e43cdde83d8656c1ee1348ac2886ecff1fee475f101ac4965a5be6565408fa5b990c723f3fdc833edfca60a719f735a43040cd14a1b59a88b labels: - org.opencontainers.image.source: https://github.com/siderolabs/sbc-raspberrypi + org.opencontainers.image.source: https://github.com/siderolabs/sbc-rockchip diff --git a/artifacts/nanopi-r4s/u-boot/pkg.yaml b/artifacts/nanopi-r4s/u-boot/pkg.yaml index b076439..47c75e1 100644 --- a/artifacts/nanopi-r4s/u-boot/pkg.yaml +++ b/artifacts/nanopi-r4s/u-boot/pkg.yaml @@ -19,12 +19,14 @@ steps: # nanopi-r4s - | mkdir -p /usr/bin \ - && ln -sf /toolchain/bin/env /usr/bin/env + && ln -sf /toolchain/bin/env /usr/bin/env \ + && ln -sf /toolchain/bin/python3 /toolchain/bin/python + + pip3 install pyelftools tar xf u-boot.tar.bz2 --strip-components=1 - | make nanopi-r4s-rk3399_defconfig - sed -i "s/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/" .config build: - | make -j $(nproc) HOSTLDLIBS_mkimage="-lssl -lcrypto" BL31=/libs/arm-trusted-firmware/rk3399/bl31.elf diff --git a/artifacts/rock64/u-boot/pkg.yaml b/artifacts/rock64/u-boot/pkg.yaml index 0e98544..34918e8 100644 --- a/artifacts/rock64/u-boot/pkg.yaml +++ b/artifacts/rock64/u-boot/pkg.yaml @@ -19,12 +19,14 @@ steps: # rock-pi-4-rk3399 - | mkdir -p /usr/bin \ - && ln -sf /toolchain/bin/env /usr/bin/env + && ln -sf /toolchain/bin/env /usr/bin/env \ + && ln -sf /toolchain/bin/python3 /toolchain/bin/python + + pip3 install pyelftools tar xf u-boot.tar.bz2 --strip-components=1 - | make rock64-rk3328_defconfig - sed -i "s/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/" .config build: - | make -j $(nproc) HOSTLDLIBS_mkimage="-lssl -lcrypto" BL31=/libs/arm-trusted-firmware/rk3328/bl31.elf diff --git a/artifacts/rockpi4/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch b/artifacts/rockpi4/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch deleted file mode 100644 index 12ec2bf..0000000 --- a/artifacts/rockpi4/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch +++ /dev/null @@ -1,153 +0,0 @@ -# copied from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch -# and modified for u-boot v2023.01 -diff --git arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -index c17e769f64..bd8c60b4cd 100644 ---- arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -+++ arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -@@ -8,7 +8,27 @@ - - / { - chosen { -- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; -+ u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci; -+ }; -+ -+ config { -+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ -+ }; -+}; -+ -+&spi1 { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <10000000>; -+ }; -+}; -+ -+&spi1 { -+ spi_flash: flash@0 { -+ u-boot,dm-pre-reloc; - }; - }; - -diff --git configs/rock-pi-4-rk3399_defconfig configs/rock-pi-4-rk3399_defconfig -index 91ecb6d9f1..2e9b92614c 100644 ---- configs/rock-pi-4-rk3399_defconfig -+++ configs/rock-pi-4-rk3399_defconfig -@@ -4,12 +4,16 @@ CONFIG_COUNTER_FREQUENCY=24000000 - CONFIG_ARCH_ROCKCHIP=y - CONFIG_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x6000 - CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_SECT_SIZE=0x1000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b" - CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 - CONFIG_DEBUG_UART=y - CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -@@ -28,6 +32,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000 - CONFIG_SPL_STACK=0x400000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_SPL_SPI_LOAD=y - CONFIG_TPL=y - CONFIG_CMD_BOOTZ=y - CONFIG_CMD_NVEDIT_EFI=y -@@ -43,8 +48,9 @@ CONFIG_CMD_EFIDEBUG=y - CONFIG_CMD_TIME=y - 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_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_DFU_MMC=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -@@ -54,6 +60,10 @@ CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=1 -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XTX=y - CONFIG_ETH_DESIGNWARE=y - CONFIG_GMAC_ROCKCHIP=y - CONFIG_NVME_PCI=y -@@ -68,6 +78,7 @@ CONFIG_RAM_RK3399_LPDDR4=y - CONFIG_DM_RESET=y - CONFIG_BAUDRATE=1500000 - CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y -diff --git configs/rock-pi-4c-rk3399_defconfig configs/rock-pi-4c-rk3399_defconfig -index bd21a4c8b6..ffcb5d4b67 100644 ---- configs/rock-pi-4c-rk3399_defconfig -+++ configs/rock-pi-4c-rk3399_defconfig -@@ -4,12 +4,16 @@ CONFIG_COUNTER_FREQUENCY=24000000 - CONFIG_ARCH_ROCKCHIP=y - CONFIG_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x6000 - CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_SECT_SIZE=0x1000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" - CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 - CONFIG_DEBUG_UART=y - CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -@@ -28,6 +32,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000 - CONFIG_SPL_STACK=0x400000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_SPL_SPI_LOAD=y - CONFIG_TPL=y - CONFIG_CMD_BOOTZ=y - CONFIG_CMD_NVEDIT_EFI=y -@@ -43,8 +48,9 @@ CONFIG_CMD_EFIDEBUG=y - CONFIG_CMD_TIME=y - 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_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_DFU_MMC=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -@@ -54,6 +60,10 @@ CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=1 -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XTX=y - CONFIG_ETH_DESIGNWARE=y - CONFIG_GMAC_ROCKCHIP=y - CONFIG_NVME_PCI=y -@@ -68,6 +78,7 @@ CONFIG_RAM_RK3399_LPDDR4=y - CONFIG_DM_RESET=y - CONFIG_BAUDRATE=1500000 - CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y diff --git a/artifacts/rockpi4/u-boot/patches/enable-boot-from-spi-flash.patch b/artifacts/rockpi4/u-boot/patches/enable-boot-from-spi-flash.patch deleted file mode 100644 index 5e5dd3d..0000000 --- a/artifacts/rockpi4/u-boot/patches/enable-boot-from-spi-flash.patch +++ /dev/null @@ -1,26 +0,0 @@ -# this patch was missing from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch -# and prevented booting from SPI -diff --git configs/rock-pi-4-rk3399_defconfig configs/rock-pi-4-rk3399_defconfig -index 2e9b92614c..a87d011473 100644 ---- configs/rock-pi-4-rk3399_defconfig -+++ configs/rock-pi-4-rk3399_defconfig -@@ -12,6 +12,7 @@ CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI=y - CONFIG_SPL_SPI_FLASH_SUPPORT=y - CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 -diff --git configs/rock-pi-4c-rk3399_defconfig configs/rock-pi-4c-rk3399_defconfig -index ffcb5d4b67..744b769076 100644 ---- configs/rock-pi-4c-rk3399_defconfig -+++ configs/rock-pi-4c-rk3399_defconfig -@@ -12,6 +12,7 @@ CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI=y - CONFIG_SPL_SPI_FLASH_SUPPORT=y - CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 diff --git a/artifacts/rockpi4/u-boot/patches/general-add-xtx-spi-nor-chips.patch b/artifacts/rockpi4/u-boot/patches/general-add-xtx-spi-nor-chips.patch deleted file mode 100644 index f400577..0000000 --- a/artifacts/rockpi4/u-boot/patches/general-add-xtx-spi-nor-chips.patch +++ /dev/null @@ -1,14 +0,0 @@ -# copied from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/general-add-xtx-spi-nor-chips.patch -# and modified for u-boot v2023.01 -diff --git drivers/mtd/spi/spi-nor-ids.c drivers/mtd/spi/spi-nor-ids.c -index 7050ddc397..1d982c8994 100644 ---- drivers/mtd/spi/spi-nor-ids.c -+++ drivers/mtd/spi/spi-nor-ids.c -@@ -387,6 +387,7 @@ const struct flash_info spi_nor_ids[] = { - #endif - #ifdef CONFIG_SPI_FLASH_XTX - /* XTX Technology (Shenzhen) Limited */ -+ { INFO("xt25f32b", 0x0b4016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { INFO("xt25f128b", 0x0b4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - #endif - { }, diff --git a/artifacts/rockpi4/u-boot/pkg.yaml b/artifacts/rockpi4/u-boot/pkg.yaml index c1a0db3..35f8283 100644 --- a/artifacts/rockpi4/u-boot/pkg.yaml +++ b/artifacts/rockpi4/u-boot/pkg.yaml @@ -19,32 +19,24 @@ steps: # rock-pi-4-rk3399 - | mkdir -p /usr/bin \ - && ln -sf /toolchain/bin/env /usr/bin/env + && ln -sf /toolchain/bin/env /usr/bin/env \ + && ln -sf /toolchain/bin/python3 /toolchain/bin/python + + pip3 install pyelftools \ + && ln -sf /toolchain/bin/python3 /toolchain/bin/python + + pip3 install pyelftools tar xf u-boot.tar.bz2 --strip-components=1 - | - patch -p0 < /pkg/patches/board-rock-pi-4-enable-spi-flash.patch - patch -p0 < /pkg/patches/general-add-xtx-spi-nor-chips.patch - patch -p0 < /pkg/patches/enable-boot-from-spi-flash.patch - make rock-pi-4-rk3399_defconfig - sed -i "s/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/" .config build: - | make -j $(nproc) HOSTLDLIBS_mkimage="-lssl -lcrypto" BL31=/libs/arm-trusted-firmware/rk3399/bl31.elf - - # create spi image - # https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/config/sources/families/include/rockchip64_common.inc#L173-L178 - tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin rkspi_tpl_spl.img - dd if=/dev/zero of=rkspi_loader.img count=8128 status=none - dd if=rkspi_tpl_spl.img of=rkspi_loader.img conv=notrunc status=none - dd if=u-boot.itb of=rkspi_loader.img seek=768 conv=notrunc status=none install: - | mkdir -p /rootfs/artifacts/arm64/u-boot/rockpi4 cp u-boot-rockchip.bin /rootfs/artifacts/arm64/u-boot/rockpi4 - - cp rkspi_loader.img /rootfs/artifacts/arm64/u-boot/rockpi4 finalize: - from: /rootfs to: /rootfs diff --git a/artifacts/rockpi4c/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch b/artifacts/rockpi4c/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch deleted file mode 100644 index 12ec2bf..0000000 --- a/artifacts/rockpi4c/u-boot/patches/board-rock-pi-4-enable-spi-flash.patch +++ /dev/null @@ -1,153 +0,0 @@ -# copied from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch -# and modified for u-boot v2023.01 -diff --git arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -index c17e769f64..bd8c60b4cd 100644 ---- arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -+++ arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi -@@ -8,7 +8,27 @@ - - / { - chosen { -- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; -+ u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci; -+ }; -+ -+ config { -+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ -+ }; -+}; -+ -+&spi1 { -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <10000000>; -+ }; -+}; -+ -+&spi1 { -+ spi_flash: flash@0 { -+ u-boot,dm-pre-reloc; - }; - }; - -diff --git configs/rock-pi-4-rk3399_defconfig configs/rock-pi-4-rk3399_defconfig -index 91ecb6d9f1..2e9b92614c 100644 ---- configs/rock-pi-4-rk3399_defconfig -+++ configs/rock-pi-4-rk3399_defconfig -@@ -4,12 +4,16 @@ CONFIG_COUNTER_FREQUENCY=24000000 - CONFIG_ARCH_ROCKCHIP=y - CONFIG_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x6000 - CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_SECT_SIZE=0x1000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b" - CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 - CONFIG_DEBUG_UART=y - CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -@@ -28,6 +32,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000 - CONFIG_SPL_STACK=0x400000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_SPL_SPI_LOAD=y - CONFIG_TPL=y - CONFIG_CMD_BOOTZ=y - CONFIG_CMD_NVEDIT_EFI=y -@@ -43,8 +48,9 @@ CONFIG_CMD_EFIDEBUG=y - CONFIG_CMD_TIME=y - 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_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_DFU_MMC=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -@@ -54,6 +60,10 @@ CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=1 -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XTX=y - CONFIG_ETH_DESIGNWARE=y - CONFIG_GMAC_ROCKCHIP=y - CONFIG_NVME_PCI=y -@@ -68,6 +78,7 @@ CONFIG_RAM_RK3399_LPDDR4=y - CONFIG_DM_RESET=y - CONFIG_BAUDRATE=1500000 - CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y -diff --git configs/rock-pi-4c-rk3399_defconfig configs/rock-pi-4c-rk3399_defconfig -index bd21a4c8b6..ffcb5d4b67 100644 ---- configs/rock-pi-4c-rk3399_defconfig -+++ configs/rock-pi-4c-rk3399_defconfig -@@ -4,12 +4,16 @@ CONFIG_COUNTER_FREQUENCY=24000000 - CONFIG_ARCH_ROCKCHIP=y - CONFIG_TEXT_BASE=0x00200000 - CONFIG_NR_DRAM_BANKS=1 -+CONFIG_ENV_SIZE=0x6000 - CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_SECT_SIZE=0x1000 - CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c" - CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 - CONFIG_DEBUG_UART=y - CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -@@ -28,6 +32,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000 - CONFIG_SPL_STACK=0x400000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 -+CONFIG_SPL_SPI_LOAD=y - CONFIG_TPL=y - CONFIG_CMD_BOOTZ=y - CONFIG_CMD_NVEDIT_EFI=y -@@ -43,8 +48,9 @@ CONFIG_CMD_EFIDEBUG=y - CONFIG_CMD_TIME=y - 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_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_DFU_MMC=y - CONFIG_ROCKCHIP_GPIO=y - CONFIG_SYS_I2C_ROCKCHIP=y -@@ -54,6 +60,10 @@ CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=1 -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XTX=y - CONFIG_ETH_DESIGNWARE=y - CONFIG_GMAC_ROCKCHIP=y - CONFIG_NVME_PCI=y -@@ -68,6 +78,7 @@ CONFIG_RAM_RK3399_LPDDR4=y - CONFIG_DM_RESET=y - CONFIG_BAUDRATE=1500000 - CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y - CONFIG_SYSRESET=y - CONFIG_USB=y - CONFIG_USB_XHCI_HCD=y diff --git a/artifacts/rockpi4c/u-boot/patches/enable-boot-from-spi-flash.patch b/artifacts/rockpi4c/u-boot/patches/enable-boot-from-spi-flash.patch deleted file mode 100644 index 5e5dd3d..0000000 --- a/artifacts/rockpi4c/u-boot/patches/enable-boot-from-spi-flash.patch +++ /dev/null @@ -1,26 +0,0 @@ -# this patch was missing from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/board-rock-pi-4-enable-spi-flash.patch -# and prevented booting from SPI -diff --git configs/rock-pi-4-rk3399_defconfig configs/rock-pi-4-rk3399_defconfig -index 2e9b92614c..a87d011473 100644 ---- configs/rock-pi-4-rk3399_defconfig -+++ configs/rock-pi-4-rk3399_defconfig -@@ -12,6 +12,7 @@ CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI=y - CONFIG_SPL_SPI_FLASH_SUPPORT=y - CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 -diff --git configs/rock-pi-4c-rk3399_defconfig configs/rock-pi-4c-rk3399_defconfig -index ffcb5d4b67..744b769076 100644 ---- configs/rock-pi-4c-rk3399_defconfig -+++ configs/rock-pi-4c-rk3399_defconfig -@@ -12,6 +12,7 @@ CONFIG_ROCKCHIP_RK3399=y - CONFIG_TARGET_EVB_RK3399=y - CONFIG_DEBUG_UART_BASE=0xFF1A0000 - CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI=y - CONFIG_SPL_SPI_FLASH_SUPPORT=y - CONFIG_SPL_SPI_SUPPORT=y - CONFIG_SYS_LOAD_ADDR=0x800800 diff --git a/artifacts/rockpi4c/u-boot/patches/general-add-xtx-spi-nor-chips.patch b/artifacts/rockpi4c/u-boot/patches/general-add-xtx-spi-nor-chips.patch deleted file mode 100644 index f400577..0000000 --- a/artifacts/rockpi4c/u-boot/patches/general-add-xtx-spi-nor-chips.patch +++ /dev/null @@ -1,14 +0,0 @@ -# copied from https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/patch/u-boot/u-boot-rockchip64/general-add-xtx-spi-nor-chips.patch -# and modified for u-boot v2023.01 -diff --git drivers/mtd/spi/spi-nor-ids.c drivers/mtd/spi/spi-nor-ids.c -index 7050ddc397..1d982c8994 100644 ---- drivers/mtd/spi/spi-nor-ids.c -+++ drivers/mtd/spi/spi-nor-ids.c -@@ -387,6 +387,7 @@ const struct flash_info spi_nor_ids[] = { - #endif - #ifdef CONFIG_SPI_FLASH_XTX - /* XTX Technology (Shenzhen) Limited */ -+ { INFO("xt25f32b", 0x0b4016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - { INFO("xt25f128b", 0x0b4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, - #endif - { }, diff --git a/artifacts/rockpi4c/u-boot/pkg.yaml b/artifacts/rockpi4c/u-boot/pkg.yaml index b74de81..c4e0a26 100644 --- a/artifacts/rockpi4c/u-boot/pkg.yaml +++ b/artifacts/rockpi4c/u-boot/pkg.yaml @@ -19,32 +19,21 @@ steps: # rock-pi-4c-rk3399 - | mkdir -p /usr/bin \ - && ln -sf /toolchain/bin/env /usr/bin/env + && ln -sf /toolchain/bin/env /usr/bin/env \ + && ln -sf /toolchain/bin/python3 /toolchain/bin/python + + pip3 install pyelftools tar xf u-boot.tar.bz2 --strip-components=1 - | - patch -p0 < /pkg/patches/board-rock-pi-4-enable-spi-flash.patch - patch -p0 < /pkg/patches/general-add-xtx-spi-nor-chips.patch - patch -p0 < /pkg/patches/enable-boot-from-spi-flash.patch - make rock-pi-4c-rk3399_defconfig - sed -i "s/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/" .config build: - | make -j $(nproc) HOSTLDLIBS_mkimage="-lssl -lcrypto" BL31=/libs/arm-trusted-firmware/rk3399/bl31.elf - - # create spi image - # https://github.com/armbian/build/blob/09e416e31cc01ece4533a65f02a470a4c21b90ea/config/sources/families/include/rockchip64_common.inc#L173-L178 - tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin rkspi_tpl_spl.img - dd if=/dev/zero of=rkspi_loader.img count=8128 status=none - dd if=rkspi_tpl_spl.img of=rkspi_loader.img conv=notrunc status=none - dd if=u-boot.itb of=rkspi_loader.img seek=768 conv=notrunc status=none install: - | mkdir -p /rootfs/artifacts/arm64/u-boot/rockpi4c cp u-boot-rockchip.bin /rootfs/artifacts/arm64/u-boot/rockpi4c - - cp rkspi_loader.img /rootfs/artifacts/arm64/u-boot/rockpi4c finalize: - from: /rootfs to: /rootfs