From d3809d5ba4d028ca6e617bbfde8c22d1ea3e5d72 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 22 Dec 2023 17:03:18 +0800
Subject: [PATCH] Update bootloader build shell script to support igkboard-imx6ull

---
 bootloader/build.sh                                                 |   33 +
 bootloader/patches/igkboard-imx6ull/uboot-imx-lf-6.1.36-2.1.0.patch | 1666 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 bootloader/patches/igkboard-imx8mp/uboot-imx-lf-6.1.36-2.1.0.patch  |   14 
 3 files changed, 1,699 insertions(+), 14 deletions(-)

diff --git a/bootloader/build.sh b/bootloader/build.sh
index 0e19266..e6468fc 100755
--- a/bootloader/build.sh
+++ b/bootloader/build.sh
@@ -57,13 +57,18 @@
     export CROSS_COMPILE=`jq -r ".bsp.cortexAtool" $CONF_FILE | tr 'A-Z' 'a-z'`
     export MCORE_COMPILE=`jq -r ".bsp.cortexMtool" $CONF_FILE | tr 'A-Z' 'a-z'`
 
-    export SRCS="imx-atf uboot-imx imx-mkimage"
     export BRANCH=$BSP_VER
     export JOBS=`cat /proc/cpuinfo | grep processor | wc -l`
     export ARCH=arm
 
+    # i.MX6ULL only need uboot-imx
+    if [[ $BOARD =~ mx6ull ]] ; then
+        export SRCS="uboot-imx"
+        return ;
+    fi
+
+    export SRCS="uboot-imx imx-atf imx-mkimage"
     export_fmver
-    export SRCS="imx-atf uboot-imx imx-mkimage"
 
     if [[ $BOARD =~ mx8mp ]] ; then
 
@@ -108,6 +113,10 @@
         fi
     done
 
+    # i.MX6ULL only need uboot-imx
+    if [[ $BOARD =~ mx6ull ]] ; then
+        return ;
+    fi
 
     mkdir -p $FMW_PATH && cd $FMW_PATH
 
@@ -194,6 +203,16 @@
     fi
     make -j${JOBS} CROSS_COMPILE=${CROSS_COMPILE} ARCH=arm
 
+    # i.MX6ULL only need uboot-imx
+    if [[ $BOARD =~ mx6ull ]] ; then
+        cp u-boot-dtb.imx u-boot-${BOARD}.imx
+        chmod a+x u-boot-${BOARD}.imx
+        set -x
+        cp u-boot-${BOARD}.imx $PRFX_PATH
+        set +x
+        return ;
+    fi
+
     set -x
     cp u-boot.bin $MKIMG_BIN_PATH
     cp u-boot-nodtb.bin $MKIMG_BIN_PATH
@@ -270,10 +289,16 @@
     cd $PRJ_PATH
     mkdir -p $PRFX_PATH
 
-    build_atf
-    #build_cortexM
     build_uboot
+
+    # i.MX6ULL only need uboot-imx
+    if [[ ${BOARD} =~ mx6ull ]] ; then
+        return ;
+    fi
+
+    build_atf
     build_imxboot
+    #build_cortexM
 }
 
 function do_install()
