Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 73fb583829efb296ecdddb08c426e2261cb84d0a

Authored by York Sun
1 parent c1303bfd7e
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

armv7: ls1021a: Drop macro CONFIG_LS102XA 

Use CONFIG_ARCH_LS1021A instead.

Signed-off-by: York Sun <york.sun@nxp.com>

Showing 19 changed files with 20 additions and 27 deletions Side-by-side Diff

arch/arm/cpu/armv7/Makefile
Diff comments   View file @ 73fb583
... ... @@ -12,7 +12,7 @@
12 12 obj-y += cpu.o cp15.o
13 13 obj-y += syslib.o
14 14  
15   -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA)$(CONFIG_ARCH_MX7ULP)$(CONFIG_LS102XA),)
  15 +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA)$(CONFIG_ARCH_MX7ULP)$(CONFIG_ARCH_LS1021A),)
16 16 ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
17 17 obj-y += lowlevel_init.o
18 18 endif
arch/arm/dts/Makefile
Diff comments   View file @ 73fb583
... ... @@ -166,7 +166,7 @@
166 166 am571x-idk.dtb
167 167 dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
168 168  
169   -dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \
  169 +dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \
170 170 ls1021a-qds-lpuart.dtb \
171 171 ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \
172 172 ls1021a-iot-duart.dtb
arch/arm/include/asm/arch-ls102xa/config.h
Diff comments   View file @ 73fb583
... ... @@ -108,7 +108,7 @@
108 108  
109 109 #define DCU_LAYER_MAX_NUM 16
110 110  
111   -#ifdef CONFIG_LS102XA
  111 +#ifdef CONFIG_ARCH_LS1021A
112 112 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
113 113 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
114 114 #else
arch/arm/include/asm/config.h
Diff comments   View file @ 73fb583
... ... @@ -14,7 +14,7 @@
14 14 #define CONFIG_STATIC_RELA
15 15 #endif
16 16  
17   -#if defined(CONFIG_LS102XA) || \
  17 +#if defined(CONFIG_ARCH_LS1021A) || \
18 18 defined(CONFIG_CPU_PXA27X) || \
19 19 defined(CONFIG_CPU_MONAHANS) || \
20 20 defined(CONFIG_CPU_PXA25X) || \
board/freescale/common/arm_sleep.c
Diff comments   View file @ 73fb583
... ... @@ -13,7 +13,7 @@
13 13 #endif
14 14 #include <asm/armv7.h>
15 15  
16   -#if defined(CONFIG_LS102XA)
  16 +#if defined(CONFIG_ARCH_LS1021A)
17 17 #include <asm/arch/immap_ls102xa.h>
18 18 #endif
19 19  
... ... @@ -66,7 +66,7 @@
66 66 *dst++ = *src++;
67 67 }
68 68  
69   -#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA)
  69 +#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A)
70 70 void ls1_psci_resume_fixup(void)
71 71 {
72 72 u32 tmp;
... ... @@ -104,7 +104,7 @@
104 104 #ifdef CONFIG_U_QE
105 105 u_qe_resume();
106 106 #endif
107   -#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA)
  107 +#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A)
108 108 ls1_psci_resume_fixup();
109 109 #endif
110 110 }
board/freescale/common/fsl_chain_of_trust.c
Diff comments   View file @ 73fb583
... ... @@ -22,7 +22,7 @@
22 22 #include <asm/fsl_pamu.h>
23 23 #endif
24 24  
25   -#ifdef CONFIG_LS102XA
  25 +#ifdef CONFIG_ARCH_LS1021A
26 26 #include <asm/arch/immap_ls102xa.h>
27 27 #endif
28 28  
board/freescale/common/fsl_validate.c
Diff comments   View file @ 73fb583
... ... @@ -15,7 +15,7 @@
15 15 #include <u-boot/rsa-mod-exp.h>
16 16 #include <hash.h>
17 17 #include <fsl_secboot_err.h>
18   -#ifdef CONFIG_LS102XA
  18 +#ifdef CONFIG_ARCH_LS1021A
19 19 #include <asm/arch/immap_ls102xa.h>
20 20 #endif
21 21  
drivers/i2c/mxc_i2c.c
Diff comments   View file @ 73fb583
... ... @@ -589,7 +589,7 @@
589 589 #endif
590 590  
591 591 static struct mxc_i2c_bus mxc_i2c_buses[] = {
592   -#if defined(CONFIG_LS102XA) || defined(CONFIG_VF610) || \
  592 +#if defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_VF610) || \
593 593 defined(CONFIG_FSL_LAYERSCAPE)
594 594 { 0, I2C1_BASE_ADDR, I2C_QUIRK_FLAG },
595 595 { 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG },
... ... @@ -13,7 +13,7 @@
13 13 #include <asm/io.h>
14 14 #include <linux/immap_qe.h>
15 15 #include <fsl_qe.h>
16   -#ifdef CONFIG_LS102XA
  16 +#ifdef CONFIG_ARCH_LS1021A
17 17 #include <asm/arch/immap_ls102xa.h>
18 18 #endif
19 19  
... ... @@ -355,7 +355,7 @@
355 355 size_t length;
356 356 const struct qe_header *hdr;
357 357 #ifdef CONFIG_DEEP_SLEEP
358   -#ifdef CONFIG_LS102XA
  358 +#ifdef CONFIG_ARCH_LS1021A
359 359 struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
360 360 #else
361 361 ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
... ... @@ -494,7 +494,7 @@
494 494 size_t length;
495 495 const struct qe_header *hdr;
496 496 #ifdef CONFIG_DEEP_SLEEP
497   -#ifdef CONFIG_LS102XA
  497 +#ifdef CONFIG_ARCH_LS1021A
498 498 struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
499 499 #else
500 500 ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
drivers/usb/common/fsl-errata.c
Diff comments   View file @ 73fb583
... ... @@ -204,7 +204,7 @@
204 204 case SVR_LS1043A:
205 205 return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1);
206 206 #endif
207   -#ifdef CONFIG_LS102XA
  207 +#ifdef CONFIG_ARCH_LS1021A
