]> git.sur5r.net Git - u-boot/commitdiff
ARM: Board voiceblue update
authorLadislav Michl <ladis@linux-mips.org>
Thu, 6 Dec 2007 23:42:32 +0000 (00:42 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 3 Feb 2008 23:17:20 +0000 (00:17 +0100)
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Makefile
board/voiceblue/Makefile
board/voiceblue/config.mk
board/voiceblue/setup.S
include/configs/voiceblue.h

index 0f6cc59aeeba4ff3fe36bcd0be5308b08f881804..ec8661ad89863b047e2982713c431e42619807f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2467,20 +2467,8 @@ versatileab_config       \
 versatilepb_config :   unconfig
        @board/versatile/split_by_variant.sh $@
 
-voiceblue_smallflash_config    \
 voiceblue_config:      unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)board/voiceblue
-       @if [ "$(findstring _smallflash_,$@)" ] ; then \
-               $(XECHO) "... boot from lower flash bank" ; \
-               echo "#define VOICEBLUE_SMALL_FLASH" >>$(obj)include/config.h ; \
-               echo "VOICEBLUE_SMALL_FLASH=y" >$(obj)board/voiceblue/config.tmp ; \
-       else \
-               $(XECHO) "... boot from upper flash bank" ; \
-               >$(obj)include/config.h ; \
-               echo "VOICEBLUE_SMALL_FLASH=n" >$(obj)board/voiceblue/config.tmp ; \
-       fi
-       @$(MKCONFIG) -a voiceblue arm arm925t voiceblue
+       @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
 
 cm4008_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cm4008 NULL ks8695
index 5f340b47f0a98a06240ea1cd64a4239a4362eb3d..9386bb0e7af420d071e5c861d3c4356047ff0db6 100644 (file)
@@ -62,7 +62,7 @@ clean:
 
 
 distclean:     clean
-       rm -f $(LIB) core config.tmp *.bak .depend
+       rm -f $(LIB) core *.bak .depend
 
 #########################################################################
 
index d55daa41d9f35780265bfa2a98bce523bb049bce..2cfc56ada5f3e1c25c22b676b7ecc77fc3a4fe45 100644 (file)
@@ -1,16 +1 @@
-#
-# Linux-Kernel is expected to be at 1000'8000,
-# entry 1000'8000 (mem base + reserved)
-#
-
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
-ifeq ($(VOICEBLUE_SMALL_FLASH),y)
-# We load ourself to internal SRAM at 2001'2000
-# Check map file when changing TEXT_BASE.
-# Everything has fit into 192kB internal SRAM!
-TEXT_BASE = 0x20012000
-else
-# Running in SDRAM...
 TEXT_BASE = 0x13FD0000
-endif
index dcf37b5dce5bc9390f60e823162b691dfa93dcd9..78cd2b6bfeeaa35b2da9a4c0c61993c124d757b3 100644 (file)
@@ -77,7 +77,7 @@ MUX_CONFIG_VALUES:
        .word 0x00000000        @ FUNC_MUX_CTRL_3
        .word 0x00000000        @ FUNC_MUX_CTRL_4
        .word 0x12082480        @ FUNC_MUX_CTRL_5
-       .word 0x00000004        @ FUNC_MUX_CTRL_6
+       .word 0x0000001c        @ FUNC_MUX_CTRL_6
        .word 0x00000003        @ FUNC_MUX_CTRL_7
        .word 0x10001200        @ FUNC_MUX_CTRL_8
        .word 0x01201012        @ FUNC_MUX_CTRL_9
index 7cab31dee4d25e67b0094776a9ed709ac4088a29..8c827af315e0ea9c176ce57c3f580d35f96e99c8 100644 (file)
 
 #include <configs/omap1510.h>
 
-/*
- * High Level Configuration Options
- * (easy to change)
- */
 #define CONFIG_ARM925T 1               /* This is an arm925t CPU */
 #define CONFIG_OMAP    1               /* in a TI OMAP core */
 #define CONFIG_OMAP1510 1              /* which is in a 5910 */
  */
 #define CONFIG_NR_DRAM_BANKS   1               /* we have 1 bank of DRAM */
 #define PHYS_SDRAM_1           0x10000000      /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE      SZ_64M
