Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 30411e7cfc5a54856536881b893439dc158023a9

Authored by York Sun
1 parent 24ad75ae55
Exists in v2017.01-smarct4x and in 25 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_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_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

powerpc: MPC8536DS: Remove macro CONFIG_MPC8536DS 

Use CONFIG_TARGET_MPC8536DS instead.

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

Showing 4 changed files with 2 additions and 4 deletions Side-by-side Diff

board/freescale/common/Makefile
Diff comments   View file @ 30411e7
... ... @@ -49,7 +49,7 @@
49 49 obj-$(CONFIG_TARGET_MPC8548CDS) += cds_pci_ft.o
50 50 obj-$(CONFIG_MPC8555CDS) += cds_pci_ft.o
51 51  
52   -obj-$(CONFIG_MPC8536DS) += ics307_clk.o
  52 +obj-$(CONFIG_TARGET_MPC8536DS) += ics307_clk.o
53 53 obj-$(CONFIG_MPC8572DS) += ics307_clk.o
54 54 obj-$(CONFIG_P1022DS) += ics307_clk.o
55 55 obj-$(CONFIG_P2020DS) += ics307_clk.o
board/freescale/common/pixis.h
Diff comments   View file @ 30411e7
... ... @@ -7,7 +7,7 @@
7 7 #define __PIXIS_H_ 1
8 8  
9 9 /* PIXIS register set. */
10   -#if defined(CONFIG_MPC8536DS)
  10 +#if defined(CONFIG_TARGET_MPC8536DS)
11 11 typedef struct pixis {
12 12 u8 id;
13 13 u8 ver;
include/configs/MPC8536DS.h
Diff comments   View file @ 30411e7
... ... @@ -40,7 +40,6 @@
40 40 /* High Level Configuration Options */
41 41 #define CONFIG_BOOKE 1 /* BOOKE */
42 42 #define CONFIG_E500 1 /* BOOKE e500 family */
43   -#define CONFIG_MPC8536DS 1
44 43  
45 44 #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */
46 45 #define CONFIG_PCI1 1 /* Enable PCI controller 1 */
scripts/config_whitelist.txt
Diff comments   View file @ 30411e7
... ... @@ -3140,7 +3140,6 @@
3140 3140 CONFIG_MPC83XX_GPIO_1_INIT_VALUE
3141 3141 CONFIG_MPC83XX_PCI2
3142 3142 CONFIG_MPC850
3143   -CONFIG_MPC8536DS
3144 3143 CONFIG_MPC8540
3145 3144 CONFIG_MPC8540ADS
3146 3145 CONFIG_MPC8541