Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P

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

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Minkyu Kang 2010-08-23 19:52:03 +09:00
parent da70a2bb4a
commit 889a275d42
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/serial.c
View file

@ -78,7 +78,7 @@ struct serial_device *__default_serial_console (void)
#else #else
#error "CONFIG_SERIAL? missing." #error "CONFIG_SERIAL? missing."
#endif #endif
#elif defined(CONFIG_S5PC1XX) #elif defined(CONFIG_S5P)
#if defined(CONFIG_SERIAL0) #if defined(CONFIG_SERIAL0)
return &s5p_serial0_device; return &s5p_serial0_device;
#elif defined(CONFIG_SERIAL1) #elif defined(CONFIG_SERIAL1)
@ -162,7 +162,7 @@ void serial_initialize (void)
serial_register(&s3c24xx_serial1_device); serial_register(&s3c24xx_serial1_device);
serial_register(&s3c24xx_serial2_device); serial_register(&s3c24xx_serial2_device);
#endif #endif
#if defined(CONFIG_S5PC1XX) #if defined(CONFIG_S5P)
serial_register(&s5p_serial0_device); serial_register(&s5p_serial0_device);
serial_register(&s5p_serial1_device); serial_register(&s5p_serial1_device);
serial_register(&s5p_serial2_device); serial_register(&s5p_serial2_device);

2
drivers/gpio/Makefile
View file

@ -29,7 +29,7 @@ COBJS-$(CONFIG_AT91_GPIO) += at91_gpio.o
COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o
COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o
COBJS-$(CONFIG_PCA953X) += pca953x.o COBJS-$(CONFIG_PCA953X) += pca953x.o
COBJS-$(CONFIG_S5PC1XX) += s5p_gpio.o COBJS-$(CONFIG_S5P) += s5p_gpio.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

6
drivers/mtd/onenand/samsung.c
View file

@ -67,7 +67,7 @@ do { \
#define MAP_01 (0x1 << 24) #define MAP_01 (0x1 << 24)
#define MAP_10 (0x2 << 24) #define MAP_10 (0x2 << 24)
#define MAP_11 (0x3 << 24) #define MAP_11 (0x3 << 24)
#elif defined(CONFIG_S5PC1XX) #elif defined(CONFIG_S5P)
#define MAP_00 (0x0 << 26) #define MAP_00 (0x0 << 26)
#define MAP_01 (0x1 << 26) #define MAP_01 (0x1 << 26)
#define MAP_10 (0x2 << 26) #define MAP_10 (0x2 << 26)
@ -121,7 +121,7 @@ static unsigned int s3c_mem_addr(int fba, int fpa, int fsa)
{ {
return (fba << 12) | (fpa << 6) | (fsa << 4); return (fba << 12) | (fpa << 6) | (fsa << 4);
} }
#elif defined(CONFIG_S5PC1XX) #elif defined(CONFIG_S5P)
static unsigned int s3c_mem_addr(int fba, int fpa, int fsa) static unsigned int s3c_mem_addr(int fba, int fpa, int fsa)
{ {
return (fba << 13) | (fpa << 7) | (fsa << 5); return (fba << 13) | (fpa << 7) | (fsa << 5);
@ -614,7 +614,7 @@ void s3c_onenand_init(struct mtd_info *mtd)
#if defined(CONFIG_S3C64XX) #if defined(CONFIG_S3C64XX)
onenand->base = (void *)0x70100000; onenand->base = (void *)0x70100000;
onenand->ahb_addr = (void *)0x20000000; onenand->ahb_addr = (void *)0x20000000;
#elif defined(CONFIG_S5PC1XX) #elif defined(CONFIG_S5P)
onenand->base = (void *)0xE7100000; onenand->base = (void *)0xE7100000;
onenand->ahb_addr = (void *)0xB0000000; onenand->ahb_addr = (void *)0xB0000000;
#endif #endif

2
drivers/serial/Makefile
View file

@ -36,7 +36,7 @@ COBJS-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o
COBJS-$(CONFIG_SYS_NS16550) += ns16550.o COBJS-$(CONFIG_SYS_NS16550) += ns16550.o
COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o
COBJS-$(CONFIG_S3C64XX) += s3c64xx.o COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
COBJS-$(CONFIG_S5PC1XX) += serial_s5p.o COBJS-$(CONFIG_S5P) += serial_s5p.o
COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o COBJS-$(CONFIG_CLPS7111_SERIAL) += serial_clps7111.o
COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o COBJS-$(CONFIG_IMX_SERIAL) += serial_imx.o

2
include/configs/s5p_goni.h
View file

@ -30,7 +30,7 @@
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ #define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC110 1 /* which is in a S5PC110 */ #define CONFIG_S5PC110 1 /* which is in a S5PC110 */
#define CONFIG_MACH_GONI 1 /* working with Goni */ #define CONFIG_MACH_GONI 1 /* working with Goni */

2
include/configs/smdkc100.h
View file

@ -34,7 +34,7 @@
*/ */
#define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */ #define CONFIG_ARMV7 1 /* This is an ARM V7 CPU core */
#define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */
#define CONFIG_S5PC1XX 1 /* which is in a S5PC1XX Family */ #define CONFIG_S5P 1 /* which is in a S5P Family */
#define CONFIG_S5PC100 1 /* which is in a S5PC100 */ #define CONFIG_S5PC100 1 /* which is in a S5PC100 */
#define CONFIG_SMDKC100 1 /* working with SMDKC100 */ #define CONFIG_SMDKC100 1 /* working with SMDKC100 */

2
include/serial.h
View file

@ -52,7 +52,7 @@ extern struct serial_device s3c24xx_serial1_device;
extern struct serial_device s3c24xx_serial2_device; extern struct serial_device s3c24xx_serial2_device;
#endif #endif
#if defined(CONFIG_S5PC1XX) #if defined(CONFIG_S5P)
extern struct serial_device s5p_serial0_device; extern struct serial_device s5p_serial0_device;
extern struct serial_device s5p_serial1_device; extern struct serial_device s5p_serial1_device;
extern struct serial_device s5p_serial2_device; extern struct serial_device s5p_serial2_device;