+#define PHYS_SDRAM_1_SIZE      (64 * 1024 * 1024)
 
 #define PHYS_FLASH_1           0x00000000      /* Flash Bank #1 */
-#define PHYS_FLASH_2           0x0c000000
 
 #define CFG_LOAD_ADDR          PHYS_SDRAM_1 + 0x400000 /* default load address */
 
 #define CFG_FLASH_CFI                  /* Flash is CFI conformant */
 #define CFG_FLASH_CFI_DRIVER           /* Use the common driver */
 #define CFG_MAX_FLASH_BANKS    1
-#ifdef VOICEBLUE_SMALL_FLASH
-#define CFG_FLASH_BANKS_LIST   { PHYS_FLASH_2 }
-#else
-#define CFG_FLASH_BANKS_LIST   { PHYS_FLASH_1 }
-#endif
+#define CFG_FLASH_BASE         PHYS_FLASH_1
 
 /* FIXME: Does not work on AMD flash */
 /* #define CFG_FLASH_USE_BUFFER_WRITE 1 */     /* use buffered writes (20x faster) */
 #define CFG_MAX_FLASH_SECT     512     /* max # of sectors on one chip */
 
 #define CFG_MONITOR_BASE       PHYS_FLASH_1
-#define CFG_MONITOR_LEN                SZ_128K
+#define CFG_MONITOR_LEN                (256 * 1024)
 
 /*
  * Environment settings
  */
-#ifdef VOICEBLUE_SMALL_FLASH
-#define CFG_ENV_IS_NOWHERE
-#define CFG_ENV_SIZE           SZ_1K
-#else
 #define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_ADDR           (PHYS_FLASH_1 + CFG_MONITOR_LEN)
-#define CFG_ENV_SIZE           SZ_8K
-#define CFG_ENV_SECT_SIZE      SZ_64K
+#define CFG_ENV_SIZE           (8 * 1024)
+#define CFG_ENV_SECT_SIZE      (64 * 1024)
 #define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
 
 #define CONFIG_ENV_OVERWRITE
 
-#endif
-
 /*
  * Size of malloc() pool and stack
  */
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
-#ifdef VOICEBLUE_SMALL_FLASH
-#define CFG_MALLOC_LEN         (SZ_64K - CFG_GBL_DATA_SIZE)
-#define CONFIG_STACKSIZE       SZ_8K
-#define PHYS_SDRAM_1_RESERVED  0
-#else
-#define CFG_MALLOC_LEN         SZ_4M
-#define CONFIG_STACKSIZE       SZ_1M
+#define CFG_MALLOC_LEN         (4 * 1024 * 1024)
+#define CONFIG_STACKSIZE       (1 * 1024 * 1024)
 #define PHYS_SDRAM_1_RESERVED  (CFG_MONITOR_LEN + CFG_MALLOC_LEN + CONFIG_STACKSIZE)
-#endif
 
 /*
  * Hardware drivers
 #define CONFIG_DRIVER_SMC91111
 #define CONFIG_SMC91111_BASE   0x08000300
 
+#define CONFIG_HARD_I2C
+#define CFG_I2C_SPEED          100000
+#define CFG_I2C_SLAVE          1
+#define CONFIG_DRIVER_OMAP1510_I2C
+
+#define CONFIG_RTC_DS1307
+#define CFG_I2C_RTC_ADDR       0x68
+
 /*
  * NS16550 Configuration
  */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_BDI
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_IMI
+#define CONFIG_CMD_BOOTD
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV
 #define CONFIG_CMD_FLASH
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_LOADB
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_NET
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_RUN
 
