* Cleanup TQM5200 board configurations:

  - make highboot configurations use environment at high end, too,
    to avoid flash fragmentation
  - always use redundand environment
  - don't enable video code for modules without graphics controller
  - provide useful (though different) mtdparts settings
  - get rid of CONFIG_CS_AUTOCONF which was always set anyway

* Extend mkconfig tool to print more useful target name

diff --git a/CHANGELOG b/CHANGELOG
index 291204b72f636df70442ee239b1efcd28e9129fc..41fd312f8b0162f5a34f8faf287b90856fd68aca 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup TQM5200 board configurations:
+  - make highboot configurations use environment at high end, too,
+    to avoid flash fragmentation
+  - always use redundand environment
+  - don't enable video code for modules without graphics controller
+  - provide useful (though different) mtdparts settings
+  - get rid of CONFIG_CS_AUTOCONF which was always set anyway
+
+* Extend mkconfig tool to print more useful target name
+
 * Add support for high-boot on TQM5200 and TQM5200S boards.
   Hint: the CPLD on the TQM5200 must be programmed with a software
   version supporting the high boot option! The new TQM5200S is

diff --git a/MAKEALL b/MAKEALL
index 372e19aa8bd6970804f5e17dedae7e4718eedd4a..a9d60a4f52134782baec44bc4ede888fb7c25178 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -29,6 +29,7 @@ LIST_5xxx="   \
        icecube_5200    lite5200b       mcc200          o2dnt           \
        pf5200          PM520           TB5200          Total5100       \
        Total5200       Total5200_Rev2  TQM5200         TQM5200_B       \
+       TQM5200S                                                        \
 "
 
 #########################################################################

diff --git a/Makefile b/Makefile
index 4188ff638ca8938dac9d87587db3f8885c1a68c8..bd907465978dfca314ad12997aaac508df8475ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -356,8 +356,6 @@ smmaco4_config: unconfig
        @./mkconfig -a smmaco4 ppc mpc5xxx tqm5200
 
 spieval_config:        unconfig
-       @echo "#define CONFIG_CS_AUTOCONF">>include/config.h
-       @echo "... with automatic CS configuration"
        @./mkconfig -a spieval ppc mpc5xxx tqm5200
 
 TB5200_B_config \
@@ -366,15 +364,13 @@ TB5200_config:    unconfig
                { echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
                  echo "... with MPC5200B processor" ; \
                }
-       @echo "#define CONFIG_CS_AUTOCONF">>include/config.h
-       @echo "... with automatic CS configuration"
-       @./mkconfig -a TB5200 ppc mpc5xxx tqm5200
+       @./mkconfig -n $@ -a TB5200 ppc mpc5xxx tqm5200
 
 MINI5200_config        \
 EVAL5200_config        \
 TOP5200_config:        unconfig
        @ echo "#define CONFIG_$(@:_config=) 1" >include/config.h
-       @./mkconfig -a TOP5200 ppc mpc5xxx top5200 emk
+       @./mkconfig -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
 
 Total5100_config               \
 Total5200_config               \
@@ -405,29 +401,39 @@ Total5200_Rev2_lowboot_config:    unconfig
        @./mkconfig -a Total5200 ppc mpc5xxx total5200
 
 TQM5200_config \
-TQM5200_STK100_config \
 TQM5200_B_config \
 TQM5200_B_HIGHBOOT_config \
+TQM5200S_config \
+TQM5200S_HIGHBOOT_config \
+TQM5200_STK100_config \
+cameron_config \
 MiniFAP_config:        unconfig
        @ >include/config.h
        @[ -z "$(findstring MiniFAP,$@)" ] || \
                { echo "#define CONFIG_MINIFAP" >>include/config.h ; \
                  echo "... TQM5200_AC on MiniFAP" ; \
                }
+       @[ -z "$(findstring cameron,$@)" ] || \
+               { echo "#define CONFIG_CAMERON" >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
+                 echo "... TQM5200S on Cameron" ; \
+               }
        @[ -z "$(findstring STK100,$@)" ] || \
                { echo "#define CONFIG_STK52XX_REV100"  >>include/config.h ; \
                  echo "... on a STK52XX.100 base board" ; \
                }
