diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-25 13:33:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-25 13:33:47 -0400 |
| commit | 4d8c21da4170e7c1d38c0106898e0d8347b4f0ff (patch) | |
| tree | 45f7de9cc281bd4fcbb777cabd71b0a5a6eecf91 | |
| parent | 1b044fd1c93d4f66230bf038c630bb1c493ea5d7 (diff) | |
| parent | 52ce6a61c1fc74b62be7f57ba83c1b43181b1f91 (diff) | |
| download | u-boot-4d8c21da4170e7c1d38c0106898e0d8347b4f0ff.tar.gz | |
Merge tag 'u-boot-imx-20210625' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2021.07
-----------------
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/7903
| -rw-r--r-- | arch/arm/dts/o4-imx-nano.dts | 18 | ||||
| -rw-r--r-- | configs/imx8mm_evk_defconfig | 3 | ||||
| -rw-r--r-- | configs/imx8mp_evk_defconfig | 3 |
3 files changed, 8 insertions, 16 deletions
diff --git a/arch/arm/dts/o4-imx-nano.dts b/arch/arm/dts/o4-imx-nano.dts index d1785b7dc7..54d32f9dd4 100644 --- a/arch/arm/dts/o4-imx-nano.dts +++ b/arch/arm/dts/o4-imx-nano.dts @@ -24,40 +24,34 @@ leds { compatible = "gpio-leds"; - led@0 { + led0 { color = <LED_COLOR_ID_RED>; gpios = <&pcf8574a 0 GPIO_ACTIVE_LOW>; - reg = <0>; }; - led@1 { + led1{ color = <LED_COLOR_ID_GREEN>; gpios = <&pcf8574a 1 GPIO_ACTIVE_LOW>; - reg = <1>; }; - led@2 { + led2 { gpios = <&pcf8574a 2 GPIO_ACTIVE_LOW>; color = <LED_COLOR_ID_BLUE>; - reg = <2>; }; - led@3 { + led3 { color = <LED_COLOR_ID_RED>; gpios = <&pcf8574a 3 GPIO_ACTIVE_LOW>; - reg = <3>; }; - led@4 { + led4{ color = <LED_COLOR_ID_GREEN>; gpios = <&pcf8574a 4 GPIO_ACTIVE_LOW>; - reg = <4>; }; - led@5 { + led5 { color = <LED_COLOR_ID_BLUE>; gpios = <&pcf8574a 5 GPIO_ACTIVE_LOW>; - reg = <5>; }; }; diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig index 200bf554e0..1ac48167b5 100644 --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -18,6 +18,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y @@ -40,7 +41,6 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y @@ -50,7 +50,6 @@ 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_SPL_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 11d62837bc..79b4a7b247 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y @@ -45,7 +46,6 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y @@ -55,7 +55,6 @@ 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_SPL_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y |