Commit
e702146ee5738c49355bce4f5c35cb080f71e6f5
Exists in
v2017.01-smarct4x
and in
35 other branches
8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc
ARM: integrator: abolish CONFIG_INTEGRATOR
Switch to CONFIG_ARCH_INTEGRATOR defined by Kconfig.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Showing
2 changed files
with
2 additions
and
4 deletions
Side-by-side Diff
| ... |
... |
@@ -53,7 +53,7 @@ |
|
53
|
53 |
asm ("mcr p15, 0, %0, c7, c6, 0": :"r" (i)); |
|
54
|
54 |
} |
|
55
|
55 |
|
|
56
|
|
-#ifndef CONFIG_INTEGRATOR |
|
|
56 |
+#ifndef CONFIG_ARCH_INTEGRATOR |
|
57
|
57 |
|
|
58
|
58 |
__attribute__((noreturn)) void reset_cpu(ulong addr __attribute__((unused))) |
|
59
|
59 |
{ |
| ... |
... |
@@ -63,5 +63,5 @@ |
|
63
|
63 |
; |
|
64
|
64 |
} |
|
65
|
65 |
|
|
66
|
|
-#endif /* #ifdef CONFIG_INTEGRATOR */ |
|
|
66 |
+#endif /* #ifdef CONFIG_ARCH_INTEGRATOR */ |
| ... |
... |
@@ -7,8 +7,6 @@ |
|
7
|
7 |
* SPDX-License-Identifier: GPL-2.0+ |
|
8
|
8 |
*/ |
|
9
|
9 |
|
|
10
|
|
-#define CONFIG_INTEGRATOR |
|
11
|
|
- |
|
12
|
10 |
#define CONFIG_SYS_TEXT_BASE 0x01000000 |
|
13
|
11 |
#define CONFIG_SYS_MEMTEST_START 0x100000 |
|
14
|
12 |
#define CONFIG_SYS_MEMTEST_END 0x10000000 |
Tom Rini