From 149fce953c0e557f089db6ed0b4a757c4c56a992 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Mon, 17 Apr 2023 00:34:44 +0800 Subject: [PATCH] Fix u-boot build for miss buildroot cross compiler bug --- bsp/bootloader/patch/uboot-imx-lf-5.15.32-2.0.0.patch | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bsp/bootloader/patch/uboot-imx-lf-5.15.32-2.0.0.patch b/bsp/bootloader/patch/uboot-imx-lf-5.15.32-2.0.0.patch index 83a1463..eeb654e 100644 --- a/bsp/bootloader/patch/uboot-imx-lf-5.15.32-2.0.0.patch +++ b/bsp/bootloader/patch/uboot-imx-lf-5.15.32-2.0.0.patch @@ -33,7 +33,7 @@ + phy-reset-post-delay = <15>; status = "okay"; }; - + @@ -91,14 +94,17 @@ pinctrl-0 = <&pinctrl_enet2>; phy-mode = "rmii"; @@ -42,11 +42,11 @@ + phy-reset-duration = <50>; + phy-reset-post-delay = <15>; status = "okay"; - + mdio { #address-cells = <1>; #size-cells = <0>; - + - ethphy0: ethernet-phy@2 { - reg = <2>; + ethphy0: ethernet-phy@0 { @@ -56,13 +56,13 @@ clock-names = "rmii-ref"; @@ -151,21 +157,21 @@ status = "okay"; - + display0: display@0 { - bits-per-pixel = <24>; - bus-width = <24>; + bits-per-pixel = <16>; + bus-width = <16>; - + display-timings { native-mode = <&timing0>; timing0: timing0 { @@ -84,11 +84,11 @@ + vback-porch = <32>; + vfront-porch = <13>; + vsync-len = <3>; - + hsync-active = <0>; vsync-active = <0>; @@ -284,6 +290,40 @@ - + &iomuxc { pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_extgpio>; @@ -125,7 +125,7 @@ + MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x17059 /* 40# GPIO */ + >; + }; - + pinctrl_csi1: csi1grp { fsl,pins = < @@ -312,6 +352,7 @@ @@ -135,7 +135,7 @@ + MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x10B0 /* ENET1 RESET */ >; }; - + @@ -327,6 +368,7 @@ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0 MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0 @@ -143,7 +143,7 @@ + MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x10B0 /* ENET2 RESET */ >; }; - + @@ -384,13 +426,6 @@ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79 MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79 @@ -157,7 +157,7 @@ - MX6UL_PAD_LCD_DATA23__LCDIF_DATA23 0x79 >; }; - + @@ -423,7 +458,6 @@ MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088 MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088 @@ -165,7 +165,7 @@ - MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 0x17059 >; }; - + @@ -448,7 +482,6 @@ fsl,pins = < MX6UL_PAD_BOOT_MODE0__GPIO5_IO10 0x70a1 @@ -179,7 +179,7 @@ +++ uboot-imx-lf-5.15.32-2.0.0/arch/arm/dts/Makefile 2022-09-04 15:05:50.936174546 +0800 @@ -871,6 +871,7 @@ imx6ull-kontron-n641x-s.dtb - + dtb-$(CONFIG_MX6ULL) += \ + igkboard.dtb \ imx6ull-14x14-ddr3-val.dtb \ @@ -191,7 +191,7 @@ @@ -157,6 +157,16 @@ prompt "MX6 board select" optional - + +config TARGET_LINGYUN_IGKBOARD + bool "LingYun IoT Gateway Kits Board(IGKBoard)" + depends on MX6ULL @@ -210,7 +210,7 @@ source "board/BuR/brppt2/Kconfig" source "board/out4/o4-imx6ull-nano/Kconfig" +source "board/lingyun/igkboard/Kconfig" - + endif diff -Nuar -x lingyun.bmp uboot-imx/board/lingyun/igkboard/igkboard.c uboot-imx-lf-5.15.32-2.0.0/board/lingyun/igkboard/igkboard.c --- uboot-imx/board/lingyun/igkboard/igkboard.c 1970-01-01 08:00:00.000000000 +0800 @@ -1257,12 +1257,12 @@ @@ -182,6 +182,8 @@ { int result; - + + phy_reset(phydev); + if (phydev->autoneg != AUTONEG_ENABLE) return genphy_setup_forced(phydev); - + diff -Nuar -x lingyun.bmp uboot-imx/include/configs/igkboard.h uboot-imx-lf-5.15.32-2.0.0/include/configs/igkboard.h --- uboot-imx/include/configs/igkboard.h 1970-01-01 08:00:00.000000000 +0800 +++ uboot-imx-lf-5.15.32-2.0.0/include/configs/igkboard.h 2022-09-04 15:05:50.940174512 +0800 @@ -1538,13 +1538,13 @@ @@ -273,6 +273,9 @@ CROSS_COMPILE ?= endif - + +ARCH = arm +CROSS_COMPILE ?= /opt/buildroot/cortexA7/bin/arm-linux- + KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG - + diff -Nuar -x lingyun.bmp uboot-imx/tools/boot/bootm.c uboot-imx-lf-5.15.32-2.0.0/tools/boot/bootm.c --- uboot-imx/tools/boot/bootm.c 1970-01-01 08:00:00.000000000 +0800 +++ uboot-imx-lf-5.15.32-2.0.0/tools/boot/bootm.c 2022-09-04 15:05:57.424118419 +0800 -- Gitblit v1.9.1