Skip to contentSkip to conversation

ppc4xx: merge xilinx-ppc440 and xilinx-ppc405 cfg

PATCH New Ricardo Ribalda Delgado 2 participants 2 messages Oct 27, 2008 – Oct 31, 2008 Arm/Zynq architecture

lore
Share & tools
lore

Ricardo Ribalda Delgado

author
#0 lore raw

PATCH 1/1 ppc4xx: merge xilinx-ppc440 and xilinx-ppc405 cfg

Xilinx ppc440 and ppc405 have many similarities. This patch merge the config files of both infrastuctures

Signed-off-by Ricardo Ribalda Delgado <[email protected]>
---
 board/avnet/fx12mm/xparameters.h |    2 +-
 include/configs/fx12mm.h         |    3 -
 include/configs/ml507.h          |    6 +-
 include/configs/xilinx-ppc.h     |  136 ++++++++++++++++++++++++++++++++++++++
 include/configs/xilinx-ppc405.h  |   91 +-------------------------
 include/configs/xilinx-ppc440.h  |   88 ++-----------------------
 6 files changed, 147 insertions(+), 179 deletions(-)
 create mode 100644 include/configs/xilinx-ppc.h
board/avnet/fx12mm/xparameters.h +1 -1
index f7031b3..4410f19 100644
@@ -46,6 +46,6 @@
 #define XPAR_DDR2_SDRAM_MEM_BASEADDR 0x00000000
 
 /* FLASH */
-#define XPAR_FLASH_2MX16_MEM0_BASEADDR 0xFFC00000
+#define XPAR_FLASH_MEM0_BASEADDR 0xFFC00000
 
 #endif
include/configs/fx12mm.h +0 -3
index d45e7a0..8481c33 100644
@@ -57,11 +57,8 @@
 #define CONFIG_PREBOOT      	"echo U-Boot is up and runnining;"
 
 /*Flash*/
-#define CONFIG_SYS_FLASH_BASE          XPAR_FLASH_2MX16_MEM0_BASEADDR
 #define CONFIG_SYS_FLASH_SIZE          (4*1024*1024)
 #define CONFIG_SYS_MAX_FLASH_SECT      71
-#define CONFIG_SYS_FLASH_CFI		1
-#define CONFIG_FLASH_CFI_DRIVER		1
 #define MTDIDS_DEFAULT		"nor0=fx12mm-flash"
 #define MTDPARTS_DEFAULT	"mtdparts=fx12mm-flash:-(user)"
include/configs/ml507.h +3 -3
index c637904..a7319e4 100644
@@ -30,15 +30,15 @@
 #define	CONFIG_ENV_IS_IN_FLASH	1
 #define	CONFIG_ENV_SIZE		0x20000
 #define	CONFIG_ENV_SECT_SIZE	0x20000
-#define CONFIG_ENV_OFFSET		0x340000
+#define CONFIG_ENV_OFFSET	0x340000
 #define CONFIG_ENV_ADDR		(XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
 
 /*Misc*/
-#define CONFIG_SYS_PROMPT		"ml507:/# "	/* Monitor Command Prompt    */
+#define CONFIG_SYS_PROMPT	"ml507:/# "	/* Monitor Command Prompt    */
 #define CONFIG_PREBOOT		"echo U-Boot is up and runnining;"
 
 /*Flash*/
-#define	CONFIG_SYS_FLASH_SIZE		(32*1024*1024)
+#define	CONFIG_SYS_FLASH_SIZE	(32*1024*1024)
 #define	CONFIG_SYS_MAX_FLASH_SECT	259
 #define MTDIDS_DEFAULT		"nor0=ml507-flash"
 #define MTDPARTS_DEFAULT	"mtdparts=ml507-flash:-(user)"
include/configs/xilinx-ppc.h new file +136 -0

136 lines not on this page · raw message

include/configs/xilinx-ppc405.h +2 -89

99 lines not on this page · raw message

include/configs/xilinx-ppc440.h +5 -83

95 lines not on this page · raw message

Signature · 1 line
1.5.6.5
Applied
#1 lore raw

PATCH 1/1 ppc4xx: merge xilinx-ppc440 and xilinx-ppc405 cfg

Quoted 4 lines · Ricardo Ribalda Delgado

Xilinx ppc440 and ppc405 have many similarities. This patch merge the config files of both infrastuctures

Signed-off-by Ricardo Ribalda Delgado <[email protected]>

Applied to 4xx/master. Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================