208 208 case SOC_VER_LS1020:
209 209 case SOC_VER_LS1021:
210 210 case SOC_VER_LS1022:
include/configs/ls1021aiot.h
Diff comments   View file @ 73fb583
... ... @@ -7,8 +7,6 @@
7 7 #ifndef __CONFIG_H
8 8 #define __CONFIG_H
9 9  
10   -#define CONFIG_LS102XA
11   -
12 10 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
13 11  
14 12 #define CONFIG_SYS_FSL_CLK
include/configs/ls1021aqds.h
Diff comments   View file @ 73fb583
... ... @@ -7,8 +7,6 @@
7 7 #ifndef __CONFIG_H
8 8 #define __CONFIG_H
9 9  
10   -#define CONFIG_LS102XA
11   -
12 10 #define CONFIG_ARMV7_PSCI_1_0
13 11  
14 12 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
include/configs/ls1021atwr.h
Diff comments   View file @ 73fb583
... ... @@ -7,8 +7,6 @@
7 7 #ifndef __CONFIG_H
8 8 #define __CONFIG_H
9 9  
10   -#define CONFIG_LS102XA
11   -
12 10 #define CONFIG_ARMV7_PSCI_1_0
13 11  
14 12 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR
include/fsl_errata.h
Diff comments   View file @ 73fb583
... ... @@ -10,7 +10,7 @@
10 10 #include <common.h>
11 11 #if defined(CONFIG_PPC)
12 12 #include <asm/processor.h>
13   -#elif defined(CONFIG_LS102XA)
  13 +#elif defined(CONFIG_ARCH_LS1021A)
14 14 #include <asm/arch-ls102xa/immap_ls102xa.h>
15 15 #elif defined(CONFIG_FSL_LAYERSCAPE)
16 16 #include <asm/arch/soc.h>
... ... @@ -66,7 +66,7 @@
66 66  
67 67  
68 68 switch (soc) {
69   -#ifdef CONFIG_LS102XA
  69 +#ifdef CONFIG_ARCH_LS1021A
70 70 case SOC_VER_LS1020:
71 71 case SOC_VER_LS1021:
72 72 case SOC_VER_LS1022:
include/linux/immap_qe.h
Diff comments   View file @ 73fb583
... ... @@ -24,7 +24,7 @@
24 24 #endif
25 25 #endif
26 26  
27   -#ifdef CONFIG_LS102XA
  27 +#ifdef CONFIG_ARCH_LS1021A
28 28 #define QE_MURAM_SIZE 0x6000UL
29 29 #define MAX_QE_RISC 1
30 30 #define QE_NUM_OF_SNUM 28
include/linux/usb/xhci-fsl.h
Diff comments   View file @ 73fb583
... ... @@ -54,7 +54,7 @@
54 54 struct dwc3 *dwc3_reg;
55 55 };
56 56  
57   -#if defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A)
  57 +#if defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_ARCH_LS1012A)
58 58 #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR
59 59 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0
60 60 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
... ... @@ -20,7 +20,7 @@
20 20  
21 21 #ifndef CONFIG_DM_ETH
22 22  
23   -#ifdef CONFIG_LS102XA
  23 +#ifdef CONFIG_ARCH_LS1021A
24 24 #define TSEC_SIZE 0x40000
25 25 #define TSEC_MDIO_OFFSET 0x40000
26 26 #else
include/usb/ehci-ci.h
Diff comments   View file @ 73fb583
... ... @@ -159,7 +159,7 @@
159 159 #elif defined(CONFIG_MPC512X)
160 160 #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR
161 161 #define CONFIG_SYS_FSL_USB2_ADDR 0
162   -#elif defined(CONFIG_LS102XA)
  162 +#elif defined(CONFIG_ARCH_LS1021A)
163 163 #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR
164 164 #define CONFIG_SYS_FSL_USB2_ADDR 0
165 165 #endif
scripts/config_whitelist.txt
Diff comments   View file @ 73fb583
... ... @@ -1697,7 +1697,6 @@
1697 1697 CONFIG_LPUART
1698 1698 CONFIG_LPUART_32B_REG
1699 1699 CONFIG_LQ038J7DH53
1700   -CONFIG_LS102XA
1701 1700 CONFIG_LS102XA_STREAM_ID
1702 1701 CONFIG_LSCHLV2
1703 1702 CONFIG_LSXHL