-       @[ -z "$(findstring B,$@)" ] || \
+       @[ -z "$(findstring TQM5200_B,$@)" ] || \
                { echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
-                 echo "... with MPC5200B processor" ; \
+               }
+       @[ -z "$(findstring TQM5200S,$@)" ] || \
+               { echo "#define CONFIG_TQM5200S"        >>include/config.h ; \
+                 echo "#define CONFIG_TQM5200_B"       >>include/config.h ; \
                }
        @[ -z "$(findstring HIGHBOOT,$@)" ] || \
                { echo "TEXT_BASE = 0xFFF00000" >board/tqm5200/config.tmp ; \
                }
-       @echo "#define CONFIG_CS_AUTOCONF">>include/config.h ;
-       @echo "... with automatic CS configuration" ;
-       @./mkconfig -a TQM5200 ppc mpc5xxx tqm5200
+       @./mkconfig -n $@ -a TQM5200 ppc mpc5xxx tqm5200
 
 #########################################################################
 ## MPC8xx Systems

diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index 1756e7f0d788e4fc3db3abf173b6472907d90a1a..8ed44d84a1603380212ad63f834c44e6603a0ede 100644 (file)
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -273,27 +273,36 @@ long int initdram (int board_type)
 
 int checkboard (void)
 {
-#if defined (CONFIG_AEVFIFO)
+#if defined(CONFIG_AEVFIFO)
        puts ("Board: AEVFIFO\n");
        return 0;
 #endif
-#if defined (CONFIG_TQM5200)
-#if defined(CONFIG_TQM5200_B)
-       puts ("Board: TQM5200 or TQM5200S (TQ-Components GmbH)\n");
+
+#if defined(CONFIG_TQM5200S)
+# define MODULE_NAME   "TQM5200S"
 #else
-       puts ("Board: TQM5200 (TQ-Components GmbH)\n");
-#endif /* CONFIG_TQM5200_B */
-#endif
-#if defined (CONFIG_STK52XX)
-       puts ("       on a STK52XX baseboard\n");
+# define MODULE_NAME   "TQM5200"
 #endif
-#if defined (CONFIG_TB5200)
-       puts ("       on a TB5200 baseboard\n");
+
+#if defined(CONFIG_STK52XX)
+# define CARRIER_NAME  "STK52xx"
+#elif defined(CONFIG_TB5200)
+# define CARRIER_NAME  "TB5200"
+#elif defined(CONFIG_CAMERON)
+# define CARRIER_NAME  "Cameron"
+#else
+# error "Unknown carrier board"
 #endif
 
+       puts (  "Board: " MODULE_NAME " (TQ-Components GmbH)\n"
+               "       on a " CARRIER_NAME " carrier board\n");
+
        return 0;
 }
 
