[U-Boot] [PATCH] S5PC2XX: Rename S5pc2XX to exynos4

Chander Kashyap chander.kashyap at linaro.org
Thu Nov 17 06:51:12 CET 2011


As per new conventions Samsung SoC's are named as Exynos.
Cortex-A9 based Soc's are named as exynos4. s5pc2xx is cortex-A9
based, hence renamed to exynos4. This is done as per kernel
naming convetions.

Similerly rename the s5p-common to exynos-common and
libs5p-common to libexynos-common.

Signed-off-by: Chander Kashyap <chander.kashyap at linaro.org>
---
 Makefile                                           |    6 +++---
 .../armv7/{s5p-common => exynos-common}/Makefile   |    2 +-
 .../armv7/{s5p-common => exynos-common}/cpu_info.c |    0
 .../cpu/armv7/{s5p-common => exynos-common}/pwm.c  |    0
 .../armv7/{s5p-common => exynos-common}/sromc.c    |    0
 .../armv7/{s5p-common => exynos-common}/timer.c    |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile   |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c    |    0
 arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c      |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/adc.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/clk.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/clock.h     |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/cpu.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/gpio.h      |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/mmc.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/pwm.h       |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/sromc.h     |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h |    0
 .../asm/{arch-s5pc2xx => arch-exynos4}/uart.h      |    0
 boards.cfg                                         |    6 +++---
 20 files changed, 7 insertions(+), 7 deletions(-)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/Makefile (97%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/cpu_info.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/pwm.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/sromc.c (100%)
 rename arch/arm/cpu/armv7/{s5p-common => exynos-common}/timer.c (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/Makefile (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/clock.c (100%)
 rename arch/arm/cpu/armv7/{s5pc2xx => exynos4}/soc.c (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/adc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clk.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/clock.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/cpu.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/gpio.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/mmc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/pwm.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sromc.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/sys_proto.h (100%)
 rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos4}/uart.h (100%)

diff --git a/Makefile b/Makefile
index 294c762..1d7721c 100644
--- a/Makefile
+++ b/Makefile
@@ -301,10 +301,10 @@ LIBS += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
 ifeq ($(SOC),s5pc1xx)
-LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
 endif
-ifeq ($(SOC),s5pc2xx)
-LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
+ifeq ($(SOC),exynos4)
+LIBS += $(CPUDIR)/exynos-common/libexynos-common.o
 endif
 
 LIBS := $(addprefix $(obj),$(sort $(LIBS)))
diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/exynos-common/Makefile
similarity index 97%
rename from arch/arm/cpu/armv7/s5p-common/Makefile
rename to arch/arm/cpu/armv7/exynos-common/Makefile
index 1705399..3c2aef8 100644
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/exynos-common/Makefile
@@ -23,7 +23,7 @@
 
 include $(TOPDIR)/config.mk
 
-LIB	= $(obj)libs5p-common.o
+LIB	= $(obj)libexynos-common.o
 
 COBJS-y		+= cpu_info.o
 COBJS-y		+= timer.o
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/exynos-common/cpu_info.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/cpu_info.c
rename to arch/arm/cpu/armv7/exynos-common/cpu_info.c
diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/exynos-common/pwm.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/pwm.c
rename to arch/arm/cpu/armv7/exynos-common/pwm.c
diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/exynos-common/sromc.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/sromc.c
rename to arch/arm/cpu/armv7/exynos-common/sromc.c
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/exynos-common/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5p-common/timer.c
rename to arch/arm/cpu/armv7/exynos-common/timer.c
diff --git a/arch/arm/cpu/armv7/s5pc2xx/Makefile b/arch/arm/cpu/armv7/exynos4/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/Makefile
rename to arch/arm/cpu/armv7/exynos4/Makefile
diff --git a/arch/arm/cpu/armv7/s5pc2xx/clock.c b/arch/arm/cpu/armv7/exynos4/clock.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/clock.c
rename to arch/arm/cpu/armv7/exynos4/clock.c
diff --git a/arch/arm/cpu/armv7/s5pc2xx/soc.c b/arch/arm/cpu/armv7/exynos4/soc.c
similarity index 100%
rename from arch/arm/cpu/armv7/s5pc2xx/soc.c
rename to arch/arm/cpu/armv7/exynos4/soc.c
diff --git a/arch/arm/include/asm/arch-s5pc2xx/adc.h b/arch/arm/include/asm/arch-exynos4/adc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/adc.h
rename to arch/arm/include/asm/arch-exynos4/adc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/clk.h b/arch/arm/include/asm/arch-exynos4/clk.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/clk.h
rename to arch/arm/include/asm/arch-exynos4/clk.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/clock.h b/arch/arm/include/asm/arch-exynos4/clock.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/clock.h
rename to arch/arm/include/asm/arch-exynos4/clock.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-exynos4/cpu.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/cpu.h
rename to arch/arm/include/asm/arch-exynos4/cpu.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/gpio.h b/arch/arm/include/asm/arch-exynos4/gpio.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/gpio.h
rename to arch/arm/include/asm/arch-exynos4/gpio.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-exynos4/mmc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/mmc.h
rename to arch/arm/include/asm/arch-exynos4/mmc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-exynos4/pwm.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/pwm.h
rename to arch/arm/include/asm/arch-exynos4/pwm.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/sromc.h b/arch/arm/include/asm/arch-exynos4/sromc.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/sromc.h
rename to arch/arm/include/asm/arch-exynos4/sromc.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/sys_proto.h b/arch/arm/include/asm/arch-exynos4/sys_proto.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/sys_proto.h
rename to arch/arm/include/asm/arch-exynos4/sys_proto.h
diff --git a/arch/arm/include/asm/arch-s5pc2xx/uart.h b/arch/arm/include/asm/arch-exynos4/uart.h
similarity index 100%
rename from arch/arm/include/asm/arch-s5pc2xx/uart.h
rename to arch/arm/include/asm/arch-exynos4/uart.h
diff --git a/boards.cfg b/boards.cfg
index 8b7a03b..c7d5377 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -195,9 +195,9 @@ omap4_panda                  arm         armv7       panda               ti
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
 s5p_goni                     arm         armv7       goni                samsung        s5pc1xx
 smdkc100                     arm         armv7       smdkc100            samsung        s5pc1xx
-origen			     arm	 armv7	     origen		 samsung	s5pc2xx
-s5pc210_universal            arm         armv7       universal_c210      samsung        s5pc2xx
-smdkv310		     arm	 armv7	     smdkv310		 samsung	s5pc2xx
+origen			     arm	 armv7	     origen		 samsung	exynos4
+s5pc210_universal            arm         armv7       universal_c210      samsung        exynos4
+smdkv310		     arm	 armv7	     smdkv310		 samsung	exynos4
 harmony                      arm         armv7       harmony             nvidia         tegra2
 seaboard                     arm         armv7       seaboard            nvidia         tegra2
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500
-- 
1.7.5.4



More information about the U-Boot mailing list