Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 77f9e189ffd989486d49035ba08c1c76e1e19e8c

Authored by Eric Lee
1 parent 6ceaa2bdcc
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga

Make changes for rev. 00B0

Showing 11 changed files with 11 additions and 130 deletions Side-by-side Diff

arch/arm/dts/fsl-smarcimx8mm.dts
Diff comments   View file @ 77f9e18
... ... @@ -499,22 +499,6 @@
499 499 status = "okay";
500 500 };
501 501  
502   -&flexspi0 {
503   - pinctrl-names = "default";
504   - pinctrl-0 = <&pinctrl_flexspi0>;
505   - status = "okay";
506   -
507   - flash0: mx25u6473f@0 {
508   - reg = <0>;
509   - #address-cells = <1>;
510   - #size-cells = <1>;
511   - compatible = "spi-flash";
512   - /*spi-max-frequency = <29000000>;*/
513   - spi-max-frequency = <12000000>;
514   - spi-nor,ddr-quad-read-dummy = <6>;
515   - };
516   -};
517   -
518 502 &fec1 {
519 503 pinctrl-names = "default";
520 504 pinctrl-0 = <&pinctrl_fec1>;
board/embedian/smarcimx8mm/smarcimx8mm.c
Diff comments   View file @ 77f9e18
... ... @@ -437,6 +437,7 @@
437 437 IMX8MM_PAD_NAND_DATA04_GPIO3_IO10 | MUX_PAD_CTRL(WEAK_PULLUP),
438 438 IMX8MM_PAD_NAND_DATA05_GPIO3_IO11 | MUX_PAD_CTRL(WEAK_PULLUP),
439 439 IMX8MM_PAD_GPIO1_IO10_GPIO1_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
  440 + IMX8MM_PAD_GPIO1_IO11_GPIO1_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
440 441 };
441 442  
442 443 static void setup_iomux_usb_en_oc(void)
... ... @@ -450,6 +451,8 @@
450 451 gpio_direction_input(IMX_GPIO_NR(3, 11));
451 452 gpio_request(IMX_GPIO_NR(1, 10), "usb0_id");
452 453 gpio_direction_input(IMX_GPIO_NR(1, 10));
  454 + gpio_request(IMX_GPIO_NR(1, 11), "usb1_id");
  455 + gpio_direction_input(IMX_GPIO_NR(1, 11));
453 456 }
454 457  
455 458 #ifdef CONFIG_USB_TCPC
configs/smarcimx8mm_2g_ser0_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_2g_ser1_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_2g_ser2_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_2g_ser3_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_4g_ser0_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_4g_ser1_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_4g_ser2_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_4g_ser3_defconfig
Diff comments   View file @ 77f9e18
... ... @@ -22,7 +22,6 @@
22 22 CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23 23 CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24 24 CONFIG_ENV_IS_IN_MMC=y
25   -CONFIG_CMD_SF=y
26 25 CONFIG_CMD_I2C=y
27 26 CONFIG_CMD_GPIO=y
28 27 CONFIG_CMD_CACHE=y
... ... @@ -47,9 +46,7 @@
47 46 CONFIG_DM_MMC=y
48 47 # CONFIG_DM_PMIC=y
49 48 CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
  49 +CONFIG_FSL_FSPI=y
