svn commit: r189651 - in head/sys: arm/xscale/ixp425 conf

[Sam Leffler]

Author: sam
Date: Tue Mar 10 21:49:22 2009
New Revision: 189651
URL: http://svn.freebsd.org/changeset/base/189651

Log:
  add IXP4XX_FLASH_SIZE config knob that can be used to override the default
  flash size; this is necessary at the moment because we map all of flash at
  boot, eventually we'll do this on the fly

Modified:
  head/sys/arm/xscale/ixp425/ixp425reg.h
  head/sys/conf/options.arm

Modified: head/sys/arm/xscale/ixp425/ixp425reg.h
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425reg.h	Tue Mar 10 21:47:17 2009	(r189650)
+++ head/sys/arm/xscale/ixp425/ixp425reg.h	Tue Mar 10 21:49:22 2009	(r189651)
@@ -660,7 +660,11 @@
 /* NB: CS0 is special; it maps flash */
 #define	IXP425_EXP_BUS_CS0_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(0)
 #define IXP425_EXP_BUS_CS0_VBASE	0xFD000000UL
+#ifndef IXP4XX_FLASH_SIZE
 #define IXP425_EXP_BUS_CS0_SIZE		0x01000000	/* NB: 16M */
+#else
+#define IXP425_EXP_BUS_CS0_SIZE		IXP4XX_FLASH_SIZE
+#endif
 #define	IXP425_EXP_BUS_CS1_HWBASE	IXP425_EXP_BUS_CSx_HWBASE(1)
 #define IXP425_EXP_BUS_CS1_VBASE	IXP425_EXP_BUS_CSx_VBASE(1)
 #define IXP425_EXP_BUS_CS1_SIZE		IXP425_EXP_BUS_CSx_SIZE

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Tue Mar 10 21:47:17 2009	(r189650)
+++ head/sys/conf/options.arm	Tue Mar 10 21:49:22 2009	(r189651)
@@ -18,6 +18,7 @@ CPU_XSCALE_IXP425	opt_global.h
 CPU_XSCALE_IXP435	opt_global.h
 CPU_XSCALE_PXA2X0	opt_global.h
 FLASHADDR		opt_global.h
+IXP4XX_FLASH_SIZE	opt_global.h
 KERNPHYSADDR		opt_global.h
 KERNVIRTADDR		opt_global.h
 LOADERRAMADDR		opt_global.h