Skip to content

Commit

Permalink
Add support for advanced version
Browse files Browse the repository at this point in the history
Signed-off-by: Le Jin <le.jin@siemens.com>
  • Loading branch information
Le Jin committed May 9, 2020
1 parent 6ba8769 commit 437270f
Show file tree
Hide file tree
Showing 47 changed files with 634 additions and 78 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2a37c06cafb717ab8d02d9d88b70b221d4755872 Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Tue, 12 Nov 2019 17:36:06 +0800
Subject: [PATCH 01/15] feat: add iot2050 platform support
Subject: [PATCH 01/18] feat: add iot2050 platform support

Signed-off-by: le.jin <le.jin@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8e4decfe354a5f8d21d8b00edaeb33e972065579 Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Tue, 12 Nov 2019 18:26:14 +0800
Subject: [PATCH 02/15] am654x: frequency update for both arm clusters and bump
Subject: [PATCH 02/18] am654x: frequency update for both arm clusters and bump
up to 1GHz

Signed-off-by: le.jin <le.jin@siemens.com>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b10414684b81c4750614d240d1b0d86b9fbc6cab Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Mon, 18 Nov 2019 09:58:29 +0800
Subject: [PATCH 03/15] iot2050:turn on red led when something goes wrong
Subject: [PATCH 03/18] iot2050:turn on red led when something goes wrong

Signed-off-by: le.jin <le.jin@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6da565a50598aa74ab6ef1654350c30274166295 Mon Sep 17 00:00:00 2001
From: "le.jin@siemens.com" <le.jin@siemens.com>
Date: Sun, 16 Feb 2020 18:39:15 +0800
Subject: [PATCH 04/15] am65x:fix usb hub issue for disabling charge detect
Subject: [PATCH 04/18] am65x:fix usb hub issue for disabling charge detect

Signed-off-by: le <le.jin@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 549a95faa2fca208d14bb614d8b1e17733d6c058 Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Tue, 12 Nov 2019 19:23:40 +0800
Subject: [PATCH 05/15] am654x: remove dependency of TI_SECURE_DEV_PKG
Subject: [PATCH 05/18] am654x: remove dependency of TI_SECURE_DEV_PKG

Signed-off-by: le.jin <le.jin@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1c315cc40a232f12ddf7897732f268187fbea360 Mon Sep 17 00:00:00 2001
From: Gao Nian <nian.gao@siemens.com>
Date: Tue, 12 Nov 2019 19:26:20 +0800
Subject: [PATCH 06/15] mmc:change SD to mmc0 and EMMC-Flash to mmc1
Subject: [PATCH 06/18] mmc:change SD to mmc0 and EMMC-Flash to mmc1

Signed-off-by: Gao Nian <nian.gao@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 98cc8b6c0f116019e0b47a2c1a063d3dac5d5598 Mon Sep 17 00:00:00 2001
From: Gao Nian <nian.gao@siemens.com>
Date: Tue, 12 Nov 2019 19:30:14 +0800
Subject: [PATCH 07/15] feat:add scripts to select fdt name
Subject: [PATCH 07/18] feat:add scripts to select fdt name

Signed-off-by: Gao Nian <nian.gao@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d8aaae7d8b1ee73fb50a00abdde7f7a3c1e9a372 Mon Sep 17 00:00:00 2001
From: Gao Nian <nian.gao@siemens.com>
Date: Tue, 12 Nov 2019 19:31:47 +0800
Subject: [PATCH 08/15] feat:add UUID checking before run distro_bootcmd
Subject: [PATCH 08/18] feat:add UUID checking before run distro_bootcmd

Signed-off-by: Gao Nian <nian.gao@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 614ad3e26430bc19701c53cb7febe9862a329394 Mon Sep 17 00:00:00 2001
From: zengchao <chao.zeng@siemens.com>
Date: Fri, 15 Nov 2019 17:55:33 +0800
Subject: [PATCH 09/15] setting the rj45 port led behavior
Subject: [PATCH 09/18] setting the rj45 port led behavior

