summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe SAVE2012-08-22 15:11:01 +0200
committerCyril Jourdan2012-09-20 11:23:14 +0200
commita788ca277ca3e0840eaf2183331ade318dd62cce (patch)
tree3765afd5f937c7498be462b724d913c5d4881f0c
parentfbe79c0fc3d4a49cde071481e9f5b6a08e5e103d (diff)
cleo/uboot/cpu/spc300: change SYNOP3504_FIXED_CLK feature, refs #2961
- change !SYNOP3504_FIXED_CLK feature into SPCETH - rename eth_init.S file into spceth.S
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/Makefile2
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/spceth.S (renamed from cleopatre/u-boot-1.1.6/cpu/spc300/eth_init.S)8
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/start.S2
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/Makefile b/cleopatre/u-boot-1.1.6/cpu/spc300/Makefile
index c0210ae44c..d695aa42cc 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/Makefile
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/Makefile
@@ -23,7 +23,7 @@ LIB = lib$(CPU).a
START = start.o
OBJS = interrupts.o cpu.o timer.o serial.o wdt.o
-SOBJS = reset.o spcpll.o msepll.o eth_init.o nvram.o dsp.o sdram.o miu.o \
+SOBJS = reset.o spcpll.o msepll.o spceth.o nvram.o dsp.o sdram.o miu.o \
spcpio.o iomux.o
all: .depend $(START) $(LIB)
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/eth_init.S b/cleopatre/u-boot-1.1.6/cpu/spc300/spceth.S
index e27e16c09a..6938afb0cb 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/eth_init.S
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/spceth.S
@@ -1,5 +1,5 @@
/*
- * cpu/spc300/eth_init.S
+ * cpu/spc300/spceth.S
*
* Copyright (C) 2009 SPiDCOM Technologies
*
@@ -21,12 +21,12 @@
#include <config.h>
-#ifndef CONFIG_CHIP_FEATURE_SYNOP3504_FIXED_CLOCK
+#ifdef CONFIG_CHIP_FEATURE_SPCETH
#include <asm/hardware.h>
#include <asm/arch/nvram.h>
- .file "eth_init.S"
+ .file "spceth.S"
.text
.arm @ This is ARM code; performs the same action as .code 32
@@ -180,4 +180,4 @@ ethernet_config:
/* back to my caller */
mov pc, lr
-#endif /* CONFIG_CHIP_FEATURE_SYNOP3504_FIXED_CLOCK */
+#endif /* CONFIG_CHIP_FEATURE_SPCETH */
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
index ebb9330019..4fc9064bb2 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
@@ -280,7 +280,7 @@ in_sdram:
bl gpio_pio_init /* we pass NVRAM addr in r10; do not corrupt r10 in this function */
#endif
-#ifndef CONFIG_CHIP_FEATURE_SYNOP3504_FIXED_CLOCK
+#if defined(CONFIG_CHIP_FEATURE_SPCETH)
/*
* Configure Ethernet IP
diff --git a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
index 08c7366812..8b8403133b 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
@@ -32,12 +32,12 @@
# define CONFIG_CHIP_MAX_MASTER_CLOCK 147000000
# define CONFIG_CHIP_FEATURE_SPCPLL 1
# define CONFIG_CHIP_FEATURE_SPCPIO 1
+# define CONFIG_CHIP_FEATURE_SPCETH 1
#elif defined (CONFIG_CHIP_MSE500DINI_300)
# define CONFIG_CHIP_FEATURE_INT_MAP_V2 1
# define CONFIG_CHIP_FEATURE_MIU_CTRL 1
# define CONFIG_CHIP_FEATURE_SYNOP3504 1
# define CONFIG_CHIP_FEATURE_SYNOP3504_NO_GIGABIT 1
-# define CONFIG_CHIP_FEATURE_SYNOP3504_FIXED_CLOCK 1
# define CONFIG_CHIP_FEATURE_SYNOP3504_PHY_DINI 1
# define CONFIG_CHIP_FEATURE_LINUX_MEM_WORKAROUND 1
# define CONFIG_CHIP_FEATURE_DINI_UART_SELECT 1