ppc: Conditionally compile bat_rw.c

[karo-tx-uboot.git] / include / configs / shannon.h

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 75ba34cdb851b90f3b4ec81654ec1412eb979a1c..d848915d0e99761779a6ba2a78bd4467f1f0ff52 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -44,6 +44,8 @@
 #define CONFIG_SHANNON         1       /* on an SHANNON/TuxScreen Board      */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_NO_DCACHE
 
 /*
  * Size of malloc() pool
@@ -59,6 +61,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_SA1100_SERIAL
 #define CONFIG_SERIAL3          1      /* we use SERIAL 3  */
 
 /* allow to overwrite serial and ethaddr */
@@ -105,8 +108,6 @@
 #define CONFIG_SYS_MEMTEST_START       0xc0400000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0xc0800000      /* 4 ... 8 MB in DRAM   */
 
-#undef  CONFIG_SYS_CLKS_IN_HZ          /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0xd0000000      /* default load address */
 
 #define        CONFIG_SYS_HZ                   3686400         /* incrementer freq: 3.6864 MHz */
@@ -160,12 +161,13 @@
 
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #ifdef CONFIG_INFERNO
-/* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */
+/* we take the last sector, 128 KB in size, but we only use 16 KB of it for stack reasons */
 #define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x003E0000)     /* Addr of Environment Sector   */
-#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment    */
+#define CONFIG_ENV_SECT_SIZE   (128 << 10)     /* size of environment sector */
 #else
 #define CONFIG_ENV_ADDR                (PHYS_FLASH_1 + 0x1C000)        /* Addr of Environment Sector   */
-#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SIZE                0x4000  /* Total Size of Environment    */
 #endif
 
 /*-----------------------------------------------------------------------