+#undef MODULE_NAME
+#undef CARRIER_NAME
+
 void flash_preinit(void)
 {
        /*
@@ -435,7 +444,6 @@ int board_early_init_r (void)
 #endif
 #endif /* CONFIG_PS2MULT */
 
-#if defined(CONFIG_CS_AUTOCONF)
 int last_stage_init (void)
 {
        /*
@@ -530,7 +538,6 @@ int last_stage_init (void)
 
        return 0;
 }
-#endif /* CONFIG_CS_AUTOCONF */
 
 #ifdef CONFIG_VIDEO_SM501
 
@@ -600,10 +607,10 @@ void video_get_info_str (int line_number, char *info)
 #if defined (CONFIG_STK52XX) || defined (CONFIG_TB5200)
        } else if (line_number == 2) {
 #if defined (CONFIG_STK52XX)
-               strcpy (info, "        on a STK52XX baseboard");
+               strcpy (info, "        on a STK52xx carrier board");
 #endif
 #if defined (CONFIG_TB5200)
-               strcpy (info, "        on a TB5200 baseboard");
+               strcpy (info, "        on a TB5200 carrier board");
 #endif
 #endif
        }

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 5d8c8898f87504d656dd4b713906f40e84a7a75b..8a6e5a61b7363cfb77de1e6397ee78b349fc4cc3 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -440,32 +440,25 @@
 #define CFG_CS0_START          CFG_FLASH_BASE
 #define CFG_CS0_SIZE           CFG_FLASH_SIZE
 
-/* automatic configuration of chip selects */
-#ifdef CONFIG_CS_AUTOCONF
 #define CONFIG_LAST_STAGE_INIT
-#endif
 
 /*
  * SRAM - Do not map below 2 GB in address space, because this area is used
  * for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define CFG_CS2_START          0xE5000000
 #define CFG_CS2_SIZE           0x100000        /* 1 MByte */
 #define CFG_CS2_CFG            0x0004D930
-#endif
 
 /*
  * Grafic controller - Do not map below 2 GB in address space, because this
  * area is used for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define SM501_FB_BASE          0xE0000000
 #define CFG_CS1_START          (SM501_FB_BASE)
 #define CFG_CS1_SIZE           0x4000000       /* 64 MByte */
 #define CFG_CS1_CFG            0x8F48FF70
 #define SM501_MMIO_BASE                CFG_CS1_START + 0x03E00000
-#endif
 
 #define CFG_CS_BURST           0x00000000
 #define CFG_CS_DEADCYCLE       0x33333311      /* 1 dead cycle for flash and SM501 */

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 0ef0b9155e2d2e694b8e636c723d42eaf2bb4a5b..342cf1be45ff709df04c0292ecdeff54a5396056 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -32,27 +32,30 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
-#define CONFIG_TQM5200         1       /* ... on TQM5200 module */
-#undef CONFIG_TQM5200_REV100           /*  define for revision 100 modules */
-#define CONFIG_STK52XX         1       /* ... on a STK52XX base board */
+#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
+#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
+#define CONFIG_TQM5200         1       /* ... on TQM5200 module                */
+#undef CONFIG_TQM5200_REV100           /*  define for revision 100 modules     */
 
-#define CFG_MPC5XXX_CLKIN      33000000 /* ... running at 33.000000MHz */
+#ifndef CONFIG_CAMERON                 /* On a Cameron board or ...            */
+#define CONFIG_STK52XX         1       /* ... on a STK52XX board               */
+#endif
+
+#define CFG_MPC5XXX_CLKIN      33000000 /* ... running at 33.000000MHz         */
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
-#define BOOTFLAG_WARM          0x02    /* Software reboot           */
+#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
+#define BOOTFLAG_WARM          0x02    /* Software reboot                      */
 
-#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs */
+#define CFG_CACHELINE_SIZE     32      /* For MPC5xxx CPUs                     */
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
+#  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value        */
 #endif
 
 /*
  * Serial console configuration
  */
-#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1 */
-#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps */
+#define CONFIG_PSC_CONSOLE     1       /* console is on PSC1                   */
+#define CONFIG_BAUDRATE                115200  /* ... at 115200 bps                    */
 #define CFG_BAUDRATE_TABLE     { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #ifdef CONFIG_STK52XX
@@ -96,7 +99,7 @@
 /*
  * Video console
  */
-#if 1
+#ifndef CONFIG_TQM5200S                /* No graphics controller on TQM5200S */
 #define CONFIG_VIDEO
 #define CONFIG_VIDEO_SM501
 #define CONFIG_VIDEO_SM501_32BPP
@@ -129,10 +132,12 @@
 #define ADD_USB_CMD            0
 #endif
 
+#ifndef CONFIG_CAMERON
 /* POST support */
 #define CONFIG_POST            (CFG_POST_MEMORY   | \
                                 CFG_POST_CPU      | \
                                 CFG_POST_I2C)
+#endif
 
 #ifdef CONFIG_POST
 #define CFG_CMD_POST_DIAG CFG_CMD_DIAG
@@ -176,8 +181,8 @@
 
 #define        CONFIG_TIMESTAMP                /* display image timestamps */
 
