Skip to content

Commit 73fb583

Browse files
author
York Sun
committed
armv7: ls1021a: Drop macro CONFIG_LS102XA
Use CONFIG_ARCH_LS1021A instead. Signed-off-by: York Sun <york.sun@nxp.com>
1 parent c1303bf commit 73fb583

File tree

19 files changed

+20
-27
lines changed

19 files changed

+20
-27
lines changed

‎arch/arm/cpu/armv7/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ obj-y += cache_v7.o cache_v7_asm.o
1212
obj-y += cpu.o cp15.o
1313
obj-y += syslib.o
1414

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),)
1616
ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
1717
obj-y += lowlevel_init.o
1818
endif

‎arch/arm/dts/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \
166166
am571x-idk.dtb
167167
dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb
168168

169-
dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \
169+
dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \
170170
ls1021a-qds-lpuart.dtb \
171171
ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \
172172
ls1021a-iot-duart.dtb

‎arch/arm/include/asm/arch-ls102xa/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
#define DCU_LAYER_MAX_NUM 16
110110

111-
#ifdef CONFIG_LS102XA
111+
#ifdef CONFIG_ARCH_LS1021A
112112
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
113113
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
114114
#else

‎arch/arm/include/asm/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define CONFIG_STATIC_RELA
1515
#endif
1616

17-
#if defined(CONFIG_LS102XA) || \
17+
#if defined(CONFIG_ARCH_LS1021A) || \
1818
defined(CONFIG_CPU_PXA27X) || \
1919
defined(CONFIG_CPU_MONAHANS) || \
2020
defined(CONFIG_CPU_PXA25X) || \

‎board/freescale/common/arm_sleep.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#endif
1414
#include <asm/armv7.h>
1515

16-
#if defined(CONFIG_LS102XA)
16+
#if defined(CONFIG_ARCH_LS1021A)
1717
#include <asm/arch/immap_ls102xa.h>
1818
#endif
1919

@@ -66,7 +66,7 @@ static void dp_ddr_restore(void)
6666
*dst++ = *src++;
6767
}
6868

69-
#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA)
69+
#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A)
7070
void ls1_psci_resume_fixup(void)
7171
{
7272
u32 tmp;
@@ -104,7 +104,7 @@ static void dp_resume_prepare(void)
104104
#ifdef CONFIG_U_QE
105105
u_qe_resume();
106106
#endif
107-
#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA)
107+
#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A)
108108
ls1_psci_resume_fixup();
109109
#endif
110110
}

‎board/freescale/common/fsl_chain_of_trust.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <asm/fsl_pamu.h>
2323
#endif
2424

25-
#ifdef CONFIG_LS102XA
25+
#ifdef CONFIG_ARCH_LS1021A
2626
#include <asm/arch/immap_ls102xa.h>
2727
#endif
2828

‎board/freescale/common/fsl_validate.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <u-boot/rsa-mod-exp.h>
1616
#include <hash.h>
1717
#include <fsl_secboot_err.h>
18-
#ifdef CONFIG_LS102XA
18+
#ifdef CONFIG_ARCH_LS1021A
1919
#include <asm/arch/immap_ls102xa.h>
2020
#endif
2121

‎drivers/i2c/mxc_i2c.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr,
589589
#endif
590590

591591
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) || \
593593
defined(CONFIG_FSL_LAYERSCAPE)
594594
{ 0, I2C1_BASE_ADDR, I2C_QUIRK_FLAG },
595595
{ 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG },

‎drivers/qe/qe.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <asm/io.h>
1414
#include <linux/immap_qe.h>
1515
#include <fsl_qe.h>
16-
#ifdef CONFIG_LS102XA
16+
#ifdef CONFIG_ARCH_LS1021A
1717
#include <asm/arch/immap_ls102xa.h>
1818
#endif
1919

@@ -355,7 +355,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
355355
size_t length;
356356
const struct qe_header *hdr;
357357
#ifdef CONFIG_DEEP_SLEEP
358-
#ifdef CONFIG_LS102XA
358+
#ifdef CONFIG_ARCH_LS1021A
359359
struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
360360
#else
361361
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
@@ -494,7 +494,7 @@ int u_qe_upload_firmware(const struct qe_firmware *firmware)
494494
size_t length;
495495
const struct qe_header *hdr;
496496
#ifdef CONFIG_DEEP_SLEEP
497-
#ifdef CONFIG_LS102XA
497+
#ifdef CONFIG_ARCH_LS1021A
498498
struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
499499
#else
500500
ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);

‎drivers/usb/common/fsl-errata.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ bool has_erratum_a010151(void)
204204
case SVR_LS1043A:
205205
return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1);
206206
#endif
207-
#ifdef CONFIG_LS102XA
207+
#ifdef CONFIG_ARCH_LS1021A
208208
case SOC_VER_LS1020:
209209
case SOC_VER_LS1021:
210210
case SOC_VER_LS1022:

0 commit comments

Comments
 (0)