Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c1303bfd7e14f5ee451f6aafeeca2d87ac1255d6

Authored by York Sun
1 parent 4a3ab19322
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

armv8: ls1043a: Drop macro CONFIG_LS1043A 

Use CONFIG_ARCH_LS1043A instead.

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

Showing 7 changed files with 5 additions and 7 deletions Side-by-side Diff

arch/arm/cpu/armv8/fsl-layerscape/Makefile
Diff comments   View file @ c1303bf
... ... @@ -26,7 +26,7 @@
26 26 obj-$(CONFIG_SYS_HAS_SERDES) += ls2080a_serdes.o
27 27 endif
28 28  
29   -ifneq ($(CONFIG_LS1043A),)
  29 +ifneq ($(CONFIG_ARCH_LS1043A),)
30 30 obj-$(CONFIG_SYS_HAS_SERDES) += ls1043a_serdes.o
31 31 obj-$(CONFIG_ARMV8_PSCI) += ls1043a_psci.o
32 32 endif
arch/arm/include/asm/arch-fsl-layerscape/config.h
Diff comments   View file @ c1303bf
... ... @@ -132,7 +132,7 @@
132 132 #define CONFIG_SYS_FSL_PEX_LUT_BE
133 133  
134 134 /* SoC related */
135   -#ifdef CONFIG_LS1043A
  135 +#ifdef CONFIG_ARCH_LS1043A
136 136 #define CONFIG_SYS_FMAN_V3
137 137 #define CONFIG_SYS_NUM_FMAN 1
138 138 #define CONFIG_SYS_NUM_FM1_DTSEC 7
arch/arm/include/asm/fsl_secure_boot.h
Diff comments   View file @ c1303bf
... ... @@ -88,7 +88,7 @@
88 88 /* For SD boot address and size are assigned in terms of sector
89 89 * offset and no. of sectors respectively.
90 90 */
91   -#if defined(CONFIG_LS1043A) || defined(CONFIG_ARCH_LS1046A)
  91 +#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
92 92 #define CONFIG_BS_HDR_ADDR_DEVICE 0x00000920
93 93 #else
94 94 #define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900
drivers/net/fm/Makefile
Diff comments   View file @ c1303bf
... ... @@ -34,6 +34,6 @@
34 34 obj-$(CONFIG_ARCH_T4160) += t4240.o
35 35 obj-$(CONFIG_ARCH_B4420) += b4860.o
36 36 obj-$(CONFIG_ARCH_B4860) += b4860.o
37   -obj-$(CONFIG_LS1043A) += ls1043.o
  37 +obj-$(CONFIG_ARCH_LS1043A) += ls1043.o
38 38 obj-$(CONFIG_ARCH_LS1046A) += ls1046.o
include/configs/ls1043a_common.h
Diff comments   View file @ c1303bf
... ... @@ -28,7 +28,6 @@
28 28  
29 29 #define CONFIG_REMAKE_ELF
30 30 #define CONFIG_FSL_LAYERSCAPE
31   -#define CONFIG_LS1043A
32 31 #define CONFIG_MP
33 32 #define CONFIG_GICV2
34 33  
include/linux/usb/xhci-fsl.h
Diff comments   View file @ c1303bf
... ... @@ -62,7 +62,7 @@
62 62 #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR
63 63 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR
64 64 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
65   -#elif defined(CONFIG_LS1043A) || defined(CONFIG_ARCH_LS1046A)
  65 +#elif defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A)
66 66 #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR
67 67 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR
68 68 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR
scripts/config_whitelist.txt
Diff comments   View file @ c1303bf
... ... @@ -1699,7 +1699,6 @@
1699 1699 CONFIG_LQ038J7DH53
1700 1700 CONFIG_LS102XA
1701 1701 CONFIG_LS102XA_STREAM_ID
1702   -CONFIG_LS1043A
1703 1702 CONFIG_LSCHLV2
1704 1703 CONFIG_LSXHL
1705 1704 CONFIG_LUAN