Signed-off-by: zengchao <chao.zeng@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ec439a9f4fc648e0757b69d4a673cfa6fc0f18c8 Mon Sep 17 00:00:00 2001
From: Gao Nian <nian.gao@siemens.com>
Date: Thu, 2 Jan 2020 13:54:01 +0800
Subject: [PATCH 10/15] fix:rproc init error in u-boot
Subject: [PATCH 10/18] fix:rproc init error in u-boot

Signed-off-by: Gao Nian <nian.gao@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 305e35edf10a84ee2632651688034ba55b3dcfe4 Mon Sep 17 00:00:00 2001
From: Gao Nian <nian.gao@siemens.com>
Date: Tue, 7 Jan 2020 13:50:42 +0800
Subject: [PATCH 11/15] feat: catch-up 100M full duplex in u-boot
Subject: [PATCH 11/18] feat: catch-up 100M full duplex in u-boot

Signed-off-by: Gao Nian <nian.gao@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 09622d175a5421e19dd6cf5cc65bfa3d061a8afb Mon Sep 17 00:00:00 2001
From: zengchao <chao.zeng@siemens.com>
Date: Wed, 8 Jan 2020 11:46:39 +0800
Subject: [PATCH 12/15] feat: add the flash protect for winbond flash
Subject: [PATCH 12/18] feat: add the flash protect for winbond flash

as lack of the flash protect for winbond flash,
add the flash protect for windbond
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 487e7b37faf81c0af8c94b10bb1418da3cf7629d Mon Sep 17 00:00:00 2001
From: zengchao <chao.zeng@siemens.com>
Date: Sat, 11 Jan 2020 14:17:59 +0800
Subject: [PATCH 13/15] bugfix: set gpio direction output show error
Subject: [PATCH 13/18] bugfix: set gpio direction output show error

when gpio pin exceed 31,init the output pin value would show error

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a0fc26a3b60381aac8183a6d7ef951c9c0077312 Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Tue, 14 Jan 2020 22:46:46 +0800
Subject: [PATCH 14/15] feat: add config for skipping certificate verification
Subject: [PATCH 14/18] feat: add config for skipping certificate verification

Signed-off-by: le.jin <le.jin@siemens.com>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a5588edb0176a045758165ea4b27ee51bbdd3b34 Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Wed, 29 Jan 2020 21:22:51 +0800
Subject: [PATCH 15/15] feat: enable verified boot
Subject: [PATCH 15/18] feat: enable verified boot

Signed-off-by: le.jin <le.jin@siemens.com>
---
Expand Down
80 changes: 80 additions & 0 deletions recipes-bsp/u-boot/files/0016-feat-add-sysfw-19.12-support.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
From 0e21d77caff758d4031b094ee12681e3a819ca9a Mon Sep 17 00:00:00 2001
From: "le.jin" <le.jin@siemens.com>
Date: Mon, 2 Mar 2020 23:07:12 +0800
Subject: [PATCH 16/18] feat: add sysfw 19.12 support

Signed-off-by: le.jin <le.jin@siemens.com>
---
arch/arm/dts/iot2050-common.dtsi | 1 +
arch/arm/dts/k3-am65-mcu.dtsi | 8 ++++----
arch/arm/dts/k3-am654-r5-base-board.dts | 2 +-
arch/arm/mach-k3/Kconfig | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/iot2050-common.dtsi b/arch/arm/dts/iot2050-common.dtsi
index 2f4b839cf5..5113aaf4ef 100644
--- a/arch/arm/dts/iot2050-common.dtsi
+++ b/arch/arm/dts/iot2050-common.dtsi
@@ -176,6 +176,7 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
+ power-domains = <&k3_pds 248 TI_SCI_PD_SHARED>; /* Seboot in shared mode */

