- CONFIG_SYS_BOOTMAPSZ for 16 instead of 8 MB, moved to common
- baudrate back to 9600 for backward compatibility
- HCU4: CONFIG_SYS_ICACHE_SACR_VALUE defined
- CONFIG_VXWORKS_PREBOOT for HCU4 and MCU25
- HCU5: Add CPU and OCM POST
Signed-off-by: Niklaus Giger <niklaus.gi...@netstal.com>
---
include/configs/hcu4.h | 9 ++-------
include/configs/hcu5.h | 38 +++++++++++++++++++++++---------------
include/configs/mcu25.h | 8 ++------
include/configs/netstal-common.h | 9 ++++++---
4 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 369b368..fddfebc 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -64,6 +64,7 @@
#define CONFIG_SYS_OCM_DATA_SIZE 0x00001000
/* Do not set up locked dcache as init ram. */
#undef CONFIG_SYS_INIT_DCACHE_CS
+#define CONFIG_SYS_ICACHE_SACR_VALUE 0x80000001
/* Use the On-Chip-Memory (OCM) as a temporary stack for the startup code. */
#define CONFIG_SYS_TEMP_STACK_OCM 1
@@ -200,6 +201,7 @@
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
*----------------------------------------------------------------------*/
+#define CONFIG_VXWORKS_PREBOOT 1
#define CONFIG_SYS_LONGHELP /* undef to save memory
*/
#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt
*/
#if defined(CONFIG_CMD_KGDB)
@@ -243,13 +245,6 @@
#define CONFIG_SYS_GPIO0_TCR 0x7FFE0000 /* GPIO value */
#define CONFIG_SYS_GPIO0_ODR 0x00E897FC /* GPIO value */
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_SYS_BOOTMAPSZ (8 << 20)/* Initial Memory map for
Linux */
-
/* Init Memory Controller:
*
* BR0/1 and OR0/1 (FLASH)
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 26d2d0c..6b90705 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -92,7 +92,7 @@
* Serial Port
*----------------------------------------------------------------------*/
#undef CONFIG_SYS_EXT_SERIAL_CLOCK /* external serial clock */
-#define CONFIG_BAUDRATE 115200
+#define CONFIG_BAUDRATE 9600
#undef CONFIG_SERIAL_SOFTWARE_FIFO
#undef CONFIG_UART1_CONSOLE
@@ -131,7 +131,9 @@
#define CONFIG_SYS_MBYTES_SDRAM (128) /* 128 MB or 256 MB
*/
#define CONFIG_SYS_DDR_CACHED_ADDR 0x50000000 /* setup 2nd TLB cached
here */
#undef CONFIG_DDR_DATA_EYE /* Do not use DDR2 optimization */
-#define CONFIG_DDR_ECC 1 /* enable ECC */
+/* warum gibt es Fehler mit #undef CONFIG_DDR_ECC (Hub) */
+#define CONFIG_DDR_ECC
+#undef DISABLE_DDR_ECC_AFTER_POST /* disable ECC after POST tests */
/* Following two definitions must be kept in sync with config.h of vxWorks */
#define USER_RESERVED_MEM ( 0) /* in kB */
@@ -155,11 +157,12 @@
CONFIG_NETSTAL_DEF_ENV_POWERPC \
""
-#define CONFIG_M88E1111_PHY 1
+/* HCU5 has a SMII for 10/100Mbps Micrel KS8001 */
+#define CONFIG_MICREL_KS8001_PHY 1
#define CONFIG_IBM_EMAC4_V4 1
-
-#define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */
-#define CONFIG_PHY1_ADDR 2
+#define CONFIG_PHY_DYNAMIC_ANEG 1
+#define CONFIG_PHY_RESET 1
+#define CONFIG_PHY_ADDR 1 /* PHY address
*/
/* USB */
#define CONFIG_USB_OHCI
@@ -205,18 +208,30 @@
#define CONFIG_CMD_USB
/* POST support */
-#define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \
- CONFIG_SYS_POST_UART | \
+#define CONFIG_POST (CONFIG_SYS_POST_UART | \
CONFIG_SYS_POST_I2C | \
CONFIG_SYS_POST_CACHE | \
CONFIG_SYS_POST_FPU | \
+ CONFIG_SYS_POST_CPU | \
+ CONFIG_SYS_POST_OCM | \
CONFIG_SYS_POST_ETHER | \
CONFIG_SYS_POST_SPR)
+#define CONFIG_SYS_POST_MEMORY_EXTENDED /* 1 * in case of memory error execute
extended test */
#define CONFIG_SYS_POST_UART_TABLE {UART0_BASE}
+#define CONFIG_SYS_OCM_SIZE (16 << 10)
+#define CONFIG_SYS_OCM_STATUS_OK 0x00009A00
+#define CONFIG_SYS_OCM_STATUS_FAIL 0x0000A300
+#define CONFIG_SYS_OCM_STATUS_MASK 0x0000FF00
+#define CONFIG_SYS_OCM_STATUS_ADDR (CONFIG_SYS_PERIPHERAL_BASE +
GPT0_MASK1)
+
#define CONFIG_SYS_POST_WORD_ADDR (CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
#define CONFIG_SYS_POST_CACHE_ADDR 0x7fff0000 /* free virtual address
*/
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as
output */
+/* defining CONFIG_4xx_DCACHE leads to erros in memory_extended_tests */
+#undef CONFIG_WATCHDOG
+/* Watchdog cannot be enabled, as it would be still enabled booting vxWorks */
+#undef CONFIG_4xx_DCACHE
#define CONFIG_SUPPORT_VFAT
@@ -255,13 +270,6 @@
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC
*/
#define CONFIG_SYS_PCI_SUBSYS_ID 0xcafe /* Whatever
*/
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for
Linux */
-
/*-----------------------------------------------------------------------
* Flash
*----------------------------------------------------------------------*/
diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 5f31198..ef8a48c 100644
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -64,6 +64,7 @@
#define CONFIG_SYS_OCM_DATA_SIZE 0x00001000
/* Do not set up locked dcache as init ram. */
#undef CONFIG_SYS_INIT_DCACHE_CS
+#define CONFIG_SYS_ICACHE_SACR_VALUE 0x80000001
/* Use the On-Chip-Memory (OCM) as a temporary stack for the startup code. */
#define CONFIG_SYS_TEMP_STACK_OCM 1
@@ -208,6 +209,7 @@
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
*----------------------------------------------------------------------*/
+#define CONFIG_VXWORKS_PREBOOT 1
#define CONFIG_SYS_LONGHELP /* undef to save memory
*/
#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt
*/
#if defined(CONFIG_CMD_KGDB)
@@ -256,12 +258,6 @@
#define CONFIG_SYS_GPIO0_OR 0x087FFFFF /* GPIO value */
#define CONFIG_SYS_GPIO0_TCR 0x7FFF8000 /* GPIO value */
#define CONFIG_SYS_GPIO0_ODR 0xFFFF0000 /* GPIO value */
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for
Linux */
/* Init Memory Controller:
*
diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h
index 4bed7ae..0d1f6bb 100644
--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@@ -92,6 +92,8 @@
#define CONFIG_CMD_REGINFO
#define CONFIG_BOOT_RETRY_TIME 30
#define CONFIG_RESET_TO_RETRY
+#define CONFIG_SHOW_ACTIVITY
+
/*
* Miscellaneous configurable options
*/
@@ -142,10 +144,11 @@
/*
* For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
+ * have to be in the first 16 MB of memory, since this is
+ * the maximum mapped by the 40x Linux kernel during initialization.
*/
-#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for
Linux */
+#define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for
Linux */
+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size
*/
/*
* Internal Definitions
--
1.6.3.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
