armadeus-commitlog Mailing List for armadeus (Page 4)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: sszy <ss...@us...> - 2024-11-29 10:10:38
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 12ab071561ba58be2783a6420eee5337b399f817 (commit)
from 4be1b355534698ab738ab74e82d2000550ce7d04 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 12ab071561ba58be2783a6420eee5337b399f817
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Nov 26 16:18:02 2024 +0100
Add OPOS93SP and OPOS93SPDev support
-----------------------------------------------------------------------
Summary of changes:
arch/arm/dts/imx93-opos93.dtsi | 11 +-
...dts => imx93-opos93dev-opos93spdev-common.dtsi} | 44 ----
arch/arm/dts/imx93-opos93dev.dts | 258 +--------------------
arch/arm/dts/imx93-opos93sp-u-boot.dtsi | 6 +
arch/arm/dts/imx93-opos93sp.dtsi | 14 ++
arch/arm/dts/imx93-opos93spdev-u-boot.dtsi | 6 +
arch/arm/dts/imx93-opos93spdev.dts | 14 ++
arch/arm/mach-imx/imx9/Kconfig | 9 +
board/armadeus/opos93spdev/Kconfig | 12 +
board/armadeus/opos93spdev/MAINTAINERS | 6 +
board/armadeus/opos93spdev/Makefile | 7 +
board/armadeus/opos93spdev/opos93spdev.c | 5 +
board/armadeus/opos93spdev/opos93spdev.env | 128 ++++++++++
configs/opos93spdev_defconfig | 168 ++++++++++++++
include/configs/{opos93dev.h => opos93.h} | 8 +-
include/configs/opos93dev.h | 24 +-
include/configs/opos93spdev.h | 11 +
17 files changed, 402 insertions(+), 329 deletions(-)
copy arch/arm/dts/{imx93-opos93dev.dts => imx93-opos93dev-opos93spdev-common.dtsi} (82%)
create mode 100644 arch/arm/dts/imx93-opos93sp-u-boot.dtsi
create mode 100644 arch/arm/dts/imx93-opos93sp.dtsi
create mode 100644 arch/arm/dts/imx93-opos93spdev-u-boot.dtsi
create mode 100644 arch/arm/dts/imx93-opos93spdev.dts
create mode 100644 board/armadeus/opos93spdev/Kconfig
create mode 100644 board/armadeus/opos93spdev/MAINTAINERS
create mode 100644 board/armadeus/opos93spdev/Makefile
create mode 100644 board/armadeus/opos93spdev/opos93spdev.c
create mode 100644 board/armadeus/opos93spdev/opos93spdev.env
create mode 100644 configs/opos93spdev_defconfig
copy include/configs/{opos93dev.h => opos93.h} (80%)
create mode 100644 include/configs/opos93spdev.h
diff --git a/arch/arm/dts/imx93-opos93.dtsi b/arch/arm/dts/imx93-opos93.dtsi
index ec649740c1..0efbaf2ee1 100644
--- a/arch/arm/dts/imx93-opos93.dtsi
+++ b/arch/arm/dts/imx93-opos93.dtsi
@@ -138,6 +138,8 @@
iw416: wifi@1 {
compatible = "nxp,iw416";
reg = <1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wifi>;
interrupt-parent = <&gpio4>;
interrupts = <28 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "host-wake";
@@ -239,10 +241,15 @@
MX93_PAD_SD3_DATA1__USDHC3_DATA1 0x4000139e
MX93_PAD_SD3_DATA2__USDHC3_DATA2 0x4000139e
MX93_PAD_SD3_DATA3__USDHC3_DATA3 0x4000139e
+ >;
+ };
+
+ pinctrl_wifi: wifigrp {
+ fsl,pins = <
/* WL_EN */
- MX93_PAD_CCM_CLKO1__GPIO3_IO26 0x059e
+ MX93_PAD_CCM_CLKO1__GPIO3_IO26 0x059e
/* WL_GPIO0 */
- MX93_PAD_CCM_CLKO3__GPIO4_IO28 0x1200
+ MX93_PAD_CCM_CLKO3__GPIO4_IO28 0x1200
>;
};
};
diff --git a/arch/arm/dts/imx93-opos93dev.dts b/arch/arm/dts/imx93-opos93dev-opos93spdev-common.dtsi
similarity index 82%
copy from arch/arm/dts/imx93-opos93dev.dts
copy to arch/arm/dts/imx93-opos93dev-opos93spdev-common.dtsi
index d047c2b99b..629c866194 100644
--- a/arch/arm/dts/imx93-opos93dev.dts
+++ b/arch/arm/dts/imx93-opos93dev-opos93spdev-common.dtsi
@@ -3,16 +3,10 @@
// Copyright 2024 Armadeus Systems <su...@ar...>
//
-/dts-v1/;
-
#include <dt-bindings/leds/common.h>
#include <dt-bindings/usb/pd.h>
-#include "imx93-opos93.dtsi"
/ {
- model = "Armadeus OPOS93 SoM on OPOS93 Dev board";
- compatible = "armadeus,imx93-opos93dev", "armadeus,imx93-opos93", "fsl,imx93";
-
backlight: backlight {
compatible = "pwm-backlight";
pwms = <&tpm1 2 10000000>;
@@ -26,19 +20,6 @@
stdout-path = &lpuart1;
};
- gpio-keys {
- compatible = "gpio-keys";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio_keys>;
-
- user-button {
- label = "User button";
- gpios = <&gpio4 23 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_MISC>;
- wakeup-source;
- };
- };
-
gpio-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -82,15 +63,6 @@
regulator-max-microvolt = <3300000>;
vin-supply = <®_3v3_som>;
};
-
- reg_1v2: regulator-1v2 {
- compatible = "regulator-fixed";
- regulator-name = "reg_1v2";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- vin-supply = <®_3v3>;
- };
-
};
&flexcan1 {
@@ -190,12 +162,6 @@
>;
};
- pinctrl_gpio_keys: gpiokeysgrp {
- fsl,pins = <
- MX93_PAD_ENET2_RXC__GPIO4_IO23 0x1000
- >;
- };
-
pinctrl_gpio_leds: gpioledsgrp {
fsl,pins = <
MX93_PAD_GPIO_IO27__GPIO2_IO27 0x039e
@@ -244,16 +210,6 @@
>;
};
- pinctrl_sai2: sai2grp {
- fsl,pins = <
- MX93_PAD_ENET2_TXC__SAI2_TX_BCLK 0x1200
- MX93_PAD_ENET2_TX_CTL__SAI2_TX_SYNC 0x1200
- MX93_PAD_ENET2_TD3__SAI2_RX_DATA00 0x1200
- MX93_PAD_ENET2_RX_CTL__SAI2_TX_DATA00 0x031e
- MX93_PAD_ENET2_RD2__SAI2_MCLK 0x031e
- >;
- };
-
pinctrl_touchscreen: touchscreengrp {
fsl,pins = <
/* TOUCH_RST */
diff --git a/arch/arm/dts/imx93-opos93dev.dts b/arch/arm/dts/imx93-opos93dev.dts
index d047c2b99b..5c8cbbd452 100644
--- a/arch/arm/dts/imx93-opos93dev.dts
+++ b/arch/arm/dts/imx93-opos93dev.dts
@@ -5,27 +5,13 @@
/dts-v1/;
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/usb/pd.h>
#include "imx93-opos93.dtsi"
+#include "imx93-opos93dev-opos93spdev-common.dtsi"
/ {
model = "Armadeus OPOS93 SoM on OPOS93 Dev board";
compatible = "armadeus,imx93-opos93dev", "armadeus,imx93-opos93", "fsl,imx93";
- backlight: backlight {
- compatible = "pwm-backlight";
- pwms = <&tpm1 2 10000000>;
- power-supply = <®_5v>;
- brightness-levels = <0 20 40 60 70 80 90 100>;
- num-interpolated-steps = <20>;
- default-brightness-level = <50>;
- };
-
- chosen {
- stdout-path = &lpuart1;
- };
-
gpio-keys {
compatible = "gpio-keys";
pinctrl-names = "default";
@@ -38,254 +24,12 @@
wakeup-source;
};
};
-
- gpio-leds {
- compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_gpio_leds>;
-
- led-0 {
- gpios = <&gpio2 27 GPIO_ACTIVE_LOW>;
- color = <LED_COLOR_ID_GREEN>;
- function = LED_FUNCTION_HEARTBEAT;
- linux,default-trigger = "heartbeat";
- };
- };
-
- reg_5v_usb: regulator-5v-usb {
- compatible = "regulator-fixed";
- regulator-name = "reg_5v_usb";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- };
-
- reg_5v: regulator-5v {
- compatible = "regulator-fixed";
- regulator-name = "reg_5v";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <®_5v_usb>;
- };
-
- reg_3v3_som: regulator-3v3-som {
- compatible = "regulator-fixed";
- regulator-name = "reg_3v3_som";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <®_5v_usb>;
- };
-
- reg_3v3: regulator-3v3 {
- compatible = "regulator-fixed";
- regulator-name = "reg_3v3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- vin-supply = <®_3v3_som>;
- };
-
- reg_1v2: regulator-1v2 {
- compatible = "regulator-fixed";
- regulator-name = "reg_1v2";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- vin-supply = <®_3v3>;
- };
-
-};
-
-&flexcan1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_flexcan1>;
- status = "okay";
-};
-
-&lpi2c1 {
- clock-frequency = <400000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lpi2c1>;
- status = "okay";
-};
-
-&lpi2c3 {
- clock-frequency = <400000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lpi2c3>;
- status = "okay";
-};
-
-&lpi2c5 {
- clock-frequency = <400000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lpi2c5>;
- status = "okay";
-};
-
-&lpspi1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_lpspi1>;
- cs-gpios = <0>;
- status = "okay";
-
- spi@0 {
- compatible = "spidev";
- reg = <0>;
- spi-max-frequency = <5000000>;
- };
-};
-
-/* console */
-&lpuart1 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1>;
- status = "okay";
-};
-
-&lpuart4 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart4>;
- status = "okay";
-};
-
-&tpm1 {
- #pwm-cells = <2>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_tpm1>;
- status = "okay";
-};
-
-&usbotg1 {
- dr_mode = "otg";
- hnp-disable;
- srp-disable;
- adp-disable;
- usb-role-switch;
- disable-over-current;
- status = "okay";
-};
-
-&usbotg2 {
- dr_mode = "host";
- hnp-disable;
- srp-disable;
- adp-disable;
- disable-over-current;
- status = "okay";
-};
-
-&usdhc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc2>;
- bus-width = <4>;
- no-1-8-v;
- cd-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
- disable-wp;
- status = "okay";
};
&iomuxc {
- pinctrl_flexcan1: can1grp {
- fsl,pins = <
- MX93_PAD_PDM_CLK__CAN1_TX 0x039e
- MX93_PAD_PDM_BIT_STREAM0__CAN1_RX 0x139e
- >;
- };
-
pinctrl_gpio_keys: gpiokeysgrp {
fsl,pins = <
MX93_PAD_ENET2_RXC__GPIO4_IO23 0x1000
>;
};
-
- pinctrl_gpio_leds: gpioledsgrp {
- fsl,pins = <
- MX93_PAD_GPIO_IO27__GPIO2_IO27 0x039e
- >;
- };
-
- pinctrl_lpi2c1: lpi2c1grp {
- fsl,pins = <
- MX93_PAD_I2C1_SCL__LPI2C1_SCL 0x4000199e
- MX93_PAD_I2C1_SDA__LPI2C1_SDA 0x4000199e
- >;
- };
-
- pinctrl_lpi2c3: lpi2c3grp {
- fsl,pins = <
- MX93_PAD_GPIO_IO28__LPI2C3_SDA 0x4000199e
- MX93_PAD_GPIO_IO29__LPI2C3_SCL 0x4000199e
- >;
- };
-
- pinctrl_lpi2c5: lpi2c5grp {
- fsl,pins = <
- MX93_PAD_GPIO_IO22__LPI2C5_SDA 0x4000199e
- MX93_PAD_GPIO_IO23__LPI2C5_SCL 0x4000199e
- >;
- };
-
- pinctrl_lpspi1: lpspi1grp {
- fsl,pins = <
- MX93_PAD_SAI1_TXC__LPSPI1_SIN 0x119e
- MX93_PAD_SAI1_TXFS__LPSPI1_PCS0 0x019e
- MX93_PAD_SAI1_RXD0__LPSPI1_SOUT 0x019e
- MX93_PAD_SAI1_TXD0__LPSPI1_SCK 0x019e
- >;
- };
-
- pinctrl_panel: panelgrp {
- fsl,pins = <
- MX93_PAD_WDOG_ANY__GPIO1_IO15 0x039e
- >;
- };
-
- pinctrl_tpm1: tpm1grp {
- fsl,pins = <
- MX93_PAD_UART2_RXD__TPM1_CH2 0x019e
- >;
- };
-
- pinctrl_sai2: sai2grp {
- fsl,pins = <
- MX93_PAD_ENET2_TXC__SAI2_TX_BCLK 0x1200
- MX93_PAD_ENET2_TX_CTL__SAI2_TX_SYNC 0x1200
- MX93_PAD_ENET2_TD3__SAI2_RX_DATA00 0x1200
- MX93_PAD_ENET2_RX_CTL__SAI2_TX_DATA00 0x031e
- MX93_PAD_ENET2_RD2__SAI2_MCLK 0x031e
- >;
- };
-
- pinctrl_touchscreen: touchscreengrp {
- fsl,pins = <
- /* TOUCH_RST */
- MX93_PAD_GPIO_IO25__GPIO2_IO25 0x019e
- /* TOUCH_INT# */
- MX93_PAD_GPIO_IO26__GPIO2_IO26 0x1000
- >;
- };
-
- pinctrl_uart1: uart1grp {
- fsl,pins = <
- MX93_PAD_UART1_RXD__LPUART1_RX 0x139e
- MX93_PAD_UART1_TXD__LPUART1_TX 0x039e
- >;
- };
-
- pinctrl_uart4: uart4grp {
- fsl,pins = <
- MX93_PAD_GPIO_IO14__LPUART4_TX 0x039e
- MX93_PAD_GPIO_IO15__LPUART4_RX 0x139e
- >;
- };
-
- pinctrl_usdhc2: usdhc2grp {
- fsl,pins = <
- MX93_PAD_SD2_CLK__USDHC2_CLK 0x019e
- MX93_PAD_SD2_CMD__USDHC2_CMD 0x119e
- MX93_PAD_SD2_DATA0__USDHC2_DATA0 0x119e
- MX93_PAD_SD2_DATA1__USDHC2_DATA1 0x119e
- MX93_PAD_SD2_DATA2__USDHC2_DATA2 0x119e
- MX93_PAD_SD2_DATA3__USDHC2_DATA3 0x119e
- MX93_PAD_PDM_BIT_STREAM1__GPIO1_IO10 0x1000
- >;
- };
};
diff --git a/arch/arm/dts/imx93-opos93sp-u-boot.dtsi b/arch/arm/dts/imx93-opos93sp-u-boot.dtsi
new file mode 100644
index 0000000000..26734f1c4d
--- /dev/null
+++ b/arch/arm/dts/imx93-opos93sp-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2024 Armadeus Systems <co...@ar...>
+//
+
+#include "imx93-opos93-u-boot.dtsi"
diff --git a/arch/arm/dts/imx93-opos93sp.dtsi b/arch/arm/dts/imx93-opos93sp.dtsi
new file mode 100644
index 0000000000..80c9d26c14
--- /dev/null
+++ b/arch/arm/dts/imx93-opos93sp.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2024 Armadeus Systems <su...@ar...>
+
+#include "imx93-opos93.dtsi"
+
+&pinctrl_wifi {
+ fsl,pins = <
+ /* WL_EN */
+ MX93_PAD_SD2_VSELECT__GPIO3_IO19 0x059e
+ /* WL_GPIO0 */
+ MX93_PAD_CCM_CLKO3__GPIO4_IO28 0x1200
+ >;
+};
diff --git a/arch/arm/dts/imx93-opos93spdev-u-boot.dtsi b/arch/arm/dts/imx93-opos93spdev-u-boot.dtsi
new file mode 100644
index 0000000000..343b36bd50
--- /dev/null
+++ b/arch/arm/dts/imx93-opos93spdev-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2024 Armadeus Systems <co...@ar...>
+ */
+
+#include "imx93-opos93sp-u-boot.dtsi"
diff --git a/arch/arm/dts/imx93-opos93spdev.dts b/arch/arm/dts/imx93-opos93spdev.dts
new file mode 100644
index 0000000000..908edcadcd
--- /dev/null
+++ b/arch/arm/dts/imx93-opos93spdev.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2024 Armadeus Systems <su...@ar...>
+//
+
+/dts-v1/;
+
+#include "imx93-opos93sp.dtsi"
+#include "imx93-opos93dev-opos93spdev-common.dtsi"
+
+/ {
+ model = "Armadeus OPOS93SP SoM on OPOS93SP Dev board";
+ compatible = "armadeus,imx93-opos93spdev", "armadeus,imx93-opos93sp", "fsl,imx93";
+};
diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
index 230d08c368..0a14c4f245 100644
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@ -26,6 +26,10 @@ config IMX93_OPOS93
select OF_SYSTEM_SETUP
select OF_BOARD_FIXUP
+config IMX93_OPOS93SP
+ bool
+ select IMX93_OPOS93
+
config SYS_SOC
default "imx9"
@@ -42,9 +46,14 @@ config TARGET_OPOS93DEV
bool "Armadeus Systems OPOS93 Dev board"
select IMX93_OPOS93
+config TARGET_OPOS93SPDEV
+ bool "Armadeus Systems OPOS93SP Dev board"
+ select IMX93_OPOS93SP
+
endchoice
source "board/armadeus/opos93dev/Kconfig"
+source "board/armadeus/opos93spdev/Kconfig"
source "board/freescale/imx93_evk/Kconfig"
endif
diff --git a/board/armadeus/opos93spdev/Kconfig b/board/armadeus/opos93spdev/Kconfig
new file mode 100644
index 0000000000..01c8f9a2b2
--- /dev/null
+++ b/board/armadeus/opos93spdev/Kconfig
@@ -0,0 +1,12 @@
+if TARGET_OPOS93SPDEV
+
+config SYS_BOARD
+ default "opos93spdev"
+
+config SYS_VENDOR
+ default "armadeus"
+
+config SYS_CONFIG_NAME
+ default "opos93spdev"
+
+endif
diff --git a/board/armadeus/opos93spdev/MAINTAINERS b/board/armadeus/opos93spdev/MAINTAINERS
new file mode 100644
index 0000000000..195785c91d
--- /dev/null
+++ b/board/armadeus/opos93spdev/MAINTAINERS
@@ -0,0 +1,6 @@
+OPOS93SPDev BOARD
+M: Sébastien Szymanski <seb...@ar...>
+S: Maintained
+F: board/armadeus/opos93spdev/
+F: include/configs/opos93spdev.h
+F: configs/opos93spdev_defconfig
diff --git a/board/armadeus/opos93spdev/Makefile b/board/armadeus/opos93spdev/Makefile
new file mode 100644
index 0000000000..9449da41f0
--- /dev/null
+++ b/board/armadeus/opos93spdev/Makefile
@@ -0,0 +1,7 @@
+#
+# Copyright 2024 Armadeus Systems <co...@ar...>
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-y += opos93spdev.o
diff --git a/board/armadeus/opos93spdev/opos93spdev.c b/board/armadeus/opos93spdev/opos93spdev.c
new file mode 100644
index 0000000000..155d4de1b6
--- /dev/null
+++ b/board/armadeus/opos93spdev/opos93spdev.c
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+//
+// Copyright 2024 Armadeus Systems <co...@ar...>
+//
+
diff --git a/board/armadeus/opos93spdev/opos93spdev.env b/board/armadeus/opos93spdev/opos93spdev.env
new file mode 100644
index 0000000000..d3f23f0321
--- /dev/null
+++ b/board/armadeus/opos93spdev/opos93spdev.env
@@ -0,0 +1,128 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+/*
+ * Copyright (C) 2024 Armadeus Systems <co...@ar...>
+ */
+
+/* Environment is stored in the eMMC boot1 partition */
+
+env_version=1
+consoledev=ttyLP0
+board_name=opos93sp
+fdt_addr=0x88000000
+fdt_high=0xffffffff
+fdt_name=opos93spdev
+initrd_high=0xffffffff
+ip_dyn=yes
+stdin=serial
+stdout=serial
+stderr=serial
+mmcdev=0
+mmcpart=2
+mmcroot=/dev/mmcblk0p2 ro
+mmcrootfstype=ext4 rootwait
+kernelimg=opos93sp-linux.bin
+check_env=if test -n ${flash_env_version};
+ then env default env_version;
+ else env set flash_env_version ${env_version}; env save;
+ fi;
+ if itest ${flash_env_version} != ${env_version}; then
+ echo "*** Warning - Environment version
+ change suggests: run flash_reset_env; reset";
+ env default flash_reset_env;
+ else exit; fi;
+flash_reset_env=env default -f -a && saveenv &&
+ echo Environment variables erased!
+download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin
+flash_uboot=
+ if mmc dev 0 1; then
+ setexpr sz ${filesize} / 0x200;
+ setexpr sz ${sz} + 1;
+ if mmc write ${loadaddr} 0x0 ${sz}; then
+ echo Flashing of U-Boot image succeed;
+ else echo Flashing of U-Boot image failed;
+ fi;
+ fi;
+update_uboot=run download_uboot flash_uboot
+download_kernel=tftpboot ${loadaddr} ${kernelimg}
+flash_kernel=
+ if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/${kernelimg} ${filesize}; then
+ echo kernel update succeed;
+ else echo kernel update failed;
+ fi;
+update_kernel=run download_kernel flash_kernel
+download_dtb=tftpboot ${fdt_addr} imx93-${fdt_name}.dtb
+flash_dtb=
+ if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/imx93-${fdt_name}.dtb ${filesize}; then
+ echo dtb update succeed;
+ else echo dtb update in failed;
+ fi;
+update_dtb=run download_dtb flash_dtb
+download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4
+flash_rootfs=
+ if mmc dev 0 0; then
+ setexpr nbblocks ${filesize} / 0x200;
+ setexpr nbblocks ${nbblocks} + 1;
+ if mmc write ${loadaddr} 0x100800 ${nbblocks}; then
+ echo Flashing of rootfs image succeed;
+ else echo Flashing of rootfs image failed;
+ fi;
+ fi;
+update_rootfs=run download_rootfs flash_rootfs
+flash_failsafe=
+ if mmc dev 0 0; then
+ setexpr nbblocks ${filesize} / 0x200;
+ setexpr nbblocks ${nbblocks} + 1;
+ if mmc write ${loadaddr} 0x800 ${nbblocks}; then
+ echo Flashing of rootfs image in failsafe partition succeed;
+ else echo Flashing of rootfs image in failsafe partition failed;
+ fi;
+ fi;
+update_failsafe=run download_rootfs flash_failsafe
+download_userdata=tftpboot ${loadaddr} ${board_name}-user_data.ext4
+flash_userdata=
+ if mmc dev 0 0; then
+ setexpr nbblocks ${filesize} / 0x200;
+ setexpr nbblocks ${nbblocks} + 1;
+ if mmc write ${loadaddr} 0 ${nbblocks}; then
+ echo Flashing of user_data image succeed;
+ else echo Flashing of user_data image failed;
+ fi;
+ fi;
+update_userdata=run download_userdata flash_userdata; mmc rescan
+erase_userdata=
+ if mmc dev 0 0; then
+ echo Erasing eMMC User Data partition, no way out...;
+ mw ${loadaddr} 0 0x200000;
+ mmc write ${loadaddr} 0 0x1000;
+ mmc write ${loadaddr} 0x800 0x1000;
+ mmc write ${loadaddr} 0x40800 0x1000;
+ mmc write ${loadaddr} 0x440800 0x1000;
+ fi;
+ mmc rescan
+update_all=run update_rootfs update_uboot
+initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}
+addipargs=setenv bootargs ${bootargs}
+ ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
+addmmcargs=setenv bootargs ${bootargs} root=${mmcroot}
+ rootfstype=${mmcrootfstype}
+emmcboot=run initargs; run addmmcargs;
+ load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/${kernelimg} &&
+ load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/imx93-${fdt_name}.dtb &&
+ booti ${loadaddr} - ${fdt_addr};
+emmcsafeboot=setenv mmcpart 1; setenv mmcroot /dev/mmcblk0p1 ro; run emmcboot;
+addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw
+ nfsroot=${serverip}:${rootpath},vers=4,tcp,rsize=4096,wsize=4096
+nfsboot=run initargs; run addnfsargs addipargs;
+ nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} &&
+ nfs ${fdt_addr} ${serverip}:${rootpath}/boot/imx93-${fdt_name}.dtb &&
+ booti ${loadaddr} - ${fdt_addr};
+bitstream_path=/lib/firmware/fpga/
+bitstream_name=bitstream.bin
+download_bitstream=tftpboot ${loadaddr} ${bitstream_name}
+flash_bitstream=
+ if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bitstream_path}${bitstream_name} ${filesize}; then
+ echo bitstream update succeed;
+ else echo bitstream update failed;
+ fi;
+update_bitstream=run download_bitstream flash_bitstream
diff --git a/configs/opos93spdev_defconfig b/configs/opos93spdev_defconfig
new file mode 100644
index 0000000000..612cd4d55e
--- /dev/null
+++ b/configs/opos93spdev_defconfig
@@ -0,0 +1,168 @@
+CONFIG_ARM=y
+CONFIG_ARCH_IMX9=y
+CONFIG_TEXT_BASE=0x80200000
+CONFIG_SYS_MALLOC_LEN=0x2000000
+CONFIG_SYS_MALLOC_F_LEN=0x18000
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0x0
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="imx93-opos93spdev"
+CONFIG_SPL_TEXT_BASE=0x2049A000
+CONFIG_AHAB_BOOT=y
+CONFIG_TARGET_OPOS93SPDEV=y
+CONFIG_SYS_MONITOR_LEN=524288
+CONFIG_SPL_SERIAL=y
+CONFIG_SPL_DRIVERS_MISC=y
+CONFIG_SPL_STACK=0x20519dd0
+CONFIG_SPL=y
+CONFIG_ENV_OFFSET_REDUND=0x20000
+CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
+CONFIG_SYS_LOAD_ADDR=0x80400000
+CONFIG_SYS_MEMTEST_START=0x80000000
+CONFIG_SYS_MEMTEST_END=0x90000000
+CONFIG_REMAKE_ELF=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_BOOTDELAY=5
+CONFIG_BOOTCOMMAND="run emmcboot"
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="run check_env"
+CONFIG_DEFAULT_FDT_FILE="imx93-opos93spdev.dtb"
+CONFIG_ARCH_MISC_INIT=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SPL_MAX_SIZE=0x26000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x2051a000
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+CONFIG_SPL_BOARD_INIT=y
+CONFIG_SPL_BOOTROM_SUPPORT=y
+CONFIG_SPL_LOAD_IMX_CONTAINER=y
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_SYS_MALLOC=y
+CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
+CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x83200000
+CONFIG_SPL_SYS_MALLOC_SIZE=0x80000
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1040
+CONFIG_SPL_I2C=y
+CONFIG_SPL_POWER=y
+CONFIG_SPL_WATCHDOG=y
+CONFIG_SYS_PROMPT="BIOS> "
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_CBSIZE=2048
+CONFIG_SYS_PBSIZE=2074
+CONFIG_CMD_ERASEENV=y
+# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_ADC=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_FUSE=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+CONFIG_CMD_NFS=y
+CONFIG_SYS_DISABLE_AUTOLOAD=y
+CONFIG_CMD_SNTP=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_RTC=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_GETTIME=y
+CONFIG_CMD_TIMER=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_HASH=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_IS_NOWHERE=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_USE_ETHPRIME=y
+CONFIG_ETHPRIME="eth0"
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_BOOTP_SERVERIP=y
+CONFIG_USE_ROOTPATH=y
+CONFIG_ROOTPATH="/tftpboot/opos93sp-root"
+CONFIG_SPL_DM=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_ADC_IMX93=y
+CONFIG_SPL_CLK_IMX93=y
+CONFIG_CLK_IMX93=y
+CONFIG_CPU=y
+CONFIG_CPU_IMX=y
+CONFIG_IMX9_LPDDR4X=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x80400000
+CONFIG_FASTBOOT_BUF_SIZE=0x1E000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_UUU_SUPPORT=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
+CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+CONFIG_IMX_RGPIO2P=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_IMX_LPI2C=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_ES_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_FSL_USDHC=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_PHY_GIGE=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_DWC_ETH_QOS_IMX=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
+CONFIG_MII=y
+CONFIG_RMII=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_IMX93=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_EMULATION=y
+CONFIG_DM_SERIAL=y
+CONFIG_FSL_LPUART=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
+CONFIG_SYSRESET_PSCI=y
+CONFIG_DM_THERMAL=y
+CONFIG_IMX_TMU=y
+CONFIG_USB=y
+# CONFIG_SPL_DM_USB is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_LAN75XX=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_VENDOR_NUM=0x1fc9
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
+CONFIG_CI_UDC=y
+CONFIG_ULP_WATCHDOG=y
+CONFIG_WDT=y
+CONFIG_LZO=y
+CONFIG_BZIP2=y
diff --git a/include/configs/opos93dev.h b/include/configs/opos93.h
similarity index 80%
copy from include/configs/opos93dev.h
copy to include/configs/opos93.h
index b56afb8322..80841794fc 100644
--- a/include/configs/opos93dev.h
+++ b/include/configs/opos93.h
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * Copyright 2023 Armadeus Systems <co...@ar...>
+ * Copyright 2024 Armadeus Systems <co...@ar...>
*/
-#ifndef __OPOS93DEV_CONFIG_H
-#define __OPOS93DEV_CONFIG_H
+#ifndef __OPOS93_CONFIG_H
+#define __OPOS93_CONFIG_H
#include <linux/sizes.h>
#include <linux/stringify.h>
@@ -28,4 +28,4 @@
#define PHY_ANEG_TIMEOUT 20000
#endif
-#endif /*__OPOS93DEV_CONFIG_H */
+#endif /*__OPOS93_CONFIG_H */
diff --git a/include/configs/opos93dev.h b/include/configs/opos93dev.h
index b56afb8322..140ecd6d5e 100644
--- a/include/configs/opos93dev.h
+++ b/include/configs/opos93dev.h
@@ -1,31 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * Copyright 2023 Armadeus Systems <co...@ar...>
+ * Copyright 2024 Armadeus Systems <co...@ar...>
*/
#ifndef __OPOS93DEV_CONFIG_H
#define __OPOS93DEV_CONFIG_H
-#include <linux/sizes.h>
-#include <linux/stringify.h>
-#include <asm/arch/imx-regs.h>
-
-#define CFG_SYS_UBOOT_BASE \
- (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-
-/* Link Definitions */
-#define CFG_SYS_INIT_RAM_ADDR 0x80000000
-#define CFG_SYS_INIT_RAM_SIZE 0x200000
-
-#define CFG_SYS_SDRAM_BASE 0x80000000
-#define PHYS_SDRAM 0x80000000
-#define PHYS_SDRAM_SIZE 0x20000000 /* 512MB DDR */
-
-/* Using ULP WDOG for reset */
-#define WDOG_BASE_ADDR WDG3_BASE_ADDR
-
-#if defined(CONFIG_CMD_NET)
-#define PHY_ANEG_TIMEOUT 20000
-#endif
+#include "opos93.h"
#endif /*__OPOS93DEV_CONFIG_H */
diff --git a/include/configs/opos93spdev.h b/include/configs/opos93spdev.h
new file mode 100644
index 0000000000..2ecf0e87d7
--- /dev/null
+++ b/include/configs/opos93spdev.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2024 Armadeus Systems <co...@ar...>
+*/
+
+#ifndef __OPOS93SPDEV_CONFIG_H
+#define __OPOS93SPDEV_CONFIG_H
+
+#include "opos93.h"
+
+#endif /*__OPOS93SPDEV_CONFIG_H */
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-11-27 18:22:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 21fc8a897a3a112dc639cb4cbb1819ebf8d83eb2 (commit)
via 87ac8a384a907da80f15f657dd5de3cbb59e508c (commit)
via f4e79d63df82855717d8273f1c194aad7286c80f (commit)
via 8fc6ec552d7d9997b5f00c6a32a5e06b51526a58 (commit)
from 85e9d21536b31c487a46f087769426543e1a72b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 21fc8a897a3a112dc639cb4cbb1819ebf8d83eb2
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 27 19:18:52 2024 +0100
[BUILDROOT] Bump to BR 2024.02.8
commit 87ac8a384a907da80f15f657dd5de3cbb59e508c
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 27 19:17:51 2024 +0100
[BUILD] help: add OPOS93 and OPOS93Dev
commit f4e79d63df82855717d8273f1c194aad7286c80f
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 27 14:02:57 2024 +0100
[LINUX] opos93-linux-legacy-6.1.fragment: drop CONFIG_FW_LOADER_USER_HELPER
commit 8fc6ec552d7d9997b5f00c6a32a5e06b51526a58
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 27 13:51:33 2024 +0100
[BUILDROOT] opos93-legacy: remove Qt from defconfig file
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 ++-
buildroot/configs/opos93-legacy-6.1_defconfig | 12 ------------
.../device/armadeus/opos93/opos93-linux-legacy-6.1.fragment | 2 ++
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index adf575c0c..b4e668da4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2024.02
-BUILDROOT_MINOR_VERSION ?= 7
+BUILDROOT_MINOR_VERSION ?= 8
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
@@ -98,6 +98,7 @@ help:
@echo ' opos6ulnano_defconfig - get default config for an OPOS6ULNANO+Dev kit (4.9+ mainline/vanilla kernel)'
@echo ' opos6ulsp_defconfig - get default config for an OPOS6ULSP+Dev kit (4.19+ mainline/vanilla kernel)'
@echo ' opos8mm-legacy-5.10_defconfig - get default config for an OPOS8MM+Dev kit (5.10 NXP kernel)'
+ @echo ' opos93-legacy-6.1_defconfig - get default config for an OPOS93+Dev kit (6.1 NXP kernel)'
@echo ''
@echo 'Build:'
@echo ' all - make world '
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 1073a82ae..70a7659fd 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -70,17 +70,6 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS=y
BR2_PACKAGE_FB_TEST_APP=y
-BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_WIDGETS=y
-BR2_PACKAGE_QT5BASE_FONTCONFIG=y
-BR2_PACKAGE_QT5BASE_GIF=y
-BR2_PACKAGE_QT5BASE_JPEG=y
-BR2_PACKAGE_QT5BASE_PNG=y
-BR2_PACKAGE_QT5MULTIMEDIA=y
-BR2_PACKAGE_QT5QUICKCONTROLS2=y
-BR2_PACKAGE_QT5SERIALPORT=y
-BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
-BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y
BR2_PACKAGE_IMX_FIRMWARE=y
BR2_PACKAGE_IMX_FIRMWARE_IW416=y
BR2_PACKAGE_LINUX_FIRMWARE=y
@@ -101,7 +90,6 @@ BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBNFNETLINK=y
BR2_PACKAGE_LIBNL_TOOLS=y
-BR2_PACKAGE_PCRE2_32=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
index e6c0e539f..b54f4dda8 100644
--- a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
@@ -1,5 +1,7 @@
CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
CONFIG_PWM_IMX_TPM=y
+# CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is no set
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_SND_SOC_FSL_SAI=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-11-14 14:27:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 85e9d21536b31c487a46f087769426543e1a72b1 (commit)
from aaf8d2e816c1872f5b0b341760d5128c9892dbaf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85e9d21536b31c487a46f087769426543e1a72b1
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Nov 14 15:25:00 2024 +0100
[BUILDROOT] opos93-legacy: fix defconfig
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 436555bc9..1073a82ae 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -3,9 +3,10 @@ BR2_cortex_a55=y
BR2_ARM_FPU_VFPV4D16=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_WGET="wget --passive-ftp -nd -t 3"
-BR2_DL_DIR="/home/sszy/development/buildroot-download"
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TARGET_GENERIC_HOSTNAME="opos93"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-11-13 13:17:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via aaf8d2e816c1872f5b0b341760d5128c9892dbaf (commit)
from 569af1eb1753dc19569f460b6896cb268f3ed36b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aaf8d2e816c1872f5b0b341760d5128c9892dbaf
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 13 14:15:34 2024 +0100
[BUILDROOT] opos93-legacy: bump U-Boot to 4be1b355534698ab738ab74e82d2000550ce7d04
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 180926522..436555bc9 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -148,7 +148,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b7222197d4dbb294d0accb2d1012ce6502439898"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="4be1b355534698ab738ab74e82d2000550ce7d04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
BR2_TARGET_UBOOT_SPL=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-11-13 12:03:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 4be1b355534698ab738ab74e82d2000550ce7d04 (commit)
via 81914fa8e182d456b1c68e446e0dd7da8f2dd9a5 (commit)
via 67c04f0ae2235b5a3960e6a1eb5f4a3114fbe9f3 (commit)
via 69af6c83b8b33776886380faf1b441cd5f789421 (commit)
via bdf64093bd36c44737b7808a860ae7b75abe533c (commit)
via 5054cf3ba2178ffc9013ab5fea9bd592c92727d2 (commit)
via 67c1e47e512e7348676e3c3b416aca3bd91f827d (commit)
via 25d11bb117a222f0a5d92ecfc82cb85c85a7005f (commit)
via 52814d53ab98c2fb5b84d7ca034fd250677b73dc (commit)
via 15b2cee915148f78736205f835ab435531d35561 (commit)
via a91bc0fd7a4c847167932f58d7b2e0f06af1ec3e (commit)
via 9311a40e6176758b48605dcc5e890b77f6f5806d (commit)
via 2215fe740f71832e1b340f132029c2a8e0e7dfeb (commit)
via 9a74b4723abaea74b6e31d268c0f01e73b1837f1 (commit)
via be0386b08dac39380da00ec31d29004990e4a998 (commit)
via 8ab6fa52806f1833c33e4f5c766cd0e98cdbe30a (commit)
via ed08e731239ea1890817323beedef76c4cca6eb2 (commit)
via f158f14f78e688fc68d51ea8c5800ccab13fd1e4 (commit)
via 21770d5b93791a429062381be0c91dcf577ba2b3 (commit)
via dd6e77a8d66bdcbee77ca6d8f56638575ae29ec3 (commit)
via 7e05a33df47bb7b3944179d54f72b56aa24a3f65 (commit)
via a046344ef5880353772affada28c9da6fe649bec (commit)
via 406a451e8e2aacd98f578fdaf4f082f4acf556d9 (commit)
via 4ff376c0e443a094e6804d317634b568ad3ce73e (commit)
from 750950a0beb840862c3642477038361ff63d2520 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4be1b355534698ab738ab74e82d2000550ce7d04
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Nov 12 14:43:08 2024 +0100
imx: fix disable_thermal_cpu_nodes()
Pass correct type to fdt_setprop. This fixes the following error seen on
Linux:
[ 1.359376] OF: /thermal-zones/cpu-thermal/cooling-maps/map0: could not find phandle -1058540899
[ 1.368221] thermal_sys: Add a cooling_device property with at least one device
[ 1.375526] thermal thermal_zone0: binding zone cpu-thermal with cdev thermal-devfreq-0 failed:-2
Fixes: ed08e731239e ("imx: Generalize disable_cpu_nodes")
commit 81914fa8e182d456b1c68e446e0dd7da8f2dd9a5
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Nov 8 12:37:45 2024 +0100
imx9: opos93: add opos93 with i.MX9301 and 512MB of RAM support
commit 67c04f0ae2235b5a3960e6a1eb5f4a3114fbe9f3
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Nov 8 12:24:22 2024 +0100
imx9: opos93: rename lpddr4 timings
commit 69af6c83b8b33776886380faf1b441cd5f789421
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Nov 8 12:06:09 2024 +0100
configs: opos93dev_defconfig: enable ARCH_MISC_INIT
commit bdf64093bd36c44737b7808a860ae7b75abe533c
Author: Michael Trimarchi <mi...@am...>
Date: Tue Jul 2 12:26:18 2024 +0200
clk: imx: Fix wrong flags assignment clk-composite-93
The mux flags (u8), div flags (u8), and gate flags (u8) are not the clk
flags (unsigned long). They have different meanings
Signed-off-by: Michael Trimarchi <mi...@am...>
(cherry picked from commit a66b2ce6bda1c91754a4a0cfe9ec849a387b279e)
commit 5054cf3ba2178ffc9013ab5fea9bd592c92727d2
Author: Ye Li <ye...@nx...>
Date: Thu Sep 19 12:01:29 2024 +0800
imx9: Add 233Mhz DDR PLL frequency
To support 1.866GTS LPDDR4x timing script, need to add 233Mhz freq
to DDR PLL for second mission point at 933MTS. Otherwise DDR training
will fail.
Reviewed-by: Peng Fan <pen...@nx...>
Signed-off-by: Ye Li <ye...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 1b631589d4844a129e1019160fef7aeda6fb50ff)
commit 67c1e47e512e7348676e3c3b416aca3bd91f827d
Author: Ye Li <ye...@nx...>
Date: Thu Sep 19 12:01:33 2024 +0800
imx93: Add Low performance parts 9302/9301 support
Add support for iMX93 low performance parts 9302 and 9301 which
restrict to low drive voltage only.
The parts run A55 max speed at 900Mhz and M33 at 133Mhz, have NPU
and A55 core1 (9301) disabled.
Reviewed-by: Peng Fan <pen...@nx...>
Signed-off-by: Ye Li <ye...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
[sszy: add disable_lpm() as done by downstream]
(cherry picked from commit 5ee773e60b3f5e024d1177d4be52c07d741c228d)
commit 25d11bb117a222f0a5d92ecfc82cb85c85a7005f
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:54 2024 +0800
cpu: imx: implement release_core callback
Release the secondary cores through the PSCI request.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
(cherry picked from commit 8a73b5b680a849193287decf0ca3470fbd764e42)
commit 52814d53ab98c2fb5b84d7ca034fd250677b73dc
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:48 2024 +0800
cpu: sandbox: implement release_core callback
Add empty release CPU core function for testing.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
Reviewed-by: Simon Glass <sj...@ch...>
(cherry picked from commit 3694edcabc4b62717cd71f64caacd4df2dbd5abd)
commit 15b2cee915148f78736205f835ab435531d35561
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:47 2024 +0800
cpu: add release_core callback
Add a new callback release_core to the cpu_ops, which is used to
release a CPU core to run baremetal or RTOS application on a SoC
with multiple CPU cores.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
Reviewed-by: Simon Glass <sj...@ch...>
(cherry picked from commit f2c306cd991a1c383de66ece1dd2301cd6b4b54b)
commit a91bc0fd7a4c847167932f58d7b2e0f06af1ec3e
Author: Peng Fan <pen...@nx...>
Date: Fri Oct 18 15:34:32 2024 +0800
cpu: imx8_cpu: Avoid revision to corrupt device tree
U-Boot device tree is padded just after U-Boot proper.
After the whole stuff loaded to DRAM space, the device tree
area is conflict with BSS region before U-Boot relocation.
So any write to BSS area before reloc_fdt will corrupt the
device tree. Without the fix, there is issue that âbinman_init
failed:-2â on i.MX8MP-EVK board.
Drop 'revision' and use malloc area in cpu_imx_plat->rev.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 9b1cecdd9b6eaf22c4fa268430669ceff0c48786)
commit 9311a40e6176758b48605dcc5e890b77f6f5806d
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:53 2024 +0800
cpu: imx: Add i.MX 8M series SoCs
Add i.MX 8M Mini, Nano and Plus SoCs support.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
(cherry picked from commit 01d94d006a2a9f02e76fb1660a6e8f64731bfe03)
commit 2215fe740f71832e1b340f132029c2a8e0e7dfeb
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:52 2024 +0800
cpu: imx: removed the tail '\n' of the CPU description
Return CPU description string without newline character in the end.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
(cherry picked from commit b7ed7418edb5378fb42a0e3744197b3d6a0383c8)
commit 9a74b4723abaea74b6e31d268c0f01e73b1837f1
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:51 2024 +0800
cpu: imx: fix the CPU type field width
Increase one more bit to cover all CPU types. Otherwise it shows
wrong CPU info on some platforms, such as i.MX8M Plus:
U-Boot 2024.04+g674440bc73e+p0 (Jun 06 2024 - 10:05:34 +0000)
CPU: NXP i.MX8MM Rev1.1 A53 at 4154504685 MHz at 30C
Model: NXP i.MX8MPlus LPDDR4 EVK board
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
(cherry picked from commit 37adedfb2116ed28b49c2581baf0f7eae69b97e1)
commit be0386b08dac39380da00ec31d29004990e4a998
Author: Hou Zhiqiang <Zhi...@nx...>
Date: Thu Aug 1 11:59:50 2024 +0800
cpu: imx: fix the CPU frequency in cpu_imx_get_info()
The cpu_freq stores the current CPU frequency in Hz.
Signed-off-by: Hou Zhiqiang <Zhi...@nx...>
Reviewed-by: Michael Trimarchi <mi...@am...>
(cherry picked from commit dc86c11556c194a6a0beda82ee96549ad66d0aec)
commit 8ab6fa52806f1833c33e4f5c766cd0e98cdbe30a
Author: Peng Fan <pen...@nx...>
Date: Thu Sep 19 12:01:32 2024 +0800
imx9: soc: Disable cpu1 for variants that only has one A55 core
Disale CPU1 for i.MX93 variants that only has one A55 core and update
cooling maps.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 98f948ec531ab42942becd4cfaea63da53a38b73)
commit ed08e731239ea1890817323beedef76c4cca6eb2
Author: Peng Fan <pen...@nx...>
Date: Thu Sep 19 12:01:31 2024 +0800
imx: Generalize disable_cpu_nodes
disable_cpu_nodes could be reused by i.MX9, so move disable_cpu_nodes
out from mach-imx/imx8m/soc.c to mach-imx/fdt.c and update
disable_cpu_nodes to make it easy to support different socs.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit cd9b3de763563f628a2aaedc4b19841970035a21)
commit f158f14f78e688fc68d51ea8c5800ccab13fd1e4
Author: Peng Fan <pen...@nx...>
Date: Thu Sep 19 12:01:30 2024 +0800
imx8m: soc: Drop disable_pmu_cpu_nodes
i.MX8M use PPI for PMU interrupts, there is no reason to update
interrupt-affinity for PMU even interrupt-affinity was wrongly added
to device tree before.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 16fc64b5533e97f0eb43e82113e62b236728d23e)
commit 21770d5b93791a429062381be0c91dcf577ba2b3
Author: Ye Li <ye...@nx...>
Date: Thu Sep 19 12:01:27 2024 +0800
imx9: clock: Update clock init function and sequence
Since we use SPEED GRADE fuse to set A55 frequency, remove the
set_arm_core_low_drive_clk function which has hard coded frequency.
And adjust clock_init called sequence and split it to early and late
functions.
Set the authen register in early function, because CCF driver checks
NS bit.
Set bus and core clock in late function, because the fuse read and
SoC type/rev depend on ELE.
Reviewed-by: Peng Fan <pen...@nx...>
Signed-off-by: Ye Li <ye...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 7872a986e5834bcc387788968e7f9f520f2cb140)
commit dd6e77a8d66bdcbee77ca6d8f56638575ae29ec3
Author: Ye Li <ye...@nx...>
Date: Thu Sep 19 12:01:26 2024 +0800
imx9: soc: Add function to get target voltage mode
Replace the static CONFIG_IMX9_LOW_DRIVE_MODE with runtime target
voltage mode by checking the part's SPEED GRADE fuse.
SPL will configure to highest A55 speed which is indicated by the SPEED
fuse and select corresponding voltage mode.
Reviewed-by: Peng Fan <pen...@nx...>
Signed-off-by: Ye Li <ye...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
[sszy: reduce lcd controller clock as down on downstream]
(cherry picked from commit 46f72ebad960c5b7d66ec3d901fc6c957dd2a395)
commit 7e05a33df47bb7b3944179d54f72b56aa24a3f65
Author: Peng Fan <pen...@nx...>
Date: Thu Sep 19 12:01:25 2024 +0800
imx9: soc: Print ELE information
The boot image includes Edgelock Enclave(ELE) Firmware. Print the
information out to let user know which version firmware is being used.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 3166537ae42006df649c654fd7ceba40554643fa)
commit a046344ef5880353772affada28c9da6fe649bec
Author: Peng Fan <pen...@nx...>
Date: Thu Sep 19 12:01:23 2024 +0800
imx9: soc: Change FSB directly access to fuse API
To support OSCCA enabled part which has disabled FSB access from SOC,
change directly read from FSB to use fuse_read API.
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 2f00c3e493473553cb47ef9ae6918d38b7ba9c63)
commit 406a451e8e2aacd98f578fdaf4f082f4acf556d9
Author: Ye Li <ye...@nx...>
Date: Thu Mar 28 18:49:18 2024 +0800
arm: imx9: Fix MMU map table overlap
The size for flexspi AHB buffer space is wrong, so correct it.
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit f6ee245cabc470f8f9f51fd49c264aa31e7340ed)
commit 4ff376c0e443a094e6804d317634b568ad3ce73e
Author: Primoz Fiser <pri...@no...>
Date: Thu Jan 11 13:56:25 2024 +0100
imx: imx9: fixup thermal trips from fuses
Read i.MX9 CPU temp grade from fuses and fixup thermal trips in Linux
device-tree accordingly.
Based on commit 0543a1ed2787 ("imx8m: fixup thermal trips")
Signed-off-by: Primoz Fiser <pri...@no...>
(cherry picked from commit 3233349fa6e2f64ae7f03d9d0ccce3df7a5e7721)
-----------------------------------------------------------------------
Summary of changes:
arch/arm/include/asm/arch-imx/cpu.h | 2 +
arch/arm/include/asm/arch-imx9/clock.h | 3 +-
arch/arm/include/asm/arch-imx9/imx-regs.h | 3 +
arch/arm/include/asm/arch-imx9/opos93.h | 4 +-
arch/arm/include/asm/arch-imx9/sys_proto.h | 11 +
arch/arm/include/asm/mach-imx/sys_proto.h | 7 +-
arch/arm/mach-imx/Makefile | 7 +
arch/arm/mach-imx/fdt.c | 87 +++++++
arch/arm/mach-imx/imx8m/soc.c | 137 +----------
arch/arm/mach-imx/imx9/Kconfig | 3 +
arch/arm/mach-imx/imx9/Makefile | 3 +-
arch/arm/mach-imx/imx9/clock.c | 39 ++-
arch/arm/mach-imx/imx9/opos93.c | 16 +-
...dr4_timing.c => opos9301_512mb_lpddr4_timing.c} | 182 +++++++-------
...pddr4_timing.c => opos9352_1gb_lpddr4_timing.c} | 2 +-
...dr4_timing.c => opos9352_512mb_lpddr4_timing.c} | 2 +-
arch/arm/mach-imx/imx9/soc.c | 271 ++++++++++++++++++++-
board/freescale/imx93_evk/spl.c | 6 +-
configs/opos93dev_defconfig | 1 +
drivers/clk/imx/clk-composite-93.c | 2 -
drivers/cpu/cpu-uclass.c | 10 +
drivers/cpu/cpu_sandbox.c | 6 +
drivers/cpu/imx8_cpu.c | 74 ++++--
drivers/ddr/imx/phy/ddrphy_utils.c | 4 +
include/cpu.h | 15 ++
25 files changed, 630 insertions(+), 267 deletions(-)
create mode 100644 arch/arm/mach-imx/fdt.c
copy arch/arm/mach-imx/imx9/{opos93_lpddr4_timing.c => opos9301_512mb_lpddr4_timing.c} (94%)
rename arch/arm/mach-imx/imx9/{opos93_1gb_lpddr4_timing.c => opos9352_1gb_lpddr4_timing.c} (99%)
rename arch/arm/mach-imx/imx9/{opos93_lpddr4_timing.c => opos9352_512mb_lpddr4_timing.c} (99%)
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index cbd2717f97..b0468a1a13 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -68,6 +68,8 @@
#define MXC_CPU_IMX9321 0xC6 /* dummy ID */
#define MXC_CPU_IMX9312 0xC7 /* dummy ID */
#define MXC_CPU_IMX9311 0xC8 /* dummy ID */
+#define MXC_CPU_IMX9302 0xC9 /* dummy ID */
+#define MXC_CPU_IMX9301 0xCA /* dummy ID */
#define MXC_SOC_MX6 0x60
#define MXC_SOC_MX7 0x70
diff --git a/arch/arm/include/asm/arch-imx9/clock.h b/arch/arm/include/asm/arch-imx9/clock.h
index 1169ffd74d..a257d1557c 100644
--- a/arch/arm/include/asm/arch-imx9/clock.h
+++ b/arch/arm/include/asm/arch-imx9/clock.h
@@ -211,7 +211,8 @@ struct imx_clk_setting {
u32 div;
};
-int clock_init(void);
+int clock_init_early(void);
+int clock_init_late(void);
u32 get_clk_src_rate(enum ccm_clk_src source);
u32 get_lpuart_clk(void);
void init_uart_clk(u32 index);
diff --git a/arch/arm/include/asm/arch-imx9/imx-regs.h b/arch/arm/include/asm/arch-imx9/imx-regs.h
index 9953c33b73..b8c22a26ca 100644
--- a/arch/arm/include/asm/arch-imx9/imx-regs.h
+++ b/arch/arm/include/asm/arch-imx9/imx-regs.h
@@ -51,6 +51,9 @@
#define MARKETING_GRADING_MASK GENMASK(5, 4)
#define SPEED_GRADING_MASK GENMASK(11, 6)
+#define NUM_WORDS_PER_BANK 8
+#define HW_CFG1 19
+#define HW_CFG2 20
#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
#include <asm/types.h>
diff --git a/arch/arm/include/asm/arch-imx9/opos93.h b/arch/arm/include/asm/arch-imx9/opos93.h
index d5beb7df14..dfa6405453 100644
--- a/arch/arm/include/asm/arch-imx9/opos93.h
+++ b/arch/arm/include/asm/arch-imx9/opos93.h
@@ -7,6 +7,8 @@
#ifndef __ASM_ARCH_IMX93_OPOS93_H
#define __ASM_ARCH_IMX93_OPOS93_H
-extern struct dram_timing_info opos93_1gb_dram_timing;
+extern struct dram_timing_info opos9301_512mb_dram_timing;
+extern struct dram_timing_info opos9352_512mb_dram_timing;
+extern struct dram_timing_info opos9352_1gb_dram_timing;
#endif
diff --git a/arch/arm/include/asm/arch-imx9/sys_proto.h b/arch/arm/include/asm/arch-imx9/sys_proto.h
index 2f7a129275..e4bf6a6342 100644
--- a/arch/arm/include/asm/arch-imx9/sys_proto.h
+++ b/arch/arm/include/asm/arch-imx9/sys_proto.h
@@ -8,7 +8,18 @@
#include <asm/mach-imx/sys_proto.h>
+enum imx9_soc_voltage_mode {
+ VOLT_LOW_DRIVE = 0,
+ VOLT_NOMINAL_DRIVE,
+ VOLT_OVER_DRIVE,
+};
+
void soc_power_init(void);
bool m33_is_rom_kicked(void);
int m33_prepare(void);
+
+enum imx9_soc_voltage_mode soc_target_voltage_mode(void);
+
+#define is_voltage_mode(mode) (soc_target_voltage_mode() == (mode))
+
#endif
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 31ae179b21..c146a223b7 100644
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -85,7 +85,8 @@ struct bd_info;
#define is_imx93() (is_cpu_type(MXC_CPU_IMX93) || is_cpu_type(MXC_CPU_IMX9331) || \
is_cpu_type(MXC_CPU_IMX9332) || is_cpu_type(MXC_CPU_IMX9351) || \
is_cpu_type(MXC_CPU_IMX9322) || is_cpu_type(MXC_CPU_IMX9321) || \
- is_cpu_type(MXC_CPU_IMX9312) || is_cpu_type(MXC_CPU_IMX9311))
+ is_cpu_type(MXC_CPU_IMX9312) || is_cpu_type(MXC_CPU_IMX9311) || \
+ is_cpu_type(MXC_CPU_IMX9302) || is_cpu_type(MXC_CPU_IMX9301))
#define is_imx9351() (is_cpu_type(MXC_CPU_IMX9351))
#define is_imx9332() (is_cpu_type(MXC_CPU_IMX9332))
#define is_imx9331() (is_cpu_type(MXC_CPU_IMX9331))
@@ -93,6 +94,8 @@ struct bd_info;
#define is_imx9321() (is_cpu_type(MXC_CPU_IMX9321))
#define is_imx9312() (is_cpu_type(MXC_CPU_IMX9312))
#define is_imx9311() (is_cpu_type(MXC_CPU_IMX9311))
+#define is_imx9302() (is_cpu_type(MXC_CPU_IMX9302))
+#define is_imx9301() (is_cpu_type(MXC_CPU_IMX9301))
#define is_imxrt1020() (is_cpu_type(MXC_CPU_IMXRT1020))
#define is_imxrt1050() (is_cpu_type(MXC_CPU_IMXRT1050))
@@ -275,4 +278,6 @@ void enable_ca7_smp(void);
enum boot_device get_boot_device(void);
+int disable_cpu_nodes(void *blob, const char * const *nodes_path,
+ u32 num_disabled_cores, u32 max_cores);
#endif
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index a3b44c93e3..ab6d370add 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -12,6 +12,7 @@ endif
ifeq ($(SOC),$(filter $(SOC),imx8m))
ifneq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
+obj-y += fdt.o
endif
obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
obj-$(CONFIG_FEC_MXC) += mac.o
@@ -21,6 +22,12 @@ obj-$(CONFIG_IMX_HAB) += hab.o
obj-y += cpu.o
endif
+ifeq ($(SOC),$(filter $(SOC),imx8m imx9))
+ifneq ($(CONFIG_SPL_BUILD),y)
+obj-y += fdt.o
+endif
+endif
+
ifeq ($(SOC),$(filter $(SOC),mx5 mx6))
obj-y += cpu.o speed.o
ifneq ($(CONFIG_MX51),y)
diff --git a/arch/arm/mach-imx/fdt.c b/arch/arm/mach-imx/fdt.c
new file mode 100644
index 0000000000..6db43c3760
--- /dev/null
+++ b/arch/arm/mach-imx/fdt.c
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2024 NXP
+ */
+
+#include <errno.h>
+#include <fdtdec.h>
+#include <malloc.h>
+#include <asm/arch/sys_proto.h>
+
+static void disable_thermal_cpu_nodes(void *blob, u32 num_disabled_cores, u32 max_cores)
+{
+ static const char * const thermal_path[] = {
+ "/thermal-zones/cpu-thermal/cooling-maps/map0"
+ };
+
+ int nodeoff, cnt, i, ret, j;
+ u32 num_le32 = max_cores * 3;
+ u32 *cooling_dev = (u32 *)malloc(num_le32 * sizeof(__le32));
+
+ if (!cooling_dev) {
+ printf("failed to alloc cooling dev\n");
+ return;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(thermal_path); i++) {
+ nodeoff = fdt_path_offset(blob, thermal_path[i]);
+ if (nodeoff < 0)
+ continue; /* Not found, skip it */
+
+ cnt = fdtdec_get_int_array_count(blob, nodeoff, "cooling-device",
+ cooling_dev, num_le32);
+ if (cnt < 0)
+ continue;
+
+ if (cnt != num_le32)
+ printf("Warning: %s, cooling-device count %d\n", thermal_path[i], cnt);
+
+ for (j = 0; j < cnt; j++)
+ cooling_dev[j] = cpu_to_fdt32(cooling_dev[j]);
+
+ ret = fdt_setprop(blob, nodeoff, "cooling-device", cooling_dev,
+ sizeof(__le32) * (num_le32 - num_disabled_cores * 3));
+ if (ret < 0) {
+ printf("Warning: %s, cooling-device setprop failed %d\n",
+ thermal_path[i], ret);
+ continue;
+ }
+
+ printf("Update node %s, cooling-device prop\n", thermal_path[i]);
+ }
+
+ free(cooling_dev);
+}
+
+int disable_cpu_nodes(void *blob, const char * const *nodes_path, u32 num_disabled_cores,
+ u32 max_cores)
+{
+ u32 i = 0;
+ int rc;
+ int nodeoff;
+
+ if (max_cores == 0 || (num_disabled_cores > (max_cores - 1)))
+ return -EINVAL;
+
+ i = max_cores - num_disabled_cores;
+
+ for (; i < max_cores; i++) {
+ nodeoff = fdt_path_offset(blob, nodes_path[i]);
+ if (nodeoff < 0)
+ continue; /* Not found, skip it */
+
+ debug("Found %s node\n", nodes_path[i]);
+
+ rc = fdt_del_node(blob, nodeoff);
+ if (rc < 0) {
+ printf("Unable to delete node %s, err=%s\n",
+ nodes_path[i], fdt_strerror(rc));
+ } else {
+ printf("Delete node %s\n", nodes_path[i]);
+ }
+ }
+
+ disable_thermal_cpu_nodes(blob, num_disabled_cores, max_cores);
+
+ return 0;
+}
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 39802d6a79..d25b92e46e 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -1125,117 +1125,6 @@ int disable_dsp_nodes(void *blob)
return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp));
}
-static void disable_thermal_cpu_nodes(void *blob, u32 disabled_cores)
-{
- static const char * const thermal_path[] = {
- "/thermal-zones/cpu-thermal/cooling-maps/map0"
- };
-
- int nodeoff, cnt, i, ret, j;
- u32 cooling_dev[12];
-
- for (i = 0; i < ARRAY_SIZE(thermal_path); i++) {
- nodeoff = fdt_path_offset(blob, thermal_path[i]);
- if (nodeoff < 0)
- continue; /* Not found, skip it */
-
- cnt = fdtdec_get_int_array_count(blob, nodeoff, "cooling-device", cooling_dev, 12);
- if (cnt < 0)
- continue;
-
- if (cnt != 12)
- printf("Warning: %s, cooling-device count %d\n", thermal_path[i], cnt);
-
- for (j = 0; j < cnt; j++)
- cooling_dev[j] = cpu_to_fdt32(cooling_dev[j]);
-
- ret = fdt_setprop(blob, nodeoff, "cooling-device", &cooling_dev,
- sizeof(u32) * (12 - disabled_cores * 3));
- if (ret < 0) {
- printf("Warning: %s, cooling-device setprop failed %d\n",
- thermal_path[i], ret);
- continue;
- }
-
- printf("Update node %s, cooling-device prop\n", thermal_path[i]);
- }
-}
-
-static void disable_pmu_cpu_nodes(void *blob, u32 disabled_cores)
-{
- static const char * const pmu_path[] = {
- "/pmu"
- };
-
- int nodeoff, cnt, i, ret, j;
- u32 irq_affinity[4];
-
- for (i = 0; i < ARRAY_SIZE(pmu_path); i++) {
- nodeoff = fdt_path_offset(blob, pmu_path[i]);
- if (nodeoff < 0)
- continue; /* Not found, skip it */
-
- cnt = fdtdec_get_int_array_count(blob, nodeoff, "interrupt-affinity",
- irq_affinity, 4);
- if (cnt < 0)
- continue;
-
- if (cnt != 4)
- printf("Warning: %s, interrupt-affinity count %d\n", pmu_path[i], cnt);
-
- for (j = 0; j < cnt; j++)
- irq_affinity[j] = cpu_to_fdt32(irq_affinity[j]);
-
- ret = fdt_setprop(blob, nodeoff, "interrupt-affinity", &irq_affinity,
- sizeof(u32) * (4 - disabled_cores));
- if (ret < 0) {
- printf("Warning: %s, interrupt-affinity setprop failed %d\n",
- pmu_path[i], ret);
- continue;
- }
-
- printf("Update node %s, interrupt-affinity prop\n", pmu_path[i]);
- }
-}
-
-static int disable_cpu_nodes(void *blob, u32 disabled_cores)
-{
- static const char * const nodes_path[] = {
- "/cpus/cpu@1",
- "/cpus/cpu@2",
- "/cpus/cpu@3",
- };
- u32 i = 0;
- int rc;
- int nodeoff;
-
- if (disabled_cores > 3)
- return -EINVAL;
-
- i = 3 - disabled_cores;
-
- for (; i < 3; i++) {
- nodeoff = fdt_path_offset(blob, nodes_path[i]);
- if (nodeoff < 0)
- continue; /* Not found, skip it */
-
- debug("Found %s node\n", nodes_path[i]);
-
- rc = fdt_del_node(blob, nodeoff);
- if (rc < 0) {
- printf("Unable to delete node %s, err=%s\n",
- nodes_path[i], fdt_strerror(rc));
- } else {
- printf("Delete node %s\n", nodes_path[i]);
- }
- }
-
- disable_thermal_cpu_nodes(blob, disabled_cores);
- disable_pmu_cpu_nodes(blob, disabled_cores);
-
- return 0;
-}
-
static int cleanup_nodes_for_efi(void *blob)
{
static const char * const path[][2] = {
@@ -1387,6 +1276,13 @@ static int ft_add_optee_node(void *fdt, struct bd_info *bd)
int ft_system_setup(void *blob, struct bd_info *bd)
{
+ static const char * const nodes_path[] = {
+ "/cpus/cpu@0",
+ "/cpus/cpu@1",
+ "/cpus/cpu@2",
+ "/cpus/cpu@3",
+ };
+
#ifdef CONFIG_IMX8MQ
int i = 0;
int rc;
@@ -1430,13 +1326,6 @@ usb_modify_speed:
/* Disable the CPU idle for A0 chip since the HW does not support it */
if (is_soc_rev(CHIP_REV_1_0)) {
- static const char * const nodes_path[] = {
- "/cpus/cpu@0",
- "/cpus/cpu@1",
- "/cpus/cpu@2",
- "/cpus/cpu@3",
- };
-
for (i = 0; i < ARRAY_SIZE(nodes_path); i++) {
nodeoff = fdt_path_offset(blob, nodes_path[i]);
if (nodeoff < 0)
@@ -1468,16 +1357,16 @@ usb_modify_speed:
}
if (is_imx8md())
- disable_cpu_nodes(blob, 2);
+ disable_cpu_nodes(blob, nodes_path, 2, 4);
#elif defined(CONFIG_IMX8MM)
if (is_imx8mml() || is_imx8mmdl() || is_imx8mmsl())
disable_vpu_nodes(blob);
if (is_imx8mmd() || is_imx8mmdl())
- disable_cpu_nodes(blob, 2);
+ disable_cpu_nodes(blob, nodes_path, 2, 4);
else if (is_imx8mms() || is_imx8mmsl())
- disable_cpu_nodes(blob, 3);
+ disable_cpu_nodes(blob, nodes_path, 3, 4);
#elif defined(CONFIG_IMX8MN)
if (is_imx8mnl() || is_imx8mndl() || is_imx8mnsl())
@@ -1494,9 +1383,9 @@ usb_modify_speed:
#endif
if (is_imx8mnd() || is_imx8mndl() || is_imx8mnud())
- disable_cpu_nodes(blob, 2);
+ disable_cpu_nodes(blob, nodes_path, 2, 4);
else if (is_imx8mns() || is_imx8mnsl() || is_imx8mnus())
- disable_cpu_nodes(blob, 3);
+ disable_cpu_nodes(blob, nodes_path, 3, 4);
#elif defined(CONFIG_IMX8MP)
if (is_imx8mpul()) {
@@ -1523,7 +1412,7 @@ usb_modify_speed:
disable_dsp_nodes(blob);
if (is_imx8mpd())
- disable_cpu_nodes(blob, 2);
+ disable_cpu_nodes(blob, nodes_path, 2, 4);
#endif
cleanup_nodes_for_efi(blob);
diff --git a/arch/arm/mach-imx/imx9/Kconfig b/arch/arm/mach-imx/imx9/Kconfig
index 84fee0b70c..230d08c368 100644
--- a/arch/arm/mach-imx/imx9/Kconfig
+++ b/arch/arm/mach-imx/imx9/Kconfig
@@ -23,6 +23,8 @@ config IMX93
config IMX93_OPOS93
bool
select IMX93
+ select OF_SYSTEM_SETUP
+ select OF_BOARD_FIXUP
config SYS_SOC
default "imx9"
@@ -33,6 +35,7 @@ choice
config TARGET_IMX93_11X11_EVK
bool "imx93_11x11_evk"
+ select OF_BOARD_FIXUP
select IMX93
config TARGET_OPOS93DEV
diff --git a/arch/arm/mach-imx/imx9/Makefile b/arch/arm/mach-imx/imx9/Makefile
index 7376d51f8a..b4d28e7f5c 100644
--- a/arch/arm/mach-imx/imx9/Makefile
+++ b/arch/arm/mach-imx/imx9/Makefile
@@ -4,7 +4,8 @@
obj-y += lowlevel_init.o
obj-y += soc.o clock.o clock_root.o trdc.o
-obj-$(CONFIG_IMX93_OPOS93) += opos93_lpddr4_timing.o opos93_1gb_lpddr4_timing.o opos93.o
+obj-$(CONFIG_IMX93_OPOS93) += opos9352_512mb_lpddr4_timing.o opos9352_1gb_lpddr4_timing.o \
+ opos9301_512mb_lpddr4_timing.o opos93.o
#ifndef CONFIG_SPL_BUILD
obj-y += imx_bootaux.o
diff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-imx/imx9/clock.c
index 3e6118df3d..8b26fe5278 100644
--- a/arch/arm/mach-imx/imx9/clock.c
+++ b/arch/arm/mach-imx/imx9/clock.c
@@ -609,7 +609,7 @@ void init_clk_usdhc(u32 index)
{
u32 div;
- if (IS_ENABLED(CONFIG_IMX9_LOW_DRIVE_MODE))
+ if (is_voltage_mode(VOLT_LOW_DRIVE))
div = 3; /* 266.67 Mhz */
else
div = 2; /* 400 Mhz */
@@ -706,8 +706,7 @@ void set_arm_core_max_clk(void)
#endif
-#if IS_ENABLED(CONFIG_IMX9_LOW_DRIVE_MODE)
-struct imx_clk_setting imx_clk_settings[] = {
+struct imx_clk_setting imx_clk_ld_settings[] = {
/* Set A55 clk to 500M */
{ARM_A55_CLK_ROOT, SYS_PLL_PFD0, 2},
/* Set A55 periphal to 200M */
@@ -734,7 +733,7 @@ struct imx_clk_setting imx_clk_settings[] = {
/* NIC_APB to 133M */
{NIC_APB_CLK_ROOT, SYS_PLL_PFD1_DIV2, 3}
};
-#else
+
struct imx_clk_setting imx_clk_settings[] = {
/*
* Set A55 clk to 500M. This clock root is normally used as intermediate
@@ -768,9 +767,18 @@ struct imx_clk_setting imx_clk_settings[] = {
/* NIC_APB to 133M */
{NIC_APB_CLK_ROOT, SYS_PLL_PFD1_DIV2, 3}
};
-#endif
-int clock_init(void)
+void bus_clock_init_low_drive(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(imx_clk_ld_settings); i++) {
+ ccm_clk_root_cfg(imx_clk_ld_settings[i].clk_root,
+ imx_clk_ld_settings[i].src, imx_clk_ld_settings[i].div);
+ }
+}
+
+void bus_clock_init(void)
{
int i;
@@ -778,9 +786,11 @@ int clock_init(void)
ccm_clk_root_cfg(imx_clk_settings[i].clk_root,
imx_clk_settings[i].src, imx_clk_settings[i].div);
}
+}
- if (IS_ENABLED(CONFIG_IMX9_LOW_DRIVE_MODE))
- set_arm_clk(MHZ(900));
+int clock_init_early(void)
+{
+ int i;
/* allow for non-secure access */
for (i = 0; i < OSCPLL_END; i++)
@@ -798,6 +808,19 @@ int clock_init(void)
return 0;
}
+/* Set bus and A55 core clock per voltage mode */
+int clock_init_late(void)
+{
+ if (is_voltage_mode(VOLT_LOW_DRIVE)) {
+ bus_clock_init_low_drive();
+ set_arm_core_max_clk();
+ } else {
+ bus_clock_init();
+ }
+
+ return 0;
+}
+
int set_clk_eqos(enum enet_freq type)
{
u32 eqos_post_div;
diff --git a/arch/arm/mach-imx/imx9/opos93.c b/arch/arm/mach-imx/imx9/opos93.c
index 2d7cbba119..768dcfe978 100644
--- a/arch/arm/mach-imx/imx9/opos93.c
+++ b/arch/arm/mach-imx/imx9/opos93.c
@@ -90,12 +90,16 @@ void spl_dram_init(void)
{
u32 val;
- fuse_read(47, 0, &val);
+ if (is_imx9301() || is_imx9302()) {
+ ddr_init(&opos9301_512mb_dram_timing);
+ } else {
+ fuse_read(47, 0, &val);
- if (val & 0x1)
- ddr_init(&opos93_1gb_dram_timing);
- else
- ddr_init(&dram_timing);
+ if (val & 0x1)
+ ddr_init(&opos9352_1gb_dram_timing);
+ else
+ ddr_init(&opos9352_512mb_dram_timing);
+ }
}
void board_init_f(ulong dummy)
@@ -120,6 +124,8 @@ void board_init_f(ulong dummy)
printf("LC: 0x%x\n", gd->arch.lifecycle);
}
+ clock_init_late();
+
set_arm_clk(get_cpu_speed_grade_hz());
/* Init power of mix */
diff --git a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos9301_512mb_lpddr4_timing.c
similarity index 94%
copy from arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
copy to arch/arm/mach-imx/imx9/opos9301_512mb_lpddr4_timing.c
index 0c927a3ce2..75d9d005b0 100644
--- a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos9301_512mb_lpddr4_timing.c
@@ -37,55 +37,55 @@ static struct dram_cfg_param ddr_ddrc_cfg[] = {
static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{
{
- {0x4e300100, 0x1451311B},
- {0x4e300104, 0xF8CC0017},
- {0x4e300108, 0xD4D68E00},
- {0x4e30010C, 0x0071E100},
- {0x4e300124, 0x18660000},
- {0x4e300160, 0x00009101},
- {0x4e30016C, 0x33F00000},
- {0x4e300170, 0x8B0B0608},
- {0x4e300250, 0x00000022},
+ {0x4e300100, 0x124A2100},
+ {0x4e300104, 0xF877000E},
+ {0x4e300108, 0x181604AA},
+ {0x4e30010C, 0x0051E1E6},
+ {0x4e300124, 0x0E3A0000},
+ {0x4e300160, 0x00009100},
+ {0x4e30016C, 0x30900000},
+ {0x4e300170, 0x8A0A0508},
+ {0x4e300250, 0x00000014},
{0x4e300254, 0x00000000},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
- {0x4e300300, 0x1D441D0D},
- {0x4e300304, 0x00881E10},
- {0x4e300308, 0x0C3C0C34},
+ {0x4e300300, 0x11281109},
+ {0x4e300304, 0x004C140A},
+ {0x4e300308, 0x063C071E},
},
{
- {0x01, 0xD4},
- {0x02, 0x2D},
+ {0x01, 0xB4},
+ {0x02, 0x1B},
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x1D},
{0x16, 0x04},
},
0,
},
{
{
- {0x4e300100, 0x02081100},
- {0x4e300104, 0xF866000C},
- {0x4e300108, 0xF2FA8088},
- {0x4e30010C, 0x006101A0},
- {0x4e300124, 0x0C340000},
+ {0x4e300100, 0x01041000},
+ {0x4e300104, 0xF855000A},
+ {0x4e300108, 0x9492CA58},
+ {0x4e30010C, 0x00310113},
+ {0x4e300124, 0x071E0000},
{0x4e300160, 0x00009100},
- {0x4e30016C, 0x30700000},
- {0x4e300170, 0x8A0A0508},
- {0x4e300250, 0x00000011},
+ {0x4e30016C, 0x30200000},
+ {0x4e300170, 0x89090408},
+ {0x4e300250, 0x0000000A},
{0x4e300254, 0x00000000},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
},
{
- {0x01, 0xA4},
- {0x02, 0x52},
+ {0x01, 0x94},
+ {0x02, 0x9},
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x1D},
{0x16, 0x04},
},
0,
@@ -111,7 +111,7 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x1D},
{0x16, 0x04},
},
1,
@@ -152,8 +152,8 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x55, 0x1ff},
{0x1055, 0x1ff},
{0x2055, 0x1ff},
- {0x200c5, 0x19},
- {0x1200c5, 0xb},
+ {0x200c5, 0xb},
+ {0x1200c5, 0x3},
{0x2200c5, 0x7},
{0x2002e, 0x2},
{0x12002e, 0x1},
@@ -207,21 +207,21 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x20075, 0x4},
{0x20050, 0x11},
{0x2009b, 0x2},
- {0x20008, 0x320},
- {0x120008, 0x190},
+ {0x20008, 0x1d3},
+ {0x120008, 0xe9},
{0x220008, 0x9c},
{0x20088, 0x9},
- {0x200b2, 0x134},
+ {0x200b2, 0x15c},
{0x10043, 0x5a1},
{0x10143, 0x5a1},
{0x11043, 0x5a1},
{0x11143, 0x5a1},
- {0x1200b2, 0x134},
+ {0x1200b2, 0x15c},
{0x110043, 0x5a1},
{0x110143, 0x5a1},
{0x111043, 0x5a1},
{0x111143, 0x5a1},
- {0x2200b2, 0x134},
+ {0x2200b2, 0x15c},
{0x210043, 0x5a1},
{0x210143, 0x5a1},
{0x211043, 0x5a1},
@@ -249,7 +249,7 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x2002c, 0x0},
{0x20021, 0x0},
{0x200c7, 0x21},
- {0x1200c7, 0x21},
+ {0x1200c7, 0x41},
{0x200ca, 0x24},
{0x1200ca, 0x24},
};
@@ -1237,36 +1237,36 @@ static struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
/* P0 message block parameter for training firmware */
static struct dram_cfg_param ddr_fsp0_cfg[] = {
{0xd0000, 0x0},
- {0x54003, 0xc80},
+ {0x54003, 0x74a},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1b},
{0x54008, 0x131f},
{0x54009, 0xc8},
{0x5400b, 0x4},
{0x5400d, 0x100},
{0x5400f, 0x100},
{0x54012, 0x110},
- {0x54019, 0x2dd4},
+ {0x54019, 0x1bb4},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1d08},
{0x5401e, 0x4},
- {0x5401f, 0x2dd4},
+ {0x5401f, 0x1bb4},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1d08},
{0x54024, 0x4},
- {0x54032, 0xd400},
- {0x54033, 0x332d},
+ {0x54032, 0xb400},
+ {0x54033, 0x331b},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x1d},
{0x54037, 0x400},
- {0x54038, 0xd400},
- {0x54039, 0x332d},
+ {0x54038, 0xb400},
+ {0x54039, 0x331b},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x1d},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1275,36 +1275,36 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0xd0000, 0x0},
{0x54002, 0x1},
- {0x54003, 0x640},
+ {0x54003, 0x3a4},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1b},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
{0x5400d, 0x100},
{0x5400f, 0x100},
{0x54012, 0x110},
- {0x54019, 0x52a4},
+ {0x54019, 0x994},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1d08},
{0x5401e, 0x4},
- {0x5401f, 0x52a4},
+ {0x5401f, 0x994},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1d08},
{0x54024, 0x4},
- {0x54032, 0xa400},
- {0x54033, 0x3352},
+ {0x54032, 0x9400},
+ {0x54033, 0x3309},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x1d},
{0x54037, 0x400},
- {0x54038, 0xa400},
- {0x54039, 0x3352},
+ {0x54038, 0x9400},
+ {0x54039, 0x3309},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x1d},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1315,7 +1315,7 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54002, 0x102},
{0x54003, 0x270},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1b},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1325,24 +1325,24 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54019, 0x994},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1800},
+ {0x5401c, 0x1d00},
{0x5401e, 0x4},
{0x5401f, 0x994},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1800},
+ {0x54022, 0x1d00},
{0x54024, 0x4},
{0x54032, 0x9400},
{0x54033, 0x3309},
{0x54034, 0x4600},
{0x54035, 0x49},
- {0x54036, 0x18},
+ {0x54036, 0x1d},
{0x54037, 0x400},
{0x54038, 0x9400},
{0x54039, 0x3309},
{0x5403a, 0x4600},
{0x5403b, 0x49},
- {0x5403c, 0x18},
+ {0x5403c, 0x1d},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1351,9 +1351,9 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
/* P0 2D message block parameter for training firmware */
static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0xd0000, 0x0},
- {0x54003, 0xc80},
+ {0x54003, 0x74a},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1b},
{0x54008, 0x61},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1361,27 +1361,27 @@ static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0x5400f, 0x100},
{0x54010, 0x2080},
{0x54012, 0x110},
- {0x54019, 0x2dd4},
+ {0x54019, 0x1bb4},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1d08},
{0x5401e, 0x4},
- {0x5401f, 0x2dd4},
+ {0x5401f, 0x1bb4},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1d08},
{0x54024, 0x4},
- {0x54032, 0xd400},
- {0x54033, 0x332d},
+ {0x54032, 0xb400},
+ {0x54033, 0x331b},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x1d},
{0x54037, 0x400},
- {0x54038, 0xd400},
- {0x54039, 0x332d},
+ {0x54038, 0xb400},
+ {0x54039, 0x331b},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x1d},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1871,14 +1871,14 @@ static struct dram_cfg_param ddr_phy_pie[] = {
{0x400d7, 0x20b},
{0x2003a, 0x2},
{0x200be, 0x3},
- {0x2000b, 0x384},
- {0x2000c, 0xc8},
- {0x2000d, 0x7d0},
+ {0x2000b, 0x20d},
+ {0x2000c, 0x74},
+ {0x2000d, 0x48e},
{0x2000e, 0x2c},
- {0x12000b, 0x1c2},
- {0x12000c, 0x64},
- {0x12000d, 0x3e8},
- {0x12000e, 0x2c},
+ {0x12000b, 0x107},
+ {0x12000c, 0x3a},
+ {0x12000d, 0x246},
+ {0x12000e, 0x21},
{0x22000b, 0xb0},
{0x22000c, 0x27},
{0x22000d, 0x186},
@@ -1951,15 +1951,15 @@ static struct dram_cfg_param ddr_phy_pie[] = {
static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
{
- /* P0 3200mts 1D */
- .drate = 3200,
+ /* P0 1866mts 1D */
+ .drate = 1866,
.fw_type = FW_1D_IMAGE,
.fsp_cfg = ddr_fsp0_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_cfg),
},
{
- /* P1 1600mts 1D */
- .drate = 1600,
+ /* P1 933mts 1D */
+ .drate = 933,
.fw_type = FW_1D_IMAGE,
.fsp_cfg = ddr_fsp1_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp1_cfg),
@@ -1972,8 +1972,8 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp2_cfg),
},
{
- /* P0 3200mts 2D */
- .drate = 3200,
+ /* P0 1866mts 2D */
+ .drate = 1866,
.fw_type = FW_2D_IMAGE,
.fsp_cfg = ddr_fsp0_2d_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_2d_cfg),
@@ -1981,7 +1981,7 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
};
/* ddr timing config params */
-struct dram_timing_info dram_timing = {
+struct dram_timing_info opos9301_512mb_dram_timing = {
.ddrc_cfg = ddr_ddrc_cfg,
.ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg),
.ddrphy_cfg = ddr_ddrphy_cfg,
@@ -1992,7 +1992,7 @@ struct dram_timing_info dram_timing = {
.ddrphy_trained_csr_num = ARRAY_SIZE(ddr_ddrphy_trained_csr),
.ddrphy_pie = ddr_phy_pie,
.ddrphy_pie_num = ARRAY_SIZE(ddr_phy_pie),
- .fsp_table = { 3200, 1600, 625, },
+ .fsp_table = { 1866, 933, 625, },
.fsp_cfg = ddr_dram_fsp_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_dram_fsp_cfg),
};
diff --git a/arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos9352_1gb_lpddr4_timing.c
similarity index 99%
rename from arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c
rename to arch/arm/mach-imx/imx9/opos9352_1gb_lpddr4_timing.c
index c3c2b410aa..6cc1083be5 100644
--- a/arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos9352_1gb_lpddr4_timing.c
@@ -1981,7 +1981,7 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
};
/* ddr timing config params */
-struct dram_timing_info opos93_1gb_dram_timing = {
+struct dram_timing_info opos9352_1gb_dram_timing = {
.ddrc_cfg = ddr_ddrc_cfg,
.ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg),
.ddrphy_cfg = ddr_ddrphy_cfg,
diff --git a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos9352_512mb_lpddr4_timing.c
similarity index 99%
rename from arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
rename to arch/arm/mach-imx/imx9/opos9352_512mb_lpddr4_timing.c
index 0c927a3ce2..2b2ccef195 100644
--- a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos9352_512mb_lpddr4_timing.c
@@ -1981,7 +1981,7 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
};
/* ddr timing config params */
-struct dram_timing_info dram_timing = {
+struct dram_timing_info opos9352_512mb_dram_timing = {
.ddrc_cfg = ddr_ddrc_cfg,
.ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg),
.ddrphy_cfg = ddr_ddrphy_cfg,
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 8980819f9a..626c27552a 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -96,10 +96,16 @@ int mmc_get_env_dev(void)
*/
u32 get_cpu_speed_grade_hz(void)
{
- u32 speed, max_speed;
+ int ret;
+ u32 bank, word, speed, max_speed;
u32 val;
- fuse_read(2, 3, &val);
+ bank = HW_CFG1 / NUM_WORDS_PER_BANK;
+ word = HW_CFG1 % NUM_WORDS_PER_BANK;
+ ret = fuse_read(bank, word, &val);
+ if (ret)
+ val = 0; /* If read fuse failed, return as blank fuse */
+
val = FIELD_GET(SPEED_GRADING_MASK, val) & 0xF;
speed = MHZ(2300) - val * MHZ(100);
@@ -122,9 +128,15 @@ u32 get_cpu_speed_grade_hz(void)
*/
u32 get_cpu_temp_grade(int *minc, int *maxc)
{
- u32 val;
+ int ret;
+ u32 bank, word, val;
+
+ bank = HW_CFG1 / NUM_WORDS_PER_BANK;
+ word = HW_CFG1 % NUM_WORDS_PER_BANK;
+ ret = fuse_read(bank, word, &val);
+ if (ret)
+ val = 0; /* If read fuse failed, return as blank fuse */
- fuse_read(2, 3, &val);
val = FIELD_GET(MARKETING_GRADING_MASK, val);
if (minc && maxc) {
@@ -160,13 +172,29 @@ static void set_cpu_info(struct ele_get_info_data *info)
static u32 get_cpu_variant_type(u32 type)
{
- /* word 19 */
- u32 val = readl((ulong)FSB_BASE_ADDR + 0x8000 + (19 << 2));
- u32 val2 = readl((ulong)FSB_BASE_ADDR + 0x8000 + (20 << 2));
+ u32 bank, word, val, val2;
+ int ret;
+
+ bank = HW_CFG1 / NUM_WORDS_PER_BANK;
+ word = HW_CFG1 % NUM_WORDS_PER_BANK;
+ ret = fuse_read(bank, word, &val);
+ if (ret)
+ val = 0; /* If read fuse failed, return as blank fuse */
+
+ bank = HW_CFG2 / NUM_WORDS_PER_BANK;
+ word = HW_CFG2 % NUM_WORDS_PER_BANK;
+ ret = fuse_read(bank, word, &val2);
+ if (ret)
+ val2 = 0; /* If read fuse failed, return as blank fuse */
+
bool npu_disable = !!(val & BIT(13));
bool core1_disable = !!(val & BIT(15));
u32 pack_9x9_fused = BIT(4) | BIT(17) | BIT(19) | BIT(24);
+ /* Low performance 93 part */
+ if (((val >> 6) & 0x3F) == 0xE && npu_disable)
+ return core1_disable ? MXC_CPU_IMX9301 : MXC_CPU_IMX9302;
+
if ((val2 & pack_9x9_fused) == pack_9x9_fused)
type = MXC_CPU_IMX9322;
@@ -262,7 +290,7 @@ static struct mm_region imx93_mem_map[] = {
/* Flexible Serial Peripheral Interface */
.virt = 0x28000000UL,
.phys = 0x28000000UL,
- .size = 0x30000000UL,
+ .size = 0x08000000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN
@@ -507,8 +535,214 @@ int print_cpuinfo(void)
return 0;
}
+static int fixup_thermal_trips(void *blob, const char *name)
+{
+ int minc, maxc;
+ int node, trip;
+
+ node = fdt_path_offset(blob, "/thermal-zones");
+ if (node < 0)
+ return node;
+
+ node = fdt_subnode_offset(blob, node, name);
+ if (node < 0)
+ return node;
+
+ node = fdt_subnode_offset(blob, node, "trips");
+ if (node < 0)
+ return node;
+
+ get_cpu_temp_grade(&minc, &maxc);
+
+ fdt_for_each_subnode(trip, blob, node) {
+ const char *type;
+ int temp, ret;
+
+ type = fdt_getprop(blob, trip, "type", NULL);
+ if (!type)
+ continue;
+
+ temp = 0;
+ if (!strcmp(type, "critical"))
+ temp = 1000 * (maxc - 5);
+ else if (!strcmp(type, "passive"))
+ temp = 1000 * (maxc - 10);
+ if (temp) {
+ ret = fdt_setprop_u32(blob, trip, "temperature", temp);
+ if (ret)
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+void build_info(void)
+{
+ u32 fw_version, sha1, res, status;
+ int ret;
+
+ printf("\nBuildInfo:\n");
+
+ ret = ele_get_fw_status(&status, &res);
+ if (ret) {
+ printf(" - ELE firmware status failed %d, 0x%x\n", ret, res);
+ } else if ((status & 0xff) == 1) {
+ ret = ele_get_fw_version(&fw_version, &sha1, &res);
+ if (ret) {
+ printf(" - ELE firmware version failed %d, 0x%x\n", ret, res);
+ } else {
+ printf(" - ELE firmware version %u.%u.%u-%x",
+ (fw_version & (0x00ff0000)) >> 16,
+ (fw_version & (0x0000fff0)) >> 4,
+ (fw_version & (0x0000000f)), sha1);
+ ((fw_version & (0x80000000)) >> 31) == 1 ? puts("-dirty\n") : puts("\n");
+ }
+ } else {
+ printf(" - ELE firmware not included\n");
+ }
+ puts("\n");
+}
+
+int arch_misc_init(void)
+{
+ build_info();
+ return 0;
+}
+
+struct low_drive_freq_entry {
+ const char *node_path;
+ u32 clk;
+ u32 new_rate;
+};
+
+static int low_drive_fdt_fix_clock(void *fdt, int node_off, u32 clk_index, u32 new_rate)
+{
+#define MAX_ASSIGNED_CLKS 8
+ int cnt, j;
+ u32 assignedclks[MAX_ASSIGNED_CLKS]; /* max 8 clocks*/
+
+ cnt = fdtdec_get_int_array_count(fdt, node_off, "assigned-clock-rates",
+ assignedclks, MAX_ASSIGNED_CLKS);
+ if (cnt > 0) {
+ if (cnt <= clk_index)
+ return -ENOENT;
+
+ if (assignedclks[clk_index] <= new_rate)
+ return 0;
+
+ assignedclks[clk_index] = new_rate;
+ for (j = 0; j < cnt; j++)
+ assignedclks[j] = cpu_to_fdt32(assignedclks[j]);
+
+ return fdt_setprop(fdt, node_off, "assigned-clock-rates", &assignedclks,
+ cnt * sizeof(u32));
+ }
+
+ return -ENOENT;
+}
+
+static int low_drive_freq_update(void *blob)
+{
+ int nodeoff, ret;
+ int i;
+
+ /* Update kernel dtb clocks for low drive mode */
+ struct low_drive_freq_entry table[] = {
+ {"/soc@0/lcd-controller@4ae30000", 2, 200000000},
+ {"/soc@0/bus@42800000/mmc@42850000", 0, 266666667},
+ {"/soc@0/bus@42800000/mmc@42860000", 0, 266666667},
+ {"/soc@0/bus@42800000/mmc@428b0000", 0, 266666667},
+ };
+
+ for (i = 0; i < ARRAY_SIZE(table); i++) {
+ nodeoff = fdt_path_offset(blob, table[i].node_path);
+ if (nodeoff >= 0) {
+ ret = low_drive_fdt_fix_clock(blob, nodeoff, table[i].clk,
+ table[i].new_rate);
+ if (!ret)
+ printf("%s freq updated\n", table[i].node_path);
+ }
+ }
+
+ return 0;
+}
+
+static int disable_lpm(void *blob)
+{
+ int rc;
+ char path[64];
+ static const char *compat_lpm = "nxp,imx93-lpm";
+
+ int offset = fdt_node_offset_by_compatible(blob, -1, compat_lpm);
+
+ if (offset < 0) {
+ printf("node with compatible \"%s\" not found\n", compat_lpm);
+ return 0;
+ }
+
+ rc = fdt_get_path(blob, offset, path, sizeof(path));
+ if (rc) {
+ printf("Fail to get lpm node path, err=%s\n", fdt_strerror(rc));
+ return -ENOENT;
+ }
+
+ rc = fdt_del_node(blob, offset);
+ if (rc < 0)
+ printf("Unable to delete lpm node %s, err=%s\n",
+ path, fdt_strerror(rc));
+ else
+ printf("Delete node %s\n", path);
+
+ return 0;
+}
+
+#ifdef CONFIG_OF_BOARD_FIXUP
+#ifndef CONFIG_SPL_BUILD
+int board_fix_fdt(void *fdt)
+{
+ /* Update dtb clocks for low drive mode */
+ if (is_voltage_mode(VOLT_LOW_DRIVE)) {
+ int nodeoff;
+ int i;
+
+ struct low_drive_freq_entry table[] = {
+ {"/soc@0/bus@42800000/mmc@42850000", 0, 266666667},
+ {"/soc@0/bus@42800000/mmc@42860000", 0, 266666667},
+ {"/soc@0/bus@42800000/mmc@428b0000", 0, 266666667},
+ };
+
+ for (i = 0; i < ARRAY_SIZE(table); i++) {
+ nodeoff = fdt_path_offset(fdt, table[i].node_path);
+ if (nodeoff >= 0)
+ low_drive_fdt_fix_clock(fdt, nodeoff, table[i].clk,
+ table[i].new_rate);
+ }
+ }
+
+ return 0;
+}
+#endif
+#endif
+
int ft_system_setup(void *blob, struct bd_info *bd)
{
+ static const char * const nodes_path[] = {
+ "/cpus/cpu@0",
+ "/cpus/cpu@100",
+ };
+
+ if (fixup_thermal_trips(blob, "cpu-thermal"))
+ printf("Failed to update cpu-thermal trip(s)");
+
+ if (is_imx9351() || is_imx9331() || is_imx9321() || is_imx9311() || is_imx9301())
+ disable_cpu_nodes(blob, nodes_path, 1, 2);
+
+ if (is_voltage_mode(VOLT_LOW_DRIVE)) {
+ low_drive_freq_update(blob);
+ disable_lpm(blob);
+ }
+
return 0;
}
@@ -541,7 +775,7 @@ int arch_cpu_init(void)
/* Disable wdog */
init_wdog();
- clock_init();
+ clock_init_early();
trdc_early_init();
@@ -833,3 +1067,22 @@ int psci_sysreset_get_status(struct udevice *dev, char *buf, int size)
return 0;
}
+
+enum imx9_soc_voltage_mode soc_target_voltage_mode(void)
+{
+ u32 speed = get_cpu_speed_grade_hz();
+ enum imx9_soc_voltage_mode voltage = VOLT_OVER_DRIVE;
+
+ if (is_imx93()) {
+ if (speed == 1700000000)
+ voltage = VOLT_OVER_DRIVE;
+ else if (speed == 1400000000)
+ voltage = VOLT_NOMINAL_DRIVE;
+ else if (speed == 900000000 || speed == 800000000)
+ voltage = VOLT_LOW_DRIVE;
+ else
+ printf("Unexpected A55 freq %u, default to OD\n", speed);
+ }
+
+ return voltage;
+}
diff --git a/board/freescale/imx93_evk/spl.c b/board/freescale/imx93_evk/spl.c
index be9c24fc0d..84f5875a78 100644
--- a/board/freescale/imx93_evk/spl.c
+++ b/board/freescale/imx93_evk/spl.c
@@ -70,7 +70,7 @@ int power_init_board(void)
/* enable DVS control through PMIC_STBY_REQ */
pmic_reg_write(dev, PCA9450_BUCK1CTRL, 0x59);
- if (IS_ENABLED(CONFIG_IMX9_LOW_DRIVE_MODE)) {
+ if (is_voltage_mode(VOLT_LOW_DRIVE))
/* 0.75v for Low drive mode
*/
pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS0, 0x0c);
@@ -117,9 +117,11 @@ void board_init_f(ulong dummy)
printf("LC: 0x%x\n", gd->arch.lifecycle);
}
+ clock_init_late();
+
power_init_board();
- if (!IS_ENABLED(CONFIG_IMX9_LOW_DRIVE_MODE))
+ if (!is_voltage_mode(VOLT_LOW_DRIVE))
set_arm_clk(get_cpu_speed_grade_hz());
/* Init power of mix */
diff --git a/configs/opos93dev_defconfig b/configs/opos93dev_defconfig
index fee131eb79..2ba056cc7f 100644
--- a/configs/opos93dev_defconfig
+++ b/configs/opos93dev_defconfig
@@ -31,6 +31,7 @@ CONFIG_BOOTCOMMAND="run emmcboot"
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="run check_env"
CONFIG_DEFAULT_FDT_FILE="imx93-opos93dev.dtb"
+CONFIG_ARCH_MISC_INIT=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_BOARD_LATE_INIT=y
CONFIG_SPL_MAX_SIZE=0x26000
diff --git a/drivers/clk/imx/clk-composite-93.c b/drivers/clk/imx/clk-composite-93.c
index 6d71c0c03f..34026c5e42 100644
--- a/drivers/clk/imx/clk-composite-93.c
+++ b/drivers/clk/imx/clk-composite-93.c
@@ -103,7 +103,6 @@ struct clk *imx93_clk_composite_flags(const char *name,
mux->mask = CCM_MUX_MASK;
mux->num_parents = num_parents;
mux->parent_names = parent_names;
- mux->flags = flags;
div = kzalloc(sizeof(*div), GFP_KERNEL);
if (!div)
@@ -120,7 +119,6 @@ struct clk *imx93_clk_composite_flags(const char *name,
gate->reg = reg;
gate->bit_idx = CCM_OFF_SHIFT;
- gate->flags = flags;
clk = clk_register_composite(NULL, name,
parent_names, num_parents,
diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c
index 9772578968..1eb4fbd179 100644
--- a/drivers/cpu/cpu-uclass.c
+++ b/drivers/cpu/cpu-uclass.c
@@ -105,6 +105,16 @@ int cpu_get_vendor(const struct udevice *dev, char *buf, int size)
return ops->get_vendor(dev, buf, size);
}
+int cpu_release_core(const struct udevice *dev, phys_addr_t addr)
+{
+ struct cpu_ops *ops = cpu_get_ops(dev);
+
+ if (!ops->release_core)
+ return -ENOSYS;
+
+ return ops->release_core(dev, addr);
+}
+
U_BOOT_DRIVER(cpu_bus) = {
.name = "cpu_bus",
.id = UCLASS_SIMPLE_BUS,
diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c
index 2e871fe313..cffa338334 100644
--- a/drivers/cpu/cpu_sandbox.c
+++ b/drivers/cpu/cpu_sandbox.c
@@ -45,6 +45,11 @@ void cpu_sandbox_set_current(const char *name)
cpu_current = name;
}
+static int cpu_sandbox_release_core(const struct udevice *dev, phys_addr_t addr)
+{
+ return 0;
+}
+
static int cpu_sandbox_is_current(struct udevice *dev)
{
if (!strcmp(dev->name, cpu_current))
@@ -59,6 +64,7 @@ static const struct cpu_ops cpu_sandbox_ops = {
.get_count = cpu_sandbox_get_count,
.get_vendor = cpu_sandbox_get_vendor,
.is_current = cpu_sandbox_is_current,
+ .release_core = cpu_sandbox_release_core,
};
static int cpu_sandbox_bind(struct udevice *dev)
diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c
index 98ff95f5ff..fdd0705707 100644
--- a/drivers/cpu/imx8_cpu.c
+++ b/drivers/cpu/imx8_cpu.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * Copyright 2019 NXP
+ * Copyright 2019, 2024 NXP
*/
#include <common.h>
@@ -8,6 +8,7 @@
#include <dm.h>
#include <thermal.h>
#include <asm/global_data.h>
+#include <asm/ptrace.h>
#include <asm/system.h>
#include <firmware/imx/sci/sci.h>
#include <asm/arch/sys_proto.h>
@@ -16,13 +17,15 @@
#include <imx_thermal.h>
#include <linux/bitops.h>
#include <linux/clk-provider.h>
+#include <linux/psci.h>
DECLARE_GLOBAL_DATA_PTR;
+#define IMX_REV_LEN 4
struct cpu_imx_plat {
const char *name;
- const char *rev;
const char *type;
+ char rev[IMX_REV_LEN];
u32 cpu_rsrc;
u32 cpurev;
u32 freq_mhz;
@@ -32,6 +35,12 @@ struct cpu_imx_plat {
static const char *get_imx_type_str(u32 imxtype)
{
switch (imxtype) {
+ case MXC_CPU_IMX8MM:
+ return "8MM";
+ case MXC_CPU_IMX8MN:
+ return "8MN";
+ case MXC_CPU_IMX8MP:
+ return "8MP";
case MXC_CPU_IMX8QXP:
case MXC_CPU_IMX8QXP_A0:
return "8QXP";
@@ -53,33 +62,38 @@ static const char *get_imx_type_str(u32 imxtype)
return "93(12)";/* iMX93 9x9 Dual core without NPU */
case MXC_CPU_IMX9311:
return "93(11)";/* iMX93 9x9 Single core without NPU */
+ case MXC_CPU_IMX9302:
+ return "93(02)";/* iMX93 900Mhz Low performance Dual core without NPU */
+ case MXC_CPU_IMX9301:
+ return "93(01)";/* iMX93 900Mhz Low performance Single core without NPU */
default:
return "??";
}
}
-static const char *get_imx_rev_str(u32 rev)
+static void get_imx_rev_str(struct cpu_imx_plat *plat, u32 rev)
{
- static char revision[4];
-
if (IS_ENABLED(CONFIG_IMX8)) {
switch (rev) {
case CHIP_REV_A:
- return "A";
+ plat->rev[0] = 'A';
+ break;
case CHIP_REV_B:
- return "B";
+ plat->rev[0] = 'B';
+ break;
case CHIP_REV_C:
- return "C";
+ plat->rev[0] = 'C';
+ break;
default:
- return "?";
+ plat->rev[0] = '?';
+ break;
}
+ plat->rev[1] = '\0';
} else {
- revision[0] = '1' + (((rev & 0xf0) - CHIP_REV_1_0) >> 4);
- revision[1] = '.';
- revision[2] = '0' + (rev & 0xf);
- revision[3] = '\0';
-
- return revision;
+ plat->rev[0] = '1' + (((rev & 0xf0) - CHIP_REV_1_0) >> 4);
+ plat->rev[1] = '.';
+ plat->rev[2] = '0' + (rev & 0xf);
+ plat->rev[3] = '\0';
}
}
@@ -185,8 +199,6 @@ static int cpu_imx_get_desc(const struct udevice *dev, char *buf, int size)
ret = snprintf(buf, size, " - invalid sensor data");
}
- snprintf(buf + ret, size - ret, "\n");
-
return 0;
}
@@ -194,7 +206,7 @@ static int cpu_imx_get_info(const struct udevice *dev, struct cpu_info *info)
{
struct cpu_imx_plat *plat = dev_get_plat(dev);
- info->cpu_freq = plat->freq_mhz * 1000;
+ info->cpu_freq = plat->freq_mhz * 1000000;
info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU);
return 0;
}
@@ -237,12 +249,34 @@ static int cpu_imx_is_current(struct udevice *dev)
return 0;
}
+static int cpu_imx_release_core(const struct udevice *dev, phys_addr_t addr)
+{
+ struct cpu_imx_plat *plat = dev_get_plat(dev);
+ struct pt_regs regs;
+
+ regs.regs[0] = PSCI_0_2_FN64_CPU_ON;
+ regs.regs[1] = plat->mpidr;
+ regs.regs[2] = addr;
+ regs.regs[3] = 0;
+
+ smc_call(®s);
+ if (regs.regs[0]) {
+ printf("Failed to release CPU core (mpidr: 0x%x)\n", plat->mpidr);
+ return -1;
+ }
+
+ printf("Released CPU core (mpidr: 0x%x) to address 0x%llx\n", plat->mpidr, addr);
+
+ return 0;
+}
+
static const struct cpu_ops cpu_imx_ops = {
.get_desc = cpu_imx_get_desc,
.get_info = cpu_imx_get_info,
.get_count = cpu_imx_get_count,
.get_vendor = cpu_imx_get_vendor,
.is_current = cpu_imx_is_current,
+ .release_core = cpu_imx_release_core,
};
static const struct udevice_id cpu_imx_ids[] = {
@@ -287,8 +321,8 @@ static int imx_cpu_probe(struct udevice *dev)
set_core_data(dev);
cpurev = get_cpu_rev();
plat->cpurev = cpurev;
- plat->rev = get_imx_rev_str(cpurev & 0xFFF);
- plat->type = get_imx_type_str((cpurev & 0xFF000) >> 12);
+ get_imx_rev_str(plat, cpurev & 0xFFF);
+ plat->type = get_imx_type_str((cpurev & 0x1FF000) >> 12);
plat->freq_mhz = imx_get_cpu_rate(dev) / 1000000;
plat->mpidr = dev_read_addr(dev);
if (plat->mpidr == FDT_ADDR_T_NONE) {
diff --git a/drivers/ddr/imx/phy/ddrphy_utils.c b/drivers/ddr/imx/phy/ddrphy_utils.c
index 45e1a70dbd..f0b717074e 100644
--- a/drivers/ddr/imx/phy/ddrphy_utils.c
+++ b/drivers/ddr/imx/phy/ddrphy_utils.c
@@ -149,6 +149,10 @@ void ddrphy_init_set_dfi_clk(unsigned int drate)
dram_pll_init(...
[truncated message content] |
|
From: sszy <ss...@us...> - 2024-11-07 16:27:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 750950a0beb840862c3642477038361ff63d2520 (commit)
via 5c30ec34558bf19902e5306e24c0e7408788940d (commit)
from b7222197d4dbb294d0accb2d1012ce6502439898 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 750950a0beb840862c3642477038361ff63d2520
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Nov 7 16:24:45 2024 +0100
configs: opos93dev_defconfig: enable MEMINFO
commit 5c30ec34558bf19902e5306e24c0e7408788940d
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Nov 7 16:23:18 2024 +0100
imx9: opos93: add opos93 with 1GB of RAM support
-----------------------------------------------------------------------
Summary of changes:
arch/arm/include/asm/arch-imx9/opos93.h | 12 ++++
arch/arm/mach-imx/imx9/Makefile | 2 +-
arch/arm/mach-imx/imx9/opos93.c | 11 +++-
..._lpddr4_timing.c => opos93_1gb_lpddr4_timing.c} | 70 +++++++++++-----------
configs/opos93dev_defconfig | 1 +
5 files changed, 59 insertions(+), 37 deletions(-)
create mode 100644 arch/arm/include/asm/arch-imx9/opos93.h
copy arch/arm/mach-imx/imx9/{opos93_lpddr4_timing.c => opos93_1gb_lpddr4_timing.c} (97%)
diff --git a/arch/arm/include/asm/arch-imx9/opos93.h b/arch/arm/include/asm/arch-imx9/opos93.h
new file mode 100644
index 0000000000..d5beb7df14
--- /dev/null
+++ b/arch/arm/include/asm/arch-imx9/opos93.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2024 Armadeus Systems <co...@ar...>
+ */
+
+
+#ifndef __ASM_ARCH_IMX93_OPOS93_H
+#define __ASM_ARCH_IMX93_OPOS93_H
+
+extern struct dram_timing_info opos93_1gb_dram_timing;
+
+#endif
diff --git a/arch/arm/mach-imx/imx9/Makefile b/arch/arm/mach-imx/imx9/Makefile
index 3c63e637de..7376d51f8a 100644
--- a/arch/arm/mach-imx/imx9/Makefile
+++ b/arch/arm/mach-imx/imx9/Makefile
@@ -4,7 +4,7 @@
obj-y += lowlevel_init.o
obj-y += soc.o clock.o clock_root.o trdc.o
-obj-$(CONFIG_IMX93_OPOS93) += opos93_lpddr4_timing.o opos93.o
+obj-$(CONFIG_IMX93_OPOS93) += opos93_lpddr4_timing.o opos93_1gb_lpddr4_timing.o opos93.o
#ifndef CONFIG_SPL_BUILD
obj-y += imx_bootaux.o
diff --git a/arch/arm/mach-imx/imx9/opos93.c b/arch/arm/mach-imx/imx9/opos93.c
index e58dc466ec..2d7cbba119 100644
--- a/arch/arm/mach-imx/imx9/opos93.c
+++ b/arch/arm/mach-imx/imx9/opos93.c
@@ -30,8 +30,10 @@
#include <asm/arch/ccm_regs.h>
#include <asm/arch/ddr.h>
#include <asm/arch/trdc.h>
+#include <asm/arch/opos93.h>
#include <miiphy.h>
#include <netdev.h>
+#include <fuse.h>
#define UART_PAD_CTRL (PAD_CTL_DSE(6) | PAD_CTL_FSEL2)
@@ -86,7 +88,14 @@ void spl_board_init(void)
void spl_dram_init(void)
{
- ddr_init(&dram_timing);
+ u32 val;
+
+ fuse_read(47, 0, &val);
+
+ if (val & 0x1)
+ ddr_init(&opos93_1gb_dram_timing);
+ else
+ ddr_init(&dram_timing);
}
void board_init_f(ulong dummy)
diff --git a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c
similarity index 97%
copy from arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
copy to arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c
index 0c927a3ce2..c3c2b410aa 100644
--- a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos93_1gb_lpddr4_timing.c
@@ -13,9 +13,9 @@
/* Initialize DDRC registers */
static struct dram_cfg_param ddr_ddrc_cfg[] = {
{0x4e300110, 0x44100001},
- {0x4e300000, 0x80009f},
+ {0x4e300000, 0x8000bf},
{0x4e300008, 0x0},
- {0x4e300080, 0x80000312},
+ {0x4e300080, 0x80000412},
{0x4e300084, 0x0},
{0x4e300114, 0x1002},
{0x4e300260, 0x80},
@@ -37,7 +37,7 @@ static struct dram_cfg_param ddr_ddrc_cfg[] = {
static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{
{
- {0x4e300100, 0x1451311B},
+ {0x4e300100, 0x145B311B},
{0x4e300104, 0xF8CC0017},
{0x4e300108, 0xD4D68E00},
{0x4e30010C, 0x0071E100},
@@ -50,7 +50,7 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
{0x4e300300, 0x1D441D0D},
- {0x4e300304, 0x00881E10},
+ {0x4e300304, 0x00D81E10},
{0x4e300308, 0x0C3C0C34},
},
{
@@ -59,19 +59,19 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x19},
{0x16, 0x04},
},
0,
},
{
{
- {0x4e300100, 0x02081100},
+ {0x4e300100, 0x020D1100},
{0x4e300104, 0xF866000C},
{0x4e300108, 0xF2FA8088},
{0x4e30010C, 0x006101A0},
{0x4e300124, 0x0C340000},
- {0x4e300160, 0x00009100},
+ {0x4e300160, 0x00009101},
{0x4e30016C, 0x30700000},
{0x4e300170, 0x8A0A0508},
{0x4e300250, 0x00000011},
@@ -85,16 +85,16 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x19},
{0x16, 0x04},
},
0,
},
{
{
- {0x4e300100, 0x00031000},
+ {0x4e300100, 0x00051000},
{0x4e300104, 0xF855000A},
- {0x4e300108, 0x6E621A48},
+ {0x4e300108, 0x6E620A48},
{0x4e30010C, 0x0031010D},
{0x4e300124, 0x04C50000},
{0x4e300160, 0x00009100},
@@ -111,7 +111,7 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x49},
- {0x0e, 0x18},
+ {0x0e, 0x19},
{0x16, 0x04},
},
1,
@@ -211,17 +211,17 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x120008, 0x190},
{0x220008, 0x9c},
{0x20088, 0x9},
- {0x200b2, 0x134},
+ {0x200b2, 0x14c},
{0x10043, 0x5a1},
{0x10143, 0x5a1},
{0x11043, 0x5a1},
{0x11143, 0x5a1},
- {0x1200b2, 0x134},
+ {0x1200b2, 0x14c},
{0x110043, 0x5a1},
{0x110143, 0x5a1},
{0x111043, 0x5a1},
{0x111143, 0x5a1},
- {0x2200b2, 0x134},
+ {0x2200b2, 0x14c},
{0x210043, 0x5a1},
{0x210143, 0x5a1},
{0x211043, 0x5a1},
@@ -1239,7 +1239,7 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
{0xd0000, 0x0},
{0x54003, 0xc80},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1a},
{0x54008, 0x131f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1249,24 +1249,24 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
{0x54019, 0x2dd4},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1908},
{0x5401e, 0x4},
{0x5401f, 0x2dd4},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1908},
{0x54024, 0x4},
{0x54032, 0xd400},
{0x54033, 0x332d},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x19},
{0x54037, 0x400},
{0x54038, 0xd400},
{0x54039, 0x332d},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x19},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1277,7 +1277,7 @@ static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0x54002, 0x1},
{0x54003, 0x640},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1a},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1287,24 +1287,24 @@ static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0x54019, 0x52a4},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1908},
{0x5401e, 0x4},
{0x5401f, 0x52a4},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1908},
{0x54024, 0x4},
{0x54032, 0xa400},
{0x54033, 0x3352},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x19},
{0x54037, 0x400},
{0x54038, 0xa400},
{0x54039, 0x3352},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x19},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1315,7 +1315,7 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54002, 0x102},
{0x54003, 0x270},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1a},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1325,24 +1325,24 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54019, 0x994},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1800},
+ {0x5401c, 0x1900},
{0x5401e, 0x4},
{0x5401f, 0x994},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1800},
+ {0x54022, 0x1900},
{0x54024, 0x4},
{0x54032, 0x9400},
{0x54033, 0x3309},
{0x54034, 0x4600},
{0x54035, 0x49},
- {0x54036, 0x18},
+ {0x54036, 0x19},
{0x54037, 0x400},
{0x54038, 0x9400},
{0x54039, 0x3309},
{0x5403a, 0x4600},
{0x5403b, 0x49},
- {0x5403c, 0x18},
+ {0x5403c, 0x19},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1353,7 +1353,7 @@ static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0xd0000, 0x0},
{0x54003, 0xc80},
{0x54004, 0x4},
- {0x54006, 0x18},
+ {0x54006, 0x1a},
{0x54008, 0x61},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1364,24 +1364,24 @@ static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0x54019, 0x2dd4},
{0x5401a, 0x33},
{0x5401b, 0x4946},
- {0x5401c, 0x1808},
+ {0x5401c, 0x1908},
{0x5401e, 0x4},
{0x5401f, 0x2dd4},
{0x54020, 0x33},
{0x54021, 0x4946},
- {0x54022, 0x1808},
+ {0x54022, 0x1908},
{0x54024, 0x4},
{0x54032, 0xd400},
{0x54033, 0x332d},
{0x54034, 0x4600},
{0x54035, 0x849},
- {0x54036, 0x18},
+ {0x54036, 0x19},
{0x54037, 0x400},
{0x54038, 0xd400},
{0x54039, 0x332d},
{0x5403a, 0x4600},
{0x5403b, 0x849},
- {0x5403c, 0x18},
+ {0x5403c, 0x19},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1981,7 +1981,7 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
};
/* ddr timing config params */
-struct dram_timing_info dram_timing = {
+struct dram_timing_info opos93_1gb_dram_timing = {
.ddrc_cfg = ddr_ddrc_cfg,
.ddrc_cfg_num = ARRAY_SIZE(ddr_ddrc_cfg),
.ddrphy_cfg = ddr_ddrphy_cfg,
diff --git a/configs/opos93dev_defconfig b/configs/opos93dev_defconfig
index 75aad61ac8..fee131eb79 100644
--- a/configs/opos93dev_defconfig
+++ b/configs/opos93dev_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_CBSIZE=2048
CONFIG_SYS_PBSIZE=2074
CONFIG_CMD_ERASEENV=y
# CONFIG_CMD_CRC32 is not set
+CONFIG_CMD_MEMINFO=y
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_ADC=y
CONFIG_CMD_CLK=y
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-11-06 09:24:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 569af1eb1753dc19569f460b6896cb268f3ed36b (commit)
from e4f06b7a603a334b6d6daa1a12ef363f21700860 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 569af1eb1753dc19569f460b6896cb268f3ed36b
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Nov 6 10:24:14 2024 +0100
[BUILDROOT] opos93-legacy: bump U-Boot to b7222197d4dbb294d0accb2d1012ce6502439898
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 844c17a77..180926522 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -148,7 +148,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="7e8cb6ba478a0db04404c32c5f9d24bb115d62f9"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="b7222197d4dbb294d0accb2d1012ce6502439898"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
BR2_TARGET_UBOOT_SPL=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-11-06 09:19:42
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via b7222197d4dbb294d0accb2d1012ce6502439898 (commit)
via 1b9ad332309ad07c6a21aef15504abc61b3806d4 (commit)
via fa76591113da27030ca4ef7087580619fcafbfea (commit)
via 7e868cb6cc957878dbe9bdf43f153258624d23ac (commit)
from 84c1fd1553e6d9f16687fdb17e01e3287f4b8f23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7222197d4dbb294d0accb2d1012ce6502439898
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Oct 31 20:21:28 2024 +0100
imx9: opos93: ddr: update timings
commit 1b9ad332309ad07c6a21aef15504abc61b3806d4
Author: haidong.zheng <hai...@nx...>
Date: Mon Aug 5 13:25:40 2024 +0800
LFU-781 ddr: imx9: Disable dynamic refresh rate when do mr operation
On i.MX93/91, dynamic refresh rate should be disabled before doing any
MR read or write. Otherwise conflict may happen with read MR12/MR14 in
ddr_init.
We randomly meet DDR unstable with low drive mode frequencies and 1600MTS
DDR setting on iMX91. With this fix, the issue is gone.
Signed-off-by: haidong.zheng <hai...@nx...>
Tested-by: Ye Li <ye...@nx...>
Reviewed-by: Jacky Bai <pin...@nx...>
(cherry picked from commit c50050b80a7d61c8e28d851b15af76d829c15032)
commit fa76591113da27030ca4ef7087580619fcafbfea
Author: Tom.zheng <hai...@nx...>
Date: Tue Aug 8 13:48:27 2023 +0800
LF-9746 ddr: imx9: wait until dram initialization complete
If the DDR data INIT bit is set, and ddr is running at low frequency,
need to make sure DDR initialization complete before continue.
Otherwise, unpredictable behavior when inline ECC id enabled.
Signed-off-by: Tom.zheng <hai...@nx...>
Signed-off-by: Jacky Bai <pin...@nx...>
Reviewed-by: Peng Fan <pen...@nx...>
(cherry picked from commit 162b57e3c389a6f941db2b5440c2c14e7158c5c3)
commit 7e868cb6cc957878dbe9bdf43f153258624d23ac
Author: Peng Fan <pen...@nx...>
Date: Fri Aug 2 17:29:53 2024 +0800
LFU-780 imx9: wait ssar when power on power domain
SSAR handshake done means power on finished, not ISO done. so correct
the waiting mask.
Reviewed-by: Ye Li <ye...@nx...>
Signed-off-by: Peng Fan <pen...@nx...>
(cherry picked from commit 7a7445a2113fa5bcf171347e85200decbcaa6487)
-----------------------------------------------------------------------
Summary of changes:
arch/arm/include/asm/arch-imx9/ddr.h | 1 +
arch/arm/include/asm/arch-imx9/imx-regs.h | 1 +
arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c | 107 +++++++++++++-------------
arch/arm/mach-imx/imx9/soc.c | 2 +-
drivers/ddr/imx/imx9/ddr_init.c | 34 +++++++-
5 files changed, 90 insertions(+), 55 deletions(-)
diff --git a/arch/arm/include/asm/arch-imx9/ddr.h b/arch/arm/include/asm/arch-imx9/ddr.h
index 2b22f3a5be..911ce1612a 100644
--- a/arch/arm/include/asm/arch-imx9/ddr.h
+++ b/arch/arm/include/asm/arch-imx9/ddr.h
@@ -19,6 +19,7 @@
#define REG_DDRDSR_2 (DDR_CTL_BASE + 0xB24)
#define REG_DDR_TIMING_CFG_0 (DDR_CTL_BASE + 0x104)
#define REG_DDR_SDRAM_CFG (DDR_CTL_BASE + 0x110)
+#define REG_DDR_SDRAM_CFG2 (DDR_CTL_BASE + 0x114)
#define REG_DDR_TIMING_CFG_4 (DDR_CTL_BASE + 0x160)
#define REG_DDR_DEBUG_19 (DDR_CTL_BASE + 0xF48)
#define REG_DDR_SDRAM_CFG_3 (DDR_CTL_BASE + 0x260)
diff --git a/arch/arm/include/asm/arch-imx9/imx-regs.h b/arch/arm/include/asm/arch-imx9/imx-regs.h
index 76d241eab0..9953c33b73 100644
--- a/arch/arm/include/asm/arch-imx9/imx-regs.h
+++ b/arch/arm/include/asm/arch-imx9/imx-regs.h
@@ -38,6 +38,7 @@
#define SRC_MIX_SLICE_FUNC_STAT_PSW_STAT BIT(0)
#define SRC_MIX_SLICE_FUNC_STAT_RST_STAT BIT(2)
#define SRC_MIX_SLICE_FUNC_STAT_ISO_STAT BIT(4)
+#define SRC_MIX_SLICE_FUNC_STAT_SSAR_STAT BIT(8)
#define SRC_MIX_SLICE_FUNC_STAT_MEM_STAT BIT(12)
#define IMG_CONTAINER_BASE (0x80000000UL)
diff --git a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
index f2bbdcdce3..0c927a3ce2 100644
--- a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
@@ -1,9 +1,10 @@
/*
* Copyright 2024 NXP
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: BSD-3-Clause
*
- * Code generated with DDR Tool v3.2.0_7.5.
+ * Code generated with DDR Tool v3.4.0_8.3-e3369a1a.
+ * DDR PHY FW2022.01
*/
#include <linux/kernel.h>
@@ -39,26 +40,26 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x4e300100, 0x1451311B},
{0x4e300104, 0xF8CC0017},
{0x4e300108, 0xD4D68E00},
- {0x4e30010C, 0x00718100},
- {0x4e300124, 0x18680000},
+ {0x4e30010C, 0x0071E100},
+ {0x4e300124, 0x18660000},
{0x4e300160, 0x00009101},
{0x4e30016C, 0x33F00000},
{0x4e300170, 0x8B0B0608},
{0x4e300250, 0x00000022},
- {0x4e300254, 0x00880088},
+ {0x4e300254, 0x00000000},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
{0x4e300300, 0x1D441D0D},
{0x4e300304, 0x00881E10},
- {0x4e300308, 0x0C300C34},
+ {0x4e300308, 0x0C3C0C34},
},
{
{0x01, 0xD4},
{0x02, 0x2D},
{0x03, 0x33},
{0x0b, 0x46},
- {0x0c, 0x48},
- {0x0e, 0x48},
+ {0x0c, 0x49},
+ {0x0e, 0x18},
{0x16, 0x04},
},
0,
@@ -74,7 +75,7 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x4e30016C, 0x30700000},
{0x4e300170, 0x8A0A0508},
{0x4e300250, 0x00000011},
- {0x4e300254, 0x00400040},
+ {0x4e300254, 0x00000000},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
},
@@ -83,8 +84,8 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x02, 0x52},
{0x03, 0x33},
{0x0b, 0x46},
- {0x0c, 0x48},
- {0x0e, 0x48},
+ {0x0c, 0x49},
+ {0x0e, 0x18},
{0x16, 0x04},
},
0,
@@ -100,7 +101,7 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x4e30016C, 0x30000000},
{0x4e300170, 0x89090408},
{0x4e300250, 0x00000007},
- {0x4e300254, 0x00150015},
+ {0x4e300254, 0x00010001},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
},
@@ -109,8 +110,8 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
{0x02, 0x9},
{0x03, 0x33},
{0x0b, 0x46},
- {0x0c, 0x48},
- {0x0e, 0x48},
+ {0x0c, 0x49},
+ {0x0e, 0x18},
{0x16, 0x04},
},
1,
@@ -210,17 +211,17 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x120008, 0x190},
{0x220008, 0x9c},
{0x20088, 0x9},
- {0x200b2, 0x10c},
+ {0x200b2, 0x134},
{0x10043, 0x5a1},
{0x10143, 0x5a1},
{0x11043, 0x5a1},
{0x11143, 0x5a1},
- {0x1200b2, 0x10c},
+ {0x1200b2, 0x134},
{0x110043, 0x5a1},
{0x110143, 0x5a1},
{0x111043, 0x5a1},
{0x111143, 0x5a1},
- {0x2200b2, 0x10c},
+ {0x2200b2, 0x134},
{0x210043, 0x5a1},
{0x210143, 0x5a1},
{0x211043, 0x5a1},
@@ -1238,7 +1239,7 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
{0xd0000, 0x0},
{0x54003, 0xc80},
{0x54004, 0x4},
- {0x54006, 0x15},
+ {0x54006, 0x18},
{0x54008, 0x131f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1247,25 +1248,25 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
{0x54012, 0x110},
{0x54019, 0x2dd4},
{0x5401a, 0x33},
- {0x5401b, 0x4846},
- {0x5401c, 0x4808},
+ {0x5401b, 0x4946},
+ {0x5401c, 0x1808},
{0x5401e, 0x4},
{0x5401f, 0x2dd4},
{0x54020, 0x33},
- {0x54021, 0x4846},
- {0x54022, 0x4808},
+ {0x54021, 0x4946},
+ {0x54022, 0x1808},
{0x54024, 0x4},
{0x54032, 0xd400},
{0x54033, 0x332d},
{0x54034, 0x4600},
- {0x54035, 0x848},
- {0x54036, 0x48},
+ {0x54035, 0x849},
+ {0x54036, 0x18},
{0x54037, 0x400},
{0x54038, 0xd400},
{0x54039, 0x332d},
{0x5403a, 0x4600},
- {0x5403b, 0x848},
- {0x5403c, 0x48},
+ {0x5403b, 0x849},
+ {0x5403c, 0x18},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1276,7 +1277,7 @@ static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0x54002, 0x1},
{0x54003, 0x640},
{0x54004, 0x4},
- {0x54006, 0x15},
+ {0x54006, 0x18},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1285,25 +1286,25 @@ static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0x54012, 0x110},
{0x54019, 0x52a4},
{0x5401a, 0x33},
- {0x5401b, 0x4846},
- {0x5401c, 0x4808},
+ {0x5401b, 0x4946},
+ {0x5401c, 0x1808},
{0x5401e, 0x4},
{0x5401f, 0x52a4},
{0x54020, 0x33},
- {0x54021, 0x4846},
- {0x54022, 0x4808},
+ {0x54021, 0x4946},
+ {0x54022, 0x1808},
{0x54024, 0x4},
{0x54032, 0xa400},
{0x54033, 0x3352},
{0x54034, 0x4600},
- {0x54035, 0x848},
- {0x54036, 0x48},
+ {0x54035, 0x849},
+ {0x54036, 0x18},
{0x54037, 0x400},
{0x54038, 0xa400},
{0x54039, 0x3352},
{0x5403a, 0x4600},
- {0x5403b, 0x848},
- {0x5403c, 0x48},
+ {0x5403b, 0x849},
+ {0x5403c, 0x18},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1314,7 +1315,7 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54002, 0x102},
{0x54003, 0x270},
{0x54004, 0x4},
- {0x54006, 0x15},
+ {0x54006, 0x18},
{0x54008, 0x121f},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1323,25 +1324,25 @@ static struct dram_cfg_param ddr_fsp2_cfg[] = {
{0x54012, 0x110},
{0x54019, 0x994},
{0x5401a, 0x33},
- {0x5401b, 0x4846},
- {0x5401c, 0x4800},
+ {0x5401b, 0x4946},
+ {0x5401c, 0x1800},
{0x5401e, 0x4},
{0x5401f, 0x994},
{0x54020, 0x33},
- {0x54021, 0x4846},
- {0x54022, 0x4800},
+ {0x54021, 0x4946},
+ {0x54022, 0x1800},
{0x54024, 0x4},
{0x54032, 0x9400},
{0x54033, 0x3309},
{0x54034, 0x4600},
- {0x54035, 0x48},
- {0x54036, 0x48},
+ {0x54035, 0x49},
+ {0x54036, 0x18},
{0x54037, 0x400},
{0x54038, 0x9400},
{0x54039, 0x3309},
{0x5403a, 0x4600},
- {0x5403b, 0x48},
- {0x5403c, 0x48},
+ {0x5403b, 0x49},
+ {0x5403c, 0x18},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
@@ -1352,7 +1353,7 @@ static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0xd0000, 0x0},
{0x54003, 0xc80},
{0x54004, 0x4},
- {0x54006, 0x15},
+ {0x54006, 0x18},
{0x54008, 0x61},
{0x54009, 0xc8},
{0x5400b, 0x4},
@@ -1362,25 +1363,25 @@ static struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
{0x54012, 0x110},
{0x54019, 0x2dd4},
{0x5401a, 0x33},
- {0x5401b, 0x4846},
- {0x5401c, 0x4808},
+ {0x5401b, 0x4946},
+ {0x5401c, 0x1808},
{0x5401e, 0x4},
{0x5401f, 0x2dd4},
{0x54020, 0x33},
- {0x54021, 0x4846},
- {0x54022, 0x4808},
+ {0x54021, 0x4946},
+ {0x54022, 0x1808},
{0x54024, 0x4},
{0x54032, 0xd400},
{0x54033, 0x332d},
{0x54034, 0x4600},
- {0x54035, 0x848},
- {0x54036, 0x48},
+ {0x54035, 0x849},
+ {0x54036, 0x18},
{0x54037, 0x400},
{0x54038, 0xd400},
{0x54039, 0x332d},
{0x5403a, 0x4600},
- {0x5403b, 0x848},
- {0x5403c, 0x48},
+ {0x5403b, 0x849},
+ {0x5403c, 0x18},
{0x5403d, 0x400},
{0xd0000, 0x1}
};
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index 60c0bc27bd..8980819f9a 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -721,7 +721,7 @@ static int mix_power_init(enum mix_power_domain pd)
/* power on */
clrbits_le32(&mix_regs->slice_sw_ctrl, BIT(31));
val = readl(&mix_regs->func_stat);
- while (val & SRC_MIX_SLICE_FUNC_STAT_ISO_STAT)
+ while (val & SRC_MIX_SLICE_FUNC_STAT_SSAR_STAT)
val = readl(&mix_regs->func_stat);
return 0;
diff --git a/drivers/ddr/imx/imx9/ddr_init.c b/drivers/ddr/imx/imx9/ddr_init.c
index b793274c97..747a2673c0 100644
--- a/drivers/ddr/imx/imx9/ddr_init.c
+++ b/drivers/ddr/imx/imx9/ddr_init.c
@@ -266,6 +266,11 @@ void update_umctl2_rank_space_setting(struct dram_timing_info *dram_timing, unsi
u32 ddrc_mrr(u32 chip_select, u32 mode_reg_num, u32 *mode_reg_val)
{
u32 temp;
+ u8 dyn_ref_rate_en = 0;
+
+ dyn_ref_rate_en = !!(readl(REG_DDR_SDRAM_CFG_3) & BIT(7));
+ if (dyn_ref_rate_en)
+ clrbits_le32(REG_DDR_SDRAM_CFG_3, BIT(7));
writel(0x80000000, REG_DDR_SDRAM_MD_CNTL_2);
temp = 0x80000000 | (chip_select << 28) | (mode_reg_num << 0);
@@ -281,12 +286,20 @@ u32 ddrc_mrr(u32 chip_select, u32 mode_reg_num, u32 *mode_reg_val)
writel(0x0, REG_DDR_SDRAM_MPR4);
writel(0x0, REG_DDR_SDRAM_MD_CNTL_2);
+ if (dyn_ref_rate_en)
+ setbits_le32(REG_DDR_SDRAM_CFG_3, BIT(7));
+
return 0;
}
void ddrc_mrs(u32 cs_sel, u32 opcode, u32 mr)
{
u32 regval;
+ u8 dyn_ref_rate_en = 0;
+
+ dyn_ref_rate_en = !!(readl(REG_DDR_SDRAM_CFG_3) & BIT(7));
+ if (dyn_ref_rate_en)
+ clrbits_le32(REG_DDR_SDRAM_CFG_3, BIT(7));
regval = (cs_sel << 28) | (opcode << 6) | (mr);
writel(regval, REG_DDR_SDRAM_MD_CNTL);
@@ -294,6 +307,9 @@ void ddrc_mrs(u32 cs_sel, u32 opcode, u32 mr)
while ((readl(REG_DDR_SDRAM_MD_CNTL) & 0x80000000) == 0x80000000)
;
check_ddrc_idle();
+
+ if (dyn_ref_rate_en)
+ setbits_le32(REG_DDR_SDRAM_CFG_3, BIT(7));
}
u32 lpddr4_mr_read(u32 mr_rank, u32 mr_addr)
@@ -342,9 +358,11 @@ int ddr_init(struct dram_timing_info *dram_timing)
unsigned int initial_drate;
struct dram_timing_info *saved_timing;
void *fsp;
- int ret;
+ int i, ret;
u32 mr12, mr14;
u32 regval;
+ struct dram_cfg_param *ddrc_cfg;
+ unsigned int ddrc_cfg_num;
debug("DDRINFO: start DRAM init\n");
@@ -387,6 +405,20 @@ int ddr_init(struct dram_timing_info *dram_timing)
check_ddrc_idle();
+ /* if DRAM Data INIT set, wait it be completed */
+ ddrc_cfg = dram_timing->ddrc_cfg;
+ ddrc_cfg_num = dram_timing->ddrc_cfg_num;
+ for (i = 0; i < ddrc_cfg_num; i++) {
+ if (ddrc_cfg->reg == REG_DDR_SDRAM_CFG2) {
+ if (ddrc_cfg->val & 0x10) {
+ while (readl(REG_DDR_SDRAM_CFG2) & 0x10)
+ ;
+ }
+ break;
+ }
+ ddrc_cfg++;
+ }
+
mr12 = lpddr4_mr_read(1, 12);
mr14 = lpddr4_mr_read(1, 14);
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-11-04 14:25:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e4f06b7a603a334b6d6daa1a12ef363f21700860 (commit)
from 9838b0c38bc823275f5e099a5a3df84bdf03d5e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e4f06b7a603a334b6d6daa1a12ef363f21700860
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 4 12:57:52 2024 +0100
[BUILDROOT] 2024.02: patch to fix fbv downloading
-----------------------------------------------------------------------
Summary of changes:
...ackage-fbv-change-upstream-update-version.patch | 555 +++++++++++++++++++++
patches/buildroot/2024.02/cleanup_buildroot.sh | 14 +
2 files changed, 569 insertions(+)
create mode 100644 patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
diff --git a/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch b/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
new file mode 100644
index 000000000..b1d0e65a5
--- /dev/null
+++ b/patches/buildroot/2024.02/0435-package-fbv-change-upstream-update-version.patch
@@ -0,0 +1,555 @@
+From c7109e265cb6c179dd51a02637bb5f97f4767d21 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wb...@op...>
+Date: Fri, 23 Aug 2024 14:54:40 +0200
+Subject: [PATCH 1/1] package/fbv: change upstream, update version
+
+After the official fbv download page is no longer available switch to
+an hopefully active github fork.
+
+Changes made to the Buildroot package:
+- new active upstream fork (6 month old commits)
+- use autoreconf to create configure
+- remove all patches because they are no longer required
+- upstream removed GIF support, so remove it here too
+- license is unchanged, but full COPYING file is now included
+
+Tested on a RPI5 with a PNG, BMP and JPEG picture.
+
+Signed-off-by: Waldemar Brodkorb <wb...@op...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .checkpackageignore | 7 --
+ Config.in.legacy | 6 ++
+ DEVELOPERS | 1 +
+ package/fbv/0001-cross.patch | 44 ----------
+ ...nstead-of-a-macro-for-jpeg-detection.patch | 29 +++++++
+ ...0002-fix-24bpp-support-on-big-endian.patch | 32 -------
+ package/fbv/0003-fix-bgr555.patch | 64 --------------
+ package/fbv/0004-giflib.patch | 84 -------------------
+ package/fbv/0005-include.patch | 20 -----
+ package/fbv/0006-libpng15.patch | 24 ------
+ .../0007-gif.c-fic-build-with-gcc-10.patch | 36 --------
+ package/fbv/Config.in | 13 +--
+ package/fbv/fbv.hash | 4 +-
+ package/fbv/fbv.mk | 30 +------
+ 14 files changed, 44 insertions(+), 350 deletions(-)
+ delete mode 100644 package/fbv/0001-cross.patch
+ create mode 100644 package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+ delete mode 100644 package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+ delete mode 100644 package/fbv/0003-fix-bgr555.patch
+ delete mode 100644 package/fbv/0004-giflib.patch
+ delete mode 100644 package/fbv/0005-include.patch
+ delete mode 100644 package/fbv/0006-libpng15.patch
+ delete mode 100644 package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+
+Index: buildroot/.checkpackageignore
+===================================================================
+--- buildroot.orig/.checkpackageignore
++++ buildroot/.checkpackageignore
+@@ -376,13 +376,6 @@ package/fbterm/0001-fbio.cpp-improxy.cpp
+ package/fbterm/0002-mouse.cpp-fix-musl-compile.patch Upstream
+ package/fbterm/0003-C++11-compliance.patch Upstream
+ package/fbterm/0004-iconv.patch Upstream
+-package/fbv/0001-cross.patch Sob Upstream
+-package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob Upstream
+-package/fbv/0003-fix-bgr555.patch Upstream
+-package/fbv/0004-giflib.patch Upstream
+-package/fbv/0005-include.patch Sob Upstream
+-package/fbv/0006-libpng15.patch Upstream
+-package/fbv/0007-gif.c-fic-build-with-gcc-10.patch Upstream
+ package/fcgiwrap/0001-use-LIBS-from-configure.patch Upstream
+ package/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch Upstream
+ package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch Upstream
+Index: buildroot/DEVELOPERS
+===================================================================
+--- buildroot.orig/DEVELOPERS
++++ buildroot/DEVELOPERS
+@@ -3147,6 +3147,7 @@ F: package/ngrep/
+
+ N: Waldemar Brodkorb <wb...@op...>
+ F: package/asterisk/
++F: package/fbv/
+ F: package/libjwt/
+ F: package/mksh/
+ F: package/ruby/
+Index: buildroot/package/fbv/0001-cross.patch
+===================================================================
+--- buildroot.orig/package/fbv/0001-cross.patch
++++ /dev/null
+@@ -1,44 +0,0 @@
+-diff -urpN fbv-1.0b.orig/configure fbv-1.0b/configure
+---- fbv-1.0b.orig/configure 2004-09-07 13:29:27.000000000 +0200
+-+++ fbv-1.0b/configure 2008-04-24 10:52:37.000000000 +0200
+-@@ -80,6 +80,7 @@ while true ; do
+- esac
+- done
+-
+-+[ -z "$CC" ] && CC=cc
+- [ -z "$prefix" ] && prefix="/usr/local"
+- [ -z "$bindir" ] && bindir="${prefix}/bin"
+- [ -z "$mandir" ] && mandir="${prefix}/man"
+-@@ -106,12 +107,12 @@ xdir="/usr/X11R6"
+- ungif="no"
+- echo "libungif check" >>./config.log
+- echo " 1st:" >>./config.log
+--cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+- if [ -e \$\$~test ]; then
+- libs="-lungif $libs" ; ungif="yes"
+- else
+- echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
+-- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+-+ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+- if [ -e \$\$~test ]; then
+- libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
+- fi
+-@@ -124,7 +125,7 @@ echo "libungif: $ungif" >> ./config.log
+- echo -n "checking for libjpeg presence... "
+- if [ "$jpeg" != "disabled" ]; then
+- jpeg="no"
+--cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
+-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
+- if [ -e \$\$~test ]; then
+- libs="-ljpeg $libs" ; jpeg="yes"
+- fi
+-@@ -135,7 +136,7 @@ echo "libjpeg: $jpeg" >> ./config.log
+- echo -n "checking for libpng presence... "
+- if [ "$png" != "disabled" ]; then
+- png="no"
+--cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
+-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
+- if [ -e \$\$~test ]; then
+- libs="-lpng $libs" ; png="yes"
+- fi
+Index: buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+@@ -0,0 +1,29 @@
++From 3547055ba135dc1d8aacea68f16456aabb8c0a91 Mon Sep 17 00:00:00 2001
++From: Waldemar Brodkorb <wb...@op...>
++Date: Fri, 23 Aug 2024 06:11:43 +0200
++Subject: [PATCH] use a function instead of a macro for jpeg detection
++
++Signed-off-by: Waldemar Brodkorb <wb...@op...>
++Upstream: https://github.com/amadvance/fbv/pull/1
++---
++ configure.ac | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/configure.ac b/configure.ac
++index 3fa4666..fc65903 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -28,8 +28,8 @@ AC_SEARCH_LIBS([png_create_read_struct], [png], [
++ ]
++ )
++
++-AC_SEARCH_LIBS([jpeg_create_decompress], [jpeg], [
++- LIBS="-ljpeg"
+++AC_SEARCH_LIBS([jpeg_start_decompress], [jpeg], [
+++ LIBS="$LIBS -ljpeg"
++ CFLAGS="$CFLAGS -DFBV_SUPPORT_JPEG"
++ ], [
++ ]
++--
++2.39.2
++
+Index: buildroot/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+===================================================================
+--- buildroot.orig/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
++++ /dev/null
+@@ -1,32 +0,0 @@
+-diff -upr a/fb_display.c b/fb_display.c
+---- a/fb_display.c 2007-06-01 16:52:45.000000000 +0200
+-+++ b/fb_display.c 2007-06-01 16:51:43.000000000 +0200
+-@@ -307,7 +307,7 @@ void* convertRGB2FB(int fh, unsigned cha
+- {
+- unsigned long i;
+- void *fbbuff = NULL;
+-- u_int8_t *c_fbbuff;
+-+ u_int8_t *c_fbbuff;
+- u_int16_t *s_fbbuff;
+- u_int32_t *i_fbbuff;
+-
+-@@ -335,6 +335,16 @@ void* convertRGB2FB(int fh, unsigned cha
+- fbbuff = (void *) s_fbbuff;
+- break;
+- case 24:
+-+ *cpp = 3;
+-+ c_fbbuff = (unsigned char *) malloc(count * 3 * sizeof(unsigned char));
+-+ for(i = 0; i < (3 * count); i += 3) {
+-+ /* Big endian framebuffer. */
+-+ c_fbbuff[i] = rgbbuff[i+2];
+-+ c_fbbuff[i+1] = rgbbuff[i+1];
+-+ c_fbbuff[i+2] = rgbbuff[i];
+-+ }
+-+ fbbuff = (void *) c_fbbuff;
+-+ break;
+- case 32:
+- *cpp = 4;
+- i_fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int));
+-Only in build_avr32/fbv-1.0b-modified: .fb_display.c.swp
+-Binary files build_avr32/fbv-1.0b/fb_display.o and build_avr32/fbv-1.0b-modified/fb_display.o differ
+-Binary files build_avr32/fbv-1.0b/fbv and build_avr32/fbv-1.0b-modified/fbv differ
+Index: buildroot/package/fbv/0003-fix-bgr555.patch
+===================================================================
+--- buildroot.orig/package/fbv/0003-fix-bgr555.patch
++++ /dev/null
+@@ -1,64 +0,0 @@
+-[PATCH] fbv: support bgr555 format
+-
+-Signed-off-by: Josh.Wu <jo...@at...>
+-diff -Naur fbv-1.0b-ori/fb_display.c fbv-1.0b/fb_display.c
+---- fbv-1.0b-ori/fb_display.c 2010-04-02 09:38:15.000000000 +0800
+-+++ fbv-1.0b/fb_display.c 2010-04-01 18:54:15.000000000 +0800
+-@@ -297,6 +297,14 @@
+- ((b >> 3) & 31) );
+- }
+-
+-+inline static unsigned short make15color_bgr(unsigned char r, unsigned char g, unsigned char b)
+-+{
+-+ return (
+-+ (((b >> 3) & 31) << 10) |
+-+ (((g >> 3) & 31) << 5) |
+-+ ((r >> 3) & 31) );
+-+}
+-+
+- inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b)
+- {
+- return (
+-@@ -313,6 +321,14 @@
+- u_int16_t *s_fbbuff;
+- u_int32_t *i_fbbuff;
+-
+-+ int is_bgr555 = 0;
+-+ struct fb_var_screeninfo var;
+-+ getVarScreenInfo(fh, &var);
+-+ if(var.red.offset == 0 &&
+-+ var.green.offset == 5 &&
+-+ var.blue.offset == 10)
+-+ is_bgr555 = 1;
+-+
+- switch(bpp)
+- {
+- case 8:
+-@@ -325,15 +341,23 @@
+- case 15:
+- *cpp = 2;
+- s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short));
+-- for(i = 0; i < count ; i++)
+-- s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+-+ if(is_bgr555)
+-+ for(i = 0; i < count ; i++)
+-+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+-+ else
+-+ for(i = 0; i < count ; i++)
+-+ s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+- fbbuff = (void *) s_fbbuff;
+- break;
+- case 16:
+- *cpp = 2;
+- s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short));
+-- for(i = 0; i < count ; i++)
+-- s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+-+ if(is_bgr555)
+-+ for(i = 0; i < count ; i++)
+-+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+-+ else
+-+ for(i = 0; i < count ; i++)
+-+ s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]);
+- fbbuff = (void *) s_fbbuff;
+- break;
+- case 24:
+Index: buildroot/package/fbv/0004-giflib.patch
+===================================================================
+--- buildroot.orig/package/fbv/0004-giflib.patch
++++ /dev/null
+@@ -1,84 +0,0 @@
+-Adjust source code to work with giflib 5.1x
+-
+-Downloaded patch for gif.c from
+-https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib-5.1.patch?h=packages/fbv
+-
+-Signed-off-by: Bernd Kuhls <ber...@t-...>
+-
+-diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c
+---- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400
+-+++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400
+-@@ -31,10 +31,10 @@
+- #include <string.h>
+- #define min(a,b) ((a) < (b) ? (a) : (b))
+- #define gflush return(FH_ERROR_FILE);
+--#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+--#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+-+#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+-+#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+- #define agflush return(FH_ERROR_FORMAT);
+--#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+-+#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+-
+-
+- int fh_gif_id(char *name)
+-@@ -81,7 +81,7 @@
+- ColorMapObject *cmap;
+- int cmaps;
+-
+-- gft=DGifOpenFileName(name);
+-+ gft=DGifOpenFileName(name, NULL);
+- if(gft==NULL){printf("err5\n"); gflush;} //////////
+- do
+- {
+-@@ -170,7 +170,7 @@
+- }
+- }
+- while( rt!= TERMINATE_RECORD_TYPE );
+-- DGifCloseFile(gft);
+-+ DGifCloseFile(gft, NULL);
+- return(FH_ERROR_OK);
+- }
+-
+-@@ -184,7 +184,7 @@
+- int extcode;
+- GifRecordType rt;
+-
+-- gft=DGifOpenFileName(name);
+-+ gft=DGifOpenFileName(name, NULL);
+- if(gft==NULL) gflush;
+- do
+- {
+-@@ -197,7 +197,7 @@
+- px=gft->Image.Width;
+- py=gft->Image.Height;
+- *x=px; *y=py;
+-- DGifCloseFile(gft);
+-+ DGifCloseFile(gft, NULL);
+- return(FH_ERROR_OK);
+- break;
+- case EXTENSION_RECORD_TYPE:
+-@@ -210,7 +210,7 @@
+- }
+- }
+- while( rt!= TERMINATE_RECORD_TYPE );
+-- DGifCloseFile(gft);
+-+ DGifCloseFile(gft, NULL);
+- return(FH_ERROR_FORMAT);
+- }
+- #endif
+-diff -uNr fbv-1.0b.org/configure fbv-1.0b/configure
+---- fbv-1.0b.org/configure 2004-09-07 13:29:27.000000000 +0200
+-+++ fbv-1.0b/configure 2015-01-29 19:58:30.374599874 +0100
+-@@ -106,9 +106,9 @@
+- ungif="no"
+- echo "libungif check" >>./config.log
+- echo " 1st:" >>./config.log
+--$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lgif $libs
+- if [ -e \$\$~test ]; then
+-- libs="-lungif $libs" ; ungif="yes"
+-+ libs="-lgif $libs" ; ungif="yes"
+- else
+- echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
+- $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+Index: buildroot/package/fbv/0005-include.patch
+===================================================================
+--- buildroot.orig/package/fbv/0005-include.patch
++++ /dev/null
+@@ -1,20 +0,0 @@
+-diff -urpN fbv-1.0b.orig/fb_display.c fbv-1.0b/fb_display.c
+---- fbv-1.0b.orig/fb_display.c 2004-09-07 14:09:43.000000000 +0200
+-+++ fbv-1.0b/fb_display.c 2008-04-24 10:48:29.000000000 +0200
+-@@ -18,8 +18,6 @@
+- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+--#include <linux/fb.h>
+--
+- #include <stdio.h>
+- #include <stdlib.h>
+- #include <sys/types.h>
+-@@ -31,6 +29,7 @@
+- #include <asm/types.h>
+- #include <string.h>
+- #include <errno.h>
+-+#include <linux/fb.h>
+- #include "config.h"
+- /* Public Use Functions:
+- *
+Index: buildroot/package/fbv/0006-libpng15.patch
+===================================================================
+--- buildroot.orig/package/fbv/0006-libpng15.patch
++++ /dev/null
+@@ -1,24 +0,0 @@
+-Support for libpng 1.5+ shamelessly taken from Gentoo.
+-
+-Signed-off-by: Gustavo Zacarias <gu...@za...>
+-
+---- a/png.c
+-+++ b/png.c
+-@@ -69,7 +69,7 @@
+- fclose(fh); return(FH_ERROR_FORMAT);
+- }
+- rp=0;
+-- if (setjmp(png_ptr->jmpbuf))
+-+ if (setjmp(png_jmpbuf(png_ptr)))
+- {
+- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+- if(rp) free(rp);
+-@@ -161,7 +161,7 @@
+- fclose(fh); return(FH_ERROR_FORMAT);
+- }
+- rp=0;
+-- if (setjmp(png_ptr->jmpbuf))
+-+ if (setjmp(png_jmpbuf(png_ptr)))
+- {
+- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+- if(rp) free(rp);
+Index: buildroot/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+===================================================================
+--- buildroot.orig/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
++++ /dev/null
+@@ -1,36 +0,0 @@
+-From 8877207b290da1c3bc100f2705c30e6bdafcd985 Mon Sep 17 00:00:00 2001
+-From: Fabrice Fontaine <fon...@gm...>
+-Date: Thu, 26 May 2022 23:59:46 +0200
+-Subject: [PATCH] gif.c: fic build with gcc >= 10
+-
+-Fix the following build failure with gcc >= 10::
+-
+-/nvmedata/autobuild/instance-30/output-1/per-package/fbv/host/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/11.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: gif.o: in function `fh_gif_load':
+-gif.c:(.text+0x338): undefined reference to `m_rend_gif_decodecolormap'
+-
+-Fixes:
+- - http://autobuild.buildroot.org/results/dca603a61b1fd0558992b4a40152d23b5b9c0049
+-
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+-[Upstream status: not upstreamable (most active fork dropped gif
+-support: https://github.com/godspeed1989/fbv/pull/17)]
+----
+- gif.c | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/gif.c b/gif.c
+-index 689e549..5560f25 100644
+---- a/gif.c
+-+++ b/gif.c
+-@@ -48,7 +48,7 @@ int fh_gif_id(char *name)
+- return(0);
+- }
+-
+--inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency)
+-+static inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency)
+- {
+- GifColorType *cmentry;
+- int i;
+---
+-2.35.1
+-
+Index: buildroot/package/fbv/Config.in
+===================================================================
+--- buildroot.orig/package/fbv/Config.in
++++ buildroot/package/fbv/Config.in
+@@ -2,10 +2,10 @@ config BR2_PACKAGE_FBV
+ bool "fbv"
+ help
+ fbv is a very simple graphic file viewer for the framebuffer
+- console, capable of displaying GIF, JPEG, PNG and BMP files
+- using libungif, libjpeg and libpng.
++ console, capable of displaying JPEG, PNG and BMP files
++ using libjpeg and libpng.
+
+- http://freshmeat.net/projects/fbv/
++ https://github.com/amadvance/fbv
+
+ if BR2_PACKAGE_FBV
+
+@@ -23,11 +23,4 @@ config BR2_PACKAGE_FBV_JPEG
+ help
+ Enable support for JPEG using IJG's libjpeg.
+
+-config BR2_PACKAGE_FBV_GIF
+- bool "GIF support"
+- default y
+- select BR2_PACKAGE_GIFLIB
+- help
+- Enable support for GIF using giflib.
+-
+ endif # BR2_PACKAGE_FBV
+Index: buildroot/package/fbv/fbv.hash
+===================================================================
+--- buildroot.orig/package/fbv/fbv.hash
++++ buildroot/package/fbv/fbv.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz
+-sha256 bf21d97bafcaacb5d6bc3d5502030c340f0e0593614078ab017af91e950083af COPYING
++sha256 d18505f95546adb8175652e971d9ab3f2bece6ed21d72ff8e62881caa286a22b fbv-7c2000804226ca860ca80f3baa993582e29aa1a2.tar.gz
++sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
+Index: buildroot/package/fbv/fbv.mk
+===================================================================
+--- buildroot.orig/package/fbv/fbv.mk
++++ buildroot/package/fbv/fbv.mk
+@@ -4,11 +4,11 @@
+ #
+ ################################################################################
+
+-FBV_VERSION = 1.0b
+-FBV_SITE = http://s-tech.elsat.net.pl/fbv
+-
++FBV_VERSION = 7c2000804226ca860ca80f3baa993582e29aa1a2
++FBV_SITE = $(call github,amadvance,fbv,$(FBV_VERSION))
+ FBV_LICENSE = GPL-2.0
+ FBV_LICENSE_FILES = COPYING
++FBV_AUTORECONF = YES
+
+ ### image format dependencies and configure options
+ FBV_DEPENDENCIES = # empty
+@@ -29,29 +29,5 @@ FBV_DEPENDENCIES += jpeg
+ else
+ FBV_CONFIGURE_OPTS += --without-libjpeg
+ endif
+-ifeq ($(BR2_PACKAGE_FBV_GIF),y)
+-FBV_DEPENDENCIES += giflib
+-else
+-FBV_CONFIGURE_OPTS += --without-libungif
+-endif
+-
+-#fbv doesn't support cross-compilation
+-define FBV_CONFIGURE_CMDS
+- (cd $(FBV_DIR); rm -f config.cache; \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure \
+- --prefix=/usr \
+- $(FBV_CONFIGURE_OPTS) \
+- )
+-endef
+-
+-define FBV_BUILD_CMDS
+- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+-endef
+-
+-define FBV_INSTALL_TARGET_CMDS
+- $(INSTALL) -D $(@D)/fbv $(TARGET_DIR)/usr/bin/fbv
+-endef
+
+ $(eval $(autotools-package))
+Index: buildroot/Config.in.legacy
+===================================================================
+--- buildroot.orig/Config.in.legacy
++++ buildroot/Config.in.legacy
+@@ -144,6 +144,14 @@ endif
+
+ ###############################################################################
+
++comment "Legacy options removed in 2024.11"
++
++config BR2_PACKAGE_FBV_GIF
++ bool "fbv GIF support has been removed"
++ select BR2_LEGACY
++ help
++ Fbv GIF support has been removed, use PNG, BMP or JPEG.
++
+ comment "Legacy options removed in 2024.02"
+
+ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
diff --git a/patches/buildroot/2024.02/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
index 83e6bea4e..bc4cb755e 100755
--- a/patches/buildroot/2024.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2024.02/cleanup_buildroot.sh
@@ -9,6 +9,9 @@
# #
####################################################
+rm -rf buildroot/.checkpackageignore
+rm -rf buildroot/Config.in.legacy
+rm -rf buildroot/DEVELOPERS
rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/arm-trusted-firmware/Config.in
@@ -26,6 +29,17 @@ rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
rm -rf buildroot/package/expect/expect.mk
+rm -rf buildroot/package/fbv/0001-cross.patch
+rm -rf buildroot/package/fbv/0001-use-a-function-instead-of-a-macro-for-jpeg-detection.patch
+rm -rf buildroot/package/fbv/0002-fix-24bpp-support-on-big-endian.patch
+rm -rf buildroot/package/fbv/0003-fix-bgr555.patch
+rm -rf buildroot/package/fbv/0004-giflib.patch
+rm -rf buildroot/package/fbv/0005-include.patch
+rm -rf buildroot/package/fbv/0006-libpng15.patch
+rm -rf buildroot/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch
+rm -rf buildroot/package/fbv/Config.in
+rm -rf buildroot/package/fbv/fbv.hash
+rm -rf buildroot/package/fbv/fbv.mk
rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-10-28 13:49:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 84c1fd1553e6d9f16687fdb17e01e3287f4b8f23 (commit)
from 7e8cb6ba478a0db04404c32c5f9d24bb115d62f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 84c1fd1553e6d9f16687fdb17e01e3287f4b8f23
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 28 14:34:44 2024 +0100
imx9: opos93: ddr: set FSP[1] to 1600 MT/s
-----------------------------------------------------------------------
Summary of changes:
arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c | 50 +++++++++++++--------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c b/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
index 17a269f610..f2bbdcdce3 100644
--- a/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
+++ b/arch/arm/mach-imx/imx9/opos93_lpddr4_timing.c
@@ -65,22 +65,22 @@ static struct dram_fsp_cfg ddr_dram_fsp_cfg[] = {
},
{
{
- {0x4e300100, 0x124A2100},
- {0x4e300104, 0xF877000E},
- {0x4e300108, 0x181604AA},
- {0x4e30010C, 0x005101E6},
- {0x4e300124, 0x0E3C0000},
+ {0x4e300100, 0x02081100},
+ {0x4e300104, 0xF866000C},
+ {0x4e300108, 0xF2FA8088},
+ {0x4e30010C, 0x006101A0},
+ {0x4e300124, 0x0C340000},
{0x4e300160, 0x00009100},
- {0x4e30016C, 0x30900000},
+ {0x4e30016C, 0x30700000},
{0x4e300170, 0x8A0A0508},
- {0x4e300250, 0x00000014},
- {0x4e300254, 0x004C004C},
+ {0x4e300250, 0x00000011},
+ {0x4e300254, 0x00400040},
{0x4e300258, 0x00000008},
{0x4e30025C, 0x00000400},
},
{
- {0x01, 0xB4},
- {0x02, 0x1B},
+ {0x01, 0xA4},
+ {0x02, 0x52},
{0x03, 0x33},
{0x0b, 0x46},
{0x0c, 0x48},
@@ -155,7 +155,7 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x1200c5, 0xb},
{0x2200c5, 0x7},
{0x2002e, 0x2},
- {0x12002e, 0x2},
+ {0x12002e, 0x1},
{0x22002e, 0x2},
{0x90204, 0x0},
{0x190204, 0x0},
@@ -207,7 +207,7 @@ static struct dram_cfg_param ddr_ddrphy_cfg[] = {
{0x20050, 0x11},
{0x2009b, 0x2},
{0x20008, 0x320},
- {0x120008, 0x1d3},
+ {0x120008, 0x190},
{0x220008, 0x9c},
{0x20088, 0x9},
{0x200b2, 0x10c},
@@ -1274,7 +1274,7 @@ static struct dram_cfg_param ddr_fsp0_cfg[] = {
static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0xd0000, 0x0},
{0x54002, 0x1},
- {0x54003, 0x74a},
+ {0x54003, 0x640},
{0x54004, 0x4},
{0x54006, 0x15},
{0x54008, 0x121f},
@@ -1283,24 +1283,24 @@ static struct dram_cfg_param ddr_fsp1_cfg[] = {
{0x5400d, 0x100},
{0x5400f, 0x100},
{0x54012, 0x110},
- {0x54019, 0x1bb4},
+ {0x54019, 0x52a4},
{0x5401a, 0x33},
{0x5401b, 0x4846},
{0x5401c, 0x4808},
{0x5401e, 0x4},
- {0x5401f, 0x1bb4},
+ {0x5401f, 0x52a4},
{0x54020, 0x33},
{0x54021, 0x4846},
{0x54022, 0x4808},
{0x54024, 0x4},
- {0x54032, 0xb400},
- {0x54033, 0x331b},
+ {0x54032, 0xa400},
+ {0x54033, 0x3352},
{0x54034, 0x4600},
{0x54035, 0x848},
{0x54036, 0x48},
{0x54037, 0x400},
- {0x54038, 0xb400},
- {0x54039, 0x331b},
+ {0x54038, 0xa400},
+ {0x54039, 0x3352},
{0x5403a, 0x4600},
{0x5403b, 0x848},
{0x5403c, 0x48},
@@ -1874,9 +1874,9 @@ static struct dram_cfg_param ddr_phy_pie[] = {
{0x2000c, 0xc8},
{0x2000d, 0x7d0},
{0x2000e, 0x2c},
- {0x12000b, 0x20d},
- {0x12000c, 0x74},
- {0x12000d, 0x48e},
+ {0x12000b, 0x1c2},
+ {0x12000c, 0x64},
+ {0x12000d, 0x3e8},
{0x12000e, 0x2c},
{0x22000b, 0xb0},
{0x22000c, 0x27},
@@ -1957,8 +1957,8 @@ static struct dram_fsp_msg ddr_dram_fsp_msg[] = {
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_cfg),
},
{
- /* P1 1866mts 1D */
- .drate = 1866,
+ /* P1 1600mts 1D */
+ .drate = 1600,
.fw_type = FW_1D_IMAGE,
.fsp_cfg = ddr_fsp1_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_fsp1_cfg),
@@ -1991,7 +1991,7 @@ struct dram_timing_info dram_timing = {
.ddrphy_trained_csr_num = ARRAY_SIZE(ddr_ddrphy_trained_csr),
.ddrphy_pie = ddr_phy_pie,
.ddrphy_pie_num = ARRAY_SIZE(ddr_phy_pie),
- .fsp_table = { 3200, 1866, 625, },
+ .fsp_table = { 3200, 1600, 625, },
.fsp_cfg = ddr_dram_fsp_cfg,
.fsp_cfg_num = ARRAY_SIZE(ddr_dram_fsp_cfg),
};
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-10-21 15:48:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9838b0c38bc823275f5e099a5a3df84bdf03d5e4 (commit)
from f76d158cde02c1813eb90f3dedbd21a2d49d4202 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9838b0c38bc823275f5e099a5a3df84bdf03d5e4
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 21 17:46:49 2024 +0200
.gitlab-ci.yml: allow to run build-nightly manually from gitlab.com
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e81e978d..dead008e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ build-merge-request:
build-nightly:
rules:
- - if: $CI_PIPELINE_SOURCE == "schedule"
+ - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
extends: .build_template
artifacts:
name: "$ARMADEUS_PLATFORM-$CI_COMMIT_SHORT_SHA-images"
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-10-21 07:59:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f76d158cde02c1813eb90f3dedbd21a2d49d4202 (commit)
from 6b3248ea5de135138325b4f9f4dceba790378b89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f76d158cde02c1813eb90f3dedbd21a2d49d4202
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 21 09:58:52 2024 +0200
[BUILDROOT] Bump to BR 2024.02.7
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3557d6519..adf575c0c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2024.02
-BUILDROOT_MINOR_VERSION ?= 6
+BUILDROOT_MINOR_VERSION ?= 7
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-10-04 08:58:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6b3248ea5de135138325b4f9f4dceba790378b89 (commit)
from 067b5682a4a121de5873e628b9a5d6843494a933 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6b3248ea5de135138325b4f9f4dceba790378b89
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Oct 4 10:57:30 2024 +0200
[BUILDROOT] opos93-legacy: bump U-Boot to 7e8cb6ba478a0db04404c32c5f9d24bb115d62f9
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 629202404..844c17a77 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -148,7 +148,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="211ca15163f04bf846c8b6e9ae2603cbcfe61ae7"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="7e8cb6ba478a0db04404c32c5f9d24bb115d62f9"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
BR2_TARGET_UBOOT_SPL=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-10-03 14:49:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 7e8cb6ba478a0db04404c32c5f9d24bb115d62f9 (commit)
via 0d148c3634683c48b999bd10361dadeee4d71afb (commit)
via 2ed215fc8a9b43f80cfbcabda4640ddc19be22e1 (commit)
via 0f99c0218c92982a7a2e5271f4467f40ec770d68 (commit)
via 4fb89e3ee090063312c95860540dab96b54a74b1 (commit)
from 9243306233e136d65c2e382415e63951e725e9f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e8cb6ba478a0db04404c32c5f9d24bb115d62f9
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Oct 2 09:34:55 2024 +0200
configs: opos93dev_defconfig: enable AHAB_BOOT
commit 0d148c3634683c48b999bd10361dadeee4d71afb
Author: Ye Li <ye...@nx...>
Date: Mon Apr 1 09:41:09 2024 +0800
arm: imx9: Call imx9_probe_mu for DM post in board_r
This event callback imx9_probe_mu needs to be called in board_r
as well, because many ELE APIs depending on this MU probed
Signed-off-by: Ye Li <ye...@nx...>
(cherry picked from commit ffb0a930ce7e234d4d9136a5695a48b6e3d2a7c6)
commit 2ed215fc8a9b43f80cfbcabda4640ddc19be22e1
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Oct 3 10:43:03 2024 +0200
imx9: opos93: start ELE RNG
commit 0f99c0218c92982a7a2e5271f4467f40ec770d68
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Oct 3 11:45:24 2024 +0200
arm: dts: opos93: remove unused reserved memory
commit 4fb89e3ee090063312c95860540dab96b54a74b1
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Sep 27 16:57:29 2024 +0200
arm: dts: opos93: remove unused pin muxing group
-----------------------------------------------------------------------
Summary of changes:
arch/arm/dts/imx93-opos93-u-boot.dtsi | 2 ++
arch/arm/dts/imx93-opos93.dtsi | 7 -------
arch/arm/mach-imx/imx9/opos93.c | 4 ++++
arch/arm/mach-imx/imx9/soc.c | 1 +
configs/opos93dev_defconfig | 1 +
include/configs/opos93dev.h | 4 ----
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/arch/arm/dts/imx93-opos93-u-boot.dtsi b/arch/arm/dts/imx93-opos93-u-boot.dtsi
index f25b93219f..aa95106ae1 100644
--- a/arch/arm/dts/imx93-opos93-u-boot.dtsi
+++ b/arch/arm/dts/imx93-opos93-u-boot.dtsi
@@ -3,6 +3,8 @@
* Copyright 2024 Armadeus Systems <co...@ar...>
*/
+/delete-node/ &ele_reserved;
+
/ {
wdt-reboot {
compatible = "wdt-reboot";
diff --git a/arch/arm/dts/imx93-opos93.dtsi b/arch/arm/dts/imx93-opos93.dtsi
index 03b36c54a2..ec649740c1 100644
--- a/arch/arm/dts/imx93-opos93.dtsi
+++ b/arch/arm/dts/imx93-opos93.dtsi
@@ -168,13 +168,6 @@
>;
};
- pinctrl_uart1: uart1grp {
- fsl,pins = <
- MX93_PAD_UART1_RXD__LPUART1_RX 0x51e
- MX93_PAD_UART1_TXD__LPUART1_TX 0x31e
- >;
- };
-
pinctrl_uart5: uart5grp {
fsl,pins = <
MX93_PAD_DAP_TCLK_SWCLK__LPUART5_CTS_B 0x131e
diff --git a/arch/arm/mach-imx/imx9/opos93.c b/arch/arm/mach-imx/imx9/opos93.c
index 65c5d7d05c..e58dc466ec 100644
--- a/arch/arm/mach-imx/imx9/opos93.c
+++ b/arch/arm/mach-imx/imx9/opos93.c
@@ -122,6 +122,10 @@ void board_init_f(ulong dummy)
/* DDR initialization */
spl_dram_init();
+ ret = ele_start_rng();
+ if (ret)
+ printf("failed to start ELE RNG\n");
+
/* Put M33 into CPUWAIT for following kick */
ret = m33_prepare();
if (!ret)
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c
index bf03764e11..60c0bc27bd 100644
--- a/arch/arm/mach-imx/imx9/soc.c
+++ b/arch/arm/mach-imx/imx9/soc.c
@@ -577,6 +577,7 @@ int imx9_probe_mu(void)
return 0;
}
EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_F, imx9_probe_mu);
+EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_R, imx9_probe_mu);
int timer_init(void)
{
diff --git a/configs/opos93dev_defconfig b/configs/opos93dev_defconfig
index ddc617d9c3..75aad61ac8 100644
--- a/configs/opos93dev_defconfig
+++ b/configs/opos93dev_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x0
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="imx93-opos93dev"
CONFIG_SPL_TEXT_BASE=0x2049A000
+CONFIG_AHAB_BOOT=y
CONFIG_TARGET_OPOS93DEV=y
CONFIG_SYS_MONITOR_LEN=524288
CONFIG_SPL_SERIAL=y
diff --git a/include/configs/opos93dev.h b/include/configs/opos93dev.h
index 68da8994e5..b56afb8322 100644
--- a/include/configs/opos93dev.h
+++ b/include/configs/opos93dev.h
@@ -13,10 +13,6 @@
#define CFG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#ifdef CONFIG_SPL_BUILD
-#define CFG_MALLOC_F_ADDR 0x204D0000
-#endif
-
/* Link Definitions */
#define CFG_SYS_INIT_RAM_ADDR 0x80000000
#define CFG_SYS_INIT_RAM_SIZE 0x200000
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-09-25 08:12:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 067b5682a4a121de5873e628b9a5d6843494a933 (commit)
from a11f73880c3222154d7aebb94ca03820ffd665cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 067b5682a4a121de5873e628b9a5d6843494a933
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Sep 25 10:12:14 2024 +0200
[BUILDROOT] Bump to BR 2024.02.6
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 830d7223c..3557d6519 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2024.02
-BUILDROOT_MINOR_VERSION ?= 4
+BUILDROOT_MINOR_VERSION ?= 6
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-09-23 13:24:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a11f73880c3222154d7aebb94ca03820ffd665cd (commit)
from fe82ebb9951e37587512f7d6896de1ac3aacb8c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a11f73880c3222154d7aebb94ca03820ffd665cd
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Sep 23 15:23:45 2024 +0200
[BUILDROOT] opos93-legacy: bump Linux to 038a4fac803e8c682c0bba645ab4cf78078d7dee
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 7e01ddb9e..629202404 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ed4b9bea393cdd5516d3d53e9c14fe2f58d7975f"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="038a4fac803e8c682c0bba645ab4cf78078d7dee"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-09-16 16:28:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fe82ebb9951e37587512f7d6896de1ac3aacb8c8 (commit)
from 4043090fc8935b43d425c2590999f485ac1ca01f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fe82ebb9951e37587512f7d6896de1ac3aacb8c8
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Sep 16 18:27:13 2024 +0200
[LINUX] opos93-linux-legacy-6.1.fragment: SND_SOC_FSL_SAI built-in
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment | 1 +
1 file changed, 1 insertion(+)
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
index b219dd19e..e6c0e539f 100644
--- a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
@@ -2,4 +2,5 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
CONFIG_PWM_IMX_TPM=y
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
+CONFIG_SND_SOC_FSL_SAI=y
CONFIG_TOUCHSCREEN_FTS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-09-16 13:54:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4043090fc8935b43d425c2590999f485ac1ca01f (commit)
from 1da5dbba5b1f8dda1caee294fe5ab6d08f5f24d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4043090fc8935b43d425c2590999f485ac1ca01f
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Sep 16 15:53:56 2024 +0200
[BUILDROOT] opos93-legacy: bump Linux to ed4b9bea393cdd5516d3d53e9c14fe2f58d7975f
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 45 ++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 4 deletions(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 3491a6993..7e01ddb9e 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="984640b9a7f42fe32d36c1ed00c58a13ffe61293"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ed4b9bea393cdd5516d3d53e9c14fe2f58d7975f"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -32,28 +32,64 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
+BR2_PACKAGE_LINUX_TOOLS_PERF=y
+BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS=y
+BR2_PACKAGE_LINUX_TOOLS_PERF_TUI=y
+BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3=y
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_ALSALOOP=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_GSTREAMER1=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BAYER2RGB_NEON=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_BAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY=y
+BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
+BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_YAVTA=y
BR2_PACKAGE_DROPWATCH=y
+BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS=y
BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_WIDGETS=y
+BR2_PACKAGE_QT5BASE_FONTCONFIG=y
+BR2_PACKAGE_QT5BASE_GIF=y
+BR2_PACKAGE_QT5BASE_JPEG=y
+BR2_PACKAGE_QT5BASE_PNG=y
+BR2_PACKAGE_QT5MULTIMEDIA=y
+BR2_PACKAGE_QT5QUICKCONTROLS2=y
+BR2_PACKAGE_QT5SERIALPORT=y
+BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
+BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION=y
BR2_PACKAGE_IMX_FIRMWARE=y
BR2_PACKAGE_IMX_FIRMWARE_IW416=y
BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y
BR2_PACKAGE_FIRMWARE_ELE_IMX=y
BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_MDIO_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_LIBDRM=y
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
@@ -62,9 +98,9 @@ BR2_PACKAGE_LIBGPIOD_TOOLS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_LIBMNL=y
BR2_PACKAGE_LIBNFNETLINK=y
BR2_PACKAGE_LIBNL_TOOLS=y
+BR2_PACKAGE_PCRE2_32=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
@@ -93,12 +129,13 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
+BR2_PACKAGE_PROCPS_NG=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_UTIL_LINUX_RFKILL=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="180M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-09-11 13:43:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1da5dbba5b1f8dda1caee294fe5ab6d08f5f24d9 (commit)
from f2075c96708b0e6014a8b7081b921f9f77e61754 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1da5dbba5b1f8dda1caee294fe5ab6d08f5f24d9
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Sep 11 15:43:21 2024 +0200
[LINUX] opos93-linux-legacy-6.1.fragment: enable touchscreen driver
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment | 1 +
1 file changed, 1 insertion(+)
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
index f49af6996..b219dd19e 100644
--- a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
+++ b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
@@ -2,3 +2,4 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
CONFIG_PWM_IMX_TPM=y
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
+CONFIG_TOUCHSCREEN_FTS=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-09-03 13:03:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f2075c96708b0e6014a8b7081b921f9f77e61754 (commit)
from e36e0c592dde90f08f16ab435058a8c310196aa4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f2075c96708b0e6014a8b7081b921f9f77e61754
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 3 15:02:28 2024 +0200
[BUILDROOT] opos93-legacy: bump Linux to 984640b9a7f42fe32d36c1ed00c58a13ffe61293
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos93-legacy-6.1_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos93-legacy-6.1_defconfig b/buildroot/configs/opos93-legacy-6.1_defconfig
index 370c9cdda..3491a6993 100644
--- a/buildroot/configs/opos93-legacy-6.1_defconfig
+++ b/buildroot/configs/opos93-legacy-6.1_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="19de17ec4119a888eab71cb5d61e76bf804b19d3"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="984640b9a7f42fe32d36c1ed00c58a13ffe61293"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-08-16 14:48:23
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e36e0c592dde90f08f16ab435058a8c310196aa4 (commit)
via 03597758f8b279379db924bf10972701b5d19842 (commit)
from 02c299518ae1815e8c0a7263b691ccd0b3cd70c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e36e0c592dde90f08f16ab435058a8c310196aa4
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Aug 16 16:47:46 2024 +0200
[BUILDROOT] 2024.02: patches to bump weston
commit 03597758f8b279379db924bf10972701b5d19842
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Aug 14 11:23:54 2024 +0200
[BUILDROOT] 2024.02: fix uuu bump patches numbering
-----------------------------------------------------------------------
Summary of changes:
...0429-package-uuu-bump-to-version-1.5.179.patch} | 0
...0430-package-uuu-bump-to-version-1.5.181.patch} | 0
...0431-package-uuu-bump-to-version-1.5.182.patch} | 0
.../0432-package-weston-bump-to-13.0.0.patch | 87 ++++++++++++++++++++++
.../0433-package-weston-bump-to-13.0.1.patch | 43 +++++++++++
.../0434-package-weston-bump-to-13.0.3.patch | 43 +++++++++++
patches/buildroot/2024.02/cleanup_buildroot.sh | 3 +
7 files changed, 176 insertions(+)
rename patches/buildroot/2024.02/{4029-package-uuu-bump-to-version-1.5.179.patch => 0429-package-uuu-bump-to-version-1.5.179.patch} (100%)
rename patches/buildroot/2024.02/{4030-package-uuu-bump-to-version-1.5.181.patch => 0430-package-uuu-bump-to-version-1.5.181.patch} (100%)
rename patches/buildroot/2024.02/{4031-package-uuu-bump-to-version-1.5.182.patch => 0431-package-uuu-bump-to-version-1.5.182.patch} (100%)
create mode 100644 patches/buildroot/2024.02/0432-package-weston-bump-to-13.0.0.patch
create mode 100644 patches/buildroot/2024.02/0433-package-weston-bump-to-13.0.1.patch
create mode 100644 patches/buildroot/2024.02/0434-package-weston-bump-to-13.0.3.patch
diff --git a/patches/buildroot/2024.02/4029-package-uuu-bump-to-version-1.5.179.patch b/patches/buildroot/2024.02/0429-package-uuu-bump-to-version-1.5.179.patch
similarity index 100%
rename from patches/buildroot/2024.02/4029-package-uuu-bump-to-version-1.5.179.patch
rename to patches/buildroot/2024.02/0429-package-uuu-bump-to-version-1.5.179.patch
diff --git a/patches/buildroot/2024.02/4030-package-uuu-bump-to-version-1.5.181.patch b/patches/buildroot/2024.02/0430-package-uuu-bump-to-version-1.5.181.patch
similarity index 100%
rename from patches/buildroot/2024.02/4030-package-uuu-bump-to-version-1.5.181.patch
rename to patches/buildroot/2024.02/0430-package-uuu-bump-to-version-1.5.181.patch
diff --git a/patches/buildroot/2024.02/4031-package-uuu-bump-to-version-1.5.182.patch b/patches/buildroot/2024.02/0431-package-uuu-bump-to-version-1.5.182.patch
similarity index 100%
rename from patches/buildroot/2024.02/4031-package-uuu-bump-to-version-1.5.182.patch
rename to patches/buildroot/2024.02/0431-package-uuu-bump-to-version-1.5.182.patch
diff --git a/patches/buildroot/2024.02/0432-package-weston-bump-to-13.0.0.patch b/patches/buildroot/2024.02/0432-package-weston-bump-to-13.0.0.patch
new file mode 100644
index 000000000..5e7c2c63e
--- /dev/null
+++ b/patches/buildroot/2024.02/0432-package-weston-bump-to-13.0.0.patch
@@ -0,0 +1,87 @@
+From 4ee858808d132fe7d290abbdad7d1f38b47e8b6f Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <th...@de...>
+Date: Wed, 14 Feb 2024 21:38:45 +0100
+Subject: [PATCH 1/1] package/weston: bump to 13.0.0
+
+Announce:
+ https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html
+
+Drop -Dlauncher-libseat=true, as it has been dropped upstream [1].
+
+Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in
+commit 6d677931284d58ae0e8e001cfd990eafaee5cecc
+ "package/weston: select the seatd daemon", and
+commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab
+ "package/weston: don't select seatd daemon if we have logind",
+as it is not strictly needed anymore.
+
+In package/seatd/Config.in we have:
+ select BR2_PACKAGE_SEATD_BUILTIN \
+ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON
+
+Here we have:
+ select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND
+
+This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only-
+backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind
+of logic should be selected in the device defconfigs or by packages that
+really need one specific backend.
+
+[1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58>
+
+Signed-off-by: Thomas Devoogdt <tho...@ba...>
+Signed-off-by: Arnout Vandecappelle <ar...@mi...>
+---
+ package/weston/Config.in | 1 -
+ package/weston/weston.hash | 6 +++---
+ package/weston/weston.mk | 3 +--
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/package/weston/Config.in b/package/weston/Config.in
+index db6a78ee8a2a..1b282fb362fc 100644
+--- a/package/weston/Config.in
++++ b/package/weston/Config.in
+@@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON
+ select BR2_PACKAGE_LIBINPUT
+ select BR2_PACKAGE_LIBDRM
+ select BR2_PACKAGE_SEATD
+- select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND
+ # Runtime dependency
+ select BR2_PACKAGE_XKEYBOARD_CONFIG
+ select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL
+diff --git a/package/weston/weston.hash b/package/weston/weston.hash
+index 0ecbaa4168ba..ded5d352751f 100644
+--- a/package/weston/weston.hash
++++ b/package/weston/weston.hash
+@@ -1,4 +1,4 @@
+-# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html
+-sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz
+-sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz
++# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html
++sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz
++sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz
+ sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
+diff --git a/package/weston/weston.mk b/package/weston/weston.mk
+index b07e7987650e..5ae9c2297309 100644
+--- a/package/weston/weston.mk
++++ b/package/weston/weston.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-WESTON_VERSION = 12.0.1
++WESTON_VERSION = 13.0.0
+ WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads
+ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
+ WESTON_LICENSE = MIT
+@@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \
+ -Ddoc=false \
+ -Dremoting=false \
+ -Dbackend-vnc=false \
+- -Dlauncher-libseat=true \
+ -Dtools=calibrator,debug,info,terminal,touch-calibrator
+
+ ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y)
+--
+2.44.2
+
diff --git a/patches/buildroot/2024.02/0433-package-weston-bump-to-13.0.1.patch b/patches/buildroot/2024.02/0433-package-weston-bump-to-13.0.1.patch
new file mode 100644
index 000000000..3a528e13b
--- /dev/null
+++ b/patches/buildroot/2024.02/0433-package-weston-bump-to-13.0.1.patch
@@ -0,0 +1,43 @@
+From 157b9d1199f9f1101e76aedc552cfa524990acd6 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <th...@de...>
+Date: Sat, 27 Apr 2024 15:47:47 +0200
+Subject: [PATCH 1/1] package/weston: bump to 13.0.1
+
+Announce:
+ https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html
+
+Signed-off-by: Thomas Devoogdt <th...@de...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ package/weston/weston.hash | 6 +++---
+ package/weston/weston.mk | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/weston/weston.hash b/package/weston/weston.hash
+index ded5d352751f..5fa0c9d2bef4 100644
+--- a/package/weston/weston.hash
++++ b/package/weston/weston.hash
+@@ -1,4 +1,4 @@
+-# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html
+-sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz
+-sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz
++# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html
++sha256 ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a weston-13.0.1.tar.xz
++sha512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122 weston-13.0.1.tar.xz
+ sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
+diff --git a/package/weston/weston.mk b/package/weston/weston.mk
+index 5ae9c2297309..499cf45fabce 100644
+--- a/package/weston/weston.mk
++++ b/package/weston/weston.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-WESTON_VERSION = 13.0.0
++WESTON_VERSION = 13.0.1
+ WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads
+ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
+ WESTON_LICENSE = MIT
+--
+2.44.2
+
diff --git a/patches/buildroot/2024.02/0434-package-weston-bump-to-13.0.3.patch b/patches/buildroot/2024.02/0434-package-weston-bump-to-13.0.3.patch
new file mode 100644
index 000000000..97b6cdcbf
--- /dev/null
+++ b/patches/buildroot/2024.02/0434-package-weston-bump-to-13.0.3.patch
@@ -0,0 +1,43 @@
+From 224067105db10ad00ad1e7b2eb6444732323eb65 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <th...@de...>
+Date: Sat, 8 Jun 2024 12:25:26 +0200
+Subject: [PATCH 1/1] package/weston: bump to 13.0.3
+
+Announce:
+ https://lists.freedesktop.org/archives/wayland-devel/2024-June/043655.html
+
+Signed-off-by: Thomas Devoogdt <th...@de...>
+Signed-off-by: Arnout Vandecappelle <ar...@mi...>
+---
+ package/weston/weston.hash | 6 +++---
+ package/weston/weston.mk | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/package/weston/weston.hash b/package/weston/weston.hash
+index 5fa0c9d2bef4..62322ac639ea 100644
+--- a/package/weston/weston.hash
++++ b/package/weston/weston.hash
+@@ -1,4 +1,4 @@
+-# From https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html
+-sha256 ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a weston-13.0.1.tar.xz
+-sha512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122 weston-13.0.1.tar.xz
++# From https://lists.freedesktop.org/archives/wayland-devel/2024-June/043655.html
++sha256 27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093 weston-13.0.3.tar.xz
++sha512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb weston-13.0.3.tar.xz
+ sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING
+diff --git a/package/weston/weston.mk b/package/weston/weston.mk
+index b708d037431a..bd5a0550b122 100644
+--- a/package/weston/weston.mk
++++ b/package/weston/weston.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-WESTON_VERSION = 13.0.1
++WESTON_VERSION = 13.0.3
+ WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads
+ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
+ WESTON_LICENSE = MIT
+--
+2.44.2
+
diff --git a/patches/buildroot/2024.02/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
index 3f513b458..83e6bea4e 100755
--- a/patches/buildroot/2024.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2024.02/cleanup_buildroot.sh
@@ -91,6 +91,9 @@ rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
rm -rf buildroot/package/uuu/uuu.hash
rm -rf buildroot/package/uuu/uuu.mk
+rm -rf buildroot/package/weston/Config.in
+rm -rf buildroot/package/weston/weston.hash
+rm -rf buildroot/package/weston/weston.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
rm -rf buildroot/package/xc3sprog/Config.in
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-07-16 15:53:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 02c299518ae1815e8c0a7263b691ccd0b3cd70c6 (commit)
from 72233fb11b5400fab48e4aba83ab74dc69a14713 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02c299518ae1815e8c0a7263b691ccd0b3cd70c6
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 16 17:52:05 2024 +0200
[BUILDROOT] Make fw_{print,set}env commands work on OPOS93
-----------------------------------------------------------------------
Summary of changes:
.../etc/{fw_env_opos8mm.config => fw_env_opos93.config} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
copy buildroot/target/device/armadeus/rootfs/target_overlay/etc/{fw_env_opos8mm.config => fw_env_opos93.config} (73%)
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos8mm.config b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos93.config
similarity index 73%
copy from buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos8mm.config
copy to buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos93.config
index 2e2ebdf04..07121e5b2 100644
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos8mm.config
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/fw_env_opos93.config
@@ -1,7 +1,7 @@
-# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS8MM <<<.
+# Configuration file for fw_(printenv/saveenv) utility on >>> OPOS93 <<<.
# Up to two entries are valid, in this case the redundant environment sector is
# assumed present.
# Block device name Device offset Env. size
-/dev/mmcblk0boot1 0x0 0x4000
-/dev/mmcblk0boot1 0x4000 0x4000
+/dev/mmcblk0boot1 0x0 0x20000
+/dev/mmcblk0boot1 0x20000 0x20000
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-07-16 09:22:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 72233fb11b5400fab48e4aba83ab74dc69a14713 (commit)
from b81d53263e9c03ada6986f96ce86a047323acc67 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 72233fb11b5400fab48e4aba83ab74dc69a14713
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 16 11:21:31 2024 +0200
[BUILDROOT] Bump to BR 2024.02.4
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 00db8d50c..830d7223c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2024.02
-BUILDROOT_MINOR_VERSION ?= 3
+BUILDROOT_MINOR_VERSION ?= 4
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
hooks/post-receive
--
armadeus
|
|
From: sszy <ss...@us...> - 2024-07-10 08:35:52
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2024.01 has been updated
via 9243306233e136d65c2e382415e63951e725e9f6 (commit)
from 211ca15163f04bf846c8b6e9ae2603cbcfe61ae7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9243306233e136d65c2e382415e63951e725e9f6
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jul 10 10:35:22 2024 +0200
configs: opos93dev_defconfig: enable UMS
-----------------------------------------------------------------------
Summary of changes:
configs/opos93dev_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/opos93dev_defconfig b/configs/opos93dev_defconfig
index b7f8baf480..ddc617d9c3 100644
--- a/configs/opos93dev_defconfig
+++ b/configs/opos93dev_defconfig
@@ -66,6 +66,7 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_POWEROFF=y
CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
CONFIG_CMD_NFS=y
CONFIG_SYS_DISABLE_AUTOLOAD=y
CONFIG_CMD_SNTP=y
hooks/post-receive
--
armadeus/u-boot
|
|
From: sszy <ss...@us...> - 2024-07-05 08:30:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus/u-boot".
The branch, armadeus-2015.01 has been deleted
was 92fa7f53f1f3f03296f8ffb14bdf1baefab83368
-----------------------------------------------------------------------
92fa7f53f1f3f03296f8ffb14bdf1baefab83368 Prepare v2015.01
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus/u-boot
|