-#if (TEXT_BASE == 0xFC000000)          /* Boot low */
-#   define CFG_LOWBOOT         1
+#if (TEXT_BASE != 0xFFF00000)
+#   define CFG_LOWBOOT         1       /* Boot low */
 #endif
 
 /*
@@ -191,30 +196,38 @@
 
 #undef CONFIG_BOOTARGS
 
-#if defined(CONFIG_TQM5200_B)
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       "netdev=eth0\0"                                                 \
-       "rootpath=/opt/eldk/ppc_6xx\0"                                  \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
-       "addip=setenv bootargs ${bootargs} "                            \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
-               ":${hostname}:${netdev}:off panic=1\0"                  \
-       "flash_self=run ramargs addip;"                                 \
-               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
-       "flash_nfs=run nfsargs addip;"                                  \
-               "bootm ${kernel_addr}\0"                                \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
-       "bootfile=/tftpboot/tqm5200/uImage\0"                           \
-       "load=tftp 200000 ${u-boot}\0"                                  \
-       "u-boot=/tftpboot/tqm5200/u-boot.bin\0"                         \
+#ifdef CONFIG_STK52XX
+# if defined(CONFIG_TQM5200_B)
+#  if defined(CFG_LOWBOOT)
+#   define ENV_UPDT                                                    \
        "update=protect off FC000000 FC07FFFF;"                         \
                "erase FC000000 FC07FFFF;"                              \
                "cp.b 200000 FC000000 ${filesize};"                     \
-               "protect on FC000000 FC07FFFF\0"                        \
-       ""
+               "protect on FC000000 FC07FFFF\0"
+#  else        /* highboot */
+#   define ENV_UPDT                                                    \
+       "update=protect off FFF00000 FFF7FFFF;"                         \
+               "erase FFF00000 FFF7FFFF;"                              \
+               "cp.b 200000 FFF00000 ${filesize};"                     \
+               "protect on FFF00000 FFF7FFFF\0"
+#  endif /* CFG_LOWBOOT */
+# else /* !CONFIG_TQM5200_B */
+#  define ENV_UPDT                                                     \
+       "update=protect off FC000000 FC05FFFF;"                         \
+               "erase FC000000 FC05FFFF;"                              \
+               "cp.b 200000 FC000000 ${filesize};"                     \
+               "protect on FC000000 FC05FFFF\0"
+# endif /* CONFIG_TQM5200_B */
+#elif defined (CONFIG_CAMERON)
+#   define ENV_UPDT                                                    \
+       "update=protect off FC000000 FC03FFFF;"                         \
+               "erase FC000000 FC03FFFF;"                              \
+               "cp.b 200000 FC000000 ${filesize};"                     \
+               "protect on FC000000 FC03FFFF\0"
 #else
+# error "Unknown Carrier Board"
+#endif /* CONFIG_STK52XX */
+
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
@@ -224,20 +237,19 @@
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
-       "flash_self=run ramargs addip;"                                 \
+       "addcons=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate}\0"                           \
+       "flash_self=run ramargs addip addcons;"                         \
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
-       "flash_nfs=run nfsargs addip;"                                  \
+       "flash_nfs=run nfsargs addip addcons;"                          \
                "bootm ${kernel_addr}\0"                                \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"    \
+               "bootm\0"                                               \
        "bootfile=/tftpboot/tqm5200/uImage\0"                           \
-       "load=tftp 200000 ${u-boot}\0"                                  \
        "u-boot=/tftpboot/tqm5200/u-boot.bin\0"                         \
-       "update=protect off FC000000 FC05FFFF;"                         \
-               "erase FC000000 FC05FFFF;"                              \
-               "cp.b 200000 FC000000 ${filesize};"                     \
-               "protect on FC000000 FC05FFFF\0"                        \
+       "load=tftp 200000 ${u-boot}\0"                                  \
+       ENV_UPDT                                                        \
        ""
-#endif /* CONFIG_TQM5200_B */
 
 #define CONFIG_BOOTCOMMAND     "run net_nfs"
 
@@ -319,45 +331,69 @@
 #define CFG_MAX_FLASH_SECT     512     /* max num of sects on one chip */
 #define CFG_FLASH_USE_BUFFER_WRITE     1
 
-#if defined(CONFIG_TQM5200_B)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00080000)
+#if defined (CONFIG_CAMERON)
+# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00040000)
+#elif defined(CONFIG_TQM5200_B)
+# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00080000)
 #else
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
-#endif /* CONFIG_TQM5200_B */
+# define CFG_ENV_ADDR          (CFG_FLASH_BASE + 0x00060000)
+#endif
+
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
 
 /* Dynamic MTD partition support */
 #define CONFIG_JFFS2_CMDLINE
 #define MTDIDS_DEFAULT         "nor0=TQM5200-0"