diff --git a/bootloader/patches/igkboard-imx6ull/uboot-imx-lf-6.1.36-2.1.0.patch b/bootloader/patches/igkboard-imx6ull/uboot-imx-lf-6.1.36-2.1.0.patch
new file mode 100644
index 0000000..fa62132
--- /dev/null
+++ b/bootloader/patches/igkboard-imx6ull/uboot-imx-lf-6.1.36-2.1.0.patch
@@ -0,0 +1,1666 @@
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 8b65ac0b..a9828526 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -936,6 +936,7 @@ dtb-$(CONFIG_MX6UL) += \
+ 	imx6ull-kontron-bl.dtb
+ 
+ dtb-$(CONFIG_MX6ULL) += \
++	igkboard-imx6ull.dtb \
+ 	imx6ull-14x14-ddr3-val.dtb \
+ 	imx6ull-14x14-ddr3-val-epdc.dtb \
+ 	imx6ull-14x14-ddr3-val-emmc.dtb \
+diff --git a/arch/arm/dts/igkboard-imx6ull.dts b/arch/arm/dts/igkboard-imx6ull.dts
+new file mode 100644
+index 00000000..b87e0155
+--- /dev/null
++++ b/arch/arm/dts/igkboard-imx6ull.dts
+@@ -0,0 +1,377 @@
++// SPDX-License-Identifier: (GPL-2.0 OR MIT)
++//
++// Copyright (C) 2023 LingYun IoT System Studio
++
++/dts-v1/;
++
++#include "imx6ull.dtsi"
++
++/ {
++	model = "LingYun IoT Gateway Kits Board based on i.MX6ULL";
++	compatible = "lingyun,igkboard-imx6ull", "fsl,imx6ull-14x14-evk", "fsl,imx6ull";
++
++	chosen {
++		stdout-path = &uart1;
++	};
++
++	memory@80000000 {
++		device_type = "memory";
++		reg = <0x80000000 0x20000000>;
++	};
++
++	reg_sd1_vmmc: regulator-sd1-vmmc {
++		compatible = "regulator-fixed";
++		regulator-name = "VSD_3V3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
++		off-on-delay-us = <20000>;
++		enable-active-high;
++	};
++};
++
++&fec1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet1>;
++	phy-mode = "rmii";
++	phy-handle = <&ethphy0>;
++	phy-reset-gpios = <&gpio5 7 GPIO_ACTIVE_LOW>;
++	phy-reset-duration = <50>;
++	phy-reset-post-delay = <15>;
++	status = "okay";
++};
++
++&fec2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet2>;
++	phy-mode = "rmii";
++	phy-handle = <&ethphy1>;
++	phy-reset-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
++	phy-reset-duration = <50>;
++	phy-reset-post-delay = <15>;
++	status = "okay";
++
++	mdio {
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		ethphy0: ethernet-phy@0 {
++			reg = <0>;
++			micrel,led-mode = <1>;
++			clocks = <&clks IMX6UL_CLK_ENET_REF>;
++			clock-names = "rmii-ref";
++		};
++
++		ethphy1: ethernet-phy@1 {
++			reg = <1>;
++			micrel,led-mode = <1>;
++			clocks = <&clks IMX6UL_CLK_ENET2_REF>;
++			clock-names = "rmii-ref";
++		};
++	};
++};
++
++&lcdif {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_lcdif_dat
++		     &pinctrl_lcdif_ctrl>;
++
++	display = <&display0>;
++	status = "okay";
++
++	display0: display@0 {
++		bits-per-pixel = <16>;
++		bus-width = <16>;
++
++		display-timings {
++			native-mode = <&timing0>;
++			timing0: timing0 {
++			clock-frequency = <30000000>;
++			hactive = <800>;
++			vactive = <480>;
++			hfront-porch = <40>;
++			hback-porch = <88>;
++			hsync-len = <48>;
++			vback-porch = <32>;
++			vfront-porch = <13>;
++			vsync-len = <3>;
++
++			hsync-active = <0>;
++			vsync-active = <0>;
++			de-active = <1>;
++			pixelclk-active = <0>;
++			};
++		};
++	};
++};
++
++&snvs_poweroff {
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart1>;
++	status = "okay";
++};
++
++&usbotg1 {
++	dr_mode = "otg";
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usb_otg1>;
++	status = "okay";
++};
++
++&usbotg2 {
++	dr_mode = "host";
++	disable-over-current;
++	status = "okay";
++};
++
++&usbphy1 {
++	fsl,tx-d-cal = <106>;
++};
++
++&usbphy2 {
++	fsl,tx-d-cal = <106>;
++};
++
++&usdhc1 {
++	pinctrl-names = "default", "state_100mhz", "state_200mhz";
++	pinctrl-0 = <&pinctrl_usdhc1>;
++	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
++	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
++	cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
++	keep-power-in-suspend;
++	wakeup-source;
++	vmmc-supply = <&reg_sd1_vmmc>;
++	status = "okay";
++};
++
++&usdhc2 {
++    pinctrl-names = "default";
++    pinctrl-0 = <&pinctrl_usdhc2>;
++    no-1-8-v;
++    broken-cd;
++    keep-power-in-suspend;
++    wakeup-source;
++    status = "okay";
++};
++
++&wdog1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_wdog>;
++	fsl,ext-reset-output;
++};
++
++&iomuxc {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_extgpio>;
++
++	pinctrl_extgpio: extgpiogrp {
++		fsl,pins = <
++			MX6UL_PAD_GPIO1_IO03__GPIO1_IO03	0x17059 /*	3# I2C1_SDA */
++			MX6UL_PAD_GPIO1_IO02__GPIO1_IO02	0x17059 /*	5# I2C1_SCL */
++			MX6UL_PAD_UART1_CTS_B__GPIO1_IO18	0x17059 /*	7#	GPIO	*/
++			MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x17059 /* 11# UART3_TX */
++			MX6UL_PAD_UART4_TX_DATA__GPIO1_IO28 0x17059 /* 13# UART4_TX */
++			MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x17059 /* 15# UART4_RX */
++			MX6UL_PAD_LCD_DATA22__GPIO3_IO27	0x17059 /* 19# SPI1_MOSI*/
++			MX6UL_PAD_LCD_DATA23__GPIO3_IO28	0x17059 /* 21# SPI1_MISO*/
++			MX6UL_PAD_LCD_DATA20__GPIO3_IO25	0x17059 /* 23# SPI1_SCLK*/
++			MX6UL_PAD_UART3_CTS_B__GPIO1_IO26	0x17059 /* 27# CAN1_TX	*/
++			MX6UL_PAD_UART3_RTS_B__GPIO1_IO27	0x17059 /* 29# CAN1_RX	*/
++			MX6UL_PAD_UART2_CTS_B__GPIO1_IO22	0x17059 /* 31# CAN2_TX	*/
++			MX6UL_PAD_UART2_RTS_B__GPIO1_IO23	0x17059 /* 33# CAN2_RX	*/
++			MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01	0x17059 /* 35#	GPIO	*/
++			MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08	0x17059 /* 37#	GPIO	*/
++			MX6UL_PAD_UART2_TX_DATA__GPIO1_IO20 0x17059 /* 8# UART2_TX */
++			MX6UL_PAD_UART2_RX_DATA__GPIO1_IO21 0x17059 /* 10# UART2_RX */
++			MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x17059 /* 12# UART3_RX */
++			MX6UL_PAD_LCD_DATA16__GPIO3_IO21	0x17059 /* 16# UART7_TX */
++			MX6UL_PAD_LCD_DATA17__GPIO3_IO22	0x17059 /* 18# UART7_RX */
++			MX6UL_PAD_LCD_DATA18__GPIO3_IO23	0x17059 /* 22# GPIO		*/
++			MX6UL_PAD_LCD_DATA21__GPIO3_IO26	0x17059 /* 24# SPI1_SS0 */
++			MX6UL_PAD_LCD_DATA19__GPIO3_IO24	0x17059 /* 26# GPIO		*/
++			MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15	0x17059 /* 28# PWM8		*/
++			MX6UL_PAD_JTAG_TCK__GPIO1_IO14		0x17059 /* 32# PWM7		*/
++			MX6UL_PAD_JTAG_TMS__GPIO1_IO11		0x17059 /* 36# GPIO */
++			MX6UL_PAD_JTAG_MOD__GPIO1_IO10		0x17059 /* 38# GPIO */
++			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09	0x17059 /* 40# GPIO */
++		>;
++	};
++
++	pinctrl_enet1: enet1grp {
++		fsl,pins = <
++			MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN	0x1b0b0
++			MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER	0x1b0b0
++			MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00	0x1b0b0
++			MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01	0x1b0b0
++			MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN	0x1b0b0
++			MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00	0x1b0b0
++			MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01	0x1b0b0
++			MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x4001b031
++			MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x10B0 /* ENET1 RESET */
++		>;
++	};
++
++	pinctrl_enet2: enet2grp {
++		fsl,pins = <
++			MX6UL_PAD_GPIO1_IO07__ENET2_MDC		0x1b0b0
++			MX6UL_PAD_GPIO1_IO06__ENET2_MDIO	0x1b0b0
++			MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN	0x1b0b0
++			MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER	0x1b0b0
++			MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00	0x1b0b0
++			MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01	0x1b0b0
++			MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN	0x1b0b0
++			MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00	0x1b0b0
++			MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01	0x1b0b0
++			MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2	0x4001b031
++			MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04	0x10B0 /* ENET2 RESET */
++		>;
++	};
++
++	pinctrl_lcdif_dat: lcdifdatgrp {
++		fsl,pins = <
++			MX6UL_PAD_LCD_DATA00__LCDIF_DATA00  0x79
++			MX6UL_PAD_LCD_DATA01__LCDIF_DATA01  0x79
++			MX6UL_PAD_LCD_DATA02__LCDIF_DATA02  0x79
++			MX6UL_PAD_LCD_DATA03__LCDIF_DATA03  0x79
++			MX6UL_PAD_LCD_DATA04__LCDIF_DATA04  0x79
++			MX6UL_PAD_LCD_DATA05__LCDIF_DATA05  0x79
++			MX6UL_PAD_LCD_DATA06__LCDIF_DATA06  0x79
++			MX6UL_PAD_LCD_DATA07__LCDIF_DATA07  0x79
++			MX6UL_PAD_LCD_DATA08__LCDIF_DATA08  0x79
++			MX6UL_PAD_LCD_DATA09__LCDIF_DATA09  0x79
++			MX6UL_PAD_LCD_DATA10__LCDIF_DATA10  0x79
++			MX6UL_PAD_LCD_DATA11__LCDIF_DATA11  0x79
++			MX6UL_PAD_LCD_DATA12__LCDIF_DATA12  0x79
++			MX6UL_PAD_LCD_DATA13__LCDIF_DATA13  0x79
++			MX6UL_PAD_LCD_DATA14__LCDIF_DATA14  0x79
++			MX6UL_PAD_LCD_DATA15__LCDIF_DATA15  0x79
++		>;
++	};
++
++	pinctrl_lcdif_ctrl: lcdifctrlgrp {
++		fsl,pins = <
++			MX6UL_PAD_LCD_CLK__LCDIF_CLK	    0x79
++			MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE  0x79
++			MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC    0x79
++			MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC    0x79
++			/* used for lcd reset */
++			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09  0x79
++		>;
++	};
++
++	pinctrl_uart1: uart1grp {
++		fsl,pins = <
++			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1
++			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
++		>;
++	};
++
++	pinctrl_usb_otg1: usbotg1grp {
++		fsl,pins = <
++			MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID	0x17059
++		>;
++	};
++
++	pinctrl_usdhc1: usdhc1grp {
++		fsl,pins = <
++			MX6UL_PAD_SD1_CMD__USDHC1_CMD     	0x17059
++			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10071
++			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 	0x17059
++			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 	0x17059
++			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 	0x17059
++			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 	0x17059
++			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19       0x17059 /* SD1 CD */
++			MX6UL_PAD_GPIO1_IO05__USDHC1_VSELECT    0x17059 /* SD1 VSELECT */
++			MX6UL_PAD_GPIO1_IO09__GPIO1_IO09        0x17059 /* SD1 RESET */
++		>;
++	};
++
++	pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
++		fsl,pins = <
++			MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170b9
++			MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100b9
++			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170b9
++			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170b9
++			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170b9
++			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170b9
++
++		>;
++	};
++
++	pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
++		fsl,pins = <
++			MX6UL_PAD_SD1_CMD__USDHC1_CMD     0x170f9
++			MX6UL_PAD_SD1_CLK__USDHC1_CLK     0x100f9
++			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x170f9
++			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x170f9
++			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x170f9
++			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x170f9
++		>;
++	};
++
++	pinctrl_usdhc2: usdhc2grp {
++		fsl,pins = <
++			MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x17059
++			MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x17059
++			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
++			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
++			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
++			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
++		>;
++	};
++
++	pinctrl_usdhc2_8bit: usdhc2grp_8bit {
++		fsl,pins = <
++			MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x10069
++			MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x17059
++			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
++			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
++			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
++			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
++			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
++			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
++			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
++			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
++		>;
++	};
++
++	pinctrl_usdhc2_8bit_100mhz: usdhc2grp_8bit_100mhz {
++		fsl,pins = <
++			MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x100b9
++			MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x170b9
++			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170b9
++			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170b9
++			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170b9
++			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170b9
++			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170b9
++			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170b9
++			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170b9
++			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170b9
++		>;
++	};
++
++	pinctrl_usdhc2_8bit_200mhz: usdhc2grp_8bit_200mhz {
++		fsl,pins = <
++			MX6UL_PAD_NAND_RE_B__USDHC2_CLK     0x100f9
++			MX6UL_PAD_NAND_WE_B__USDHC2_CMD     0x170f9
++			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x170f9
++			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x170f9
++			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x170f9
++			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9
++			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x170f9
++			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x170f9
++			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x170f9
++			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x170f9
++		>;
++	};
++
++	pinctrl_wdog: wdoggrp {
++		fsl,pins = <
++			MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY    0x30b0
++		>;
++	};
++};
+diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
+index a7a04350..40e21004 100644
+--- a/arch/arm/mach-imx/mx6/Kconfig
++++ b/arch/arm/mach-imx/mx6/Kconfig
+@@ -157,6 +157,16 @@ choice
+ 	prompt "MX6 board select"
+ 	optional
+ 
++config TARGET_LINGYUN_IGKBOARD_IMX6ULL
++	bool "LingYun i.MX6ULL IoT Gateway Kits Board(igkboard-imx6ull)"
++	depends on MX6ULL
++	select BOARD_LATE_INIT
++	select DM
++	select DM_THERMAL
++	select IMX_MODULE_FUSE
++	select OF_SYSTEM_SETUP
++	imply CMD_DM
++
+ config TARGET_APALIS_IMX6
+ 	bool "Toradex Apalis iMX6 board"
+ 	depends on MX6Q
+@@ -901,5 +911,6 @@ source "board/udoo/neo/Kconfig"
+ source "board/wandboard/Kconfig"
+ source "board/BuR/brppt2/Kconfig"
+ source "board/out4/o4-imx6ull-nano/Kconfig"
++source "board/lingyun/igkboard-imx6ull/Kconfig"
+ 
+ endif
+diff --git a/board/lingyun/igkboard-imx6ull/Kconfig b/board/lingyun/igkboard-imx6ull/Kconfig
+new file mode 100644
+index 00000000..3d2a41bd
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/Kconfig
+@@ -0,0 +1,14 @@
++if TARGET_LINGYUN_IGKBOARD_IMX6ULL
++
++config SYS_BOARD
++	default "igkboard-imx6ull"
++
++config SYS_VENDOR
++	default "lingyun"
++
++config SYS_CONFIG_NAME
++	default "igkboard-imx6ull"
++
++config TEXT_BASE
++	default 0x87800000
++endif
+diff --git a/board/lingyun/igkboard-imx6ull/MAINTAINERS b/board/lingyun/igkboard-imx6ull/MAINTAINERS
+new file mode 100644
+index 00000000..90a4eecb
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/MAINTAINERS
+@@ -0,0 +1,7 @@
++LingYun i.MX6ULL IoT Gateway Board(igkboard-imx6ull)
++M:	Guo Wenxue <guowenxue@gmail.com>
++S:	Maintained
++F:	board/lingyun/igkboard-imx6ull/
++F:	include/configs/igkboard-imx6ull.h
++F:	configs/igkboard-imx6ull_defconfig
++
+diff --git a/board/lingyun/igkboard-imx6ull/Makefile b/board/lingyun/igkboard-imx6ull/Makefile
+new file mode 100644
+index 00000000..dcc09891
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/Makefile
+@@ -0,0 +1,5 @@
++# SPDX-License-Identifier: GPL-2.0+
++# (C) Copyright 2016 Freescale Semiconductor, Inc.
++
++obj-y  := igkboard-imx6ull.o
++obj-y  += ../../freescale/common/mmc.o
+diff --git a/board/lingyun/igkboard-imx6ull/igkboard-imx6ull.c b/board/lingyun/igkboard-imx6ull/igkboard-imx6ull.c
+new file mode 100644
+index 00000000..3134b61f
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/igkboard-imx6ull.c
+@@ -0,0 +1,362 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright (C) 2016 Freescale Semiconductor, Inc.
++ * Copyright 2017 NXP
++ */
++
++#include <init.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/iomux.h>
++#include <asm/arch/imx-regs.h>
++#include <asm/arch/crm_regs.h>
++#include <asm/arch/mx6-pins.h>
++#include <asm/arch/sys_proto.h>
++#include <asm/global_data.h>
++#include <asm/gpio.h>
++#include <asm/mach-imx/iomux-v3.h>
++#include <asm/mach-imx/boot_mode.h>
++#include <asm/mach-imx/mxc_i2c.h>
++#include <asm/io.h>
++#include <common.h>
++#include <env.h>
++#include <fsl_esdhc_imx.h>
++#include <i2c.h>
++#include <miiphy.h>
++#include <linux/sizes.h>
++#include <linux/delay.h>
++#include <mmc.h>
++#include <miiphy.h>
++#include <power/pmic.h>
++#include <power/pfuze3000_pmic.h>
++#include "../../freescale/common/pfuze.h"
++
++DECLARE_GLOBAL_DATA_PTR;
++
++#define UART_PAD_CTRL  (PAD_CTL_PKE | PAD_CTL_PUE |		\
++	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |		\
++	PAD_CTL_DSE_40ohm   | PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
++
++#define I2C_PAD_CTRL    (PAD_CTL_PKE | PAD_CTL_PUE |            \
++	PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED |               \
++	PAD_CTL_DSE_40ohm | PAD_CTL_HYS |			\
++	PAD_CTL_ODE)
++
++#define LCD_PAD_CTRL    (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
++	PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
++
++#define GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP)
++#define GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \
++			PAD_CTL_SRE_FAST)
++#define GPMI_PAD_CTRL2 (GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1)
++
++
++#ifdef CONFIG_DM_PMIC
++int power_init_board(void)
++{
++	struct udevice *dev;
++	int ret, dev_id, rev_id;
++	unsigned int reg;
++
++	ret = pmic_get("pfuze3000@8", &dev);
++	if (ret == -ENODEV)
++		return 0;
++	if (ret != 0)
++		return ret;
++
++	dev_id = pmic_reg_read(dev, PFUZE3000_DEVICEID);
++	rev_id = pmic_reg_read(dev, PFUZE3000_REVID);
++	printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id);
++
++	/* disable Low Power Mode during standby mode */
++	reg = pmic_reg_read(dev, PFUZE3000_LDOGCTL);
++	reg |= 0x1;
++	pmic_reg_write(dev, PFUZE3000_LDOGCTL, reg);
++
++	/* SW1B step ramp up time from 2us to 4us/25mV */
++	pmic_reg_write(dev, PFUZE3000_SW1BCONF, 0x40);
++
++	/* SW1B mode to APS/PFM */
++	pmic_reg_write(dev, PFUZE3000_SW1BMODE, 0xc);
++
++	/* SW1B standby voltage set to 0.975V */
++	pmic_reg_write(dev, PFUZE3000_SW1BSTBY, 0xb);
++
++	return 0;
++}
++
++#ifdef CONFIG_LDO_BYPASS_CHECK
++void ldo_mode_set(int ldo_bypass)
++{
++	unsigned int value;
++	u32 vddarm;
++	struct udevice *dev;
++	int ret;
++
++	ret = pmic_get("pfuze3000@8", &dev);
++	if (ret == -ENODEV) {
++		printf("No PMIC found!\n");
++		return;
++	}
++
++	/* switch to ldo_bypass mode */
++	if (ldo_bypass) {
++		prep_anatop_bypass();
++		/* decrease VDDARM to 1.275V */
++		value = pmic_reg_read(dev, PFUZE3000_SW1BVOLT);
++		value &= ~0x1f;
++		value |= PFUZE3000_SW1AB_SETP(12750);
++		pmic_reg_write(dev, PFUZE3000_SW1BVOLT, value);
++
++		set_anatop_bypass(1);
++		vddarm = PFUZE3000_SW1AB_SETP(11750);
++
++		value = pmic_reg_read(dev, PFUZE3000_SW1BVOLT);
++		value &= ~0x1f;
++		value |= vddarm;
++		pmic_reg_write(dev, PFUZE3000_SW1BVOLT, value);
++
++		finish_anatop_bypass();
++
++		printf("switch to ldo_bypass mode!\n");
++	}
++}
++#endif
++#endif
++
++int dram_init(void)
++{
++	gd->ram_size = imx_ddr_size();
++
++	return 0;
++}
++
++static iomux_v3_cfg_t const uart1_pads[] = {
++	MX6_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
++	MX6_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
++};
++
++static void setup_iomux_uart(void)
++{
++	imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
++}
++
++#ifdef CONFIG_FSL_QSPI
++
++#ifndef CONFIG_DM_SPI
++#define QSPI_PAD_CTRL1	\
++	(PAD_CTL_SRE_FAST | PAD_CTL_SPEED_MED | \
++	 PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_47K_UP | PAD_CTL_DSE_120ohm)
++
++static iomux_v3_cfg_t const quadspi_pads[] = {
++	MX6_PAD_NAND_WP_B__QSPI_A_SCLK | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++	MX6_PAD_NAND_READY_B__QSPI_A_DATA00 | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++	MX6_PAD_NAND_CE0_B__QSPI_A_DATA01 | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++	MX6_PAD_NAND_CE1_B__QSPI_A_DATA02 | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++	MX6_PAD_NAND_CLE__QSPI_A_DATA03 | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++	MX6_PAD_NAND_DQS__QSPI_A_SS0_B | MUX_PAD_CTRL(QSPI_PAD_CTRL1),
++};
++#endif
++
++static int board_qspi_init(void)
++{
++#ifndef CONFIG_DM_SPI
++	/* Set the iomux */
++	imx_iomux_v3_setup_multiple_pads(quadspi_pads,
++					 ARRAY_SIZE(quadspi_pads));
++#endif
++	/* Set the clock */
++	enable_qspi_clk(0);
++
++	return 0;
++}
++#endif
++
++#ifdef CONFIG_NAND_MXS
++static iomux_v3_cfg_t const nand_pads[] = {
++	MX6_PAD_NAND_DATA00__RAWNAND_DATA00 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA01__RAWNAND_DATA01 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA02__RAWNAND_DATA02 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA03__RAWNAND_DATA03 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA04__RAWNAND_DATA04 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA05__RAWNAND_DATA05 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA06__RAWNAND_DATA06 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DATA07__RAWNAND_DATA07 | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_CLE__RAWNAND_CLE | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_ALE__RAWNAND_ALE | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_CE0_B__RAWNAND_CE0_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_CE1_B__RAWNAND_CE1_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_RE_B__RAWNAND_RE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_WE_B__RAWNAND_WE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_WP_B__RAWNAND_WP_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_READY_B__RAWNAND_READY_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++	MX6_PAD_NAND_DQS__RAWNAND_DQS | MUX_PAD_CTRL(GPMI_PAD_CTRL2),
++};
++
++static void setup_gpmi_nand(void)
++{
++	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
++
++	/* config gpmi nand iomux */
++	imx_iomux_v3_setup_multiple_pads(nand_pads, ARRAY_SIZE(nand_pads));
++
++	setup_gpmi_io_clk((MXC_CCM_CS2CDR_ENFC_CLK_PODF(0) |
++			MXC_CCM_CS2CDR_ENFC_CLK_PRED(3) |
++			MXC_CCM_CS2CDR_ENFC_CLK_SEL(3)));
++
++	/* enable apbh clock gating */
++	setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK);
++}
++#endif
++
++#ifdef CONFIG_FEC_MXC
++static int setup_fec(void)
++{
++	struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
++	int ret;
++
++	/*
++	 * Use 50M anatop loopback REF_CLK1 for ENET1,
++	 * clear gpr1[13], set gpr1[17].
++	 */
++	clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC1_MASK,
++			IOMUX_GPR1_FEC1_CLOCK_MUX1_SEL_MASK);
++	/*
++	 * Use 50M anatop loopback REF_CLK2 for ENET2,
++	 * clear gpr1[14], set gpr1[18].
++	 */
++	if (!check_module_fused(MODULE_ENET2)) {
++		clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
++				IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
++	}
++
++	ret = enable_fec_anatop_clock(0, ENET_50MHZ);
++	if (ret)
++		return ret;
++
++	if (!check_module_fused(MODULE_ENET2)) {
++		ret = enable_fec_anatop_clock(1, ENET_50MHZ);
++		if (ret)
++			return ret;
++	}
++
++	enable_enet_clk(1);
++
++	return 0;
++}
++
++int board_phy_config(struct phy_device *phydev)
++{
++	phy_write(phydev, MDIO_DEVAD_NONE, 0x1f, 0x8190);
++
++	if (phydev->drv->config)
++		phydev->drv->config(phydev);
++
++	return 0;
++}
++#endif
++
++#ifdef CONFIG_DM_VIDEO
++static iomux_v3_cfg_t const lcd_pads[] = {
++	/* Use GPIO for Brightness adjustment, duty cycle = period. */
++	MX6_PAD_GPIO1_IO08__GPIO1_IO08 | MUX_PAD_CTRL(NO_PAD_CTRL),
++};
++
++static int setup_lcd(void)
++{
++	enable_lcdif_clock(LCDIF1_BASE_ADDR, 1);
++
++	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
++
++	/* Reset the LCD */
++	gpio_request(IMX_GPIO_NR(5, 9), "lcd reset");
++	gpio_direction_output(IMX_GPIO_NR(5, 9) , 0);
++	udelay(500);
++	gpio_direction_output(IMX_GPIO_NR(5, 9) , 1);
++
++	/* Set Brightness to high */
++	gpio_request(IMX_GPIO_NR(1, 8), "backlight");
++	gpio_direction_output(IMX_GPIO_NR(1, 8) , 1);
++
++	return 0;
++}
++#else
++static inline int setup_lcd(void) { return 0; }
++#endif
++
++int board_early_init_f(void)
++{
++	setup_iomux_uart();
++
++	return 0;
++}
++
++int board_init(void)
++{
++	/* Address of boot parameters */
++	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
++
++#ifdef	CONFIG_FEC_MXC
++	setup_fec();
++#endif
++
++#ifdef CONFIG_FSL_QSPI
++	board_qspi_init();
++#endif
++
++#ifdef CONFIG_NAND_MXS
++	setup_gpmi_nand();
++#endif
++
++	return 0;
++}
++
++#ifdef CONFIG_CMD_BMODE
++static const struct boot_mode board_boot_modes[] = {
++	/* 4 bit bus width */
++	{"sd1", MAKE_CFGVAL(0x42, 0x20, 0x00, 0x00)},
++	{"sd2", MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)},
++	{"qspi1", MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)},
++	{NULL,	 0},
++};
++#endif
++
++int board_late_init(void)
++{
++#ifdef CONFIG_CMD_BMODE
++	add_board_boot_modes(board_boot_modes);
++#endif
++
++	env_set("tee", "no");
++#ifdef CONFIG_IMX_OPTEE
++	env_set("tee", "yes");
++#endif
++
++	setup_lcd();
++
++#ifdef CONFIG_ENV_IS_IN_MMC
++	board_late_mmc_env_init();
++#endif
++
++	set_wdog_reset((struct wdog_regs *)WDOG1_BASE_ADDR);
++
++	return 0;
++}
++
++int checkboard(void)
++{
++	if (is_mx6ull_9x9_evk())
++		puts("Board: MX6ULL 9x9 EVK\n");
++	else if (is_cpu_type(MXC_CPU_MX6ULZ))
++		puts("Board: MX6ULZ 14x14 EVK\n");
++	else
++		puts("Board: igkboard-imx6ull\n\n");
++
++	return 0;
++}
++
++void board_quiesce_devices(void)
++{
++#if defined(CONFIG_VIDEO_MXS)
++	enable_lcdif_clock(LCDIF1_BASE_ADDR, 0);
++#endif
++}
+diff --git a/board/lingyun/igkboard-imx6ull/imximage.cfg b/board/lingyun/igkboard-imx6ull/imximage.cfg
+new file mode 100644
+index 00000000..6e8a9187
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/imximage.cfg
+@@ -0,0 +1,120 @@
++/* SPDX-License-Identifier: GPL-2.0+ */
++/*
++ * Copyright (C) 2016 Freescale Semiconductor, Inc.
++ * Copyright 2017 NXP
++ *
++ * Refer doc/imx/mkimage/imximage.txt for more details about how-to configure
++ * and create imximage boot image
++ *
++ * The syntax is taken as close as possible with the kwbimage
++ */
++
++#include <config.h>
++
++/* image version */
++
++IMAGE_VERSION 2
++
++/*
++ * Boot Device : one of
++ * spi/sd/nand/onenand, qspi/nor
++ */
++
++#ifdef CONFIG_QSPI_BOOT
++BOOT_FROM	qspi
++#elif defined(CONFIG_NOR_BOOT)
++BOOT_FROM	nor
++#else
++BOOT_FROM	sd
++#endif
++
++#ifdef CONFIG_USE_IMXIMG_PLUGIN
++/*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
++PLUGIN	board/freescale/mx6ullevk/plugin.bin 0x00907000
++#else
++
++#ifdef CONFIG_IMX_HAB
++CSF CONFIG_CSF_SIZE
++#endif
++
++/*
++ * Device Configuration Data (DCD)
++ *
++ * Each entry must have the format:
++ * Addr-type           Address        Value
++ *
++ * where:
++ *	Addr-type register length (1,2 or 4 bytes)
++ *	Address	  absolute address of the register
++ *	value	  value to be stored in the register
++ */
++
++/* Enable all clocks */
++DATA 4 0x020c4068 0xffffffff
++DATA 4 0x020c406c 0xffffffff
++DATA 4 0x020c4070 0xffffffff
++DATA 4 0x020c4074 0xffffffff
++DATA 4 0x020c4078 0xffffffff
++DATA 4 0x020c407c 0xffffffff
++DATA 4 0x020c4080 0xffffffff
++
++#ifdef CONFIG_IMX_OPTEE
++DATA 4 0x20e4024 0x00000001
++CHECK_BITS_SET 4 0x20e4024 0x1
++#endif
++
++DATA 4 0x020E04B4 0x000C0000
++DATA 4 0x020E04AC 0x00000000
++DATA 4 0x020E027C 0x00000030
++DATA 4 0x020E0250 0x00000030
++DATA 4 0x020E024C 0x00000030
++DATA 4 0x020E0490 0x00000030
++DATA 4 0x020E0288 0x000C0030
++DATA 4 0x020E0270 0x00000000
++DATA 4 0x020E0260 0x00000030
++DATA 4 0x020E0264 0x00000030
++DATA 4 0x020E04A0 0x00000030
++DATA 4 0x020E0494 0x00020000
++DATA 4 0x020E0280 0x00000030
++DATA 4 0x020E0284 0x00000030
++DATA 4 0x020E04B0 0x00020000
++DATA 4 0x020E0498 0x00000030
++DATA 4 0x020E04A4 0x00000030
++DATA 4 0x020E0244 0x00000030
++DATA 4 0x020E0248 0x00000030
++DATA 4 0x021B001C 0x00008000
++DATA 4 0x021B0800 0xA1390003
++DATA 4 0x021B080C 0x00000004
++DATA 4 0x021B083C 0x41640158
++DATA 4 0x021B0848 0x40403237
++DATA 4 0x021B0850 0x40403C33
++DATA 4 0x021B081C 0x33333333
++DATA 4 0x021B0820 0x33333333
++DATA 4 0x021B082C 0xf3333333
++DATA 4 0x021B0830 0xf3333333
++DATA 4 0x021B08C0 0x00944009
++DATA 4 0x021B08b8 0x00000800
++DATA 4 0x021B0004 0x0002002D
++DATA 4 0x021B0008 0x1B333030
++DATA 4 0x021B000C 0x676B52F3
++DATA 4 0x021B0010 0xB66D0B63
++DATA 4 0x021B0014 0x01FF00DB
++DATA 4 0x021B0018 0x00201740
++DATA 4 0x021B001C 0x00008000
++DATA 4 0x021B002C 0x000026D2
++DATA 4 0x021B0030 0x006B1023
++DATA 4 0x021B0040 0x0000004F
++DATA 4 0x021B0000 0x84180000
++DATA 4 0x021B0890 0x00400000
++DATA 4 0x021B001C 0x02008032
++DATA 4 0x021B001C 0x00008033
++DATA 4 0x021B001C 0x00048031
++DATA 4 0x021B001C 0x15208030
++DATA 4 0x021B001C 0x04008040
++DATA 4 0x021B0020 0x00000800
++DATA 4 0x021B0818 0x00000227
++DATA 4 0x021B0004 0x0002552D
++DATA 4 0x021B0404 0x00011006
++DATA 4 0x021B001C 0x00000000
++
++#endif
+diff --git a/board/lingyun/igkboard-imx6ull/imximage_lpddr2.cfg b/board/lingyun/igkboard-imx6ull/imximage_lpddr2.cfg
+new file mode 100644
+index 00000000..c6141e9c
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/imximage_lpddr2.cfg
+@@ -0,0 +1,125 @@
++/*
++ * Copyright (C) 2016 Freescale Semiconductor, Inc.
++ * Copyright 2017 NXP
++ *
++ * SPDX-License-Identifier:	GPL-2.0+
++ *
++ * Refer docs/README.imxmage for more details about how-to configure
++ * and create imximage boot image
++ *
++ * The syntax is taken as close as possible with the kwbimage
++ */
++
++#include <config.h>
++
++/* image version */
++
++IMAGE_VERSION 2
++
++/*
++ * Boot Device : one of
++ * spi/sd/nand/onenand, qspi/nor
++ */
++
++#ifdef CONFIG_QSPI_BOOT
++BOOT_FROM	qspi
++#elif defined(CONFIG_NOR_BOOT)
++BOOT_FROM	nor
++#else
++BOOT_FROM	sd
++#endif
++
++#ifdef CONFIG_USE_IMXIMG_PLUGIN
++/*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
++PLUGIN	board/lingyun/igkboard-imx6ull/plugin.bin 0x00907000
++#else
++
++#ifdef CONFIG_IMX_HAB
++CSF CONFIG_CSF_SIZE
++#endif
++
++/*
++ * Device Configuration Data (DCD)
++ *
++ * Each entry must have the format:
++ * Addr-type           Address        Value
++ *
++ * where:
++ *	Addr-type register length (1,2 or 4 bytes)
++ *	Address	  absolute address of the register
++ *	value	  value to be stored in the register
++ */
++
++DATA 4 0x020c4068 0xffffffff
++DATA 4 0x020c406c 0xffffffff
++DATA 4 0x020c4070 0xffffffff
++DATA 4 0x020c4074 0xffffffff
++DATA 4 0x020c4078 0xffffffff
++DATA 4 0x020c407c 0xffffffff
++DATA 4 0x020c4080 0xffffffff
++
++#ifdef CONFIG_IMX_OPTEE
++DATA 4 0x20e4024 0x00000001
++CHECK_BITS_SET 4 0x20e4024 0x1
++#endif
++
++DATA 4 0x020E04B4 0x00080000
++DATA 4 0x020E04AC 0x00000000
++DATA 4 0x020E027C 0x00000030
++DATA 4 0x020E0250 0x00000030
++DATA 4 0x020E024C 0x00000030
++DATA 4 0x020E0490 0x00000030
++DATA 4 0x020E0288 0x00000030
++DATA 4 0x020E0270 0x00000000
++DATA 4 0x020E0260 0x00000000
++DATA 4 0x020E0264 0x00000000
++DATA 4 0x020E04A0 0x00000030
++DATA 4 0x020E0494 0x00020000
++DATA 4 0x020E0280 0x00003030
++DATA 4 0x020E0284 0x00003030
++DATA 4 0x020E04B0 0x00020000
++DATA 4 0x020E0498 0x00000030
++DATA 4 0x020E04A4 0x00000030
++DATA 4 0x020E0244 0x00000030
++DATA 4 0x020E0248 0x00000030
++
++DATA 4 0x021B001C 0x00008000
++DATA 4 0x021B085C 0x1b4700c7
++DATA 4 0x021B0800 0xA1390003
++DATA 4 0x021B0890 0x23400A38
++DATA 4 0x021B08b8 0x00000800
++
++DATA 4 0x021B081C 0x33333333
++DATA 4 0x021B0820 0x33333333
++DATA 4 0x021B082C 0xf3333333
++DATA 4 0x021B0830 0xf3333333
++DATA 4 0x021B083C 0x20000000
++DATA 4 0x021B0848 0x40403439
++DATA 4 0x021B0850 0x4040342D
++DATA 4 0x021B08C0 0x00921012
++DATA 4 0x021B08b8 0x00000800
++
++DATA 4 0x021B0004 0x00020052
++DATA 4 0x021B0008 0x00000000
++DATA 4 0x021B000C 0x33374133
++DATA 4 0x021B0010 0x00100A82
++DATA 4 0x021B0038 0x00170557
++DATA 4 0x021B0014 0x00000093
++DATA 4 0x021B0018 0x00201748
++DATA 4 0x021B002C 0x0F9F26D2
++DATA 4 0x021B0030 0x009F0010
++DATA 4 0x021B0040 0x00000047
++DATA 4 0x021B0000 0x83100000
++DATA 4 0x021B001C 0x00008010
++DATA 4 0x021B001C 0x003F8030
++DATA 4 0x021B001C 0xFF0A8030
++DATA 4 0x021B001C 0x82018030
++DATA 4 0x021B001C 0x04028030
++DATA 4 0x021B001C 0x01038030
++DATA 4 0x021B0020 0x00001800
++DATA 4 0x021B0818 0x00000000
++DATA 4 0x021B0800 0xA1310003
++DATA 4 0x021B0004 0x00025552
++DATA 4 0x021B0404 0x00011006
++DATA 4 0x021B001C 0x00000000
++#endif
+diff --git a/board/lingyun/igkboard-imx6ull/plugin.S b/board/lingyun/igkboard-imx6ull/plugin.S
+new file mode 100644
+index 00000000..812088d1
+--- /dev/null
++++ b/board/lingyun/igkboard-imx6ull/plugin.S
+@@ -0,0 +1,263 @@
++/* SPDX-License-Identifier: GPL-2.0+ */
++/*
++ * Copyright (C) 2016 Freescale Semiconductor, Inc.
++ * Copyright 2017 NXP
++ */
++
++#include <config.h>
++
++/* DDR script */
++.macro imx6ull_ddr3_evk_setting
++	ldr r0, =IOMUXC_BASE_ADDR
++	ldr r1, =0x000C0000
++	str r1, [r0, #0x4B4]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x4AC]
++	ldr r1, =0x00000030
++	str r1, [r0, #0x27C]
++	ldr r1, =0x00000030
++	str r1, [r0, #0x250]
++	str r1, [r0, #0x24C]
++	str r1, [r0, #0x490]
++	ldr r1, =0x000C0030
++	str r1, [r0, #0x288]
++
++	ldr r1, =0x00000000
++	str r1, [r0, #0x270]
++
++	ldr r1, =0x00000030
++	str r1, [r0, #0x260]
++	str r1, [r0, #0x264]
++	str r1, [r0, #0x4A0]
++
++	ldr r1, =0x00020000
++	str r1, [r0, #0x494]
++
++	ldr r1, =0x00000030
++	str r1, [r0, #0x280]
++	ldr r1, =0x00000030
++	str r1, [r0, #0x284]
++
++	ldr r1, =0x00020000
++	str r1, [r0, #0x4B0]
++
++	ldr r1, =0x00000030
++	str r1, [r0, #0x498]
++	str r1, [r0, #0x4A4]
++	str r1, [r0, #0x244]
++	str r1, [r0, #0x248]
++
++	ldr r0, =MMDC_P0_BASE_ADDR
++	ldr r1, =0x00008000
++	str r1, [r0, #0x1C]
++	ldr r1, =0xA1390003
++	str r1, [r0, #0x800]
++	ldr r1, =0x00000004
++	str r1, [r0, #0x80C]
++	ldr r1, =0x41640158
++	str r1, [r0, #0x83C]
++	ldr r1, =0x40403237
++	str r1, [r0, #0x848]
++	ldr r1, =0x40403C33
++	str r1, [r0, #0x850]
++	ldr r1, =0x33333333
++	str r1, [r0, #0x81C]
++	str r1, [r0, #0x820]
++	ldr r1, =0xF3333333
++	str r1, [r0, #0x82C]
++	str r1, [r0, #0x830]
++	ldr r1, =0x00944009
++	str r1, [r0, #0x8C0]
++	ldr r1, =0x00000800
++	str r1, [r0, #0x8B8]
++	ldr r1, =0x0002002D
++	str r1, [r0, #0x004]
++	ldr r1, =0x1B333030
++	str r1, [r0, #0x008]
++	ldr r1, =0x676B52F3
++	str r1, [r0, #0x00C]
++	ldr r1, =0xB66D0B63
++	str r1, [r0, #0x010]
++	ldr r1, =0x01FF00DB
++	str r1, [r0, #0x014]
++	ldr r1, =0x00201740
++	str r1, [r0, #0x018]
++	ldr r1, =0x00008000
++	str r1, [r0, #0x01C]
++	ldr r1, =0x000026D2
++	str r1, [r0, #0x02C]
++	ldr r1, =0x006B1023
++	str r1, [r0, #0x030]
++	ldr r1, =0x0000004F
++	str r1, [r0, #0x040]
++	ldr r1, =0x84180000
++	str r1, [r0, #0x000]
++	ldr r1, =0x00400000
++	str r1, [r0, #0x890]
++	ldr r1, =0x02008032
++	str r1, [r0, #0x01C]
++	ldr r1, =0x00008033
++	str r1, [r0, #0x01C]
++	ldr r1, =0x00048031
++	str r1, [r0, #0x01C]
++	ldr r1, =0x15208030
++	str r1, [r0, #0x01C]
++	ldr r1, =0x04008040
++	str r1, [r0, #0x01C]
++	ldr r1, =0x00000800
++	str r1, [r0, #0x020]
++	ldr r1, =0x00000227
++	str r1, [r0, #0x818]
++	ldr r1, =0x0002552D
++	str r1, [r0, #0x004]
++	ldr r1, =0x00011006
++	str r1, [r0, #0x404]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x01C]
++.endm
++
++.macro imx6ull_lpddr2_evk_setting
++	ldr r0, =IOMUXC_BASE_ADDR
++	ldr r1, =0x00080000
++	str r1, [r0, #0x4B4]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x4AC]
++	ldr r1, =0x00000030
++	str r1, [r0, #0x27C]
++	str r1, [r0, #0x250]
++	str r1, [r0, #0x24C]
++	str r1, [r0, #0x490]
++	str r1, [r0, #0x288]
++
++	ldr r1, =0x00000000
++	str r1, [r0, #0x270]
++	str r1, [r0, #0x260]
++	str r1, [r0, #0x264]
++
++	ldr r1, =0x00000030
++	str r1, [r0, #0x4A0]
++
++	ldr r1, =0x00020000
++	str r1, [r0, #0x494]
++
++	ldr r1, =0x00003030
++	str r1, [r0, #0x280]
++	ldr r1, =0x00003030
++	str r1, [r0, #0x284]
++
++	ldr r1, =0x00020000
++	str r1, [r0, #0x4B0]
++
++	ldr r1, =0x00000030
++	str r1, [r0, #0x498]
++	str r1, [r0, #0x4A4]
++	str r1, [r0, #0x244]
++	str r1, [r0, #0x248]
++
++	ldr r0, =MMDC_P0_BASE_ADDR
++	ldr r1, =0x00008000
++	str r1, [r0, #0x1C]
++	ldr r1, =0x1b4700c7
++	str r1, [r0, #0x85c]
++	ldr r1, =0xA1390003
++	str r1, [r0, #0x800]
++	ldr r1, =0x23400A38
++	str r1, [r0, #0x890]
++	ldr r1, =0x00000800
++	str r1, [r0, #0x8b8]
++	ldr r1, =0x33333333
++	str r1, [r0, #0x81C]
++	str r1, [r0, #0x820]
++	ldr r1, =0xF3333333
++	str r1, [r0, #0x82C]
++	str r1, [r0, #0x830]
++	ldr r1, =0x20000000
++	str r1, [r0, #0x83C]
++	ldr r1, =0x40403439
++	str r1, [r0, #0x848]
++	ldr r1, =0x4040342D
++	str r1, [r0, #0x850]
++	ldr r1, =0x00921012
++	str r1, [r0, #0x8C0]
++	ldr r1, =0x00000800
++	str r1, [r0, #0x8B8]
++
++	ldr r1, =0x00020052
++	str r1, [r0, #0x004]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x008]
++	ldr r1, =0x33374133
++	str r1, [r0, #0x00C]
++	ldr r1, =0x00100A82
++	str r1, [r0, #0x010]
++	ldr r1, =0x00170557
++	str r1, [r0, #0x038]
++	ldr r1, =0x00000093
++	str r1, [r0, #0x014]
++	ldr r1, =0x00201748
++	str r1, [r0, #0x018]
++	ldr r1, =0x0F9F26D2
++	str r1, [r0, #0x02C]
++	ldr r1, =0x009F0010
++	str r1, [r0, #0x030]
++	ldr r1, =0x00000047
++	str r1, [r0, #0x040]
++	ldr r1, =0x83100000
++	str r1, [r0, #0x000]
++	ldr r1, =0x00008010
++	str r1, [r0, #0x01C]
++	ldr r1, =0x003F8030
++	str r1, [r0, #0x01C]
++	ldr r1, =0xFF0A8030
++	str r1, [r0, #0x01C]
++	ldr r1, =0x82018030
++	str r1, [r0, #0x01C]
++	ldr r1, =0x04028030
++	str r1, [r0, #0x01C]
++	ldr r1, =0x01038030
++	str r1, [r0, #0x01C]
++	ldr r1, =0x00001800
++	str r1, [r0, #0x020]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x818]
++	ldr r1, =0xA1310003
++	str r1, [r0, #0x800]
++	ldr r1, =0x00025552
++	str r1, [r0, #0x004]
++	ldr r1, =0x00011006
++	str r1, [r0, #0x404]
++	ldr r1, =0x00000000
++	str r1, [r0, #0x01C]
++.endm
++
++.macro imx6_clock_gating
++	ldr r0, =CCM_BASE_ADDR
++	ldr r1, =0xFFFFFFFF
++	str r1, [r0, #0x68]
++	str r1, [r0, #0x6C]
++	str r1, [r0, #0x70]
++	str r1, [r0, #0x74]
++	str r1, [r0, #0x78]
++	str r1, [r0, #0x7C]
++	str r1, [r0, #0x80]
++
++#ifdef CONFIG_IMX_OPTEE
++	ldr r0, =0x20e4024
++	ldr r1, =0x1
++	str r1, [r0]
++#endif
++.endm
++
++.macro imx6_qos_setting
++.endm
++
++.macro imx6_ddr_setting
++#if defined (CONFIG_TARGET_MX6ULL_9X9_EVK)
++	imx6ull_lpddr2_evk_setting
++#else
++	imx6ull_ddr3_evk_setting
++#endif
++.endm
++
++/* include the common plugin code here */
++#include <asm/arch/mx6_plugin.S>
+diff --git a/configs/igkboard-imx6ull_defconfig b/configs/igkboard-imx6ull_defconfig
+new file mode 100644
+index 00000000..22359130
+--- /dev/null
++++ b/configs/igkboard-imx6ull_defconfig
+@@ -0,0 +1,86 @@
++CONFIG_ARM=y
++CONFIG_ARCH_MX6=y
++CONFIG_SYS_MALLOC_LEN=0x1000000
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_ENV_SIZE=0x2000
++CONFIG_ENV_OFFSET=0xE0000
++CONFIG_IMX_CONFIG="board/lingyun/igkboard-imx6ull/imximage.cfg"
++CONFIG_MX6ULL=y
++CONFIG_TARGET_LINGYUN_IGKBOARD_IMX6ULL=y
++CONFIG_DM_GPIO=y
++CONFIG_DEFAULT_DEVICE_TREE="igkboard-imx6ull"
++CONFIG_SYS_PROMPT="[u-boot@igkboard]# "
++CONFIG_SYS_MEMTEST_START=0x80000000
++CONFIG_SYS_MEMTEST_END=0x88000000
++CONFIG_SUPPORT_RAW_INITRD=y
++CONFIG_BOOTDELAY=3
++CONFIG_USE_BOOTCOMMAND=y
++CONFIG_ARCH_MISC_INIT=y
++CONFIG_BOARD_EARLY_INIT_F=y
++CONFIG_HUSH_PARSER=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_CRC32_VERIFY=y
++CONFIG_CMD_MEMTEST=y
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_I2C=y
++CONFIG_CMD_MMC=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_USB_MASS_STORAGE=y
++CONFIG_CMD_DHCP=y
++CONFIG_CMD_PING=y
++CONFIG_CMD_CACHE=y
++CONFIG_CMD_RNG=y
++CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
++CONFIG_CMD_EXT4_WRITE=y
++CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
++CONFIG_OF_CONTROL=y
++CONFIG_ENV_OVERWRITE=y
++CONFIG_ENV_IS_IN_MMC=y
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_SYS_MMC_ENV_DEV=1
++CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_BOUNCE_BUFFER=y
++CONFIG_FSL_DCP_RNG=y
++CONFIG_USB_FUNCTION_FASTBOOT=y
++CONFIG_FASTBOOT_BUF_ADDR=0x83800000
++CONFIG_FASTBOOT_BUF_SIZE=0x40000000
++CONFIG_FASTBOOT_FLASH=y
++CONFIG_DM_74X164=y
++CONFIG_DM_I2C=y
++CONFIG_SYS_I2C_MXC=y
++CONFIG_FSL_USDHC=y
++CONFIG_MTD=y
++CONFIG_DM_SPI_FLASH=y
++CONFIG_SF_DEFAULT_SPEED=40000000
++CONFIG_SPI_FLASH_STMICRO=y
++CONFIG_PHYLIB=y
++CONFIG_PHY_MICREL=y
++CONFIG_PHY_MICREL_KSZ8XXX=y
++CONFIG_DM_ETH_PHY=y
++CONFIG_FEC_MXC=y
++CONFIG_MII=y
++CONFIG_PINCTRL=y
++CONFIG_PINCTRL_IMX6=y
++CONFIG_DM_REGULATOR=y
++CONFIG_DM_REGULATOR_FIXED=y
++CONFIG_DM_REGULATOR_GPIO=y
++CONFIG_DM_RNG=y
++CONFIG_DM_SERIAL=y
++CONFIG_MXC_UART=y
++CONFIG_SPI=y
++CONFIG_DM_SPI=y
++CONFIG_FSL_QSPI=y
++CONFIG_SOFT_SPI=y
++CONFIG_IMX_THERMAL=y
++CONFIG_USB=y
++CONFIG_USB_STORAGE=y
++CONFIG_USB_HOST_ETHER=y
++CONFIG_USB_ETHER_ASIX=y
++CONFIG_USB_GADGET=y
++CONFIG_USB_GADGET_MANUFACTURER="FSL"
++CONFIG_USB_GADGET_VENDOR_NUM=0x0525
++CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
++CONFIG_CI_UDC=y
++CONFIG_OF_LIBFDT_OVERLAY=y
+diff --git a/drivers/fastboot/fb_fsl/fb_fsl_partitions.c b/drivers/fastboot/fb_fsl/fb_fsl_partitions.c
+index a43c70db..50f89f9b 100644
+--- a/drivers/fastboot/fb_fsl/fb_fsl_partitions.c
++++ b/drivers/fastboot/fb_fsl/fb_fsl_partitions.c
+@@ -188,6 +188,12 @@ static int _fastboot_parts_load_from_ptable(void)
+ 			user_partition = FASTBOOT_MMC_USER_PARTITION_ID;
+ 			boot_loader_psize = mmc->capacity_boot;
+ 		}
++
++		/* add by guowenxue to export mmc_no env */
++		env_set_ulong("mmc_no", mmc_no);
++		env_set_ulong("mmcdev", mmc_no);
++		env_set_ulong("emmc_dev", mmc_no);
++		env_set_ulong("emmc_ack", mmc_no);
+ 	} else {
+ 		printf("Can't setup partition table on this device %d\n",
+ 			fastboot_devinfo.type);
+diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
+index 50e15cd3..17f4d06d 100644
+--- a/drivers/net/phy/phy.c
++++ b/drivers/net/phy/phy.c
+@@ -182,6 +182,8 @@ int genphy_config_aneg(struct phy_device *phydev)
+ {
+ 	int result;
+ 
++	phy_reset(phydev); /* Add by guowenxue to reset the ethernet phy */
++
+ 	if (phydev->autoneg != AUTONEG_ENABLE)
+ 		return genphy_setup_forced(phydev);
+ 
+diff --git a/include/configs/igkboard-dtoverlay.h b/include/configs/igkboard-dtoverlay.h
+new file mode 100644
+index 00000000..e4d68e9f
+--- /dev/null
++++ b/include/configs/igkboard-dtoverlay.h
+@@ -0,0 +1,60 @@
++/* SPDX-License-Identifier: GPL-2.0+ */
++/*
++ * Copyright (C) 2023 LingYun IoT System Studio
++ *
++ */
++#ifndef __IGKBOARD_DTOVERLAY_H
++#define __IGKBOARD_DTOVERLAY_H
++
++#define IGKBOARD_DTOVERLAY_SUPPORT
++
++#define FDT_APPLY_OVERLAY()          \
++    "echo Applying DT overlay => ${dtbo_file}; " \
++    "fatload mmc ${mmcdev}:${mmcpart} ${dtbo_addr} ${dtbo_dir}/${dtbo_file}; " \
++    "fdt addr ${fdt_addr}; " \
++    "fdt resize ${fdt_size}; " \
++    "fdt apply ${dtbo_addr}; "
++
++#define CHECK_APPLY_OVERLAY( name )     \
++    "if env exists dtoverlay_" name " && test ${dtoverlay_" name "} = 1 -o ${dtoverlay_" name "} = yes ; then " \
++        "setenv dtbo_file " name ".dtbo; " \
++        FDT_APPLY_OVERLAY() \
++    "fi; "
++
++#define CHECK_APPLY_OVERLAYS_IDX( name )     \
++    "if env exists dtoverlay_" name "; then " \
++        "for i in ${dtoverlay_" name "}; do " \
++            "setenv dtbo_file " name "$i.dtbo; " \
++            FDT_APPLY_OVERLAY() \
++        " done;" \
++    "fi; "
++
++#define CHECK_APPLY_OVERLAYS_DTBO( name )     \
++    "if env exists dtoverlay_" name "; then " \
++        "for f in ${dtoverlay_" name "}; do " \
++            "setenv dtbo_file $f.dtbo; " \
++            FDT_APPLY_OVERLAY() \
++        " done;" \
++    "fi; "
++
++#define FDT_ENTRY_DEF_SETTINGS          \
++                CHECK_APPLY_OVERLAY("lcd") \
++                CHECK_APPLY_OVERLAY("cam") \
++                CHECK_APPLY_OVERLAY("w1") \
++                CHECK_APPLY_OVERLAY("adc") \
++                CHECK_APPLY_OVERLAYS_IDX("i2c") \
++                CHECK_APPLY_OVERLAYS_IDX("spi") \
++                CHECK_APPLY_OVERLAYS_IDX("uart") \
++                CHECK_APPLY_OVERLAYS_IDX("can") \
++                CHECK_APPLY_OVERLAYS_IDX("pwm") \
++                CHECK_APPLY_OVERLAYS_DTBO("extra") \
++
++
++#define MMC_BOOT_WITH_FDT_OVERLAY   \
++    "mmc dev ${mmcdev};"            \
++    "run mmcargs; run loadenvconf;" \
++    "run loadimage; run loadfdt; "  \
++    FDT_ENTRY_DEF_SETTINGS          \
++    "run bootos; "                 \
++
++#endif  /* __IGKBOARD_DTOVERLAY_H */
+diff --git a/include/configs/igkboard-imx6ull.h b/include/configs/igkboard-imx6ull.h
+new file mode 100644
+index 00000000..11c871ee
+--- /dev/null
++++ b/include/configs/igkboard-imx6ull.h
+@@ -0,0 +1,111 @@
++/* SPDX-License-Identifier: GPL-2.0+ */
++/*
++ * Copyright (C) 2023 LingYun IoT System Studio
++ *
++ * Configuration settings for LingYun IGKBoard(IoT Gateway Kits Board) based on i.MX6ULL
++ */
++#ifndef __IGKBOARD_6ULL_CONFIG_H
++#define __IGKBOARD_6ULL_CONFIG_H
++
++#include <asm/arch/imx-regs.h>
++#include <linux/sizes.h>
++#include <linux/stringify.h>
++#include "mx6_common.h"
++#include <asm/mach-imx/gpio.h>
++#include "imx_env.h"
++#include "igkboard-dtoverlay.h"
++
++#define is_mx6ull_9x9_evk()	CONFIG_IS_ENABLED(TARGET_MX6ULL_9X9_EVK)
++
++#ifdef CONFIG_TARGET_MX6ULL_9X9_EVK
++#define PHYS_SDRAM_SIZE		SZ_256M
++#define BOOTARGS_CMA_SIZE   "cma=96M "
++#else
++#define PHYS_SDRAM_SIZE		SZ_512M
++#define BOOTARGS_CMA_SIZE   ""
++/* DCDC used on 14x14 EVK, no PMIC */
++#undef CONFIG_LDO_BYPASS_CHECK
++#endif
++
++#define CFG_MXC_UART_BASE			UART1_BASE
++
++/* MMC Configs */
++#ifdef CONFIG_FSL_USDHC
++#define CFG_SYS_FSL_ESDHC_ADDR		USDHC2_BASE_ADDR
++
++/* NAND pin conflicts with usdhc2 */
++#ifdef CONFIG_NAND_MXS
++#define CONFIG_SYS_FSL_USDHC_NUM	1
++#else
++#define CONFIG_SYS_FSL_USDHC_NUM	2
++#endif
++
++#endif
++
++
++#ifdef CONFIG_NAND_BOOT
++#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
++#else
++#define MFG_NAND_PARTITION ""
++#endif
++
++#define CFG_MFG_ENV_SETTINGS \
++	CFG_MFG_ENV_SETTINGS_DEFAULT \
++	"initrd_addr=0x86800000\0" \
++	"initrd_high=0xffffffff\0" \
++	"emmc_dev=1\0"\
++	"emmc_ack=1\0"\
++	"sd_dev=1\0" \
++	"mtdparts=" MFG_NAND_PARTITION \
++	"\0"\
++
++#define CFG_EXTRA_ENV_SETTINGS \
++	"console=ttymxc0\0" \
++    "upmode=fastboot 0\0" \
++	"envconf=config.txt\0" \
++	"image=zImage\0" \
++	"board=igkboard-imx6ull\0" \
++	"fdt_file=igkboard-imx6ull.dtb\0" \
++	"fdt_size=0x10000\0" \
++	"fdt_addr=0x83000000\0" \
++	"dtbo_addr=0x83010000\0" \
++	"dtbo_dir=overlays\0" \
++	"splashimage=0x8c000000\0" \
++    "ipaddr=192.168.2.22\0" \
++    "serverip=192.168.2.2\0" \
++    "mmcpart=1\0" \
++    "mmcargs=setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmc_no}p2 rootwait rw net.ifnames=0\0" \
++    "loadenvconf=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${envconf};env import -t ${loadaddr} ${filesize}\0" \
++	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
++	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
++    "bootos=bootz ${loadaddr} - ${fdt_addr}\0" \
++	"mmcboot=mmc dev ${mmcdev};run mmcargs;run loadimage;run loadfdt;run bootos\0" \
++    "netboot=tftp $loadaddr $image; tftp $fdt_addr ${fdt_file}; run mmcargs; run bootos\0" \
++    "bbl=tftp ${loadaddr} u-boot-${board}.imx && mmc dev ${mmcdev} 1 && mmc write ${loadaddr} 2 0x800\0" \
++    "bdtb=tftp $fdt_addr $fdt_file && fatwrite mmc 1:1 $fdt_addr $fdt_file $filesize\0" \
++    "bker=tftp $loadaddr $image&& fatwrite mmc 1:1 $loadaddr $image $filesize\0" \
++    "bsys=run bdtb && run bker\0"
++
++#ifdef IGKBOARD_DTOVERLAY_SUPPORT
++#undef  CONFIG_BOOTCOMMAND
++#define CONFIG_BOOTCOMMAND      MMC_BOOT_WITH_FDT_OVERLAY
++#endif
++
++/* Miscellaneous configurable options */
++
++/* Physical Memory Map */
++#define PHYS_SDRAM			MMDC0_ARB_BASE_ADDR
++
++#define CFG_SYS_SDRAM_BASE		PHYS_SDRAM
++#define CFG_SYS_INIT_RAM_ADDR	IRAM_BASE_ADDR
++#define CFG_SYS_INIT_RAM_SIZE	IRAM_SIZE
++
++#define CONFIG_ETHPRIME			"eth1"
++
++#ifndef CONFIG_SPL_BUILD
++#if defined(CONFIG_DM_VIDEO)
++#define CONFIG_VIDEO_LINK
++#endif
++#endif
++
++#endif
diff --git a/bootloader/patches/igkboard-imx8mp/uboot-imx-lf-6.1.36-2.1.0.patch b/bootloader/patches/igkboard-imx8mp/uboot-imx-lf-6.1.36-2.1.0.patch
index 3b10232..7d3a65b 100644
--- a/bootloader/patches/igkboard-imx8mp/uboot-imx-lf-6.1.36-2.1.0.patch
+++ b/bootloader/patches/igkboard-imx8mp/uboot-imx-lf-6.1.36-2.1.0.patch
@@ -116,10 +116,10 @@
 +};
 diff --git a/arch/arm/dts/igkboard-imx8mp.dts b/arch/arm/dts/igkboard-imx8mp.dts
 new file mode 100644
-index 00000000..cddc9470
+index 00000000..8d99dfad
 --- /dev/null
 +++ b/arch/arm/dts/igkboard-imx8mp.dts
-@@ -0,0 +1,475 @@
+@@ -0,0 +1,469 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright 2023 LingYun IoT System Studio.
@@ -272,14 +272,13 @@
 +    pinctrl-0 = <&pinctrl_eqos>;
 +    phy-mode = "rgmii-id";
 +    phy-handle = <&ethphy0>;
-+    snps,reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
-+    snps,reset-delays-us = <100000 200000 150000>;
 +    status = "okay";
 +
 +    mdio {
 +        compatible = "snps,dwmac-mdio";
 +        #address-cells = <1>;
 +        #size-cells = <0>;
++        clock-frequency = <5000000>;
 +
 +        ethphy0: ethernet-phy@0 { /* YT8521SH-CA */
 +            compatible = "ethernet-phy-ieee802.3-c22";
@@ -295,16 +294,13 @@
 +    pinctrl-0 = <&pinctrl_fec>;
 +    phy-mode = "rgmii-id";
 +    phy-handle = <&ethphy1>;
-+    phy-reset-duration = <200>;
-+    phy-reset-post-delay = <150>;
-+    phy-reset-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
-+
 +    fsl,magic-packet;
 +    status = "okay";
 +
 +    mdio {
 +        #address-cells = <1>;
 +        #size-cells = <0>;
++        clock-frequency = <5000000>;
 +
 +        ethphy1: ethernet-phy@0 { /* YT8521SH-CA */
 +            compatible = "ethernet-phy-ieee802.3-c22";
@@ -571,7 +567,6 @@
 +            MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3                   0x16
 +            MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL             0x16
 +            MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK   0x16
-+            MX8MP_IOMUXC_GPIO1_IO06__GPIO1_IO06                         0x22
 +        >;
 +    };
 +
@@ -591,7 +586,6 @@
 +            MX8MP_IOMUXC_SAI1_TXD3__ENET1_RGMII_TD3                     0x16
 +            MX8MP_IOMUXC_SAI1_TXD4__ENET1_RGMII_TX_CTL                  0x16
 +            MX8MP_IOMUXC_SAI1_TXD5__ENET1_RGMII_TXC                     0x16
-+            MX8MP_IOMUXC_GPIO1_IO01__GPIO1_IO01                         0x11
 +        >;
 +    };
 +};

--
Gitblit v1.9.1