Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 889a275d428be2790270f7280385207c1666eb4b

Authored by Minkyu Kang
1 parent da70a2bb4a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.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-m6.0.1_2.1.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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

ARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P 

Use the same configuration around S5P SoCs.
(s5pc100, s5pc110, s5pc210 and so on)

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

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

... ... @@ -78,7 +78,7 @@
78 78 #else
79 79 #error "CONFIG_SERIAL? missing."
80 80 #endif
81   -#elif defined(CONFIG_S5PC1XX)
  81 +#elif defined(CONFIG_S5P)
82 82 #if defined(CONFIG_SERIAL0)
83 83 return &s5p_serial0_device;
84 84 #elif defined(CONFIG_SERIAL1)
... ... @@ -162,7 +162,7 @@
162 162 serial_register(&s3c24xx_serial1_device);
163 163 serial_register(&s3c24xx_serial2_device);
164 164 #endif
165   -#if defined(CONFIG_S5PC1XX)
  165 +#if defined(CONFIG_S5P)
166 166 serial_register(&s5p_serial0_device);
167 167 serial_register(&s5p_serial1_device);
168 168 serial_register(&s5p_serial2_device);
drivers/gpio/Makefile
Diff comments   View file @ 889a275
... ... @@ -29,7 +29,7 @@
29 29 COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o
30 30 COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o
31 31 COBJS-$(CONFIG_PCA953X) += pca953x.o
32   -COBJS-$(CONFIG_S5PC1XX) += s5p_gpio.o
  32 +COBJS-$(CONFIG_S5P) += s5p_gpio.o
33 33  
34 34 COBJS := $(COBJS-y)
35 35 SRCS := $(COBJS:.o=.c)
drivers/mtd/onenand/samsung.c
Diff comments   View file @ 889a275
... ... @@ -67,7 +67,7 @@
67 67 #define MAP_01 (0x1 << 24)
68 68 #define MAP_10 (0x2 << 24)
69 69 #define MAP_11 (0x3 << 24)
70   -#elif defined(CONFIG_S5PC1XX)
  70 +#elif defined(CONFIG_S5P)
71 71 #define MAP_00 (0x0 << 26)
72 72 #define MAP_01 (0x1 << 26)
73 73 #define MAP_10 (0x2 << 26)
... ... @@ -121,7 +121,7 @@
121 121 {
122 122 return (fba << 12) | (fpa << 6) | (fsa << 4);
123 123 }
124   -#elif defined(CONFIG_S5PC1XX)
  124 +#elif defined(CONFIG_S5P)
125 125 static unsigned int s3c_mem_addr(int fba, int fpa, int fsa)
126 126 {
127 127 return (fba << 13) | (fpa << 7) | (fsa << 5);
... ... @@ -614,7 +614,7 @@
614 614 #if defined(CONFIG_S3C64XX)
615 615 onenand->base = (void *)0x70100000;
616 616 onenand->ahb_addr = (void *)0x20000000;
617   -#elif defined(CONFIG_S5PC1XX)
  617 +#elif defined(CONFIG_S5P)
618 618 onenand->base = (void *)0xE7100000;
619 619 onenand->ahb_addr = (void *)0xB0000000;
620 620 #endif
drivers/serial/Makefile
Diff comments   View file @ 889a275
... ... @@ -36,7 +36,7 @@
36 36 COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
37 37 COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
38 38 COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
39   -COBJS-$(CONFIG_S5PC1XX) += serial_s5p.o
  39 +COBJS-$(CONFIG_S5P) += serial_s5p.o
40 40 COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
41 41 COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o
42 42 COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o
include/configs/s5p_goni.h
Diff comments   View file @ 889a275
... ... @@ -30,7 +30,7 @@
30 30 /* High Level Configuration Options */
31 31 #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
32 32 #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
33   -#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */
  33 +#define CONFIG_S5P 1 /* which is in a S5P Family */
34 34 #define CONFIG_S5PC110 1 /* which is in a S5PC110 */
35 35 #define CONFIG_MACH_GONI 1 /* working with Goni */
36 36  
include/configs/smdkc100.h
Diff comments   View file @ 889a275
... ... @@ -34,7 +34,7 @@
34 34 */
35 35 #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
36 36 #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
37   -#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */
  37 +#define CONFIG_S5P 1 /* which is in a S5P Family */
38 38 #define CONFIG_S5PC100 1 /* which is in a S5PC100 */
39 39 #define CONFIG_SMDKC100 1 /* working with SMDKC100 */
40 40  
... ... @@ -52,7 +52,7 @@
52 52 extern struct serial_device s3c24xx_serial2_device;
53 53 #endif
54 54  
55   -#if defined(CONFIG_S5PC1XX)
  55 +#if defined(CONFIG_S5P)
56 56 extern struct serial_device s5p_serial0_device;
57 57 extern struct serial_device s5p_serial1_device;
58 58 extern struct serial_device s5p_serial2_device;