-#if !defined(VOICEBLUE_SMALL_FLASH)
-    #define CONFIG_CMD_ENV
-    #define CONFIG_CMD_JFFS2
-#endif
-
 
 /*
  * BOOTP options
 
 #define CONFIG_LOOPW
 
-#ifdef VOICEBLUE_SMALL_FLASH
-#define CONFIG_BOOTDELAY       0
-#undef  CONFIG_BOOTARGS                /* the preboot command will set bootargs*/
-#define CFG_AUTOLOAD           "n"     /* no autoload */
-#define CONFIG_PREBOOT         "run setup"
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "setup=setenv bootargs console=ttyS0,${baudrate} "      \
-               "root=/dev/nfs ip=dhcp\0"                       \
-       "update=erase c000000 c03ffff; "                        \
-               "cp.b 10400000 c000000 ${filesize}\0"
-#else
 #define CONFIG_BOOTDELAY       3
-#undef  CONFIG_BOOTARGS                /* boot command will set bootargs */
-#define CFG_AUTOLOAD           "n"     /* no autoload */
+#define CONFIG_ZERO_BOOTDELAY_CHECK    /* allow to break in always */
+#undef  CONFIG_BOOTARGS                /* the boot command will set bootargs*/
+#define CFG_AUTOLOAD           "n"             /* No autoload */
 #define CONFIG_BOOTCOMMAND     "run nboot"
 #define CONFIG_PREBOOT         "run setup"
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "silent=1\0"                                            \
        "ospart=0\0"                                            \
-       "swapos=no\0"                                           \
+       "bootfile=/boot/uImage\0"                               \
        "setpart="                                              \
-       "if test $swapos = yes; then "                          \
-               "if test $ospart -eq 0; then chpart 4; else chpart 3; fi; "\
-               "setenv swapos no; saveenv; "                   \
-       "else "                                                 \
-               "if test $ospart -eq 0; then chpart 3; else chpart 4; fi; "\
+       "if test -n $swapos; then "                             \
+               "setenv swapos; saveenv; "                      \
+               "if test $ospart -eq 0; then setenv ospart 1; else setenv ospart 0; fi; "\
        "fi\0"                                                  \
        "setup=setenv bootargs console=ttyS0,$baudrate "        \
                "mtdparts=$mtdparts\0"                          \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \
                "nfsroot=$rootpath root=/dev/nfs\0"             \
        "flashargs=run setpart; setenv bootargs $bootargs "     \
-               "root=/dev/mtdblock$partition ro "              \
+               "root=mtd:data$ospart ro "                      \
                "rootfstype=jffs2\0"                            \
        "initrdargs=setenv bootargs $bootargs "                 \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
-       "fboot=run flashargs; fsload /boot/uImage; bootm\0"     \
-       "iboot=bootp; run initrdargs; tftp; bootm\0"            \
+       "fboot=run flashargs; chpart data$ospart; fsload; bootm\0" \
+       "mboot=bootp; run initrdargs; tftp; bootm\0"            \
        "nboot=bootp; run nfsargs; tftp; bootm\0"
-#endif
 
-#ifndef VOICEBLUE_SMALL_FLASH
 #define CONFIG_SILENT_CONSOLE          1       /* enable silent startup */
 
 #if 1  /* feel free to disable for development */
  */
 #define CONFIG_JFFS2_CMDLINE
 #define MTDIDS_DEFAULT         "nor0=omapflash.0"
-#define MTDPARTS_DEFAULT       "mtdparts=omapflash.0:128k(uboot),64k(env),64k(r_env),16256k(data1),-(data2)"
-
-#endif /* VOICEBLUE_SMALL_FLASH */
+#define MTDPARTS_DEFAULT       "mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)"
 
 
 /*
  * Miscellaneous configurable options
  */
-#ifndef VOICEBLUE_SMALL_FLASH
 #define CFG_HUSH_PARSER
 #define CFG_PROMPT_HUSH_PS2    "> "
 #define CONFIG_AUTO_COMPLETE
-#endif
 #define CFG_LONGHELP                           /* undef to save memory         */
 #define CFG_PROMPT             "# "            /* Monitor Command Prompt       */
 #define CFG_CBSIZE             256             /* Console I/O Buffer Size      */