Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index b412655b6dd05a42273ab46f4abac863768712fb..ec36f55420cb762004b212827190e5d51ba5c9ed 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -104,7 +104,7 @@
 
 /* Flash */
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI_WIDTH    FLASH_CFI_16BIT
 
 #define CFG_FLASH_BASE         0xFF800000
@@ -139,7 +139,7 @@
 #define CFG_GBL_DATA_OFFSET    (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
 #define CFG_INIT_SP_OFFSET     CFG_GBL_DATA_OFFSET
 
-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
 #define CFG_MONITOR_LEN                (512 * 1024)
 #define CFG_MALLOC_LEN         (512 * 1024)
 
@@ -255,12 +255,12 @@
 #undef  CFG_FLASH_PROTECTION
 #define CONFIG_ENV_OVERWRITE
 
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0xFF800000
-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x2000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR+CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                0xFF800000
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x2000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #define CONFIG_LOADS_ECHO
 #define CFG_LOADS_BAUD_CHANGE
@@ -406,22 +406,22 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define CONFIG_RESET_TO_RETRY          1000
 
-#define MV_CI                  "mvBL-M7"
-#define MV_VCI                 "mvBL-M7"
-#define MV_FPGA_DATA           "0xfff80000"
-#define MV_FPGA_SIZE           "0x76ca2"
-#define MV_KERNEL_ADDR         "0xff810000"
-#define MV_INITRD_ADDR         "0xffc00000"
-#define MV_AUTOSCR_ADDR                "0xff804000"
-#define MV_AUTOSCR_ADDR2       "0xff806000"
-#define MV_DTB_ADDR            "0xff808000"
-#define MV_INITRD_LENGTH       "0x00300000"
+#define MV_CI                  mvBL-M7
+#define MV_VCI                 mvBL-M7
+#define MV_FPGA_DATA           0xfff80000
+#define MV_FPGA_SIZE           0x00076ca2
+#define MV_KERNEL_ADDR         0xff810000
+#define MV_INITRD_ADDR         0xffb00000
+#define MV_AUTOSCR_ADDR                0xff804000
+#define MV_AUTOSCR_ADDR2       0xff806000
+#define MV_DTB_ADDR            0xff808000
+#define MV_INITRD_LENGTH       0x00400000
 
 #define CONFIG_SHOW_BOOT_PROGRESS 1
 
-#define MV_KERNEL_ADDR_RAM     "0x00100000"
-#define MV_DTB_ADDR_RAM                "0x00600000"
-#define MV_INITRD_ADDR_RAM     "0x01000000"
+#define MV_KERNEL_ADDR_RAM     0x00100000
+#define MV_DTB_ADDR_RAM                0x00600000
+#define MV_INITRD_ADDR_RAM     0x01000000
 
 #define CONFIG_BOOTCOMMAND     "if imi ${autoscr_addr}; \
                                        then autoscr ${autoscr_addr};  \
@@ -431,25 +431,26 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "console_nr=0\0"                                        \
+       "baudrate=" MK_STR(CONFIG_BAUDRATE) "\0"                \
        "stdin=serial\0"                                        \
        "stdout=serial\0"                                       \
        "stderr=serial\0"                                       \
        "fpga=0\0"                                              \
-       "fpgadata=" MV_FPGA_DATA "\0"                           \
-       "fpgadatasize=" MV_FPGA_SIZE "\0"                       \
-       "autoscr_addr=" MV_AUTOSCR_ADDR "\0"                    \
-       "autoscr_addr2=" MV_AUTOSCR_ADDR2 "\0"                  \
-       "mv_kernel_addr=" MV_KERNEL_ADDR "\0"                   \
-       "mv_kernel_addr_ram=" MV_KERNEL_ADDR_RAM "\0"           \
-       "mv_initrd_addr=" MV_INITRD_ADDR "\0"                   \
-       "mv_initrd_addr_ram=" MV_INITRD_ADDR_RAM "\0"           \
-       "mv_initrd_length=" MV_INITRD_LENGTH "\0"               \
-       "mv_dtb_addr=" MV_DTB_ADDR "\0"                         \
-       "mv_dtb_addr_ram=" MV_DTB_ADDR_RAM "\0"                 \
-       "dtb_name=" MV_DTB_NAME "\0"                            \
+       "fpgadata=" MK_STR(MV_FPGA_DATA) "\0"                   \
+       "fpgadatasize=" MK_STR(MV_FPGA_SIZE) "\0"               \
+       "autoscr_addr=" MK_STR(MV_AUTOSCR_ADDR) "\0"            \
+       "autoscr_addr2=" MK_STR(MV_AUTOSCR_ADDR2) "\0"          \
+       "mv_kernel_addr=" MK_STR(MV_KERNEL_ADDR) "\0"           \
+       "mv_kernel_addr_ram=" MK_STR(MV_KERNEL_ADDR_RAM) "\0"   \
+       "mv_initrd_addr=" MK_STR(MV_INITRD_ADDR) "\0"           \
+       "mv_initrd_addr_ram=" MK_STR(MV_INITRD_ADDR_RAM) "\0"   \
+       "mv_initrd_length=" MK_STR(MV_INITRD_LENGTH) "\0"       \
+       "mv_dtb_addr=" MK_STR(MV_DTB_ADDR) "\0"                 \
+       "mv_dtb_addr_ram=" MK_STR(MV_DTB_ADDR_RAM) "\0"         \
+       "dtb_name=" MK_STR(MV_DTB_NAME) "\0"                    \
        "mv_version=" U_BOOT_VERSION "\0"                       \
-       "dhcp_client_id=" MV_CI "\0"                            \
-       "dhcp_vendor-class-identifier=" MV_VCI "\0"             \
+       "dhcp_client_id=" MK_STR(MV_CI) "\0"                    \
+       "dhcp_vendor-class-identifier=" MK_STR(MV_VCI) "\0"     \
        "netretry=no\0"                                         \
        "use_static_ipaddr=no\0"                                \
        "static_ipaddr=192.168.90.10\0"                         \
@@ -470,6 +471,7 @@
        "gevss_debug=0\0"                                       \
        "watchdog=0\0"                                          \
        "usb_dr_mode=host\0"                                    \
+       "sensor_cnt=2\0"                                        \
        ""
 
 #define CONFIG_FPGA_COUNT      1