From 2895e75146f3068f11b66408278629c583fe8dfa Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Fri, 24 Oct 2008 01:29:16 +0900 Subject: [PATCH] --- yaml --- r: 117913 b: refs/heads/master c: f27655e34171b0ae9ea5a0aadae894e817f0f875 h: refs/heads/master i: 117911: c6e57ca80c1c131a3a1aab75f471ab093a047154 v: v3 --- [refs] | 2 +- trunk/arch/mips/Makefile | 6 +++--- trunk/arch/mips/{emma2rh => emma}/common/Makefile | 0 trunk/arch/mips/{emma2rh => emma}/common/irq.c | 0 trunk/arch/mips/{emma2rh => emma}/common/irq_emma2rh.c | 0 trunk/arch/mips/{emma2rh => emma}/common/prom.c | 0 trunk/arch/mips/{emma2rh => emma}/markeins/Makefile | 0 trunk/arch/mips/{emma2rh => emma}/markeins/irq.c | 0 trunk/arch/mips/{emma2rh => emma}/markeins/irq_markeins.c | 0 trunk/arch/mips/{emma2rh => emma}/markeins/led.c | 0 trunk/arch/mips/{emma2rh => emma}/markeins/platform.c | 0 trunk/arch/mips/{emma2rh => emma}/markeins/setup.c | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename trunk/arch/mips/{emma2rh => emma}/common/Makefile (100%) rename trunk/arch/mips/{emma2rh => emma}/common/irq.c (100%) rename trunk/arch/mips/{emma2rh => emma}/common/irq_emma2rh.c (100%) rename trunk/arch/mips/{emma2rh => emma}/common/prom.c (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/Makefile (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/irq.c (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/irq_markeins.c (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/led.c (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/platform.c (100%) rename trunk/arch/mips/{emma2rh => emma}/markeins/setup.c (100%) diff --git a/[refs] b/[refs] index 2545b3d0524d..ce43729b1eaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd741b604b94a4d5bebf2672626ffec7de44652c +refs/heads/master: f27655e34171b0ae9ea5a0aadae894e817f0f875 diff --git a/trunk/arch/mips/Makefile b/trunk/arch/mips/Makefile index 041c4f2e088a..28c55f608913 100644 --- a/trunk/arch/mips/Makefile +++ b/trunk/arch/mips/Makefile @@ -410,15 +410,15 @@ libs-$(CONFIG_PNX8550_STB810) += arch/mips/nxp/pnx8550/stb810/ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 # -# NEC EMMA2RH boards +# Common NEC EMMAXXX # -core-$(CONFIG_SOC_EMMA2RH) += arch/mips/emma2rh/common/ +core-$(CONFIG_SOC_EMMA) += arch/mips/emma/common/ cflags-$(CONFIG_SOC_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh # # NEC EMMA2RH Mark-eins # -core-$(CONFIG_NEC_MARKEINS) += arch/mips/emma2rh/markeins/ +core-$(CONFIG_NEC_MARKEINS) += arch/mips/emma/markeins/ load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000 # diff --git a/trunk/arch/mips/emma2rh/common/Makefile b/trunk/arch/mips/emma/common/Makefile similarity index 100% rename from trunk/arch/mips/emma2rh/common/Makefile rename to trunk/arch/mips/emma/common/Makefile diff --git a/trunk/arch/mips/emma2rh/common/irq.c b/trunk/arch/mips/emma/common/irq.c similarity index 100% rename from trunk/arch/mips/emma2rh/common/irq.c rename to trunk/arch/mips/emma/common/irq.c diff --git a/trunk/arch/mips/emma2rh/common/irq_emma2rh.c b/trunk/arch/mips/emma/common/irq_emma2rh.c similarity index 100% rename from trunk/arch/mips/emma2rh/common/irq_emma2rh.c rename to trunk/arch/mips/emma/common/irq_emma2rh.c diff --git a/trunk/arch/mips/emma2rh/common/prom.c b/trunk/arch/mips/emma/common/prom.c similarity index 100% rename from trunk/arch/mips/emma2rh/common/prom.c rename to trunk/arch/mips/emma/common/prom.c diff --git a/trunk/arch/mips/emma2rh/markeins/Makefile b/trunk/arch/mips/emma/markeins/Makefile similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/Makefile rename to trunk/arch/mips/emma/markeins/Makefile diff --git a/trunk/arch/mips/emma2rh/markeins/irq.c b/trunk/arch/mips/emma/markeins/irq.c similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/irq.c rename to trunk/arch/mips/emma/markeins/irq.c diff --git a/trunk/arch/mips/emma2rh/markeins/irq_markeins.c b/trunk/arch/mips/emma/markeins/irq_markeins.c similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/irq_markeins.c rename to trunk/arch/mips/emma/markeins/irq_markeins.c diff --git a/trunk/arch/mips/emma2rh/markeins/led.c b/trunk/arch/mips/emma/markeins/led.c similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/led.c rename to trunk/arch/mips/emma/markeins/led.c diff --git a/trunk/arch/mips/emma2rh/markeins/platform.c b/trunk/arch/mips/emma/markeins/platform.c similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/platform.c rename to trunk/arch/mips/emma/markeins/platform.c diff --git a/trunk/arch/mips/emma2rh/markeins/setup.c b/trunk/arch/mips/emma/markeins/setup.c similarity index 100% rename from trunk/arch/mips/emma2rh/markeins/setup.c rename to trunk/arch/mips/emma/markeins/setup.c