flash@0{
compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/k3-am65-mcu.dtsi b/arch/arm/dts/k3-am65-mcu.dtsi
index 11ca520f87..fe71c284f9 100644
--- a/arch/arm/dts/k3-am65-mcu.dtsi
+++ b/arch/arm/dts/k3-am65-mcu.dtsi
@@ -41,8 +41,8 @@
cdns,fifo-depth = <256>;
cdns,fifo-width = <4>;
cdns,trigger-address = <0x50000000>;
- clocks = <&k3_clks 55 5>;
- power-domains = <&k3_pds 55 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 248 0>;
+ power-domains = <&k3_pds 248 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -56,8 +56,8 @@
cdns,fifo-depth = <256>;
cdns,fifo-width = <4>;
cdns,trigger-address = <0x58000000>;
- clocks = <&k3_clks 55 16>;
- power-domains = <&k3_pds 55 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 249 6>;
+ power-domains = <&k3_pds 249 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 50a164f7d2..fdf5384cb3 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -276,7 +276,7 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
- power-domains = <&k3_pds 55 TI_SCI_PD_EXCLUSIVE>;
+ power-domains = <&k3_pds 248 TI_SCI_PD_EXCLUSIVE>;
u-boot,dm-spl;
reg = <0x0 0x47040000 0x0 0x100>,
<0x0 0x50000000 0x0 0x8000000>;
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 4d61eb4f53..2c60dd01f6 100644
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -128,7 +128,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
config K3_SYSFW_IMAGE_SIZE_MAX
int "Amount of memory dynamically allocated for loading SYSFW blob"
depends on K3_LOAD_SYSFW
- default 269000
+ default 276000
help
Amount of memory reserved through dynamic allocation at runtime for
loading the combined System Firmware and configuration image tree
--
2.17.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
From 24343ee17f08b40990ce230edb98bffb059f3685 Mon Sep 17 00:00:00 2001
From: zengchao <chao.zeng@siemens.com>
Date: Tue, 17 Dec 2019 11:47:53 +0800
Subject: [PATCH 17/18] add the signature support for fit image add the support
for the fit image

Signed-off-by: Chao Zeng <chao.zeng@siemens.com>
---
include/configs/iot2050.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index bd8bcb415b..1100e4e749 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -83,7 +83,14 @@
"env set fdtfile siemens/iot2050-basic.dtb;" \
"env set fdt_found yes;" \
"fi;\0"
-
+#define EXTRA_ENV_SELECT_FIT \
+ "fit_select=if env exists board_name; then " \
+ "env set fitfile iot2050-kernel-dtb.fit.img;" \
+ "else " \
+ "echo ** Warning: board_name is not defined, default boot as IOT2050-BASIC **;" \
+ "env set fitfile iot2050-kernel-dtb.fit.img;" \
+ "env set board_name IOT2050-BASIC;" \
+ "fi;\0"
/* U-Boot general configuration */
#define EXTRA_ENV_IOT2050_BOARD_SETTINGS \
"loadaddr=0x80080000\0" \
@@ -91,6 +98,7 @@
"kernel_addr_r=0x80080000\0" \
"ramdisk_addr_r=0x81000000\0" \
"fdt_addr_r=0x82000000\0" \
+ "fit_addr_r=0x82000000\0" \
"overlay_addr_r=0x83000000\0" \
"start_icssg0=rproc start 2; rproc start 3\0" \
"load_icssg0_pru0_fw=sf read 0x89000000 0x7c0000 0x8000; rproc load 2 0x89000000 0x8000\0" \
@@ -186,7 +194,8 @@
BOOTENV \
EXTRA_ENV_IOT2050_BOARD_SETTINGS \
EXTRA_ENV_SELECT_FDT \
- UUID_CONFLICT_CHECK_ENV
+ UUID_CONFLICT_CHECK_ENV \
+ EXTRA_ENV_SELECT_FIT
#endif

#define CONFIG_SUPPORT_EMMC_BOOT
--
2.17.1

Loading

0 comments on commit 437270f

Please sign in to comment.