-#if defined(CONFIG_TQM5200_B)
-#define MTDPARTS_DEFAULT       "mtdparts=TQM5200-0:768k(firmware),"    \
-                                               "1280k(kernel),"        \
+
+#ifdef CONFIG_STK52XX
+# if defined(CONFIG_TQM5200_B)
+#  if defined(CFG_LOWBOOT)
+#   define MTDPARTS_DEFAULT    "mtdparts=TQM5200-0:1m(firmware),"      \
+                                               "1536k(kernel),"        \
+                                               "3584k(small-fs),"      \
                                                "2m(initrd),"           \
-                                               "4m(small-fs),"         \
-                                               "16m(big-fs),"          \
-                                               "8m(misc)"
-#else
-#define MTDPARTS_DEFAULT       "mtdparts=TQM5200-0:640k(firmware),"    \
+                                               "8m(misc),"             \
+                                               "16m(big-fs)"
+#  else        /* highboot */
+#   define MTDPARTS_DEFAULT    "mtdparts=TQM5200-0:2560k(kernel),"     \
+                                               "3584k(small-fs),"      \
+                                               "2m(initrd),"           \
+                                               "8m(misc),"             \
+                                               "15m(big-fs),"          \
+                                               "1m(firmware)"
+#  endif /* CFG_LOWBOOT */
+# else /* !CONFIG_TQM5200_B */
+#   define MTDPARTS_DEFAULT    "mtdparts=TQM5200-0:640k(firmware),"    \
                                                "1408k(kernel),"        \
                                                "2m(initrd),"           \
                                                "4m(small-fs),"         \
-                                               "16m(big-fs),"          \
-                                               "8m(misc)"
-#endif /* CONFIG_TQM5200_B */
+                                               "8m(misc),"             \
+                                               "16m(big-fs)"
+# endif /* CONFIG_TQM5200_B */
+#elif defined (CONFIG_CAMERON)
+#   define MTDPARTS_DEFAULT    "mtdparts=TQM5200-0:768k(firmware),"    \
+                                               "1792k(kernel),"        \
+                                               "3584k(small-fs),"      \
+                                               "2m(initrd),"           \
+                                               "8m(misc),"             \
+                                               "16m(big-fs)"
+#else
+# error "Unknown Carrier Board"
+#endif /* CONFIG_STK52XX */
 
 /*
  * Environment settings
  */
 #define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
+#define CFG_ENV_SIZE           0x4000  /* 16 k - keep small for fast booting */
 #if defined(CONFIG_TQM5200_B)
 #define CFG_ENV_SECT_SIZE      0x40000
 #else
 #define CFG_ENV_SECT_SIZE      0x20000
+#endif /* CONFIG_TQM5200_B */
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
-#endif /* CONFIG_TQM5200_B */
 
 /*
  * Memory map
@@ -385,12 +421,15 @@
 #   define CFG_RAMBOOT         1
 #endif
 
-#if defined(CONFIG_TQM5200_B)
-#define CFG_MONITOR_LEN                (512 << 10)     /* Reserve 512 kB for Monitor   */
+#if defined (CONFIG_CAMERON)
+# define CFG_MONITOR_LEN       (256 << 10)     /* Reserve 256 kB for Monitor   */
+#elif defined(CONFIG_TQM5200_B)
+# define CFG_MONITOR_LEN       (512 << 10)     /* Reserve 512 kB for Monitor   */
 #else
-#define CFG_MONITOR_LEN                (384 << 10)     /* Reserve 384 kB for Monitor   */
-#endif /* CONFIG_TQM5200_B */
-#define CFG_MALLOC_LEN         (256 << 10)     /* Reserve 256 kB for malloc()  */
+# define CFG_MONITOR_LEN       (384 << 10)     /* Reserve 384 kB for Monitor   */
+#endif
+
+#define CFG_MALLOC_LEN         (1024 << 10)    /* Reserve 1024 kB for malloc() */
 #define CFG_BOOTMAPSZ          (8 << 20)       /* Initial Memory map for Linux */
 
 /*
@@ -462,6 +501,10 @@
  */
 #define CFG_LONGHELP                   /* undef to save memory     */
 #define CFG_PROMPT             "=> "   /* Monitor Command Prompt   */
+
+#define        CFG_HUSH_PARSER         1       /* use "hush" command parser    */
+#define        CFG_PROMPT_HUSH_PS2     "> "
+
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CFG_CBSIZE             1024    /* Console I/O Buffer Size  */
 #else