53 50 CONFIG_DM_ETH=y
54 51 CONFIG_PINCTRL=y
55 52 CONFIG_PINCTRL_IMX8M=y
... ... @@ -57,7 +54,6 @@
57 54 CONFIG_DM_REGULATOR_FIXED=y
58 55 CONFIG_DM_REGULATOR_GPIO=y
59 56 CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61 57 CONFIG_NXP_TMU=y
62 58 CONFIG_DM_THERMAL=y
63 59 CONFIG_USB=y
configs/smarcimx8mm_fspi_2g_ser3_defconfig
View file @ 77f9e18
1   -CONFIG_ARM=y
2   -CONFIG_ARCH_IMX8M=y
3   -CONFIG_SYS_TEXT_BASE=0x40200000
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5   -CONFIG_BOOTDELAY=1
6   -CONFIG_TARGET_SMARCIMX8MM=y
7   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_qspi.cfg,SPL_TEXT_BASE=0x7E2000,2GB_LPDDR4"
8   -CONFIG_CONSOLE_SER3=y
9   -CONFIG_FIT=y
10   -CONFIG_SPL_LOAD_FIT=y
11   -CONFIG_ARCH_MISC_INIT=y
12   -CONFIG_SPL=y
13   -CONFIG_SPL_BOARD_INIT=y
14   -CONFIG_SPL_MMC_SUPPORT=y
15   -CONFIG_HUSH_PARSER=y
16   -CONFIG_OF_LIBFDT=y
17   -CONFIG_FS_FAT=y
18   -CONFIG_CMD_EXT2=y
19   -CONFIG_CMD_EXT4=y
20   -CONFIG_CMD_EXT4_WRITE=y
21   -CONFIG_CMD_FAT=y
22   -CONFIG_DEFAULT_DEVICE_TREE="fsl-smarcimx8mm"
23   -CONFIG_DEFAULT_FDT_FILE="fsl-smarcimx8mm.dtb"
24   -CONFIG_ENV_IS_IN_SPI_FLASH=y
25   -CONFIG_CMD_SF=y
26   -CONFIG_CMD_I2C=y
27   -CONFIG_CMD_GPIO=y
28   -CONFIG_CMD_CACHE=y
29   -CONFIG_CMD_REGULATOR=y
30   -CONFIG_CMD_MEMTEST=y
31   -CONFIG_CMD_GPT=y
32   -CONFIG_CMD_TIME=y
33   -CONFIG_OF_CONTROL=y
34   -CONFIG_FASTBOOT=y
35   -CONFIG_USB_FUNCTION_FASTBOOT=y
36   -CONFIG_CMD_FASTBOOT=y
37   -CONFIG_ANDROID_BOOT_IMAGE=y
38   -CONFIG_FSL_FASTBOOT=y
39   -CONFIG_FASTBOOT_BUF_ADDR=0x42800000
40   -CONFIG_FASTBOOT_BUF_SIZE=0x40000000
41   -CONFIG_FASTBOOT_FLASH=y
42   -CONFIG_FASTBOOT_FLASH_MMC_DEV=0
43   -
44   -CONFIG_DM_GPIO=y
45   -CONFIG_DM_I2C=y
46   -CONFIG_SYS_I2C_MXC=y
47   -CONFIG_DM_MMC=y
48   -# CONFIG_DM_PMIC=y
49   -CONFIG_EFI_PARTITION=y
50   -CONFIG_DM_SPI_FLASH=y
51   -CONFIG_SPI_FLASH=y
52   -CONFIG_SPI_FLASH_MACRONIX=y
53   -CONFIG_DM_ETH=y
54   -CONFIG_PINCTRL=y
55   -CONFIG_PINCTRL_IMX8M=y
56   -CONFIG_DM_REGULATOR=y
57   -CONFIG_DM_REGULATOR_FIXED=y
58   -CONFIG_DM_REGULATOR_GPIO=y
59   -CONFIG_DM_SPI=y
60   -CONFIG_FSL_FSPI=y
61   -CONFIG_NXP_TMU=y
62   -CONFIG_DM_THERMAL=y
63   -CONFIG_USB=y
64   -CONFIG_USB_GADGET=y
65   -CONFIG_DM_USB=y
66   -CONFIG_USB_EHCI_HCD=y
67   -
68   -CONFIG_SPL_USB_HOST_SUPPORT=y
69   -CONFIG_SPL_USB_GADGET_SUPPORT=y
70   -CONFIG_SPL_USB_SDP_SUPPORT=y
71   -CONFIG_SDP_LOADADDR=0x40400000
72   -CONFIG_USB_GADGET_MANUFACTURER="FSL"
73   -CONFIG_USB_GADGET_VENDOR_NUM=0x0525
74   -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5