arm: imx6: aristainetos board updates
Subsystems (3)
cover arm: imx6: aristainetos board updates
- remove the not longer used boards: aristainetos2, 2b, 2b-csl
- add support for aristainetos2c_cslb board variant
- sync defconfigs with current mainline
- sync dts files with latest changes in linux mainline (not all variants in linux yet)
Travis build:
https://travis-ci.org/github/hsdenx/u-boot-test/builds/746380095
Heiko Schocher (4):
imx6: remove not longer supported aristainetos boards
imx6: add support for aristainetos2c_cslb board variant
arm: dts: aristainetos: sync with changes in linux
imx: aristainetos: enable U-Boot Environment variables protection
arch/arm/dts/Makefile | 8 +-
.../dts/imx6dl-aristainetos2_4-u-boot.dtsi | 13 -
arch/arm/dts/imx6dl-aristainetos2_4.dts | 51 ---
arch/arm/dts/imx6dl-aristainetos2_4.dtsi | 84 -----
.../dts/imx6dl-aristainetos2_7-u-boot.dtsi | 19 -
arch/arm/dts/imx6dl-aristainetos2_7.dts | 16 -
arch/arm/dts/imx6dl-aristainetos2_7.dtsi | 11 +-
.../dts/imx6dl-aristainetos2b_4-u-boot.dtsi | 13 -
arch/arm/dts/imx6dl-aristainetos2b_4.dts | 50 ---
arch/arm/dts/imx6dl-aristainetos2b_7.dts | 16 -
.../imx6dl-aristainetos2b_csl_4-u-boot.dtsi | 13 -
arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts | 50 ---
.../imx6dl-aristainetos2b_csl_7-u-boot.dtsi | 19 -
arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts | 16 -
.../dts/imx6dl-aristainetos2c_4-u-boot.dtsi | 13 -
arch/arm/dts/imx6dl-aristainetos2c_4.dts | 50 ---
arch/arm/dts/imx6dl-aristainetos2c_7.dts | 4 +-
... imx6dl-aristainetos2c_cslb_7-u-boot.dtsi} | 2 +-
arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts | 16 +
.../arm/dts/imx6qdl-aristainetos2-common.dtsi | 23 +-
.../arm/dts/imx6qdl-aristainetos2-u-boot.dtsi | 22 --
arch/arm/dts/imx6qdl-aristainetos2.dtsi | 244 -------------
.../dts/imx6qdl-aristainetos2b-u-boot.dtsi | 77 ----
arch/arm/dts/imx6qdl-aristainetos2b.dtsi | 266 --------------
arch/arm/dts/imx6qdl-aristainetos2c.dtsi | 12 +-
...> imx6qdl-aristainetos2c_cslb-u-boot.dtsi} | 0
....dtsi => imx6qdl-aristainetos2c_cslb.dtsi} | 54 +--
arch/arm/mach-imx/mx6/Kconfig | 30 +-
board/aristainetos/Kconfig | 32 +-
board/aristainetos/MAINTAINERS | 34 +-
board/aristainetos/aristainetos.c | 283 ++++-----------
board/aristainetos/common/Kconfig | 6 +-
configs/aristainetos2b_defconfig | 115 ------
configs/aristainetos2bcsl_defconfig | 115 ------
configs/aristainetos2c_defconfig | 13 +-
...defconfig => aristainetos2ccslb_defconfig} | 27 +-
include/configs/aristainetos2.h | 336 +++++++++---------
37 files changed, 354 insertions(+), 1799 deletions(-)
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_7.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4.dts
rename arch/arm/dts/{imx6dl-aristainetos2b_7-u-boot.dtsi => imx6dl-aristainetos2c_cslb_7-u-boot.dtsi} (87%)
create mode 100644 arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts
delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2.dtsi
delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi
delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b.dtsi
rename arch/arm/dts/{imx6qdl-aristainetos2b_csl-u-boot.dtsi => imx6qdl-aristainetos2c_cslb-u-boot.dtsi} (100%)
rename arch/arm/dts/{imx6qdl-aristainetos2b_csl.dtsi => imx6qdl-aristainetos2c_cslb.dtsi} (80%)
delete mode 100644 configs/aristainetos2b_defconfig
delete mode 100644 configs/aristainetos2bcsl_defconfig
rename configs/{aristainetos2_defconfig => aristainetos2ccslb_defconfig} (84%)Signature · 1 line
2.25.4
PATCH 1/4 imx6: remove not longer supported aristainetos boards
Removed aristainetos2, 2b, 2b-csl. This boards have been recalled and destroyed.
Adapt board code to remove stuff not needed anymore.
Fix checkpatch warning, remove fdt_high and initrd_high from default environment.
zu remove
---
arch/arm/dts/Makefile | 7 - .../dts/imx6dl-aristainetos2_4-u-boot.dtsi | 13 - arch/arm/dts/imx6dl-aristainetos2_4.dts | 51 --- arch/arm/dts/imx6dl-aristainetos2_4.dtsi | 84 ----- .../dts/imx6dl-aristainetos2_7-u-boot.dtsi | 19 - arch/arm/dts/imx6dl-aristainetos2_7.dts | 16 - arch/arm/dts/imx6dl-aristainetos2_7.dtsi | 11 +- .../dts/imx6dl-aristainetos2b_4-u-boot.dtsi | 13 - arch/arm/dts/imx6dl-aristainetos2b_4.dts | 50 --- .../dts/imx6dl-aristainetos2b_7-u-boot.dtsi | 19 - arch/arm/dts/imx6dl-aristainetos2b_7.dts | 16 - .../imx6dl-aristainetos2b_csl_4-u-boot.dtsi | 13 - arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts | 50 --- .../imx6dl-aristainetos2b_csl_7-u-boot.dtsi | 19 - arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts | 16 - .../dts/imx6dl-aristainetos2c_4-u-boot.dtsi | 13 - arch/arm/dts/imx6dl-aristainetos2c_4.dts | 50 --- arch/arm/dts/imx6dl-aristainetos2c_7.dts | 2 +- .../arm/dts/imx6qdl-aristainetos2-common.dtsi | 23 +- .../arm/dts/imx6qdl-aristainetos2-u-boot.dtsi | 22 -- arch/arm/dts/imx6qdl-aristainetos2.dtsi | 244 ------------- .../dts/imx6qdl-aristainetos2b-u-boot.dtsi | 77 ----- arch/arm/dts/imx6qdl-aristainetos2b.dtsi | 266 -------------- .../imx6qdl-aristainetos2b_csl-u-boot.dtsi | 77 ----- arch/arm/dts/imx6qdl-aristainetos2b_csl.dtsi | 248 ------------- arch/arm/dts/imx6qdl-aristainetos2c.dtsi | 12 +- arch/arm/mach-imx/mx6/Kconfig | 33 -- board/aristainetos/Kconfig | 36 -- board/aristainetos/MAINTAINERS | 29 +- board/aristainetos/aristainetos.c | 263 +++----------- board/aristainetos/common/Kconfig | 5 +- configs/aristainetos2_defconfig | 121 ------- configs/aristainetos2b_defconfig | 115 ------ configs/aristainetos2bcsl_defconfig | 115 ------ configs/aristainetos2c_defconfig | 6 +- include/configs/aristainetos2.h | 326 +++++++++--------- 36 files changed, 249 insertions(+), 2231 deletions(-) delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_4.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_7-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6dl-aristainetos2c_4.dts delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b_csl-u-boot.dtsi delete mode 100644 arch/arm/dts/imx6qdl-aristainetos2b_csl.dtsi delete mode 100644 configs/aristainetos2_defconfig delete mode 100644 configs/aristainetos2b_defconfig delete mode 100644 configs/aristainetos2bcsl_defconfig
arch/arm/dts/Makefile +0 -7
@@ -643,13 +643,6 @@ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ ifneq ($(CONFIG_MX6DL)$(CONFIG_MX6QDL)$(CONFIG_MX6S),) dtb-y += \ - imx6dl-aristainetos2_4.dtb \ - imx6dl-aristainetos2_7.dtb \ - imx6dl-aristainetos2b_4.dtb \ - imx6dl-aristainetos2b_7.dtb \ - imx6dl-aristainetos2b_csl_4.dtb \ - imx6dl-aristainetos2b_csl_7.dtb \ - imx6dl-aristainetos2c_4.dtb \ imx6dl-aristainetos2c_7.dtb \ imx6dl-brppt2.dtb \ imx6dl-cubox-i.dtb \
arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2-u-boot.dtsi> - -&lcd_panel { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu_disp>; - enable-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; -};
arch/arm/dts/imx6dl-aristainetos2_4.dts deleted +0 -51
51 lines not on this page · raw message
arch/arm/dts/imx6dl-aristainetos2_4.dtsi deleted +0 -84
84 lines not on this page · raw message
arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi deleted +0 -19
@@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2-u-boot.dtsi> -/ { - vdd_panel_reg: regulator-panel { - compatible = "regulator-fixed"; - regulator-name = "panel_regulator"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; -}; - -&panel0 { - power-supply = <&vdd_panel_reg>; -};
arch/arm/dts/imx6dl-aristainetos2_7.dts deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0) -/* - * support for the imx6 based aristainetos2 board - * - * Copyright (C) 2019 Heiko Schocher <[email protected]> - * Copyright (C) 2015 Heiko Schocher <[email protected]> - * - */ -/dts-v1/; -#include "imx6dl-aristainetos2_7.dtsi" -#include "imx6qdl-aristainetos2.dtsi" - -/ { - model = "aristainetos2 i.MX6 Dual Lite Board 7"; - compatible = "fsl,imx6dl"; -};
arch/arm/dts/imx6dl-aristainetos2_7.dtsi +1 -10
@@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0) /* * support for the imx6 based aristainetos2 board - * parts for 7 inch LG display connected to the LVDS port and atmel maxtouch + * parts for 7 inch LG display connected to the LVDS port * * Copyright (C) 2019 Heiko Schocher <[email protected]> * Copyright (C) 2015 Heiko Schocher <[email protected]>
@@ -26,15 +26,6 @@ }; }; -&i2c3 { - touch: touch at 4d { - compatible = "atmel,maxtouch"; - reg = <0x4d>; - interrupt-parent = <&gpio2>; - interrupts = <9 8>; - }; -}; - &ldb { status = "okay";
arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2b-u-boot.dtsi> - -&lcd_panel { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu_disp>; - enable-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; -};
arch/arm/dts/imx6dl-aristainetos2b_4.dts deleted +0 -50
50 lines not on this page · raw message
arch/arm/dts/imx6dl-aristainetos2b_7-u-boot.dtsi deleted +0 -19
@@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2b-u-boot.dtsi> -/ { - vdd_panel_reg: regulator-panel { - compatible = "regulator-fixed"; - regulator-name = "panel_regulator"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; -}; - -&panel0 { - power-supply = <&vdd_panel_reg>; -};
arch/arm/dts/imx6dl-aristainetos2b_7.dts deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0) -/* - * support for the imx6 based aristainetos2 board - * - * Copyright (C) 2019 Heiko Schocher <[email protected]> - * Copyright (C) 2015 Heiko Schocher <[email protected]> - * - */ -/dts-v1/; -#include "imx6dl-aristainetos2_7.dtsi" -#include "imx6qdl-aristainetos2b.dtsi" - -/ { - model = "aristainetos2b i.MX6 Dual Lite Board 7"; - compatible = "fsl,imx6dl"; -};
arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2b_csl-u-boot.dtsi> - -&lcd_panel { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu_disp>; - enable-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; -};
arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts deleted +0 -50
50 lines not on this page · raw message
arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi deleted +0 -19
@@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2b_csl-u-boot.dtsi> -/ { - vdd_panel_reg: regulator-panel { - compatible = "regulator-fixed"; - regulator-name = "panel_regulator"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; -}; - -&panel0 { - power-supply = <&vdd_panel_reg>; -};
arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0) -/* - * support for the imx6 based aristainetos2 board - * - * Copyright (C) 2019 Heiko Schocher <[email protected]> - * Copyright (C) 2015 Heiko Schocher <[email protected]> - * - */ -/dts-v1/; -#include "imx6dl-aristainetos2_7.dtsi" -#include "imx6qdl-aristainetos2b_csl.dtsi" - -/ { - model = "aristainetos2b csl i.MX6 Dual Lite Board 7"; - compatible = "fsl,imx6dl"; -};
arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi deleted +0 -13
@@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 -/* - * Copyright (C) 2019 Heiko Schocher <[email protected]> - */ - -#include <imx6qdl-aristainetos2c-u-boot.dtsi> - -&lcd_panel { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ipu_disp>; - enable-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>; - backlight = <&backlight>; -};
arch/arm/dts/imx6dl-aristainetos2c_4.dts deleted +0 -50
50 lines not on this page · raw message
arch/arm/dts/imx6dl-aristainetos2c_7.dts +1 -1
@@ -11,6 +11,6 @@ #include "imx6qdl-aristainetos2c.dtsi" / { - model = "aristainetos2c i.MX6 Dual Lite Board 7"; + model = "aristainetos2c+2d i.MX6 Dual Lite Boards 7"; compatible = "fsl,imx6dl"; };
arch/arm/dts/imx6qdl-aristainetos2-common.dtsi +22 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0) /* - * support for the imx6 based aristainetos2 board + * support for the imx6 based aristainetos2 boards * parts common to all versions * * Copyright (C) 2019 Heiko Schocher <[email protected]>
@@ -13,6 +13,8 @@ / { aliases { eeprom0 = &i2c_eeprom0; + eeprom1 = &i2c_eeprom1; + eeprom2 = &i2c_eeprom2; pmic0 = &i2c_pmic0; };
@@ -250,6 +252,12 @@ }; }; + i2c_eeprom2: eeprom at 57{ + compatible = "atmel,24c64"; + reg = <0x57>; + pagesize = <32>; + }; + rtc at 68 { compatible = "st,m41t11"; reg = <0x68>;
@@ -274,6 +282,19 @@ }; }; +&gpio2 { + tpm_pp { + gpio-hog; + output-low; + gpios = <17 GPIO_ACTIVE_HIGH>; + }; + tpm_reset { + gpio-hog; + output-high; + gpios = <18 GPIO_ACTIVE_HIGH>; + }; +}; + &gpio6 { spi_bus_ena { gpio-hog;
arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi +0 -22
@@ -50,28 +50,6 @@ }; }; -&iomuxc { - pinctrl-0 = <&pinctrl_gpio &pinctrl_gpio_fix>; - u-boot,dm-pre-reloc; - - pinctrl_gpio_fix: gpiofixgrp { - /* - * usdhc2 has a levelshifter on the carrier board Rev. DV1, - * that will automatically detect the driving direction. - * During initialisation this isn't working correctly, - * which causes DAT3 to be driven low towards the SD-card. - * This causes a SD-card enetring the SPI-Mode - * and therefore getting inaccessible until next power cycle. - * As workaround we drive the DAT3 line as GPIO and set it high. - * This makes usdhc2 unusable in u-boot, but works for the - * initialisation in Linux - */ - fsl,pins = < - MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x20000 - >; - }; -}; - &gpio1 { usdhc_fix { gpio-hog;
arch/arm/dts/imx6qdl-aristainetos2.dtsi deleted +0 -244
244 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi deleted +0 -77
77 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2b.dtsi deleted +0 -266
266 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2b_csl-u-boot.dtsi deleted +0 -77
77 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2b_csl.dtsi deleted +0 -248
248 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2c.dtsi +11 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0) /* - * support for the imx6 based aristainetos2c board + * support for the imx6 based aristainetos2c+2d boards * * Copyright (C) 2019 Heiko Schocher <[email protected]> * Copyright (C) 2015 Heiko Schocher <[email protected]>
@@ -79,6 +79,14 @@ }; }; +&gpio7 { + eMMC_reset { + gpio-hog; + output-high; + gpios = <8 GPIO_ACTIVE_HIGH>; + }; +}; + &can1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan1>;
@@ -172,6 +180,8 @@ MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x4001b0b0 /* TPM Reset */ MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x4001b0b0 + /* eMMC Reset# */ + MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x4001b0b0 >; };
arch/arm/mach-imx/mx6/Kconfig +0 -33
@@ -128,39 +128,6 @@ config TARGET_APALIS_IMX6 imply CMD_DM imply CMD_SATA -config TARGET_ARISTAINETOS2 - bool "aristainetos2" - depends on MX6DL - select BOARD_LATE_INIT - select SYS_I2C_MXC - select MXC_UART - select FEC_MXC - select DM - imply CMD_SATA - imply CMD_DM - -config TARGET_ARISTAINETOS2B - bool "Support aristainetos2-revB" - depends on MX6DL - select BOARD_LATE_INIT - select SYS_I2C_MXC - select MXC_UART - select FEC_MXC - select DM - imply CMD_SATA - imply CMD_DM - -config TARGET_ARISTAINETOS2BCSL - bool "Support aristainetos2-revB CSL" - depends on MX6DL - select BOARD_LATE_INIT - select SYS_I2C_MXC - select MXC_UART - select FEC_MXC - select DM - imply CMD_SATA - imply CMD_DM - config TARGET_ARISTAINETOS2C bool "Support aristainetos2-revC" depends on MX6DL
board/aristainetos/Kconfig +0 -36
@@ -1,39 +1,3 @@ -if TARGET_ARISTAINETOS2 - -source "board/aristainetos/common/Kconfig" - -config SYS_BOARD - default "aristainetos" - -config SYS_BOARD_VERSION - default 2 - -endif - -if TARGET_ARISTAINETOS2B - -source "board/aristainetos/common/Kconfig" - -config SYS_BOARD - default "aristainetos" - -config SYS_BOARD_VERSION - default 3 - -endif - -if TARGET_ARISTAINETOS2BCSL - -source "board/aristainetos/common/Kconfig" - -config SYS_BOARD - default "aristainetos" - -config SYS_BOARD_VERSION - default 4 - -endif - if TARGET_ARISTAINETOS2C source "board/aristainetos/common/Kconfig"
board/aristainetos/MAINTAINERS +3 -26
@@ -3,34 +3,11 @@ M: Heiko Schocher <[email protected]> S: Maintained F: board/aristainetos/ F: include/configs/aristainetos2.h -F: configs/aristainetos2_defconfig -F: configs/aristainetos2b_defconfig -F: configs/aristainetos2bcsl_defconfig F: configs/aristainetos2c_defconfig -F: arch/arm/dts/imx6qdl-aristainetos2.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2-common.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2_7.dts -F: arch/arm/dts/imx6dl-aristainetos2_7.dtsi -F: arch/arm/dts/imx6dl-aristainetos2_7-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2_4.dts -F: arch/arm/dts/imx6dl-aristainetos2_4.dtsi -F: arch/arm/dts/imx6dl-aristainetos2_4-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2b_4.dts -F: arch/arm/dts/imx6dl-aristainetos2b_4-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2b_7.dts -F: arch/arm/dts/imx6dl-aristainetos2b_7-u-boot.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2b-u-boot.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2b.dtsi -F: arch/arm/dts/imx6dl-aristainetos2b_csl_4.dts -F: arch/arm/dts/imx6dl-aristainetos2b_csl_4-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2b_csl_7.dts -F: arch/arm/dts/imx6dl-aristainetos2b_csl_7-u-boot.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2b_csl.dtsi -F: arch/arm/dts/imx6qdl-aristainetos2b_csl-u-boot.dtsi -F: arch/arm/dts/imx6dl-aristainetos2c_4.dts -F: arch/arm/dts/imx6dl-aristainetos2c_4-u-boot.dtsi F: arch/arm/dts/imx6dl-aristainetos2c_7.dts F: arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi +F: arch/arm/dts/imx6dl-aristainetos2_7.dtsi +F: arch/arm/dts/imx6qdl-aristainetos2-common.dtsi +F: arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi F: arch/arm/dts/imx6qdl-aristainetos2c.dtsi F: arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi
board/aristainetos/aristainetos.c +46 -217
342 lines not on this page · raw message
board/aristainetos/common/Kconfig +1 -4
@@ -2,10 +2,7 @@ config SYS_BOARD_VERSION int "select version of aristainetos board" help version of aristainetos board version - 2 version 2 - 3 version 2b - 4 version 2bcsl - 5 version 2c + 5 version 2c and 2d config SYS_I2C_MXC_I2C1 default y
configs/aristainetos2_defconfig deleted +0 -121
121 lines not on this page · raw message
configs/aristainetos2b_defconfig deleted +0 -115
115 lines not on this page · raw message
configs/aristainetos2bcsl_defconfig deleted +0 -115
115 lines not on this page · raw message
configs/aristainetos2c_defconfig +3 -3
@@ -10,11 +10,10 @@ CONFIG_DM_GPIO=y CONFIG_ENV_OFFSET_REDUND=0xE0000 CONFIG_IMX_HAB=y # CONFIG_CMD_DEKBLOB is not set -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-aristainetos2c_4" CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg" -CONFIG_BOOTDELAY=3 +CONFIG_BOOTDELAY=-2 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_ENCRYPTION=y CONFIG_AUTOBOOT_STOP_STR_SHA256="30bb0bce5f77da71a6e8e436fe40af54bc823db9501ae170f77e9992499d88fb"
@@ -51,7 +50,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="imx6dl-aristainetos2c_4 imx6dl-aristainetos2c_7" +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-aristainetos2c_7" +CONFIG_OF_LIST="imx6dl-aristainetos2c_7" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y
include/configs/aristainetos2.h +161 -165
477 lines not on this page · raw message
Signature · 1 line
2.25.4
PATCH 1/4 imx6: remove not longer supported aristainetos boards
Quoted 7 lines
Removed aristainetos2, 2b, 2b-csl. This boards have been recalled and destroyed.
Adapt board code to remove stuff not needed anymore. Fix checkpatch warning, removefdt_highandinitrd_highfrom default environment.Signed-off-by Heiko Schocher <[email protected]>zu remove
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/4 imx6: add support for aristainetos2c_cslb board variant
In reply to Heiko Schocheradd support for aristainetos2c_cslb board variant.
---
arch/arm/dts/Makefile | 1 + .../imx6dl-aristainetos2c_cslb_7-u-boot.dtsi | 19 ++ arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts | 16 ++ .../imx6qdl-aristainetos2c_cslb-u-boot.dtsi | 77 ++++++ arch/arm/dts/imx6qdl-aristainetos2c_cslb.dtsi | 232 ++++++++++++++++++ arch/arm/mach-imx/mx6/Kconfig | 11 + board/aristainetos/Kconfig | 12 + board/aristainetos/MAINTAINERS | 5 + board/aristainetos/common/Kconfig | 1 + configs/aristainetos2c_defconfig | 3 +- configs/aristainetos2ccslb_defconfig | 118 +++++++++ include/configs/aristainetos2.h | 9 + 12 files changed, 502 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts create mode 100644 arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-aristainetos2c_cslb.dtsi create mode 100644 configs/aristainetos2ccslb_defconfig
arch/arm/dts/Makefile +1 -0
@@ -644,6 +644,7 @@ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ ifneq ($(CONFIG_MX6DL)$(CONFIG_MX6QDL)$(CONFIG_MX6S),) dtb-y += \ imx6dl-aristainetos2c_7.dtb \ + imx6dl-aristainetos2c_cslb_7.dtb \ imx6dl-brppt2.dtb \ imx6dl-cubox-i.dtb \ imx6dl-cubox-i-emmc-som-v15.dtb \
arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ or X11 +/* + * Copyright (C) 2019 Heiko Schocher <[email protected]> + */ + +#include <imx6qdl-aristainetos2c_cslb-u-boot.dtsi> +/ { + vdd_panel_reg: regulator-panel { + compatible = "regulator-fixed"; + regulator-name = "panel_regulator"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; +}; + +&panel0 { + power-supply = <&vdd_panel_reg>; +};
arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0) +/* + * support for the imx6 based aristainetos2c cslb board + * + * Copyright (C) 2019 Heiko Schocher <[email protected]> + * Copyright (C) 2015 Heiko Schocher <[email protected]> + * + */ +/dts-v1/; +#include "imx6dl-aristainetos2_7.dtsi" +#include "imx6qdl-aristainetos2c_cslb.dtsi" + +/ { + model = "aristainetos2c cslb i.MX6 Dual Lite Board 7"; + compatible = "fsl,imx6dl"; +};
arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi new file +77 -0
77 lines not on this page · raw message
arch/arm/dts/imx6qdl-aristainetos2c_cslb.dtsi new file +232 -0
232 lines not on this page · raw message
arch/arm/mach-imx/mx6/Kconfig +11 -0
@@ -139,6 +139,17 @@ config TARGET_ARISTAINETOS2C imply CMD_SATA imply CMD_DM +config TARGET_ARISTAINETOS2CCSLB + bool "Support aristainetos2-revC CSL" + depends on MX6DL + select BOARD_LATE_INIT + select SYS_I2C_MXC + select MXC_UART + select FEC_MXC + select DM + imply CMD_SATA + imply CMD_DM + config TARGET_CGTQMX6EVAL bool "cgtqmx6eval" depends on MX6QDL
board/aristainetos/Kconfig +12 -0
@@ -9,3 +9,15 @@ config SYS_BOARD_VERSION default 5 endif + +if TARGET_ARISTAINETOS2CCSLB + +source "board/aristainetos/common/Kconfig" + +config SYS_BOARD + default "aristainetos" + +config SYS_BOARD_VERSION + default 6 + +endif
board/aristainetos/MAINTAINERS +5 -0
@@ -4,10 +4,15 @@ S: Maintained F: board/aristainetos/ F: include/configs/aristainetos2.h F: configs/aristainetos2c_defconfig +F: configs/aristainetos2ccslb_defconfig F: arch/arm/dts/imx6dl-aristainetos2c_7.dts F: arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi +F: arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts +F: arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi F: arch/arm/dts/imx6dl-aristainetos2_7.dtsi F: arch/arm/dts/imx6qdl-aristainetos2-common.dtsi F: arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi F: arch/arm/dts/imx6qdl-aristainetos2c.dtsi F: arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi +F: arch/arm/dts/imx6qdl-aristainetos2c_cslb.dtsi +F: arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi
board/aristainetos/common/Kconfig +1 -0
@@ -3,6 +3,7 @@ config SYS_BOARD_VERSION help version of aristainetos board version 5 version 2c and 2d + 6 version 2c-cslb config SYS_I2C_MXC_I2C1 default y
configs/aristainetos2c_defconfig +1 -2
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_ENV_OFFSET_REDUND=0xE0000 CONFIG_IMX_HAB=y # CONFIG_CMD_DEKBLOB is not set +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-aristainetos2c_7" CONFIG_FIT=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
@@ -50,8 +51,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-aristainetos2c_7" -CONFIG_OF_LIST="imx6dl-aristainetos2c_7" CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y
configs/aristainetos2ccslb_defconfig new file +118 -0
118 lines not on this page · raw message
include/configs/aristainetos2.h +9 -0
@@ -16,6 +16,9 @@#if (CONFIG_SYS_BOARD_VERSION ==5 )#define CONFIG_MXC_UART_BASE UART2_BASE#define CONSOLE_DEV "ttymxc1" +#elif (CONFIG_SYS_BOARD_VERSION ==6 ) +#define CONFIG_MXC_UART_BASE UART1_BASE +#define CONSOLE_DEV "ttymxc0"#endif #define CONFIG_FEC_XCV_TYPE RGMII
@@ -95,6 +98,12 @@"led led_red on; sleep 1;" \"led led_red off; sleep 1;" \ "done\0" +#elif (CONFIG_SYS_BOARD_VERSION ==6 ) +#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \ + "dead=while true; do; " \ + "led led_red on; led led_red2 on; sleep 1;" \ + "led led_red off; led led_red2 off;; sleep 1;" \ + "done\0"#endif #define CONFIG_EXTRA_ENV_SETTINGS \
Signature · 1 line
2.25.4
PATCH 2/4 imx6: add support for aristainetos2c_cslb board variant
Quoted 2 lines
add support for
aristainetos2c_cslbboard variant.Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/4 arm: dts: aristainetos: sync with changes in linux
In reply to Heiko Schochersync with comaptible changes in linux from
Krzysztof Kozlowski.
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20200930190143.27032-12-krzk at kernel.org/
---
arch/arm/dts/imx6dl-aristainetos2c_7.dts | 2 +- arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/imx6dl-aristainetos2c_7.dts +1 -1
@@ -12,5 +12,5 @@ / { model = "aristainetos2c+2d i.MX6 Dual Lite Boards 7"; - compatible = "fsl,imx6dl"; + compatible = "abb,aristainetos2-imx6dl-7", "fsl,imx6dl"; };
arch/arm/dts/imx6dl-aristainetos2c_cslb_7.dts +1 -1
@@ -12,5 +12,5 @@ / { model = "aristainetos2c cslb i.MX6 Dual Lite Board 7"; - compatible = "fsl,imx6dl"; + compatible = "abb,aristainetos2-imx6dl-7", "fsl,imx6dl"; };
Signature · 1 line
2.25.4
PATCH 3/4 arm: dts: aristainetos: sync with changes in linux
Quoted 4 lines
sync with comaptible changes in linux from
Krzysztof Kozlowski.
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20200930190143.27032-12-krzk at kernel.org/Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/4 imx: aristainetos: enable U-Boot Environment variables protection
In reply to Heiko Schocherenable Environment protection with:
CONFIG_ENV_APPEND=yCONFIG_ENV_WRITEABLE_LIST=yCONFIG_ENV_ACCESS_IGNORE_FORCE
and add board specific env_get_location()
function.
---
board/aristainetos/aristainetos.c | 20 ++++++++++++++++++++ configs/aristainetos2c_defconfig | 8 +++++++- configs/aristainetos2ccslb_defconfig | 10 +++++++++- include/configs/aristainetos2.h | 3 +++ 4 files changed, 39 insertions(+), 2 deletions(-)
board/aristainetos/aristainetos.c +20 -0
@@ -27,6 +27,7 @@#include <bmp_logo.h> #include <dm/root.h> #include <env.h> +#include <env_internal.h> #include <i2c_eeprom.h> #include <i2c.h> #include <micrel.h>
@@ -527,3 +528,22 @@ int embedded_dtb_select(void) return 0; }#endif + +enum env_location env_get_location (enum env_operation op,int prio) +{ +if (op ==ENVOP_SAVE || op ==ENVOP_ERASE ) +return ENVL_SPI_FLASH ; + +switch (prio) { +case 0 : +return ENVL_NOWHERE ; + +case 1 : +return ENVL_SPI_FLASH ; + +default : +return ENVL_UNKNOWN ; + } + +return ENVL_UNKNOWN ; +}
configs/aristainetos2c_defconfig +7 -1
@@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 -CONFIG_SYS_MALLOC_F_LEN=0xe000 +CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0xD0000 CONFIG_MX6DL=y
@@ -30,6 +30,8 @@ CONFIG_CMD_BOOTZ=y # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set +CONFIG_CMD_ENV_FLAGS=y +CONFIG_CMD_NVEDIT_INFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y
@@ -54,10 +56,14 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_APPEND=y +CONFIG_ENV_WRITEABLE_LIST=y +CONFIG_ENV_ACCESS_IGNORE_FORCE=y CONFIG_VERSION_VARIABLE=y CONFIG_BOUNCE_BUFFER=y CONFIG_APBH_DMA=y
configs/aristainetos2ccslb_defconfig +9 -1
@@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x17800000 -CONFIG_SYS_MALLOC_F_LEN=0xe000 +CONFIG_SYS_MALLOC_F_LEN=0x13000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_OFFSET=0xD0000 CONFIG_MX6DL=y
@@ -30,6 +30,8 @@ CONFIG_CMD_BOOTZ=y # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set +CONFIG_CMD_ENV_FLAGS=y +CONFIG_CMD_NVEDIT_INFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y
@@ -54,10 +56,14 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_APPEND=y +CONFIG_ENV_WRITEABLE_LIST=y +CONFIG_ENV_ACCESS_IGNORE_FORCE=y CONFIG_VERSION_VARIABLE=y CONFIG_BOUNCE_BUFFER=y CONFIG_APBH_DMA=y
@@ -114,5 +120,7 @@ CONFIG_DISPLAY=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_VIDEO_BMP_RLE8=y +CONFIG_BMP_16BPP=y CONFIG_IMX_WATCHDOG=y # CONFIG_EFI_LOADER is not set
include/configs/aristainetos2.h +3 -0
@@ -449,4 +449,7 @@#define CONFIG_IMX6_PWM_PER_CLK 66000000 +#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \ + "sysnum:dw,panel:sw,ipaddr:iw,serverip:iw" +#endif /* __ARISTAINETOS2_CONFIG_H */
Signature · 1 line
2.25.4
PATCH 4/4 imx: aristainetos: enable U-Boot Environment variables protection
Quoted 7 lines
enable Environment protection with:
CONFIG_ENV_APPEND=yCONFIG_ENV_WRITEABLE_LIST=yCONFIG_ENV_ACCESS_IGNORE_FORCE
and add board specificenv_get_location()
function.Signed-off-by Heiko Schocher <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================