@@ -508,32 +551,25 @@
 #define CFG_CS0_START          CFG_FLASH_BASE
 #define CFG_CS0_SIZE           CFG_FLASH_SIZE
 
-/* automatic configuration of chip selects */
-#ifdef CONFIG_CS_AUTOCONF
 #define CONFIG_LAST_STAGE_INIT
-#endif
 
 /*
  * SRAM - Do not map below 2 GB in address space, because this area is used
  * for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define CFG_CS2_START          0xE5000000
 #define CFG_CS2_SIZE           0x100000        /* 1 MByte */
 #define CFG_CS2_CFG            0x0004D930
-#endif
 
 /*
  * Grafic controller - Do not map below 2 GB in address space, because this
  * area is used for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define SM501_FB_BASE          0xE0000000
 #define CFG_CS1_START          (SM501_FB_BASE)
 #define CFG_CS1_SIZE           0x4000000       /* 64 MByte */
 #define CFG_CS1_CFG            0x8F48FF70
 #define SM501_MMIO_BASE                CFG_CS1_START + 0x03E00000
-#endif
 
 #define CFG_CS_BURST           0x00000000
 #define CFG_CS_DEADCYCLE       0x33333311      /* 1 dead cycle for flash and SM501 */

diff --git a/include/configs/aev.h b/include/configs/aev.h
index aa6bc91b20fda543c5291f0bdfa8957cc4e8df1f..8d9f0a166104dcc526146df094bbac0d19296063 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2003-2005
+ * (C) Copyright 2003-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2004-2005
@@ -370,10 +370,7 @@
 #define CFG_CS0_START          CFG_FLASH_BASE
 #define CFG_CS0_SIZE           CFG_FLASH_SIZE
 
-/* automatic configuration of chip selects */
-#ifdef CONFIG_CS_AUTOCONF
 #define CONFIG_LAST_STAGE_INIT
-#endif
 
 /*
  * SRAM - Do not map below 2 GB in address space, because this area is used

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 9ebb51e0ab77125e136e251fd7a2f9c4d2e4c6a4..f40dde2ac834271e5a91299bb511f1780d3350e4 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -452,32 +452,25 @@
 #define CFG_CS0_START          CFG_FLASH_BASE
 #define CFG_CS0_SIZE           CFG_FLASH_SIZE
 
-/* automatic configuration of chip selects */
-#ifdef CONFIG_CS_AUTOCONF
 #define CONFIG_LAST_STAGE_INIT
-#endif
 
 /*
  * SRAM - Do not map below 2 GB in address space, because this area is used
  * for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define CFG_CS2_START          0xE5000000
 #define CFG_CS2_SIZE           0x100000        /* 1 MByte */
 #define CFG_CS2_CFG            0x0004D930
-#endif
 
 /*
  * Grafic controller - Do not map below 2 GB in address space, because this
  * area is used for SDRAM autosizing.
  */
-#if defined (CONFIG_CS_AUTOCONF)
 #define SM501_FB_BASE          0xE0000000
 #define CFG_CS1_START          (SM501_FB_BASE)
 #define CFG_CS1_SIZE           0x4000000       /* 64 MByte */
 #define CFG_CS1_CFG            0x8F48FF70
 #define SM501_MMIO_BASE                CFG_CS1_START + 0x03E00000
-#endif
 
 #define CFG_CS_BURST           0x00000000
 #define CFG_CS_DEADCYCLE       0x33333311      /* 1 dead cycle for flash and SM501 */

diff --git a/mkconfig b/mkconfig
index 54775d31dfef42fe0295640054976f691c1e48b3..4fe6e448bee49de675e1483092debe110ade7de2 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -9,19 +9,23 @@
 #
 
 APPEND=no      # Default: Create new config file
+BOARD_NAME=""  # Name to print in make output
 
 while [ $# -gt 0 ] ; do
        case "$1" in
        --) shift ; break ;;
        -a) shift ; APPEND=yes ;;
+       -n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
        *)  break ;;
        esac
 done
 
+[ "${BOARD_NAME}" ] || BOARD_NAME="$1"
+
 [ $# -lt 4 ] && exit 1
 [ $# -gt 6 ] && exit 1
 
-echo "Configuring for $1 board..."
+echo "Configuring for ${BOARD_NAME} board..."
 
 cd ./include