cn9130-crb: Upgrade U-Boot to 2023.07.02

kernelkit · Aug 24, 2023 · df64be1 · df64be1
1 parent ea3f4c4
commit df64be1
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 0 deletions.
diff --git a/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi b/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi
@@ -0,0 +1,38 @@
+/ {
+	config {
+		environment {
+			boot_targets = "mmc1";
+			ethprime = "eth1";
+
+			/* Uncomment this if you're debugging U-Boot
+			 *
+			 * This will allow you to break out of the
+                         * normal boot flow and into the interactive
+                         * console.
+			 *
+			 * To upgrade U-Boot itself, simply set the
+                         * `bootfile` variable to the path of
+                         * `flash-image.bin` on your TFTP server, then
+                         * issue `run ixupgradeboot`.
+			 */
+/* 			bootdelay = "2"; */
+/* 			ixupgradeboot = " */
+/* dhcp */
+/* setexpr fileblks ${filesize} + 0x1ff */
+/* setexpr fileblks ${fileblks} / 0x200 */
+
+/* mmc dev 1 */
+/* part start mmc 1 boot bootstart */
+/* part size  mmc 1 boot bootsize */
+
+
+/* mmc erase ${bootstart} ${bootsize} */
+/* mmc write ${fileaddr} ${bootstart} ${fileblks} */
+/* "; */
+		};
+	};
+};
+
+/* &cp0_eth0 { */
+/* 	phy-mode = "10gbase-r"; */
+/* }; */
diff --git a/board/aarch64/cn9130-crb/uboot/extras.config b/board/aarch64/cn9130-crb/uboot/extras.config
@@ -0,0 +1,4 @@
+CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi cn9130-crb-env.dtsi"
+
+CONFIG_ENV_IS_NOWHERE=y
+# CONFIG_ENV_IS_IN_MMC is not set
diff --git a/board/common/uboot/extras.config b/board/common/uboot/extras.config
@@ -3,11 +3,17 @@ CONFIG_DEVICE_TREE_INCLUDES="infix-env.dtsi infix-key.dtsi"
 
 CONFIG_ENV_IMPORT_FDT=y
 
+CONFIG_RSA=y
+CONFIG_RSA_VERIFY=y
+
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_BLKMAP=y
 
+CONFIG_NET_RANDOM_ETHADDR=y
+
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_CMD_SETEXPR=y
 CONFIG_CMD_SETEXPR_FMT=y
 
 CONFIG_MMC=y

diff --git a/board/common/uboot/scripts/ixboot.sh b/board/common/uboot/scripts/ixboot.sh
@@ -2,9 +2,11 @@ for tgt in "${boot_targets}"; do
     if test "${tgt}" = "mmc0"; then
 	setenv devtype "mmc"
 	setenv devnum 0
+	mmc dev 0
     elif test "${tgt}" = "mmc1"; then
 	setenv devtype "mmc"
 	setenv devnum 1
+	mmc dev 1
     else
 	setenv devtype "${tgt}"
 	setenv devnum 0

diff --git a/configs/cn9130_crb_boot_defconfig b/configs/cn9130_crb_boot_defconfig
@@ -11,6 +11,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches"
 BR2_SSP_NONE=y
 BR2_INIT_NONE=y
 BR2_SYSTEM_BIN_SH_NONE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
 # BR2_PACKAGE_BUSYBOX is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -23,7 +24,20 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
 BR2_TARGET_BINARIES_MARVELL=y
 BR2_TARGET_MV_DDR_MARVELL=y
 BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mvebu_crb_cn9130"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/extras.config $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/cn9130-crb/uboot/extras.config"
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi"
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
+# SIGN_ENABLED is not set
+DISK_IMAGE=y
+DISK_IMAGE_BOOT_BIN=y
+DISK_IMAGE_BOOT_DATA="${BINARIES_DIR}/flash-image.bin"
+DISK_IMAGE_BOOT_OFFSET=0x00200000
diff --git a/patches/uboot/crb-phy-mode.patch b/patches/uboot/crb-phy-mode.patch
@@ -0,0 +1,13 @@
+Index: uboot-2023.07.02/arch/arm/dts/cn9130-crb.dtsi
+===================================================================
+--- uboot-2023.07.02.orig/arch/arm/dts/cn9130-crb.dtsi
++++ uboot-2023.07.02/arch/arm/dts/cn9130-crb.dtsi
+@@ -239,7 +239,7 @@
+
+ &cp0_eth0 {
+ 	status = "okay";
+-	phy-mode = "sfi";
++	phy-mode = "10gbase-r";
+ };
+
+ &cp0_eth1 {