summaryrefslogtreecommitdiffstats
path: root/meta-ti-bsp/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorAndrew Davis <afd@ti.com>2023-05-25 13:11:28 -0500
committerRyan Eatmon <reatmon@ti.com>2023-06-06 08:24:37 -0500
commit0f9035a628c10ec0e0656387989e99b1365f184f (patch)
tree4e4a4b0a1ea033caf9fdc6289262165ec80cdc33 /meta-ti-bsp/recipes-bsp/u-boot
parent689eb2da095de6d750dd80753c68d7ec38e95d26 (diff)
downloadmeta-ti-0f9035a628c10ec0e0656387989e99b1365f184f.tar.gz
u-boot-ti-staging: Remove version 2021.01
This will no longer build after we switch away from k3-image-gen. Remove this version and make 2023.04 the default. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-bsp/u-boot')
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch144
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb15
2 files changed, 0 insertions, 159 deletions
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
deleted file mode 100644
index 9a832312..00000000
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1From 33c4b7335a39c48507a254505169df59c7a69c75 Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Thu, 23 Mar 2023 10:29:40 -0500
4Subject: [PATCH] configs: Update to support oe-core fitImage naming
5
6In kirkstone and forward, the values in the fitImage have been
7standardized to include both conf- and the vender subdir in the name of
8the dtbs. This patch updates u-boot to support that.
9
10Signed-off-by: Ryan Eatmon <reatmon@ti.com>
11---
12 include/configs/am62x_evm.h | 6 +++---
13 include/configs/am64x_evm.h | 4 ++--
14 include/configs/am65x_evm.h | 2 +-
15 include/configs/j721e_evm.h | 8 ++++----
16 include/configs/j721s2_evm.h | 6 +++---
17 include/configs/j784s4_evm.h | 6 +++---
18 include/configs/ti_armv7_common.h | 2 +-
19 7 files changed, 17 insertions(+), 17 deletions(-)
20
21diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
22index 97bd7c1fd7..6d957c906b 100644
23--- a/include/configs/am62x_evm.h
24+++ b/include/configs/am62x_evm.h
25@@ -122,11 +122,11 @@
26 #define EXTRA_ENV_AM625_BOARD_SETTINGS \
27 "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
28 "findfdt=" \
29- "setenv name_fdt ${default_device_tree};" \
30+ "setenv name_fdt ti_${default_device_tree};" \
31 "if test $board_name = am62x_skevm; then " \
32- "setenv name_fdt k3-am625-sk.dtb; fi;" \
33+ "setenv name_fdt ti_k3-am625-sk.dtb; fi;" \
34 "if test $board_name = am62x_lp_skevm; then " \
35- "setenv name_fdt k3-am62x-lp-sk.dtb; fi;" \
36+ "setenv name_fdt ti_k3-am62x-lp-sk.dtb; fi;" \
37 "setenv fdtfile ${name_fdt}\0" \
38 "name_kern=Image\0" \
39 "console=ttyS2,115200n8\0" \
40diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h
41index 33ba5da31f..d32b488b58 100644
42--- a/include/configs/am64x_evm.h
43+++ b/include/configs/am64x_evm.h
44@@ -107,9 +107,9 @@
45 #define EXTRA_ENV_AM642_BOARD_SETTINGS \
46 "findfdt=" \
47 "if test $board_name = am64x_gpevm; then " \
48- "setenv fdtfile k3-am642-evm.dtb; fi; " \
49+ "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \
50 "if test $board_name = am64x_skevm; then " \
51- "setenv fdtfile k3-am642-sk.dtb; fi;" \
52+ "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \
53 "if test $fdtfile = undefined; then " \
54 "echo WARNING: Could not determine device tree to use; fi; \0" \
55 "name_kern=Image\0" \
56diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
57index c78e4c4493..07d234d5d3 100644
58--- a/include/configs/am65x_evm.h
59+++ b/include/configs/am65x_evm.h
60@@ -64,7 +64,7 @@
61 /* U-Boot general configuration */
62 #define EXTRA_ENV_AM65X_BOARD_SETTINGS \
63 "findfdt=" \
64- "setenv name_fdt k3-am654-base-board.dtb;" \
65+ "setenv name_fdt ti_k3-am654-base-board.dtb;" \
66 "setenv fdtfile ${name_fdt}\0" \
67 "name_kern=Image\0" \
68 "console=ttyS2,115200n8\0" \
69diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
70index 50b018b6ed..ad11494bd0 100644
71--- a/include/configs/j721e_evm.h
72+++ b/include/configs/j721e_evm.h
73@@ -77,13 +77,13 @@
74 #define EXTRA_ENV_J721E_BOARD_SETTINGS \
75 "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
76 "findfdt=" \
77- "setenv name_fdt ${default_device_tree};" \
78+ "setenv name_fdt ti_${default_device_tree};" \
79 "if test $board_name = J721EX-PM1-SOM; then " \
80- "setenv name_fdt k3-j721e-proc-board-tps65917.dtb; fi;" \
81+ "setenv name_fdt ti_k3-j721e-proc-board-tps65917.dtb; fi;" \
82 "if test $board_name = j721e; then " \
83- "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \
84+ "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \
85 "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \
86- "setenv name_fdt k3-j721e-sk.dtb; fi;" \
87+ "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \
88 "setenv fdtfile ${name_fdt}\0" \
89 "name_kern=Image\0" \
90 "console=ttyS2,115200n8\0" \
91diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h
92index 2d26eb544d..4b4d4a6e37 100644
93--- a/include/configs/j721s2_evm.h
94+++ b/include/configs/j721s2_evm.h
95@@ -66,11 +66,11 @@
96 #define EXTRA_ENV_J721S2_BOARD_SETTINGS \
97 "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
98 "findfdt=" \
99- "setenv name_fdt ${default_device_tree};" \
100+ "setenv name_fdt ti_${default_device_tree};" \
101 "if test $board_name = j721s2; then " \
102- "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \
103+ "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \
104 "if test $board_name = am68-sk; then " \
105- "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\
106+ "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\
107 "setenv fdtfile ${name_fdt}\0" \
108 "name_kern=Image\0" \
109 "console=ttyS2,115200n8\0" \
110diff --git a/include/configs/j784s4_evm.h b/include/configs/j784s4_evm.h
111index eb609100b0..30820ea1c6 100644
112--- a/include/configs/j784s4_evm.h
113+++ b/include/configs/j784s4_evm.h
114@@ -67,11 +67,11 @@
115 #define EXTRA_ENV_J784S4_BOARD_SETTINGS \
116 "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
117 "findfdt=" \
118- "setenv name_fdt ${default_device_tree};" \
119+ "setenv name_fdt ti_${default_device_tree};" \
120 "if test $board_name = am69-sk; then " \
121- "setenv name_fdt k3-am69-sk.dtb; fi;" \
122+ "setenv name_fdt ti_k3-am69-sk.dtb; fi;" \
123 "if test $board_name = j784s4; then " \
124- "setenv name_fdt k3-j784s4-evm.dtb; fi;" \
125+ "setenv name_fdt ti_k3-j784s4-evm.dtb; fi;" \
126 "setenv fdtfile ${name_fdt}\0" \
127 "name_kern=Image\0" \
128 "console=ttyS2,115200n8\0" \
129diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
130index c48c4c2398..29de095729 100644
131--- a/include/configs/ti_armv7_common.h
132+++ b/include/configs/ti_armv7_common.h
133@@ -68,7 +68,7 @@
134 "do;" \
135 "setenv overlaystring ${overlaystring}'#'${overlay};" \
136 "done;\0" \
137- "run_fit=bootm ${addr_fit}#${fdtfile}${overlaystring}\0" \
138+ "run_fit=bootm ${addr_fit}#conf-${fdtfile}${overlaystring}\0" \
139
140 /*
141 * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined,
142--
1432.17.1
144
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
deleted file mode 100644
index 8984d859..00000000
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1
2FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
3
4require u-boot-ti.inc
5
6LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
7
8PR = "r34"
9
10BRANCH = "ti-u-boot-2021.01"
11
12SRCREV = "3a5205e9803809f18edc59a40fd9df470f98a00f"
13
14SRC_URI += "file://0001-configs-Update-to-support-oe-core-fitImage-naming.patch"
15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-04 21:55:30 +0000